v2.1.4

Author: szufix

mapel-all/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mapel"
-version = "2.1.3"
+version = "2.1.4"
 authors = [
  {name = "Stanislaw Szufa", email = "s.szufa@gmail.com"},
  {name = "Niclas Boehmer", email = "niclas.boehmer@tu-berlin.de"},

mapel-all/requirements.txt

@@ -1,4 +1,4 @@
-mapel-core==2.1.3
-mapel-elections==2.1.3
-mapel-roommates==2.1.3
-mapel-marriages==2.1.3
+mapel-core==2.1.4
+mapel-elections==2.1.4
+mapel-roommates==2.1.4
+mapel-marriages==2.1.4

mapel-core/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mapel-core"
-version = "2.1.3"
+version = "2.1.4"
 authors = [
  {name = "Stanislaw Szufa", email = "s.szufa@gmail.com"},
  {name = "Niclas Boehmer", email = "niclas.boehmer@tu-berlin.de"},

mapel-core/requirements.txt

@@ -7,4 +7,4 @@ scikit-learn~=1.3.0
 tikzplotlib~=0.10.1
 tqdm~=4.66.0
 gurobipy~=10.0.2
-prefsampling~=0.1.2
+prefsampling>=0.1.2

mapel-elections/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mapel-elections"
-version = "2.1.3"
+version = "2.1.4"
 authors = [
  {name = "Stanislaw Szufa", email = "s.szufa@gmail.com"},
  {name = "Niclas Boehmer", email = "niclas.boehmer@tu-berlin.de"},

mapel-elections/src/mapel/elections/__init__.py

@@ -1,3 +1,5 @@
+from collections import Counter
+
 from .distances_ import get_distance
 import mapel.core.printing as pr
 from .objects.ApprovalElectionExperiment import ApprovalElectionExperiment
@@ -115,21 +117,33 @@ def generate_ordinal_election_from_votes(votes=None):
     election.num_candidates = len(votes[0])
     election.num_voters = len(votes)
     election.votes = votes
+    election.is_exported = False
+    c = Counter(map(tuple, votes))
+    counted_votes = [[count, list(row)] for row, count in c.items()]
+    counted_votes = sorted(counted_votes, reverse=True)
+    election.quantites = [a[0] for a in counted_votes]
+    election.distinct_votes = [a[1] for a in counted_votes]
+    election.num_options = len(counted_votes)
     return election
 
 
-def generate_approval_election_from_votes(votes=None):
+def generate_approval_election_from_votes(votes=None, num_candidates=None):
     election = ApprovalElection()
-    election.num_candidates = len(set().union(*votes))
+    if num_candidates is None:
+        election.num_candidates = len(set().union(*votes))
+    else:
+        election.num_candidates = num_candidates
     election.num_voters = len(votes)
     election.votes = votes
+    election.is_exported = False
+    c = Counter(map(tuple, votes))
+    counted_votes = [[count, list(row)] for row, count in c.items()]
+    counted_votes = sorted(counted_votes, reverse=True)
+    election.quantites = [a[0] for a in counted_votes]
+    election.distinct_votes = [a[1] for a in counted_votes]
+    election.num_options = len(counted_votes)
     return election
 
 
 def compute_distance(*args, **kwargs):
     return get_distance(*args, **kwargs)
-
-
-# # # # # # # # # # # # # # # #
-# LAST CLEANUP ON: 11.07.2023 #
-# # # # # # # # # # # # # # # #

mapel-elections/src/mapel/elections/objects/ApprovalElection.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 import logging
 from abc import ABC
+from collections import Counter
 
 from matplotlib import pyplot as plt
 from mapel.elections.cultures_ import generate_approval_votes
@@ -44,7 +45,8 @@ def import_approval_election(self):
                         imports.import_fake_app_election(self.experiment_id, self.election_id)
                 else:
                     self.votes, self.num_voters, self.num_candidates, self.params, \
-                        self.culture_id = imports.import_real_app_election(
+                        self.culture_id, self.num_options, self.quantites, self.distinct_votes \
+                        = imports.import_real_app_election(
                             experiment_id=self.experiment_id,
                             election_id=self.election_id,
                             is_shifted=self.is_shifted)
@@ -79,10 +81,21 @@ def prepare_instance(self, is_exported=None, is_aggregated=True):
                                              num_candidates=self.num_candidates,
                                              num_voters=self.num_voters,
                                              params=self.params)
+        if not self.fake:
+            c = Counter(map(tuple, self.votes))
+            counted_votes = [[count, list(row)] for row, count in c.items()]
+            counted_votes = sorted(counted_votes, reverse=True)
+            self.quantites = [a[0] for a in counted_votes]
+            self.distinct_votes = [a[1] for a in counted_votes]
+            self.num_options = len(counted_votes)
+        else:
+            self.quantites = [self.num_voters]
+            self.num_options = 1
+
         if is_exported:
             exports.export_approval_election(self, is_aggregated=is_aggregated)
 
-    def compute_distances_between_votes(self, distance_id='hamming'):
+    def _compute_distances_between_votes(self, distance_id='hamming'):
         distances = np.zeros([self.num_voters, self.num_voters])
         for v1 in range(self.num_voters):
             for v2 in range(self.num_voters):
@@ -103,7 +116,7 @@ def compute_distances_between_votes(self, distance_id='hamming'):
 
         return distances
 
-    def compute_distances_between_candidates(self, distance_id='hamming'):
+    def _compute_distances_between_candidates(self, distance_id='hamming'):
 
         distances = np.zeros([self.num_candidates, self.num_candidates])
         for c1 in range(self.num_candidates):
@@ -125,14 +138,21 @@ def compute_distances_between_candidates(self, distance_id='hamming'):
         if self.is_exported:
             exports.export_distances(self, object_type='candidate')
 
+        return distances
+
+    def compute_distances(self, object_type=None, distance_id='hamming'):
+        if object_type == 'vote':
+            return self._compute_distances_between_votes(distance_id=distance_id)
+        elif object_type == 'candidate':
+            return self._compute_distances_between_candidates(distance_id=distance_id)
+
     def print_map(
             self,
             show=True,
             radius=None,
             name=None,
             alpha=0.1,
             s=30,
-            circles=False,
             object_type=None,
             double_gradient=False,
             saveas=None,

mapel-elections/src/mapel/elections/persistence/election_imports.py

@@ -213,14 +213,14 @@ def import_real_old_soc_election(experiment_id: str = None,
     first_line = my_file.readline()
 
     if first_line[0] != '#':
-        model_name = 'empty'
+        culture_id = 'empty'
         num_candidates = int(first_line)
     else:
         first_line = first_line.strip().split()
-        model_name = first_line[1]
+        culture_id = first_line[1]
         if experiment_id == 'original_ordinal_map':
             params = {}
-            model_name = _old_name_extractor(first_line)
+            culture_id = _old_name_extractor(first_line)
         else:
             if len(first_line) <= 2:
                 params = {}
@@ -266,7 +266,7 @@ def import_real_old_soc_election(experiment_id: str = None,
            num_voters, \
            num_candidates, \
            params, \
-           model_name, \
+           culture_id, \
            alliances, \
            num_options, \
            quantites, \
@@ -289,7 +289,7 @@ def import_fake_soc_election(experiment_id, name):
 
     first_line = my_file.readline()
     first_line = first_line.strip().split()
-    model_name = first_line[1]
+    culture_id = first_line[1]
     if len(first_line) <= 2:
         params = {}
     else:
@@ -300,7 +300,7 @@ def import_fake_soc_election(experiment_id, name):
 
     my_file.close()
 
-    return model_name, params, num_voters, num_candidates
+    return culture_id, params, num_voters, num_candidates
 
 
 def import_real_new_app_election(experiment_id: str = None,
@@ -361,8 +361,6 @@ def import_real_new_app_election(experiment_id: str = None,
 
     file.close()
 
-    alliances = None
-
     c = Counter(map(tuple, votes))
     counted_votes = [[count, list(row)] for row, count in c.items()]
     counted_votes = sorted(counted_votes, reverse=True)
@@ -373,7 +371,16 @@ def import_real_new_app_election(experiment_id: str = None,
     if is_shifted:
         votes = [[vote - 1 for vote in voter] for voter in votes]
 
-    return votes, len(votes), num_candidates, params, culture_id
+    num_voters = len(votes)
+
+    return votes, \
+           num_voters, \
+           num_candidates, \
+           params, \
+           culture_id, \
+           num_options, \
+           quantites, \
+           distinct_votes
 
 
 def import_real_old_app_election(experiment_id: str, election_id: str, is_shifted=False):
@@ -425,7 +432,21 @@ def import_real_old_app_election(experiment_id: str, election_id: str, is_shifte
         votes = [{c - 1 for c in vote} for vote in votes]
     my_file.close()
 
-    return votes, num_voters, num_candidates, params, culture_id
+    c = Counter(map(tuple, votes))
+    counted_votes = [[count, list(row)] for row, count in c.items()]
+    counted_votes = sorted(counted_votes, reverse=True)
+    quantites = [a[0] for a in counted_votes]
+    distinct_votes = [a[1] for a in counted_votes]
+    num_options = len(counted_votes)
+
+    return votes, \
+           num_voters, \
+           num_candidates, \
+           params, \
+           culture_id, \
+           num_options, \
+           quantites, \
+           distinct_votes
 
 
 def import_real_app_election(**kwargs):
@@ -443,7 +464,7 @@ def import_fake_app_election(experiment_id: str, name: str):
     my_file = open(path, 'r')
     first_line = my_file.readline()
     first_line = first_line.strip().split()
-    fake_model_name = first_line[1]
+    fake_culture_id = first_line[1]
     if len(first_line) <= 2:
         params = {}
     else:
@@ -452,7 +473,7 @@ def import_fake_app_election(experiment_id: str, name: str):
     num_candidates = int(my_file.readline().strip())
     num_voters = int(my_file.readline().strip())
 
-    return fake_model_name, params, num_voters, num_candidates
+    return fake_culture_id, params, num_voters, num_candidates
 
 
 def check_if_fake(experiment_id, name, extention):
@@ -466,11 +487,11 @@ def check_if_fake(experiment_id, name, extention):
 
 def _old_name_extractor(first_line):
     if len(first_line) == 4:
-        model_name = f'{first_line[1]} {first_line[2]} {first_line[3]}'
+        culture_id = f'{first_line[1]} {first_line[2]} {first_line[3]}'
     elif len(first_line) == 3:
-        model_name = f'{first_line[1]} {first_line[2]}'
+        culture_id = f'{first_line[1]} {first_line[2]}'
     elif len(first_line) == 2:
-        model_name = first_line[1]
+        culture_id = first_line[1]
     else:
-        model_name = 'noname'
-    return model_name
+        culture_id = 'noname'
+    return culture_id

mapel-marriages/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mapel-marriages"
-version = "2.1.3"
+version = "2.1.4"
 authors = [
  {name = "Stanislaw Szufa", email = "s.szufa@gmail.com"},
  {name = "Niclas Boehmer", email = "niclas.boehmer@tu-berlin.de"},

mapel-roommates/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mapel-roommates"
-version = "2.1.3"
+version = "2.1.4"
 authors = [
  {name = "Stanislaw Szufa", email = "s.szufa@gmail.com"},
  {name = "Niclas Boehmer", email = "niclas.boehmer@tu-berlin.de"},