The random instance generator and other improvements.

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

diff --git a/program/Test.hs b/program/Test.hs
index 7840b5e..f8cb4ef 100644 (file)
--- a/program/Test.hs
+++ b/program/Test.hs
@@ -1,15 +1,40 @@
-module Test where
+module Test (
+       -- Export everything we need to have fun in GHCi:
+       
+       -- See the results of examples.
+       module Test,
+       
+       -- Generate instances.
+       module Instance,
+       module InstanceGenerator,
+       
+       -- Solve instances.
+       module ProposalMatcher,
+       module ProposalMatcherConfig,
+       
+       -- Run randomized things.
+       module System.Random,
+       module RandomizedMonad,
+       
+       -- Visualize graphs.
+       module Data.Graph.Inductive.Graphviz
+) where
+import Instance
+import InstanceGenerator
+import ProposalMatcher
+import ProposalMatcherConfig
+import System.Random
+import RandomizedMonad
+import Data.Graph.Inductive.Graphviz
+
+-- Other imports we need
 import BellmanFord
 import UnitMinCostFlow
-import ProposalMatch
-import ProposalMatchConfig
-import Data.Array
+import Data.Array.IArray
+import Data.Array.Unboxed
 import Data.Graph.Inductive.Graph
 import Data.Graph.Inductive.Tree
-
--- So we can call graphviz' at the GHCi prompt
-import Data.Graph.Inductive.Graphviz
-graphviz' g = Data.Graph.Inductive.Graphviz.graphviz' g
+import ArrayStuff
 
 myGraph = mkGraph [(0, ()), (1, ()), (2, ())]
        [(0, 1, 2), (0, 2, 3), (2, 1, -2)] :: Gr () Double 
@@ -31,14 +56,13 @@ myPrefsArray = array ((0,0), (myNumRvrs-1,myNumProps-1)) [
 
 (myNumRvrs, myNumProps) = (5, 3)
 
-myPrefsArray = array ((0,0), (myNumRvrs-1,myNumProps-1)) [
-       ((0, 0), 15), ((1, 0), 10), ((2, 0), 15), ((3, 0), 40), ((4, 0), 20),
-       ((0, 1), 30), ((1, 1),  7), ((2, 1), 10), ((3, 1), 15), ((4, 1), 15),
-       ((0, 2), 15), ((1, 2), 25), ((2, 2), 20), ((3, 2), 20), ((4, 2), 15)
-       ]
+myPrefs = transposeArray $ listArray ((0,0), (myNumProps-1,myNumRvrs-1)) [
+       15, 10, 15, 40, 20,
+       30,  7, 10, 15, 15,
+       15, 25, 20, 20, 15
+       ] :: UArray (Int, Int) Wt
 
-myPrefs = \i j -> myPrefsArray ! (i, j)
-myInst = Instance myNumRvrs myNumProps (const 1) myPrefs
+myInst = Instance myNumRvrs myNumProps (funcArray (0, myNumRvrs-1) $ const 1) myPrefs
 
 rdnGraph = doReduction myInst
 (rdnFlowVal, rdnFlowResid) = umcf 0 1 rdnGraph