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
Make the instance generator select proposal topics from a Zipf distribution, and
[match/match.git]
/
program
/
Test.hs
diff --git
a/program/Test.hs
b/program/Test.hs
index
4d715c4
..
d0bd6e2
100644
(file)
--- a/
program/Test.hs
+++ b/
program/Test.hs
@@
-3,25
+3,33
@@
module Test (
module Test,
module TestUtils,
module Test,
module TestUtils,
+ -- Manipulate configurations.
+ module PMConfig,
+ module PMDefaults,
+
-- Generate instances.
-- Generate instances.
- module Instance,
- module InstanceGenerator,
+ module
PM
Instance,
+ module
PM
InstanceGenerator,
-- Solve instances.
module ProposalMatcher,
-- Solve instances.
module ProposalMatcher,
- module PMDefaults,
-- Run randomized things.
module System.Random,
-- Run randomized things.
module System.Random,
- module RandomizedMonad
+ module RandomizedMonad,
+
+ -- Evaluate.
+ module Evaluation
) where
import TestUtils
) where
import TestUtils
-import Instance
-import InstanceGenerator
-import ProposalMatcher
+import PMConfig
import PMDefaults
import PMDefaults
+import PMInstance
+import PMInstanceGenerator
+import ProposalMatcher
import System.Random
import RandomizedMonad
import System.Random
import RandomizedMonad
+import Evaluation
-- Other imports we need
import BellmanFord
-- Other imports we need
import BellmanFord
@@
-62,7
+70,7
@@
myPrefs = transposeArray $ listArray ((0,0), (myNumProps-1,myNumRvrs-1)) [
15, 25, 20, 20, 15
] :: UArray (Int, Int) Wt
15, 25, 20, 20, 15
] :: UArray (Int, Int) Wt
-myInst = Instance myNumRvrs myNumProps (constArray (0, myNumRvrs-1) 1) myPrefs
+myInst =
PM
Instance myNumRvrs myNumProps (constArray (0, myNumRvrs-1) 1) myPrefs
rdnResult = doReduction pmDefaults myInst
ReductionResult rrg rrso rrsi rreib rredi = rdnResult
rdnResult = doReduction pmDefaults myInst
ReductionResult rrg rrso rrsi rreib rredi = rdnResult