float STV

francois-durand · Sep 4, 2024 · c844a76 · c844a76
1 parent 0b63d16
commit c844a76
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/whalrus/rules_committee/rule_stv.py b/whalrus/rules_committee/rule_stv.py
@@ -107,26 +107,26 @@ def get_rounds_(self):
             selection(rule=rule, threshold = self.quota)
 
             for candidate in selection.selected_:
-                elected[candidate] = rule.gross_scores_[candidate]
+                elected[candidate] = float(rule.gross_scores_[candidate])
 
             if not selection.is_above_:
 
                 elimination = EliminationLast(rule=rule, k=1)
                 new_set = elimination.qualified_
                 e = next(iter(elimination.eliminated_))
-                eliminated[e] = rule.gross_scores_[e]
+                eliminated[e] = float(rule.gross_scores_[e])
                 selection = elimination
             else:
                 new_profile = selection.new_profile_
                 new_set = selection.remaining_
             rule(new_profile, candidates=new_set)
-            remaining = {c: rule.gross_scores_[c] for c in new_set}
+            remaining = {c: float(rule.gross_scores_[c]) for c in new_set}
             rounds.append((copy.deepcopy(selection), elected.copy(), remaining,eliminated.copy()))
             if len(rule.candidates_) + len(elected) == self.committee_size:
                 for candidate in rule.candidates_:
-                    elected[candidate] = rule.gross_scores_[candidate]
+                    elected[candidate] = float(rule.gross_scores_[candidate])
                 rounds[-1] = (selection, elected,{}, eliminated)
-
+            
                 return rounds
         return rounds
 
diff --git a/whalrus/selections/selection.py b/whalrus/selections/selection.py
@@ -65,13 +65,13 @@ def new_profile_(self):
 
             if len(ballot) >= 1 and ballot.first() not in self.selected_:
                 ballots.append(ballot.restrict(new_set))
-                weights.append(weight)
+                weights.append(float(weight))
 
             elif len(ballot) > 1 and self.get_winner_ratio_[ballot.first()] > 0:
 
                 ballots.append(ballot.restrict(new_set))
                 weights.append(weight*self.get_winner_ratio_[ballot.first()])
-        
+
         return Profile(ballots, weights = weights)