X-Git-Url: https://mattmccutchen.net/match/match.git/blobdiff_plain/56b565b1cacf3f74041f42fcdd95eac95352c3cf..e5c5cbd9d48ecf8de5e7b0c20d7164b4b7bf340b:/program/Main.hs

diff --git a/program/Main.hs b/program/Main.hs
index e3dbfff..92c91fc 100644
--- a/program/Main.hs
+++ b/program/Main.hs
@@ -3,30 +3,33 @@ import PMDefaults
 import ProposalMatcher
 import System.IO
 import Data.Array.IArray
+import Data.Array.Unboxed
 import ArrayStuff
-import Text.CSV
+import TSV
 
--- pretty silly but it does the job
-swapTabCommaIn s = map (\c -> if c == '\t' then ',' else if c == ',' then '\t' else c) s
-removeQuotes s = filter (\c -> not (c == '"')) s
-parseTSV fname str = case parseCSV fname (swapTabCommaIn str) of
-	Left pe -> Left pe
-	Right ll -> Right $ map (map swapTabCommaIn) ll
-printTSV ll = removeQuotes $ swapTabCommaIn $ printCSV $ map (map swapTabCommaIn) ll
+-- Command-line interface with simple tab-separated input/output formats.
+-- ./match <example.in
 
 main = do
 	incsv <- hGetContents stdin
 	-- handle errors another day, or let the platform do it
-	let Right inll = parseTSV "standard input" incsv
-	let loadList = head inll
+	let inll = parseTSV incsv
+	let loadList = tail (head inll)
 	let numRvrs = length loadList
 	let loadA = listArray (0, numRvrs-1) (map read loadList)
 	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 ! (2*j, i))
-	let expA = funcArray ((0,0), (numRvrs-1,numProps-1)) (\(i,j) -> read $ pxarr ! (2*j+1, i))
-	let theInst = PMInstance numRvrs numProps loadA prefA expA
+	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 $ printTSV $ map (\(i, j) -> map show [i, j]) theMatching
+	hPutStr stdout $ formatTSV $ map (\(i, j) -> map show [i, j]) theMatching