Evidently ghci needs -cpp even if all the modules are already compiled.

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

diff --git a/program/Test.hs b/program/Test.hs
index 4d715c4..2e42be1 100644 (file)
--- a/program/Test.hs
+++ b/program/Test.hs
@@ -4,8 +4,8 @@ module Test (
        module TestUtils,
        
        -- Generate instances.
-       module Instance,
-       module InstanceGenerator,
+       module PMInstance,
+       module PMInstanceGenerator,
        
        -- Solve instances.
        module ProposalMatcher,
@@ -13,15 +13,19 @@ module Test (
        
        -- Run randomized things.
        module System.Random,
-       module RandomizedMonad
+       module RandomizedMonad,
+       
+       -- Evaluate.
+       module Evaluation
 ) where
 import TestUtils
-import Instance
-import InstanceGenerator
+import PMInstance
+import PMInstanceGenerator
 import ProposalMatcher
 import PMDefaults
 import System.Random
 import RandomizedMonad
+import Evaluation
 
 -- Other imports we need
 import BellmanFord
@@ -62,7 +66,7 @@ myPrefs = transposeArray $ listArray ((0,0), (myNumProps-1,myNumRvrs-1)) [
        15, 25, 20, 20, 15
        ] :: UArray (Int, Int) Wt
 
-myInst = Instance myNumRvrs myNumProps (constArray (0, myNumRvrs-1) 1) myPrefs
+myInst = PMInstance myNumRvrs myNumProps (constArray (0, myNumRvrs-1) 1) myPrefs
 
 rdnResult = doReduction pmDefaults myInst
 ReductionResult rrg rrso rrsi rreib rredi = rdnResult