Rename Instance -> PMInstance and introduce PMatching type.

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

diff --git a/program/InstanceGenerator.hs b/program/PMInstanceGenerator.hs
similarity index 92%
rename from program/InstanceGenerator.hs
rename to program/PMInstanceGenerator.hs
index fbd95b2..1143f61 100644 (file)
--- a/program/InstanceGenerator.hs
+++ b/program/PMInstanceGenerator.hs
@@ -1,5 +1,5 @@
-module InstanceGenerator where
-import Instance
+module PMInstanceGenerator where
+import PMInstance
 import System.Random
 import RandomizedMonad
 import Data.Array.IArray
@@ -47,7 +47,7 @@ expertnessToPref expertness = if expertness == 0 then 7
        else if expertness == 1 then 5
        else 3
 
-randomInstance :: Int -> Int -> Randomized Instance
+randomInstance :: Int -> Int -> Randomized PMInstance
 randomInstance numRvrs numProps = do
        reviewerInfos <- indRandomArray (0, numRvrs-1) $ randomReviewerInfo numProps
                :: Randomized (Array Int ReviewerInfo)
@@ -64,4 +64,4 @@ randomInstance numRvrs numProps = do
                                PTopic2 jt1 jt2 -> (expertnessToPref (iTE ! jt1)
                                        + expertnessToPref (iTE ! jt2)) / 2
                in if isConflict then 40 else topicPref * jD - 4)
-       return $ Instance numRvrs numProps loadA prefA
+       return $ PMInstance numRvrs numProps loadA prefA