Improved generation algorithm (old with -old, all with -all (-lin))

2 files changed, 26 insertions, 13 deletions

diff --git a/src/GF/Shell.hs b/src/GF/Shell.hs
index 66297ddc8..06be45209 100644
--- a/src/GF/Shell.hs
+++ b/src/GF/Shell.hs
@@ -305,8 +305,12 @@ execC co@(comm, opts0) sa@(sh@(st,(h,_,_,_)),a) = checkOptions st co >> case com
         returnArg (ATrms ts) sa
 
   CGenerateTrees | oElem showAll opts -> do
-    let cat = firstAbsCat opts gro
-    justOutput opts (generateAll opts (putStrLn . prt_) cgr cat) sa
+    let 
+      cat = firstAbsCat opts gro
+      outp 
+       | oElem (iOpt "lin") opts = optLinearizeTreeVal opts gro . term2tree gro
+       | otherwise = prt_
+    justOutput opts (generateAll opts (putStrLn . outp) cgr cat) sa
   CGenerateTrees -> do
     let 
       a' = case a of
diff --git a/src/GF/UseGrammar/Generate.hs b/src/GF/UseGrammar/Generate.hs
index a3173635e..d0697b8dd 100644
--- a/src/GF/UseGrammar/Generate.hs
+++ b/src/GF/UseGrammar/Generate.hs
@@ -39,24 +39,22 @@ import Data.List
 
 
 -- | the main function takes an abstract syntax and returns a list of trees
-generateTrees :: Options -> GFCGrammar -> Cat -> Int -> Maybe Int -> Maybe Tree -> [Exp]
+generateTrees :: 
+  Options -> GFCGrammar -> Cat -> Int -> Maybe Int -> Maybe Tree -> [Exp]
 generateTrees opts gr cat n mn mt = map str2tr $ generate gr' ifm cat' n mn mt'
   where
     gr'  = gr2sgr opts emptyProbs gr
     cat' = prt $ snd cat
     mt'  = maybe Nothing (return . tr2str) mt
-    ifm  = oElem withMetas opts
+---    ifm  = oElem withMetas opts
+    ifm  = oElem showOld opts
 
 generateAll :: Options -> (Exp -> IO ()) -> GFCGrammar -> Cat -> IO ()
 generateAll opts io gr cat = mapM_ (io . str2tr) $ gen cat'
   where
     gr'  = gr2sgr opts emptyProbs gr
     cat' = prt $ snd cat
-    gen c = [SApp (f, xs) | 
-      (f,(cs,_)) <- funs c, 
-      xs <- combinations (map gen cs)
-      ]
-    funs c = errVal [] $ lookupTree id c gr'
+    gen c = generate gr' False c 10 Nothing Nothing
 
 
 
@@ -69,11 +67,22 @@ generateAll opts io gr cat = mapM_ (io . str2tr) $ gen cat'
 
 generate :: SGrammar -> Bool -> SCat -> Int -> Maybe Int -> Maybe STree -> [STree]
 generate gr ifm cat i mn mt = case mt of
-  Nothing -> gen cat
+  Nothing -> gen ifm cat
   Just t  -> genM t
  where
-
-  gen cat = concat $ errVal [] $ lookupTree id cat $ allTrees
+--- now use ifm to choose between two algorithms
+  gen True cat = concat $ errVal [] $ lookupTree id cat $ allTrees -- -old
+  gen _ cat = nub $ concatMap (\i -> gener i cat) [0..i-1] -- new
+
+  gener 0 c = [SApp (f, []) | (f,([],_)) <- funs c]
+  gener i c = [
+    tr | 
+      (f,(cs,_)) <- funs c,
+      let alts = map (gener (i-1)) cs,
+      ts <- combinations alts,
+      let tr = SApp (f, ts)
+--      depth tr >= i
+    ]
 
   allTrees = genAll i
 
@@ -100,5 +109,5 @@ generate gr ifm cat i mn mt = case mt of
 
   genM t = case t of
     SApp (f,ts) -> [SApp (f,ts') | ts' <- combinations (map genM ts)]
-    SMeta k     -> gen k 
+    SMeta k     -> gen ifm k 
     _ -> [t]