Merge branch 'master' of ssh://git.manuel.mausz.at:2211/ffp

Conflicts:
	AufgabeFFP8.hs

1 files changed, 42 insertions, 0 deletions

diff --git a/AufgabeFFP8.hs b/AufgabeFFP8.hs
index 2747597..436e6cb 100644
--- a/AufgabeFFP8.hs
+++ b/AufgabeFFP8.hs
@@ -115,5 +115,47 @@ minfree_bhof xs = head $ divideAndConquer (b_indiv (length xs)) b_solve (b_divid
   where b = 1+(length xs) `div` 2
   
 -- minfree refined daq higher order
+                                                                        
 
+-- refined divide-and-conquer mittels higher order function
+--minfree_rhof :: [Int] -> Int
+--minfree_rhof = divideAndConquer r_indiv r_solve r_divide r_combine 
+--
+--r_indiv :: (Int, [Int]) -> Bool
+--r_indiv (a, xs) 
 
+-- optimised divide-and-conquer mittels higher order function
+--minfree_ohof :: [Int] -> Int
+
+
+
+-- QuickCheck part
+
+functions = [ minfree_bv, minfree_chl, minfree_col,
+                                        minfree_b, minfree_r, minfree_o,
+                                        minfree_bhof]
+
+-- calc values of all function
+calc_all :: [Int] -> [Int]
+calc_all xs = [ f xs | f <- functions ]
+
+-- check if all values of a list are the same
+all_eq :: [Int] -> Bool
+all_eq (x:[]) = True
+all_eq (x:y:xs) 
+        | x == y = all_eq (y:xs)
+        | otherwise = False
+
+-- check if a list contains no duplicates
+--no_dups :: [Int] -> Bool
+--no_dups [] = True
+--no_dups (x:xs) 
+--      | x `elem` xs = False
+--      | otherwise = no_dups xs
+
+prop_allImplsEq_a :: [Int] -> Bool
+prop_allImplsEq_a xs = all_eq $ calc_all (nub xs)
+
+-- keine negativen listenelemented durch vorbedingung entfernt
+prop_allImplsEq_b :: [Int] -> Property
+prop_allImplsEq_b xs = all (>=0) xs ==> all_eq $ calc_all (nub xs)
\ No newline at end of file