X-Git-Url: https://mattmccutchen.net/match/match.git/blobdiff_plain/8c5ee850714e315aabbdcd173728e60811206b2c..eb6c3c9f810799e3bfe8cd302dd9d00f97b4baf7:/program/Test.hs

diff --git a/program/Test.hs b/program/Test.hs
index 4d715c4..1530aa9 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,
@@ -13,15 +13,19 @@ module Test (
 	
 	-- Run randomized things.
 	module System.Random,
-	module RandomizedMonad
+	module RandomizedMonad,
+	
+	-- Evaluate.
+	module Evaluation
 ) where
 import TestUtils
-import Instance
-import InstanceGenerator
+import PMInstance
+import PMInstanceGenerator
 import ProposalMatcher
 import PMDefaults
 import System.Random
 import RandomizedMonad
+import Evaluation
 
 -- Other imports we need
 import BellmanFord
@@ -62,7 +66,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
@@ -71,3 +75,8 @@ rrg2 = flowAnnotate rrg rdnFlowArray
 myMatching = doMatching pmDefaults myInst
 
 iGraph = showInstanceAsGraph myInst myMatching -- Visualize me!
+
+-- Evaluation!
+eInst = runRandom myGen $ randomInstance 20 50
+eval1 = doEvaluateMatching pmDefaults eInst
+eval2 = doEvaluateMatching pmDefaults{loadTolerance = 2} eInst