Remove references to APE grammar rules

+ small updates in the report.

Author: Kaljurand

docs/d11_1/d11_1.tex

@@ -274,15 +274,17 @@ \subsection{Comparison of Codeco and GF}
 The definite NP cannot be used after `there is' because the
 declared features \verb!def:+! and \verb!def:-! do not unify.
 
-Most of the Codeco features are syntactic in nature and therefore map to
+Most of the Codeco features are syntactic in nature (e.g. `case', `pl', `whin')
+and can be therefore handled in
 GF's concrete grammar which offers structures similar to Codeco's feature
 sets and operations similar to Codeco's unification. However, some of the
-Codeco features are semantic in nature (e.g. `exists') and should therefore be
+Codeco features are semantic in nature (e.g. `def', `exist')
+and should therefore be
 implemented in GF's abstract grammar where such unification-style rules are
 not possible. In neither case is a direct mapping of Codeco grammar rules
 and features to a GF grammar functions and categories possible.
-[TODO: go over the Codeco features and see what corresponds to them
-in GF, if it should belong to the concrete or the abstract part.]
+%[TODO: go over the Codeco features and see what corresponds to them
+%in GF, if it should belong to the concrete or the abstract part.]
 
 In the Codeco subset anaphoric references can be made via definite noun
 phrases (`the man') and variables (`X'). In order for an anaphoric reference
@@ -390,7 +392,7 @@ \subsection{Grammar module structure}
 
 The GF implementation follows the Codeco implementation, assigning a function
 to each grammar rule unless it is too specific to ACE, in which case it
-can be implemented as an ACE-only variant. [TODO: improve]
+can be implemented as an ACE-only variant.
 To correctly implement the ACE syntax, a new ACE-specific resource library
 was created. For the most part it borrows all the operators from GF's English
 resource library, but overrides certain constructions which in ACE have a
@@ -430,7 +432,7 @@ \subsection{Lexicon}
 internal representations of words can be generated using RGL operators.
 Table \ref{mapping_acewiki_to_gf} shows the mapping of AceWiki categories
 to GF RGL English operators.
-[TODO: we have to ignore certain things, e.g.  the the-PNs?]
+%[TODO: we have to ignore certain things, e.g.  the the-PNs?]
 
 \begin{table}
 \begin{center}

grammars/acewiki_aceowl/Attempto.gf

@@ -77,8 +77,6 @@ fun cn_as_VarCN : CN -> VarCN ;
 -- Note: in full ACE this must be ThereNP [KK]
 fun termNP : Term -> NP ;
 
--- 2.2.2
-
 -- Relative clause can be attached to both CNs and NPs.
 -- relCN provides relative clauses in constructs like
 -- `which woman who ...` and `for every woman who ...`
@@ -104,25 +102,17 @@ fun which_RP : RP ;
 -- e.g. ((dog of X) of X), most of which ACE does not allow. [KK]
 fun ofCN : CN -> NP -> VarCN ;
 
--- 2.3.1
-
 fun vpS : NP -> VP -> SimpleS ;
 fun neg_vpS : NP -> VP -> SimpleS ;
 
 fun v2VP : V2 -> NP -> VP ;
 
--- 2.3.2 [JJC]
-
 fun a2VP : A2 -> NP -> VP ; -- is mad-about NP
 
--- 3.2
-
 fun thereNP : ThereNP -> SimpleS ;  -- there is/are
 
 fun thereNP_as_NP : ThereNP -> NP ;
 
--- 3.4.1
-
 fun coordS : Conj -> S -> S -> S ;
 
 fun and_Conj : Conj ;
@@ -136,19 +126,13 @@ fun vp_as_posVPS : VP -> VPS ;
 fun vp_as_negVPS : VP -> VPS ;
 fun np_coord_VPS : NP -> Conj -> [VPS] -> SimpleS ;
 
--- 3.4.3
-
 fun for_everyS : VarCN -> S -> S ;
 
--- 3.4.4
-
 fun if_thenS : S -> S -> S ;
 fun falseS : SimpleS -> S ; -- it is false that
 
 fun simpleS_as_S : SimpleS -> S ;
 
--- 3.5
-
 -- These have been replaced by the more generic function npqQS, which allows
 -- for wh-words in the object position of a relative clause as subject
 -- e.g. "somebody who is who is a man?"
@@ -168,8 +152,6 @@ fun whichIP : IDet -> VarCN -> IP ;
 fun which_IDet : IDet ;
 fun whichPl_IDet : IDet ;
 
--- 4
-
 cat ACEText ;
 fun consText : Text -> ACEText -> ACEText ;
 
@@ -178,8 +160,6 @@ fun baseText : Text -> ACEText ;
 fun sText : S -> Text ;
 fun qsText : QS -> Text ;
 
--- more
-
 fun npVP  : NP -> VP ;              -- is a bank
 fun digitsCard : Digits -> Card ;   -- 8 banks
 fun v2_byVP : V2 -> NP -> VP ;      -- is bought by a customer

grammars/acewiki_aceowl/AttemptoI.gf

@@ -75,8 +75,6 @@ lin apposVarCN cn v = mkCN cn (symb v) ;
 
 lin termNP x = symb (Prelude.ss x.s) ;
 
--- 2.2.2
-
 lin relCN = mkCN ;
 lin relNP = Syntax.mkNP ;
 --lin relThereNP = Syntax.mkNP ; [JJC]
@@ -90,23 +88,15 @@ lin slashRS rp np v2 = mkRS (mkRCl rp np v2) ;
 lin neg_slashRS rp np v2 = mkRS negativePol (mkRCl rp np v2) ;
 lin which_RP = Syntax.which_RP ;
 
--- 2.2.4
-
 lin ofCN cn np = mkCN cn (Syntax.mkAdv possess_Prep np) ;
 
--- 2.3.1
-
 lin vpS np vp = mkS (mkCl np vp) ;
 lin neg_vpS np vp = mkS negativePol (mkCl np vp) ;
 
 lin v2VP = mkVP ;
 
--- 2.3.2 [JJC]
-
 lin a2VP = mkVP ; -- is mad-about NP
 
--- 3.2
-
 lin thereNP np = mkS (mkCl np) ;
 
 -- ThereNP is just a regular NP, we just need it to separate out
@@ -119,26 +109,18 @@ lin cn_as_VarCN = id Syntax.CN ;
 lin simpleS_as_S = id Syntax.S ;
 
 
--- 3.4.1
-
 lin coordS = mkS ;
 
 lin and_Conj = Syntax.and_Conj ;
 lin or_Conj = Syntax.or_Conj ;
 
--- 3.4.3
-
 lin for_everyS cn = mkS (Syntax.mkAdv for_Prep (Syntax.mkNP every_Det cn)) ;
 
--- 3.4.4
-
 lin if_thenS = mkS if_then_Conj ;
 
 lin falseS s = mkS (adj_thatCl false_A s) ;
 
 
--- 3.5
-
 -- lin ipQS ip vp = mkQS (mkQCl ip vp) ;
 -- lin neg_ipQS ip vp = mkQS negativePol (mkQCl ip vp) ;
 
@@ -152,16 +134,12 @@ lin whichIP = Syntax.mkIP ;
 lin which_IDet = Syntax.which_IDet ;
 lin whichPl_IDet = Syntax.whichPl_IDet ;
 
--- 3.6
-
 lin consText = mkText ;
 lin baseText t = t ;
 lin sText = mkText ;
 lin qsText = mkText ;
 
 
---- more
-
 lin npVP = mkVP ;
 lin digitsCard n = Syntax.mkCard <lin Digits n : Digits> ;
 lin v2_byVP v2 np = mkVP (passiveVP v2) (Syntax.mkAdv by8agent_Prep np) ;
@@ -190,12 +168,6 @@ lin v2_byVP v2 np = mkVP (passiveVP v2) (Syntax.mkAdv by8agent_Prep np) ;
   lin a2VPQ = a2VP ;
   lin v2_byVPQ = v2_byVP ;
 
-  -- These functions are language-specific
-  -- lincat VPSQ = Extra.VPS ;
-  -- lincat [VPSQ] = Extra.ListVPS ;
-  -- lin BaseVPSQ = Extra.BaseVPS ;
-  -- lin ConsVPSQ = Extra.ConsVPS ;
-
   lin vp_as_posVPSQ = vp_as_posVPS ;
   lin vp_as_negVPSQ = vp_as_negVPS ;
   lin vpq_as_posVPSQ = vp_as_posVPS ;

run-precision-test.bash

@@ -33,8 +33,7 @@ if [ $# -ge 1 ]; then
     fi
 fi
 
-echo "Depth: ${depth}"
-echo "Parsing into ${out}..."
+#echo "Parsing into ${out}..."
 egrep ".+" ${trees_file} | tools/Codeco/run.sh 1>${out}
 
 length=`cat ${trees_file} | python tools/length.py | python tools/avg.py`
@@ -44,7 +43,8 @@ parsed=`egrep "^OK:" ${out} | wc --lines`
 failed=`egrep "^FAIL:" ${out} | wc --lines`
 echo "Parsed: ${parsed}, Failed: ${failed}"
 echo "Precision:" $((parsed*100/total))"%"
+echo "Depth: ${depth}"
 echo "Average length: ${length}"
 
-echo "Creating ${out_fail}"
+#echo "Creating ${out_fail}"
 egrep "^FAIL:" ${out} | sed "s/^FAIL: //" | sort | uniq > ${out_fail}