rewrote App so that it just inherits Translate and excludes some functions. This minimizes the duplication of code between Translate and App. Also added some functions, which make App 15% slower but increase the coverage and quality. This trade-off has to be studied further.

1 files changed, 28 insertions, 33 deletions

diff --git a/examples/app/App.gf b/examples/app/App.gf
index d6d3f3bed..faaefb93c 100644
--- a/examples/app/App.gf
+++ b/examples/app/App.gf
@@ -1,42 +1,37 @@
 abstract App = 
-
--- modules in Grammar, excluding Structural
-  Tense,
-  Noun - [PPartNP],               -- to be generalized
-  Adjective,
-  Numeral,
-  Conjunction,
-  Verb [
-    UseV,ComplVV,SlashV2a,ComplSlash,UseComp,CompAP,CompNP,CompAdv,CompCN
-    ,AdvVP,AdVVP
-     ],
-  Adverb,
-  Phrase,
-  Sentence,
-  Question - [
-    ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP
-    ],
-  Relative,
-  Idiom [NP, VP, Cl, Tense, ProgrVP, ExistNP], 
-
-  Symbol [PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP],          ---- why only these?
-
-  Chunk,
-
-----  Construction,
-  Extensions [
-     CompoundCN,AdAdV,UttAdV,ApposNP,
-     MkVPI, MkVPS, PredVPS, that_RP, who_RP
-     ],
-  Dictionary,
-  Documentation
-
+  Translate - [
+  -- Verb
+    ComplVS, ComplVQ, ComplVA,
+    Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
+    SlashVV, SlashV2VNP,
+    ReflVP,
+    AdvVPSlash, AdVVPSlash, VPSlashPrep,
+  -- Sentence
+    PredSCVP, 
+    AdvSlash, SlashPrep, SlashVS,
+    EmbedS, EmbedQS, EmbedVP, RelS,
+  -- Question
+    ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
+  -- Idiom
+    CleftNP, CleftAdv,
+    ExistIP,
+    ExistNPAdv, ExistIPAdv,
+    ImpP3,
+    SelfAdvVP, SelfAdVVP, SelfNP,
+    
+  -- Construction
+    hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
+    weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN, 
+    where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP,
+  -- Extensions
+    PassVPSlash, PassAgentVPSlash
+  ]
   ,Phrasebook
 
               ** {
 flags
   startcat=Phr ;
-----  heuristic_search_factor=0.90; -- doesn't seem to affect speed or quality much
+  heuristic_search_factor=0.80; -- doesn't seem to affect speed or quality much
 
 fun
   PhrasePhr : Phrase -> Phr ;