input now need to be 2 files
- help is not defined currently, needs to be implemented
This commit is contained in:
parent
90dd0f55c1
commit
6e1421018c
BIN
dist/build/hgraph/hgraph
vendored
BIN
dist/build/hgraph/hgraph
vendored
Binary file not shown.
BIN
dist/build/hgraph/hgraph-tmp/Main.hi
vendored
BIN
dist/build/hgraph/hgraph-tmp/Main.hi
vendored
Binary file not shown.
BIN
dist/build/test-hgraph/test-hgraph
vendored
BIN
dist/build/test-hgraph/test-hgraph
vendored
Binary file not shown.
BIN
dist/build/test-hgraph/test-hgraph-tmp/Main.hi
vendored
BIN
dist/build/test-hgraph/test-hgraph-tmp/Main.hi
vendored
Binary file not shown.
4
dist/setup-config
vendored
4
dist/setup-config
vendored
File diff suppressed because one or more lines are too long
31
src/Main.hs
31
src/Main.hs
@ -101,6 +101,22 @@ emptyLog a = False --emptyLine $ foldl True (&&) (map emptyLine a)
|
|||||||
--doCalculation :: Matrix Int -> B.ByteString
|
--doCalculation :: Matrix Int -> B.ByteString
|
||||||
doCalculation a = B.pack $ (show a) ++ "\n"
|
doCalculation a = B.pack $ (show a) ++ "\n"
|
||||||
|
|
||||||
|
|
||||||
|
createOutput :: [[Int]] -> B.ByteString
|
||||||
|
createOutput a = encodeUtf8 (createOutput' a)
|
||||||
|
|
||||||
|
createOutput' :: [[Int]] -> T.Text
|
||||||
|
createOutput' [a] = T.intercalate (T.singleton ',') (map (T.pack . show) a)
|
||||||
|
createOutput' (a:as) = T.append
|
||||||
|
(T.append
|
||||||
|
(T.intercalate (T.singleton ',')
|
||||||
|
(map (T.pack . show) a))
|
||||||
|
(T.singleton '\n'))
|
||||||
|
(createOutput' as)
|
||||||
|
|
||||||
|
|
||||||
|
showHelp = undefined
|
||||||
|
|
||||||
infixl 1 +||
|
infixl 1 +||
|
||||||
|
|
||||||
(+||) :: a -> Strategy a -> a
|
(+||) :: a -> Strategy a -> a
|
||||||
@ -109,16 +125,19 @@ a +|| b = a `using` b
|
|||||||
exeMain = do
|
exeMain = do
|
||||||
args <- getArgs
|
args <- getArgs
|
||||||
input <- case args of
|
input <- case args of
|
||||||
["-"] -> B.getContents
|
["--help"] -> showHelp
|
||||||
|
["-h"] -> showHelp
|
||||||
[] -> error "Error: No filename or stdinput (-) given."
|
[] -> error "Error: No filename or stdinput (-) given."
|
||||||
[file] -> B.readFile file
|
[adj, attr] -> Prelude.mapM B.readFile [adj, attr]
|
||||||
|
_ -> error "Wrong arguments given"
|
||||||
-- read file and clean
|
-- read file and clean
|
||||||
readFile <- return $ filter (not . emptyLine) (T.lines (decodeUtf8 input))
|
adjMat <- return $ filter (not . emptyLine) (T.lines (decodeUtf8 (head input)))
|
||||||
inputLines <- return $ length readFile
|
|
||||||
|
inputLines <- return $ length adjMat
|
||||||
-- TODO: concat with foldl1' kills us later -> use presized/preallocated array so we
|
-- TODO: concat with foldl1' kills us later -> use presized/preallocated array so we
|
||||||
-- dont copy that much lateron. Best would be Matrix Int
|
-- dont copy that much lateron. Best would be Matrix Int
|
||||||
-- unrefined_graph::[Either [Int] String] - [Int] is Adjacency-Line, String is parse-Error
|
-- unrefined_graph::[Either [Int] String] - [Int] is Adjacency-Line, String is parse-Error
|
||||||
unrefined_graph <- return $ (map (traceEvent "mapping" . createGraph) readFile)
|
unrefined_graph <- return $ (map (traceEvent "mapping" . createGraph) adjMat)
|
||||||
+|| (parBuffer 100 rdeepseq) --run parallel, evaluate fully
|
+|| (parBuffer 100 rdeepseq) --run parallel, evaluate fully
|
||||||
--egraph <- return $ graphFolder unrefined_graph
|
--egraph <- return $ graphFolder unrefined_graph
|
||||||
|
|
||||||
@ -126,7 +145,7 @@ exeMain = do
|
|||||||
traceEvent "concatenating log" T.intercalate (T.singleton '\n') (rights unrefined_graph), -- concat error-log
|
traceEvent "concatenating log" T.intercalate (T.singleton '\n') (rights unrefined_graph), -- concat error-log
|
||||||
traceEvent "getting length" length unrefined_graph) -- number of elements in graph
|
traceEvent "getting length" length unrefined_graph) -- number of elements in graph
|
||||||
-- in parallel
|
-- in parallel
|
||||||
`using` parTuple3 rdeepseq rdeepseq rdeepseq)
|
`using` parTuple3 rseq rseq rseq)
|
||||||
|
|
||||||
-- validate graph
|
-- validate graph
|
||||||
log <- return $ let l = traceEvent "first validation" length graph in
|
log <- return $ let l = traceEvent "first validation" length graph in
|
||||||
|
Loading…
x
Reference in New Issue
Block a user