PMDefaults changes (commit after the fact):

- Go ahead and set CS2 as the min-cost flow solver.
- Increase knowledgeableBonus and expertBonus.

diff --git a/program/PMDefaults.hs b/program/PMDefaults.hs
index b3e290b..f7de456 100644 (file)
--- a/program/PMDefaults.hs
+++ b/program/PMDefaults.hs
@@ -12,13 +12,13 @@ pmDefaults = PMConfig {
 
 -- A naive implementation that is slow for all but the smallest instances
 -- (30s on a 20x50 example).
-minCostFlow = NaiveMinCostFlow.minCostFlow,
+--minCostFlow = NaiveMinCostFlow.minCostFlow,
 
 -- Uses CS2 (http://www.igsystems.com/cs2/), which requires a license for
 -- non-research use but is faster (<1s on a 20x50 example, 64s on a 60x500
 -- example).  Configure the path to cs2.exe in CS2MinCostFlow.hs.  Remember to
 -- compile CS2 with -DPRINT_ANS, or this won't work!
---minCostFlow = CS2MinCostFlow.minCostFlow,
+minCostFlow = CS2MinCostFlow.minCostFlow,
 
 -- The number of reviews each proposal should get.
 reviewsEachProposal = 4,
@@ -61,10 +61,10 @@ marginalVeryBoringCost = \lx -> 1000 + lx*1000,
 assignmentCost = \pref -> (widenInteger 10 + prefNewToOld pref) ^ 2,
 
 -- Bonus for a first knowledgeable or expert review.
-knowledgeableBonus = 1000,
+knowledgeableBonus = 3000,
 
 -- Bonus for an additional expert review.
-expertBonus = 1000,
+expertBonus = 3000,
 
 -- === Parameters for the random-instance generator ===