Merge branch 'master' into popl2012

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

diff --git a/program/PMInstanceGenerator.hs b/program/PMInstanceGenerator.hs
index 47a5ce4..9cafacd 100644 (file)
--- a/program/PMInstanceGenerator.hs
+++ b/program/PMInstanceGenerator.hs
@@ -80,4 +80,7 @@ randomInstance cfg numRvrs numProps = do
                                PTopic2 jt1 jt2 -> 1 + ((iTE ! jt1)
                                        + (iTE ! jt2)) / 2
                in topicExp)
-       return $ PMInstance numRvrs numProps loadA prefA expA
+       -- defaults
+       let fixA = constArray ((0,0), (numRvrs-1,numProps-1)) False
+       let pnrA = constArray (0, numProps-1) (reviewsEachProposal cfg)
+       return $ PMInstance numRvrs numProps loadA prefA expA fixA pnrA