Merge branch 'master' into popl2012

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

diff --git a/program/Main.hs b/program/Main.hs
index bdc41a2..92c91fc 100644 (file)
--- a/program/Main.hs
+++ b/program/Main.hs
@@ -14,14 +14,22 @@ main = do
        incsv <- hGetContents stdin
        -- handle errors another day, or let the platform do it
        let inll = parseTSV incsv
-       let loadList = head inll
+       let loadList = tail (head inll)
        let numRvrs = length loadList
        let loadA = listArray (0, numRvrs-1) (map read loadList)
-       let numProps = length (tail inll)
+       let numProps = length (tail inll) `div` 2
        -- explicit type on the next line appears to be necessary
        let pxarr = listOfListsToArray2D (tail inll) :: Array (Int,Int) String
        -- careful, we end up transposing the array in here
-       let prefA = funcArray ((0,0), (numRvrs-1,numProps-1)) (\(i,j) -> read (pxarr ! (j, i)))
-       let theInst = PMInstance numRvrs numProps loadA prefA
+       let prefFixA = funcArray ((0,0), (numRvrs-1,numProps-1)) (\(i,j) ->
+               let
+                       cell = pxarr ! (2*j, i+1)
+                       (fix, pstr) = if last cell == '*' then (True, init cell) else (False, cell)
+                       pref = read pstr
+               in (pref, fix)) :: Array (Int,Int) (Wt,Bool)
+       let prefA = amap2 fst prefFixA; fixA = amap2 snd prefFixA
+       let expA = funcArray ((0,0), (numRvrs-1,numProps-1)) (\(i,j) -> read $ pxarr ! (2*j+1, i+1))
+       let pnrA = funcArray (0, numProps-1) (\j -> read $ pxarr ! (2*j, 0))
+       let theInst = PMInstance numRvrs numProps loadA prefA expA fixA pnrA
        let PMatching theMatching = doMatching pmDefaults theInst
        hPutStr stdout $ formatTSV $ map (\(i, j) -> map show [i, j]) theMatching