Commit 924e798d authored by Yiannis Tsiouris's avatar Yiannis Tsiouris

Fix type signature and whitespace cleanup

parent bd6bb961
...@@ -24,12 +24,13 @@ module Table( -- Types ...@@ -24,12 +24,13 @@ module Table( -- Types
, fill_deg , fill_deg
) where ) where
import Data.Array (Array, elems, listArray, (!), (//)) import Data.Array (Array, elems, listArray, (!), (//))
import Utils (Vertex)
import Utils (Vertex)
type Freq = [Int] type Freq = [Int]
type VTable = Array Int [Vertex] type VTable = Array Int [Vertex]
type TableStats = [(String, String)] type TableStats = [(String, String)]
-- Note: Hash tables have a fixed number of slots but each slot can store -- Note: Hash tables have a fixed number of slots but each slot can store
-- a list of vertices. The functions is_member/3 and insert/3 -- a list of vertices. The functions is_member/3 and insert/3
......
{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveDataTypeable #-}
module Utils where module Utils where
import Data.Binary import Data.Binary
import Data.Typeable import Data.Typeable
-- Trying to serialize ParConf closures... -- Trying to serialize ParConf closures...
newtype GenClos = GenClos (String, Int, [Generator]) newtype GenClos = GenClos (String, Int, [Generator])
...@@ -102,7 +102,7 @@ g34 n = g3 n ++ g4 n ...@@ -102,7 +102,7 @@ g34 n = g3 n ++ g4 n
g35 n = g3 n ++ g5 n g35 n = g3 n ++ g5 n
g45 n = g4 n ++ g5 n g45 n = g4 n ++ g5 n
gg12, gg13, gg14, gg15, gg23, gg24, gg24 :: Vertex -> GenClos gg12, gg13, gg14, gg15, gg23, gg24, gg25 :: Vertex -> GenClos
gg12 n = GenClos ("g12", n, (g12 n)) gg12 n = GenClos ("g12", n, (g12 n))
gg13 n = GenClos ("g13", n, (g13 n)) gg13 n = GenClos ("g13", n, (g13 n))
gg14 n = GenClos ("g14", n, (g14 n)) gg14 n = GenClos ("g14", n, (g14 n))
...@@ -122,7 +122,8 @@ g235 n = g23 n ++ g5 n ...@@ -122,7 +122,8 @@ g235 n = g23 n ++ g5 n
g245 n = g24 n ++ g5 n g245 n = g24 n ++ g5 n
g345 n = g34 n ++ g5 n g345 n = g34 n ++ g5 n
gg123, gg124, gg125, gg134, gg135, gg145, gg234, gg235, gg245, gg345 :: Vertex -> GenClos gg123, gg124, gg125, gg134, gg135, gg145, gg234, gg235, gg245, gg345
:: Vertex -> GenClos
gg123 n = GenClos ("g123", n, (g123 n)) gg123 n = GenClos ("g123", n, (g123 n))
gg124 n = GenClos ("g124", n, (g124 n)) gg124 n = GenClos ("g124", n, (g124 n))
gg125 n = GenClos ("g125", n, (g125 n)) gg125 n = GenClos ("g125", n, (g125 n))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment