Proper fix für 8.1, TestCasesHEADmaster

1 files changed, 18 insertions, 17 deletions

diff --git a/AufgabeFFP8.hs b/AufgabeFFP8.hs
index d328ae8..fe9c894 100644
--- a/AufgabeFFP8.hs
+++ b/AufgabeFFP8.hs
@@ -96,26 +96,27 @@ divideAndConquer indiv solve divide combine initPb = dAC initPb
       
 -- minfree basic daq higher order
 
-b_indiv :: Int -> [Int] -> Bool
-b_indiv l xs = length xs < l
+minfree_bhof :: [Int] -> Int
+minfree_bhof xs = divideAndConquer b_indiv b_solve b_divide b_combine (False, xs)
 
-b_solve :: [Int] -> [Int]
-b_solve = id
+b_indiv :: (Bool, [Int]) -> Bool
+b_indiv (b, _) = b
 
-b_divide :: Int -> [Int] -> [[Int]]
-b_divide b xs = [us, vs]
-  where (us,vs) = partition (<b) xs
-  
-b_combine :: Int -> [Int] -> [[Int]] -> [Int]
-b_combine b _ (us:vs:[]) = if (null ([0..b-1] \\ us))
-    then ([b..] \\ vs)
-    else ([0..] \\ us)
-  
-minfree_bhof :: [Int] -> Int
-minfree_bhof [] = 0
-minfree_bhof xs = head $ divideAndConquer (b_indiv (length xs)) b_solve (b_divide b) (b_combine b) xs
-  where b = 1+(length xs) `div` 2
+b_solve :: (Bool, [Int]) -> Int
+b_solve (_, xs) = head xs
+
+
+
+b_divide :: (Bool, [Int]) -> [(Bool, [Int])]
+b_divide (n, xs) = if (null ([0..b-1] \\ us))
+                                                                then [(True, [b..] \\ vs)]
+                else [(True, [0..] \\ us)]
+                                                                where
+                                                                (us, vs) = partition (<b) xs
+                                                                b = 1 + (length xs) `div` 2
 
+b_combine :: (Bool, [Int]) -> [Int] -> Int
+b_combine xs sols = head sols
   
 -- minfree refined daq higher order