Matt McCutchen's Web Site
/
match
/
match.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename Instance -> PMInstance and introduce PMatching type.
[match/match.git]
/
program
/
TestUtils.hs
diff --git
a/program/TestUtils.hs
b/program/TestUtils.hs
index
f2dbe11
..
da68cf4
100644
(file)
--- a/
program/TestUtils.hs
+++ b/
program/TestUtils.hs
@@
-9,7
+9,7
@@
import System.Random
import System.Posix.IO
import System.Posix.Time
import System.Process
import System.Posix.IO
import System.Posix.Time
import System.Process
-import Instance
+import
PM
Instance
import ProposalMatcher
import MonadStuff
import ProposalMatcher
import MonadStuff
@@
-27,8
+27,8
@@
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
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 =
+showInstanceAsGraph ::
PMInstance -> PMatching
-> Gr String String
+showInstanceAsGraph (
PM
Instance numRvrs numProps rloadA prefA) matchedPairs =
let
rvrNode i = i
propNode j = numRvrs + j
let
rvrNode i = i
propNode j = numRvrs + j