Renamed folders

kandrio · Mar 4, 2021 · 46beb6c · 46beb6c
1 parent 83af09e
commit 46beb6c
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 151 deletions.
diff --git a/ex1/big_input.txt → ex01/big_input.txt b/ex1/big_input.txt → ex01/big_input.txt
diff --git a/ex1/big_output.txt → ex01/big_output.txt b/ex1/big_output.txt → ex01/big_output.txt
diff --git a/ex1/solution.hs → ex01/solution.hs b/ex1/solution.hs → ex01/solution.hs
diff --git a/ex2/solutions.hs → ex02/solutions.hs b/ex2/solutions.hs → ex02/solutions.hs
diff --git a/ex3/rally.erl → ex03/rally.erl b/ex3/rally.erl → ex03/rally.erl
diff --git a/ex3/rally.pdf → ex03/rally.pdf b/ex3/rally.pdf → ex03/rally.pdf
diff --git a/ex3/rallyomatic.beam → ex03/rallyomatic.beam b/ex3/rallyomatic.beam → ex03/rallyomatic.beam
diff --git a/ex3/report_greek.pdf → ex03/report_greek.pdf b/ex3/report_greek.pdf → ex03/report_greek.pdf
diff --git a/ex4/bughunt.erl → ex04/bughunt.erl b/ex4/bughunt.erl → ex04/bughunt.erl
diff --git a/ex4/vectors.beam → ex04/vectors.beam b/ex4/vectors.beam → ex04/vectors.beam
diff --git a/ex5/reverse_hash.hs → ex05/reverse_hash.hs b/ex5/reverse_hash.hs → ex05/reverse_hash.hs
diff --git a/ex5/reverse_hash_solver_par.hs → ex05/reverse_hash_solver_par.hs b/ex5/reverse_hash_solver_par.hs → ex05/reverse_hash_solver_par.hs
@@ -27,20 +27,23 @@ ranges n counter start end =
         in 
             ((start, end'):(ranges n (counter-1) (end' + 1) end)) 
 
-parMap' :: NFData b => (a -> b) -> [a] -> Eval [b]
-parMap' f [] = return []
-parMap' f (a:as) = do
+parMap' :: NFData b => (a -> b) -> [a] -> MVar () -> Eval [b]
+parMap' f [] _ = return []
+parMap' f (a:as) signal = do
+    sig <- return (tryReadMVar signal) 
+    return (if (sig /= Nothing) then [] else let b  = runEval (rpar (force_eval (f a)))
+                                                 bs = runEval (parMap' f as signal)
+                                                 in (b : bs))
+    {-|
     b <- rpar (force_eval (f a))
-    bs <- parMap' f as
+    bs <- parMap' f as signal
     return (b : bs)
-
-
--- Simple parallel solver
+    -}
 solver_par :: (Int -> Int) -> [Int] -> MVar () -> MVar [(Int, Int)] -> Int -> IO ()
 solver_par hash _ signal box schedulers = do
     let num = schedulers*schedulers*4 
-    output <- runEvalIO (parMap' (hashes_of_range hash) (ranges num num 0 (round(2**27-1))))
-    let flat_output = concat output -- A list of tuples: (output, input), one for each possible input
+    output <- runEvalIO (parMap' (hashes_of_range hash) (ranges num num 0 (round(2**27-1))) signal)
+    let flat_output = concat output
     _ <- readMVar signal
     _ <- putMVar box (flat_output)
     return ()
diff --git a/ex1/.ipynb_checkpoints/solution-checkpoint.ipynb b/ex1/.ipynb_checkpoints/solution-checkpoint.ipynb
diff --git a/ex1/small_input.txt.txt b/ex1/small_input.txt.txt
diff --git a/ex1/small_output.txt.txt b/ex1/small_output.txt.txt