X-Git-Url: https://mattmccutchen.net/match/match.git/blobdiff_plain/5a07db44406bad03321a90b0814cc4496c6b7d63..89b7fd0dac0bef62999e7448fce184c19fe5bc6b:/program/Test.hs

diff --git a/program/Test.hs b/program/Test.hs
index 260ce0b..2e42be1 100644
--- a/program/Test.hs
+++ b/program/Test.hs
@@ -1,59 +1,52 @@
 module Test (
 	-- Export everything we need to have fun in GHCi:
-	
-	-- See the results of examples.
 	module Test,
+	module TestUtils,
 	
 	-- Generate instances.
-	module Instance,
-	module InstanceGenerator,
+	module PMInstance,
+	module PMInstanceGenerator,
 	
 	-- Solve instances.
 	module ProposalMatcher,
-	module ProposalMatcherConfig,
+	module PMDefaults,
 	
 	-- Run randomized things.
 	module System.Random,
 	module RandomizedMonad,
 	
-	-- Visualize graphs.
-	module Data.Graph.Inductive.Graphviz
+	-- Evaluate.
+	module Evaluation
 ) where
-import Instance
-import InstanceGenerator
+import TestUtils
+import PMInstance
+import PMInstanceGenerator
 import ProposalMatcher
-import ProposalMatcherConfig
+import PMDefaults
 import System.Random
 import RandomizedMonad
-import Data.Graph.Inductive.Graphviz
+import Evaluation
 
 -- Other imports we need
 import BellmanFord
-import NaiveMinCostFlow
 import Data.Array.IArray
 import Data.Array.Unboxed
 import Data.Graph.Inductive.Graph
 import Data.Graph.Inductive.Tree
 import ArrayStuff
 
+-- TESTING GRAPH ALGORITHMS
 myGraph = mkGraph [(0, ()), (1, ()), (2, ())]
 	[(0, 1, (0, 2)), (0, 2, (1, 3)), (2, 1, (2, -2))] :: Gr () (Int, Int)
 
 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
 
-data REdgeF = REdgeF Int Int Int Wt
-instance Show REdgeF where
-	show (REdgeF idx cap flow cost) = "#" ++ (show idx) ++ ": "
-		++ (show flow) ++ " of " ++ (show cap) ++ " @ " ++ (show cost)
-flowAnnotate g fa =
-	mkGraph (labNodes g) (map (\(n1, n2, REdge i ca co) ->
-		(n1, n2, REdgeF i ca (fa ! i) co)) $ labEdges g) :: Gr () REdgeF
-
+-- PROPOSAL-MATCHING EXAMPLES
 -- Example from idea book p. 425
 {- 
 (myNumRvrs, myNumProps) = (4, 3)
@@ -73,10 +66,12 @@ myPrefs = transposeArray $ listArray ((0,0), (myNumProps-1,myNumRvrs-1)) [
 	15, 25, 20, 20, 15
 	] :: UArray (Int, Int) Wt
 
-myInst = Instance myNumRvrs myNumProps (funcArray (0, myNumRvrs-1) $ const 1) myPrefs
+myInst = PMInstance 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!