From 8fc7add8a8568384c1bfb0a7f33039da7638e427 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Wed, 2 Apr 2014 14:04:48 +0000
Subject: [PATCH] experimenting with exclusion of some functions to gain speed
 in Translate

---
 lib/src/translator/Translate.gf    |  6 +++---
 lib/src/translator/TranslateEng.gf | 13 +++++++++----
 lib/src/translator/TranslateSwe.gf | 14 ++++++++++----
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/lib/src/translator/Translate.gf b/lib/src/translator/Translate.gf
index 33a410ce1..843b9fb9d 100644
--- a/lib/src/translator/Translate.gf
+++ b/lib/src/translator/Translate.gf
@@ -7,7 +7,7 @@ abstract Translate =
   Numeral,
   Conjunction,
   Verb - [
-     SlashV2V, PassV2, ComplVV,   -- to be generalized
+-----     SlashV2V, PassV2, ComplVV,   -- to be generalized
      UseCopula                    ---- overgenerating ?? 
      ],
   Adverb,
@@ -19,10 +19,10 @@ abstract Translate =
 
   Symbol [PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP],          ---- why only these?
 
-  Chunk - [VPS,VPI],
+  Chunk,
 
   Construction,
-  Extensions,
+  Extensions - [VPI,VPS,PredFrontVQ,PredFrontVS,SlashSlashV2V,SlashV2V,SlashVPIV2V,ComplVV,PassVPSlash,PassAgentVPSlash],
   Dictionary,
   Documentation
 
diff --git a/lib/src/translator/TranslateEng.gf b/lib/src/translator/TranslateEng.gf
index 5000aab1a..16e46fd5b 100644
--- a/lib/src/translator/TranslateEng.gf
+++ b/lib/src/translator/TranslateEng.gf
@@ -12,12 +12,15 @@ concrete TranslateEng of Translate =
     ],
   ConjunctionEng,
   VerbEng - [
-    SlashV2V, PassV2, UseCopula, ComplVV,  -- generalized in Extensions
-    ComplVS, SlashV2S, ComplSlash          -- have variants in Eng
+    UseCopula,  
+--    SlashV2V, PassV2, ComplVV,  -- generalized in Extensions
+    ComplVS, SlashV2S, ComplSlash,          -- have variants in Eng
+    SlashV2VNP, SlashVV, AdVVPSlash,AdvVPSlash,VPSlashPrep -----
     ],
   AdverbEng,
   PhraseEng,
   SentenceEng - [
+    SlashVS, -----
 ----    PredVP,   -- to be replaced by PredVPS, QuestVPS, QuestIAdvVPS in Extensions
     UseCl     -- replaced by UseCl | ContractedUseCl
     ],        
@@ -27,9 +30,11 @@ concrete TranslateEng of Translate =
   ConstructionEng,
   DocumentationEng,
 
-  ChunkEng - [VPS,VPI],
+  ChunkEng,
 
-  ExtensionsEng,
+  ExtensionsEng - [
+     VPI,VPS,PredFrontVQ,PredFrontVS,SlashSlashV2V,SlashV2V,SlashVPIV2V,ComplVV,PassVPSlash,PassAgentVPSlash
+     ],
   DictionaryEng ** 
 open MorphoEng, ResEng, ParadigmsEng, (G = GrammarEng), (E = ExtraEng), Prelude in {
 
diff --git a/lib/src/translator/TranslateSwe.gf b/lib/src/translator/TranslateSwe.gf
index abe69c24b..ec02ead65 100644
--- a/lib/src/translator/TranslateSwe.gf
+++ b/lib/src/translator/TranslateSwe.gf
@@ -9,10 +9,14 @@ concrete TranslateSwe of Translate =
     PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP
     ],
   ConjunctionSwe,
-  VerbSwe - [SlashV2V, PassV2, UseCopula, ComplVV],
+  VerbSwe -  [
+    UseCopula,  
+--    SlashV2V, PassV2, ComplVV,  -- generalized in Extensions
+    SlashV2VNP, SlashVV, AdVVPSlash,AdvVPSlash,VPSlashPrep -----
+    ],
   AdverbSwe,
   PhraseSwe,
-  SentenceSwe,
+  SentenceSwe - [SlashVS],
   QuestionSwe,
   RelativeSwe,
   IdiomSwe [
@@ -22,9 +26,11 @@ concrete TranslateSwe of Translate =
   ConstructionSwe,
   DocumentationSwe,
 
-  ChunkSwe - [VPS,VPI],
+  ChunkSwe,
 
-  ExtensionsSwe,
+  ExtensionsSwe - [
+     VPI,VPS,PredFrontVQ,PredFrontVS,SlashSlashV2V,SlashV2V,SlashVPIV2V,ComplVV,PassVPSlash,PassAgentVPSlash
+     ],
   DictionarySwe ** 
 open MorphoSwe, ResSwe, ParadigmsSwe, SyntaxSwe, CommonScand, (E = ExtraSwe), Prelude in {