Fixed the display of equations such as 0 = 0 after test failure

This commit is contained in:
Neil Brown 2008-01-15 18:47:28 +00:00
parent 2cb0610d83
commit bc7c5072b8

View File

@ -163,17 +163,21 @@ lookupTable :: Map.Map CoeffIndex String
lookupTable = Map.fromList $ zip [1..] ["i","j","k","m","n","p"]
showInequality :: InequalityConstraintEquation -> String
showInequality ineq = "0 <= " ++ showItems ineq
showInequality ineq = "0 <= " ++ zeroIfBlank (showItems ineq)
showInequalities :: InequalityProblem -> String
showInequalities ineqs = concat $ intersperse "\n" $ map showInequality ineqs
showEquality :: InequalityConstraintEquation -> String
showEquality eq = "0 = " ++ showItems eq
showEquality eq = "0 = " ++ zeroIfBlank (showItems eq)
showEqualities :: InequalityProblem -> String
showEqualities eqs = concat $ intersperse "\n" $ map showEquality eqs
zeroIfBlank :: String -> String
zeroIfBlank s | null s = "0"
| otherwise = s
showProblem :: (EqualityProblem,InequalityProblem) -> String
showProblem (eqs,ineqs) = showEqualities eqs ++ "\n" ++ showInequalities ineqs