Merge pull request #18 from Abodi-Massarwa/main

PR
ariel-research · Sep 3, 2024 · cd86f85 · cd86f85
2 parents c65a1b2 + b899e6f
commit cd86f85
Show file tree

Hide file tree

Showing 15 changed files with 28,038 additions and 141 deletions.
diff --git a/experiments/results/heterogeneous_constraints_algorithms_abed_.csv b/experiments/results/heterogeneous_constraints_algorithms_abed_.csv
diff --git a/...nts/results/heterogeneous_matroid_constraints/egalitarian_binary_comparison.png b/...nts/results/heterogeneous_matroid_constraints/egalitarian_binary_comparison.png
diff --git a/...ts/heterogeneous_matroid_constraints/egalitarian_many_categories_comparison.png b/...ts/heterogeneous_matroid_constraints/egalitarian_many_categories_comparison.png
diff --git a/...ts/heterogeneous_matroid_constraints/egalitarian_single_category_comparison.png b/...ts/heterogeneous_matroid_constraints/egalitarian_single_category_comparison.png
diff --git a/experiments/results/heterogeneous_matroid_constraints/runtime_algorithm3.png b/experiments/results/heterogeneous_matroid_constraints/runtime_algorithm3.png
diff --git a/experiments/results/heterogeneous_matroid_constraints/runtime_algorithm5.png b/experiments/results/heterogeneous_matroid_constraints/runtime_algorithm5.png
diff --git a/...nts/results/heterogeneous_matroid_constraints/runtime_comparison_algorithm1.png b/...nts/results/heterogeneous_matroid_constraints/runtime_comparison_algorithm1.png
diff --git a/...nts/results/heterogeneous_matroid_constraints/runtime_comparison_algorithm2.png b/...nts/results/heterogeneous_matroid_constraints/runtime_comparison_algorithm2.png
diff --git a/...nts/results/heterogeneous_matroid_constraints/runtime_comparison_algorithm4.png b/...nts/results/heterogeneous_matroid_constraints/runtime_comparison_algorithm4.png
diff --git a/...ous_matroid_constraints/runtime_comparison_algorithm5_iterated_max_matching.png b/...ous_matroid_constraints/runtime_comparison_algorithm5_iterated_max_matching.png
diff --git a/...onstraints/runtime_comparison_heterogeneous_constraints_algorithms_original.png b/...onstraints/runtime_comparison_heterogeneous_constraints_algorithms_original.png
diff --git a/...nts/results/heterogeneous_matroid_constraints/utilitarian_binary_comparison.png b/...nts/results/heterogeneous_matroid_constraints/utilitarian_binary_comparison.png
diff --git a/...ts/heterogeneous_matroid_constraints/utilitarian_many_categories_comparison.png b/...ts/heterogeneous_matroid_constraints/utilitarian_many_categories_comparison.png
diff --git a/...ts/heterogeneous_matroid_constraints/utilitarian_single_category_comparison.png b/...ts/heterogeneous_matroid_constraints/utilitarian_single_category_comparison.png
diff --git a/fairpyx/algorithms/heterogeneous_matroid_constraints_algorithms.py b/fairpyx/algorithms/heterogeneous_matroid_constraints_algorithms.py