First working version of smith.exe

jpmacmanus · Feb 7, 2019 · b9d05ac · b9d05ac
1 parent e733d1d
commit b9d05ac
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/out/smith.exe b/out/smith.exe
diff --git a/src/LinearAlgebra/MatrixParser.o b/src/LinearAlgebra/MatrixParser.o
diff --git a/src/Main.hi b/src/Main.hi
diff --git a/src/Main.hs b/src/Main.hs
@@ -10,10 +10,13 @@ import System.Exit
 
 -- TODO change getLine to getArgs and concatenate all args into one, the rest is the same
 
-main = do l <- getLine
+main = do ls <- getArgs
+          let l = concat ls
           let m = parseMatrix l
+          putStrLn "Input:"
           output m
           let s = m >>= maybeSmith
+          putStrLn "Corresponding Smith normal-form:"
           output s
 
 output :: (Show a) =>  Maybe a -> IO ()
@@ -32,6 +35,8 @@ maybeSmith m = return $ smith m
 
 
 invalidArgs = putStrLn msg >> exit where
-    msg = "Invalid arguments" -- TODO, write this up properly for usability
+    msg = "Error: Parse error on input. \n\n" ++
+          "Command should be of the form: \n" ++
+          ">>> smith [[1,2,3],[4,5,6],[7,8,9]]"-- TODO, write this up properly for usability
 
-exit    = exitWith ExitSuccess
+exit = exitWith ExitSuccess
diff --git a/src/Main.o b/src/Main.o