X-Git-Url: https://mattmccutchen.net/match/match.git/blobdiff_plain/8c5ee850714e315aabbdcd173728e60811206b2c..05a6f0edaacc70ab373988ec4bafdf9963551004:/program/Test.hs diff --git a/program/Test.hs b/program/Test.hs index 4d715c4..8307e38 100644 --- a/program/Test.hs +++ b/program/Test.hs @@ -4,8 +4,8 @@ module Test ( module TestUtils, -- Generate instances. - module Instance, - module InstanceGenerator, + module PMInstance, + module PMInstanceGenerator, -- Solve instances. module ProposalMatcher, @@ -16,8 +16,8 @@ module Test ( module RandomizedMonad ) where import TestUtils -import Instance -import InstanceGenerator +import PMInstance +import PMInstanceGenerator import ProposalMatcher import PMDefaults import System.Random @@ -62,7 +62,7 @@ myPrefs = transposeArray $ listArray ((0,0), (myNumProps-1,myNumRvrs-1)) [ 15, 25, 20, 20, 15 ] :: UArray (Int, Int) Wt -myInst = Instance myNumRvrs myNumProps (constArray (0, myNumRvrs-1) 1) myPrefs +myInst = PMInstance myNumRvrs myNumProps (constArray (0, myNumRvrs-1) 1) myPrefs rdnResult = doReduction pmDefaults myInst ReductionResult rrg rrso rrsi rreib rredi = rdnResult