Adaptation for POPL 2012.

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

diff --git a/program/PMDefaults.hs b/program/PMDefaults.hs
index 3504e06..7bb277f 100644 (file)
--- a/program/PMDefaults.hs
+++ b/program/PMDefaults.hs
@@ -25,13 +25,13 @@ reviewsEachProposal = 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 ===
 
@@ -53,7 +53,7 @@ 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,