- Implement CS2 min-cost-flow adaptor and generalize common min-cost-flow stuff

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

diff --git a/program/Test.hs b/program/Test.hs
index cef7a53..e684859 100644 (file)
--- a/program/Test.hs
+++ b/program/Test.hs
@@ -1,8 +1,7 @@
 module Test (
        -- Export everything we need to have fun in GHCi:
-       
-       -- See the results of examples.
        module Test,
+       module TestUtils,
        
        -- Generate instances.
        module Instance,
@@ -14,31 +13,24 @@ module Test (
        
        -- Run randomized things.
        module System.Random,
-       module RandomizedMonad,
-       
-       -- Visualize graphs.
-       module Data.Graph.Inductive.Graphviz
+       module RandomizedMonad
 ) where
+import TestUtils
 import Instance
 import InstanceGenerator
 import ProposalMatcher
-import ProposalMatcherConfig
+import ProposalMatcherConfig hiding (Wt)
 import System.Random
 import RandomizedMonad
-import Data.Graph.Inductive.Graphviz
 
 -- 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
 
--- A fixed-seeded random number generator for reproducible experimentation.
-myGen = read "314159265 1" :: StdGen
-
 -- TESTING GRAPH ALGORITHMS
 myGraph = mkGraph [(0, ()), (1, ()), (2, ())]
        [(0, 1, (0, 2)), (0, 2, (1, 3)), (2, 1, (2, -2))] :: Gr () (Int, Int)
@@ -50,33 +42,6 @@ flowArray = minCostFlow (0, 2) fst (const 1) snd myGraph (0, 1)
 myNCGraph = mkGraph [(0, ())] [(0, 0, -1)] :: Gr () Int
 bfNCResult = bellmanFord id 0 myNCGraph
 
--- VISUALIZATION STUFF
-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
-
-showInstanceAsGraph :: Instance -> [(Int, Int)] -> Gr String String
-showInstanceAsGraph (Instance numRvrs numProps rloadA prefA) matchedPairs =
-       let
-               rvrNode i = i
-               propNode j = numRvrs + j
-               numNodes = numRvrs + numProps
-               theNodes = map (\i -> (rvrNode i, "R#" ++ show i ++
-                               " (RLoad " ++ show (rloadA ! i) ++ ")")) [0..numRvrs-1] ++
-                       map (\j -> (propNode j, "P#" ++ show j)) [0..numProps-1]
-               parenthesizeIf False s = s
-               parenthesizeIf True s = "(" ++ s ++ ")"
-               theEdges = do
-                       i <- [0..numRvrs-1]
-                       j <- [0..numProps-1]
-                       return (rvrNode i, propNode j,
-                               parenthesizeIf (elem (i, j) matchedPairs) $ show (prefA ! (i, j)))
-       in mkGraph theNodes theEdges
-
 -- PROPOSAL-MATCHING EXAMPLES
 -- Example from idea book p. 425
 {- 
@@ -97,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 (funcArray (0, myNumRvrs-1) $ const 1) myPrefs
+myInst = Instance myNumRvrs myNumProps (constArray (0, myNumRvrs-1) 1) myPrefs
 
 rdnResult = doReduction myInst
 ReductionResult rrg rrso rrsi rreib rredi = rdnResult