Adaptation for POPL 2012.

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

diff --git a/program/Test.hs b/program/Test.hs
index d0bd6e2..6dc2ecc 100644 (file)
--- a/program/Test.hs
+++ b/program/Test.hs
@@ -64,13 +64,21 @@ myPrefsArray = array ((0,0), (myNumRvrs-1,myNumProps-1)) [
 
 (myNumRvrs, myNumProps) = (5, 3)
 
-myPrefs = transposeArray $ listArray ((0,0), (myNumProps-1,myNumRvrs-1)) [
+myPrefs = transposeArray $ listArray ((0,0), (myNumProps-1,myNumRvrs-1)) $
+       map prefOldToNew [
        15, 10, 15, 40, 20,
        30,  7, 10, 15, 15,
        15, 25, 20, 20, 15
        ] :: UArray (Int, Int) Wt
 
-myInst = PMInstance myNumRvrs myNumProps (constArray (0, myNumRvrs-1) 1) myPrefs
+-- This data is pretty made-up... ~ 2011-07-11
+myExps = transposeArray $ listArray ((0,0), (myNumProps-1,myNumRvrs-1)) [
+        2,  2,  1,  3,  1,
+        0,  3,  2,  2,  2,
+        2,  1,  1,  2,  2
+       ] :: UArray (Int, Int) Wt
+
+myInst = PMInstance myNumRvrs myNumProps (constArray (0, myNumRvrs-1) 1) myPrefs myExps
 
 rdnResult = doReduction pmDefaults myInst
 ReductionResult rrg rrso rrsi rreib rredi = rdnResult