1 files changed, 3 insertions, 9 deletions

diff --git a/AufgabeFFP6.hs b/AufgabeFFP6.hs
index c016dd7..1fde756 100644
--- a/AufgabeFFP6.hs
+++ b/AufgabeFFP6.hs
@@ -92,22 +92,16 @@ yield_gtf :: F -> W -> [G]
 yield_gtf = filt . transform . generate
 
 generate :: F -> W -> (F, W, [G])
---generate f w =  (f, w, [ array (1,n) [ (i, j) | i<-[1..n], j<-[(+), (-), (*)] ] ] )
-generate f w =  (f, w, [ array (1,n)  [(i, j) | i<-[1..n],  j<-[(+)] ] ] )
+generate f w =  (f, w, [ array (1,n) entries | entries <- get_combinations n ] )
         where 
-        n = snd $ bounds f
+        n = (snd $ bounds f) - 1
 
-get_combinations :: Integer -> [[(Integer, Op)]]
+get_combinations :: Int -> [[(Int, Op)]]
 get_combinations 1 = [[(1,(+))], [(1, (-))], [(1, (*))], [(1,(./.))]]
 get_combinations n = [ (up i) ++ entr  | entr <- get_combinations (n-1), i <- get_combinations 1 ]
         where 
         up = map (\(num, x) -> ((num+n-1), x))
 
---aget_combinations :: Integer -> [[Op]]
---aget_combinations 1 = [[(+)], [(-)], [(*)], [(./.)]]
---aget_combinations n = [ i ++ entr  | entr <- aget_combinations (n-1), i <- aget_combinations 1 ]
-
-
 transform ::  (W -> (F,W,[G])) -> W -> ((F, W, [G]), [W])
 transform fun w = ((f, w, g), map (eval f) g )
         where