Rewrite Bellman-Ford and min-cost flow, especially to stop the latter from crashing.

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

diff --git a/program/Test.hs b/program/Test.hs
index f8cb4ef..260ce0b 100644 (file)
--- a/program/Test.hs
+++ b/program/Test.hs
@@ -29,7 +29,7 @@ import Data.Graph.Inductive.Graphviz
 
 -- Other imports we need
 import BellmanFord
-import UnitMinCostFlow
+import NaiveMinCostFlow
 import Data.Array.IArray
 import Data.Array.Unboxed
 import Data.Graph.Inductive.Graph
@@ -37,11 +37,22 @@ import Data.Graph.Inductive.Tree
 import ArrayStuff
 
 myGraph = mkGraph [(0, ()), (1, ()), (2, ())]
-       [(0, 1, 2), (0, 2, 3), (2, 1, -2)] :: Gr () Double 
+       [(0, 1, (0, 2)), (0, 2, (1, 3)), (2, 1, (2, -2))] :: Gr () (Int, Int)
 
-spTree1 = spTree 0 myGraph
+bfResult = bellmanFord snd 0 myGraph
 
-(flowVal, flowResid) = umcf 0 1 myGraph
+flowArray = minCostFlow (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
 
 -- Example from idea book p. 425
 {- 
@@ -64,7 +75,8 @@ myPrefs = transposeArray $ listArray ((0,0), (myNumProps-1,myNumRvrs-1)) [
 
 myInst = Instance myNumRvrs myNumProps (funcArray (0, myNumRvrs-1) $ const 1) myPrefs
 
-rdnGraph = doReduction myInst
-(rdnFlowVal, rdnFlowResid) = umcf 0 1 rdnGraph
-rdnFlow = flowDiff rdnGraph rdnFlowResid
+rdnResult = doReduction myInst
+ReductionResult rrg rrso rrsi rreib rredi = rdnResult
+rdnFlowArray = minCostFlow rreib reIdx reCap reCost rrg (rrso, rrsi)
+rrg2 = flowAnnotate rrg rdnFlowArray
 myMatching = doMatching myInst