9 files changed, 82 insertions, 36 deletions
diff --git a/fp2/week1/camil/RandomGetallen.dcl b/fp2/week1/camil/RandomGetallen.dcl
deleted file mode 100644
index 2ca4b27..0000000
--- a/fp2/week1/camil/RandomGetallen.dcl
+++ /dev/null
@@ -1,7 +0,0 @@
-definition module RandomGetallen
-
-import Random
-
-random_n	:: Int RandomSeed -> ([Int],RandomSeed)
-random_inf	::     RandomSeed ->  [Int]
-shuffle		:: [a] RandomSeed ->  [a]
diff --git a/fp2/week1/camil/RandomGetallen.icl b/fp2/week1/camil/RandomGetallen.icl
deleted file mode 100644
index a0a21bf..0000000
--- a/fp2/week1/camil/RandomGetallen.icl
+++ /dev/null
@@ -1,29 +0,0 @@
-implementation module RandomGetallen
-
-import StdEnv, Random
-
-random_n :: Int RandomSeed -> ([Int],RandomSeed)
-random_n 0 seed = ([], seed)
-random_n n seed = ([r:rs], s`)
-where 
-	(rs,s`) = random_n (n-1) s
-	(r,s) = random seed	
-
-random_inf :: RandomSeed -> [Int]
-random_inf s = iterateSt random s
-
-iterateSt :: (s -> (a,s)) s -> [a]
-iterateSt f s = [a : iterateSt f s`]
-where
-	(a,s`) = f s
-
-shuffle :: [a] RandomSeed -> [a]
-shuffle xs s = (perms xs)!!(fst (random s) rem (factorial (length xs)))
-
-perms :: [a] -> [[a]]
-perms [] = [[]]
-perms xs = [[xs!!i : xs`] \\ i <- [0..length xs - 1] , xs` <- perms (take i xs ++ drop (i+1) xs)]
-
-factorial :: Int -> Int
-factorial 0 = 1
-factorial n = n * factorial (n-1)
diff --git a/fp2/week1/mart/Echo b/fp2/week1/mart/Echo
new file mode 100755
index 0000000..cf2fb79
--- /dev/null
+++ b/fp2/week1/mart/Echo
diff --git a/fp2/week1/mart/Echo.icl b/fp2/week1/mart/Echo.icl
new file mode 100644
index 0000000..30a6f4b
--- /dev/null
+++ b/fp2/week1/mart/Echo.icl
@@ -0,0 +1,11 @@
+module Echo
+
+import StdEnv
+
+
+Start :: *World -> *World
+Start world
+# (console, world) = stdio world
+# (line, console) = freadline console
+| not (fend console) = fwrites line
+| otherwise = world
diff --git a/fp2/week1/mart/Galgje b/fp2/week1/mart/Galgje
new file mode 100755
index 0000000..d46de77
--- /dev/null
+++ b/fp2/week1/mart/Galgje
diff --git a/fp2/week1/mart/Galgje.icl b/fp2/week1/mart/Galgje.icl
new file mode 100644
index 0000000..e5106ee
--- /dev/null
+++ b/fp2/week1/mart/Galgje.icl
@@ -0,0 +1,13 @@
+module Galgje
+
+import StdEnv, Random
+
+//randomWord :: *env -> (Maybe String, *env) | FileSystem env                     
+//randomWord env                                                                  
+//# (ss,env) = readLines lexicon_file env                                         
+//| ss == Nothing = (Nothing, env)                                                
+//# (seed,env) = getNewRandomSeed env                                             
+//| otherwise = (Just (skip_nl ((shuffle (fromJust ss) seed)!!0)), env) 
+
+Start :: *World -> *World
+Start world = world
diff --git a/fp2/week1/mart/GalgjeWF.dcl b/fp2/week1/mart/GalgjeWF.dcl
new file mode 100644
index 0000000..a777b95
--- /dev/null
+++ b/fp2/week1/mart/GalgjeWF.dcl
@@ -0,0 +1,5 @@
+definition module GalgjeWF
+
+import iTasks
+
+galgje :: [Workflow]
diff --git a/fp2/week1/mart/SimpleFileIO.dcl b/fp2/week1/mart/SimpleFileIO.dcl
new file mode 100644
index 0000000..1bd97da
--- /dev/null
+++ b/fp2/week1/mart/SimpleFileIO.dcl
@@ -0,0 +1,14 @@
+definition module SimpleFileIO
+
+import StdFile, StdOverloaded, StdMaybe
+
+// 1.
+readFile	:: String                 *env -> (Maybe String,  *env) | FileSystem env
+writeFile	:: String String          *env -> (Bool,          *env) | FileSystem env
+
+// 2.
+readLines	:: String                 *env -> (Maybe [String],*env) | FileSystem env
+writeLines	:: String [String]        *env -> (Bool,          *env) | FileSystem env
+
+// 3.
+//mapFile		:: String String (a -> b) *env -> (Bool,          *env) | FileSystem env & ... a & ... b
diff --git a/fp2/week1/mart/SimpleFileIO.icl b/fp2/week1/mart/SimpleFileIO.icl
new file mode 100644
index 0000000..b2a483a
--- /dev/null
+++ b/fp2/week1/mart/SimpleFileIO.icl
@@ -0,0 +1,39 @@
+implementation module SimpleFileIO
+
+import StdEnv, StdFile, StdOverloaded, StdMaybe
+
+// 1.
+readFile	:: String                 *env -> (Maybe String,  *env) | FileSystem env
+readFile s env
+# (ss, env) = readLines s env
+| ss == Nothing = (Nothing, env)
+| otherwise = (Just (foldl (+++) "" (fromJust ss)), env)
+
+writeFile	:: String String          *env -> (Bool,          *env) | FileSystem env
+writeFile fn s env
+# (ok, outfile, env) = fopen fn FWriteText env
+| not ok = (False, env)
+# outfile = fwrites s outfile
+# (ok, env) = fclose outfile env
+| otherwise = (ok, env)
+
+// 2.
+readLines	:: String                 *env -> (Maybe [String],*env) | FileSystem env
+readLines s env
+# (ok, infile, env) = sfopen s FReadText env
+| not ok = (Nothing, env)
+| otherwise = (Just (fst (readLines` infile)), env)
+where
+	readLines` :: File -> ([String], File)
+	readLines` file 
+	| sfend file = ([], file)
+	# (line, file) = sfreadline file
+	# (ss, file) = readLines` file
+	| otherwise = ([line : ss], file)
+
+writeLines	:: String [String]        *env -> (Bool,          *env) | FileSystem env
+writeLines fn ss env = writeFile fn (foldl (+++) "" [s +++ "\n" \\ s <- ss]) env
+
+// 3.
+//mapFile		:: String String (a -> b) *env -> (Bool,          *env) | FileSystem env & ... a & ... b
+