Make proposal-matcher configuration non-global to make it more practical to

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

diff --git a/program/Test.hs b/program/Test.hs
index e684859..4d715c4 100644 (file)
--- a/program/Test.hs
+++ b/program/Test.hs
@@ -9,7 +9,7 @@ module Test (
        
        -- Solve instances.
        module ProposalMatcher,
-       module ProposalMatcherConfig,
+       module PMDefaults,
        
        -- Run randomized things.
        module System.Random,
@@ -19,7 +19,7 @@ import TestUtils
 import Instance
 import InstanceGenerator
 import ProposalMatcher
-import ProposalMatcherConfig hiding (Wt)
+import PMDefaults
 import System.Random
 import RandomizedMonad
 
@@ -37,7 +37,7 @@ myGraph = mkGraph [(0, ()), (1, ()), (2, ())]
 
 bfResult = bellmanFord snd 0 myGraph
 
-flowArray = minCostFlow (0, 2) fst (const 1) snd myGraph (0, 1)
+flowArray = minCostFlow pmDefaults (0, 2) fst (const 1) snd myGraph (0, 1)
 
 myNCGraph = mkGraph [(0, ())] [(0, 0, -1)] :: Gr () Int
 bfNCResult = bellmanFord id 0 myNCGraph
@@ -64,10 +64,10 @@ myPrefs = transposeArray $ listArray ((0,0), (myNumProps-1,myNumRvrs-1)) [
 
 myInst = Instance myNumRvrs myNumProps (constArray (0, myNumRvrs-1) 1) myPrefs
 
-rdnResult = doReduction myInst
+rdnResult = doReduction pmDefaults myInst
 ReductionResult rrg rrso rrsi rreib rredi = rdnResult
-rdnFlowArray = minCostFlow rreib reIdx reCap reCost rrg (rrso, rrsi)
+rdnFlowArray = minCostFlow pmDefaults rreib reIdx reCap reCost rrg (rrso, rrsi)
 rrg2 = flowAnnotate rrg rdnFlowArray
-myMatching = doMatching myInst
+myMatching = doMatching pmDefaults myInst
 
 iGraph = showInstanceAsGraph myInst myMatching -- Visualize me!