PMDefaults changes (commit after the fact):

[match/match.git] / program / PMDefaults.hs

diff --git a/program/PMDefaults.hs b/program/PMDefaults.hs
index 3504e06..f7de456 100644 (file)
--- a/program/PMDefaults.hs
+++ b/program/PMDefaults.hs
@@ -12,26 +12,29 @@ 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 = 3,
+reviewsEachProposal = 4,
+
+-- Applies to non-PC papers
+pcReviewsEachProposal = 3,
 
 -- === Interpretation of the preference values ===
 
-prefIsExpert = \p -> p <= 10,
-prefIsKnowledgeable = \p -> p <= 20,
+expIsExpert = \x -> x >= 3,
+expIsKnowledgeable = \x -> x >= 2,
 
-prefIsBoring = \p -> p > 15,
-prefIsVeryBoring = \p -> p > 25,
+prefIsBoring = \p -> p < 50,
+prefIsVeryBoring = \p -> p < 0,
 
-prefIsConflict = \p -> p >= 40,
+prefIsConflict = \p -> p <= -100,
 
 -- === Tuning parameters for the matcher ===
 
@@ -39,7 +42,9 @@ prefIsConflict = \p -> p >= 40,
 -- load of (relativeLoad * ceiling(numProps * reviewsEachProposal /
 -- totalRelativeLoad)).  For now this is an additive constant; perhaps it should
 -- be proportional to the target load.
-loadTolerance = 1,
+loadTolerance = 2,
+
+ercLoadTolerance = 3,
 
 -- Cost to overload by one review.
 -- tx = 0 at target load, 1 at end of tolerance.
@@ -53,13 +58,13 @@ marginalVeryBoringCost = \lx -> 1000 + lx*1000,
 
 -- Cost to make a review.  Used by the evaluator too.
 -- I'm using quadratic cost functions as a first attempt.
-assignmentCost = \pref -> (widenInteger 10 + pref) ^ 2,
+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 ===