Commit Graph

252 Commits

Author SHA1 Message Date
Aarne Ranta
d18b889df6 one more fix word order in ExtendGer.PredVPS ; not yet correct for Sub with ConjVPS 2024-07-22 23:59:55 +02:00
Aarne Ranta
6084aef91b trying to fix word order in ExtendGer.PredVPS ; not yet correct for Sub 2024-07-22 23:47:03 +02:00
Aarne Ranta
687f0cefc8 lost AP.ext in CompAP restored, Inv worder still to be fixed 2024-07-22 21:10:50 +02:00
Aarne Ranta
bb5107fa99 added GenRP to Extend Fin,Fre,Ger,Ita,Swe 2024-03-20 16:34:30 +01:00
Aarne Ranta
97b713520f commas in Ger subord clauses: things remaining to do 2024-03-20 09:27:47 +01:00
Hans Leiss
73de2c3f97 (Ger) Changed Quant to remove recently introduced bug that
lead to a metavariable when parsing contracted prepositions
2024-01-15 17:32:28 +01:00
Hans Leiss
6455337430 (Ger) Comment in lincat AP of CatGer corrected 2024-01-14 18:00:07 +01:00
Hans Leiss
00f8b78813 (Ger) Made AP a split phrase with movable comparison NP 2024-01-14 16:05:06 +01:00
Hans Leiss
4249c33de4 (Ger) Corrections of determiners in Structural, DetQuantOrd in Noun. Additions to Extend 2024-01-08 14:44:47 +01:00
Hans Leiss
55f8f5ebd8 (Ger) APred of OrdSuperl and OrdNumeralSuperl corrected 2023-12-27 16:19:34 +01:00
Hans Leiss
5520f7b081 (Ger) oper asQuant in StructuralGer removed 2023-12-27 11:18:50 +01:00
Hans Leiss
21db782ef5 (Ger) Some lincats changed to remove number in plural; DetQuant and DetQuantOrd reimplemented 2023-12-22 22:44:28 +01:00
Hans Leiss
c365d802fe (Ger) APred superlative and NOrd forms of numerals corrected 2023-12-04 15:48:36 +01:00
Hans Leiss
88be4ca0ae (Ger) ordinal endings of Digits fixed 2023-11-29 10:48:20 +01:00
Hans Leiss
96076d6d81 Reduced Agr to 9 values by removing AgP3SgGen 2023-11-16 19:16:58 +01:00
Hans Leiss
e200403cf8 Add forgotten hunks of branch master to smallAgr 2023-10-01 23:46:57 +02:00
Hans Leiss
1cf6496883 (Ger) Shrink Agr = Ag Gender Number Person from 3*2*3 = 18 values to 2+3+1+3+1 = 10 by
Agr = AgSgP1 | AgSgP2 | AgSgP3 Gender | AgSgP3Gen | AgPl Person | AgPlPol ;
      with AgSgP3Gen resp. AgPlPol used for reflexive,possessive forms of "man", "Sie".

      Compiles AllGer from src in 162sec with 15M VerbGer.gfo vs. 380sec with 17M VerbGer.gfo
2023-09-30 23:28:42 +02:00
Krasimir Angelov
9a413efd6f restore InLN in German 2023-08-22 08:06:07 +02:00
Krasimir Angelov
fb398c603e The new Decimal API 2023-08-21 20:14:26 +02:00
Krasimir Angelov
ce8b4575ee partly restore the Names API in German 2023-08-21 19:37:52 +02:00
Aarne Ranta
a00d41dcfa re-enabled Ger.possess_Prep 2023-08-21 16:08:52 +03:00
Krasimir Angelov
0b52307e91 added lin FClause 2023-08-21 15:02:21 +02:00
Aarne Ranta
0cbae9883d commented out Names from Grammar temporarily to avoid failure with notYet 2023-08-21 15:59:33 +03:00
Inari Listenmaa
98128cedd7 (Ger) Comment out lins that don't compile 2023-08-21 11:45:00 +03:00
Inari Listenmaa
a6f3dc6d05 Merge pull request #433 from hleiss/prepDefArt
Prep def art
2023-08-21 11:16:29 +03:00
Krasimir Angelov
6bc965f6c2 the names API in more languages 2023-08-16 19:39:22 +02:00
Krasimir Angelov
531e2c2dd2 progress on the Names API 2023-08-07 21:15:48 +02:00
Hans Leiss
e07c9ee044 Missing application of vp.c2.s to GPl in ExtendGer added 2023-08-05 19:42:33 +02:00
Hans Leiss
1f728c31a0 Conflict marker in ExtendGer removed 2023-08-05 19:11:21 +02:00
Hans Leiss
b76b8af7b2 Merge master into prepDefArt 2023-08-05 18:17:08 +02:00
Hans Leiss
e2ce9de503 Conflicts with preposition and defart resolved 2023-08-05 18:01:03 +02:00
Hans Leiss
c659270fcc Synchronized remote master; then pulled and resolved conflicts 2023-08-05 15:46:12 +02:00
Hans Leiss
c8a424c023 Implementation of prep+DefArt-gluing independent of |PCase| finished 2023-08-04 20:34:02 +02:00
Hans Leiss
0d5919d511 Extended the new glueing of prepositions with article to {Construction,Markup,Extra}Ger.
Minor edits of param Weight, mkSubject and entries in LexiconGer.
2023-08-03 16:39:30 +02:00
Krasimir Angelov
22a168198b support for measurement units 2023-07-25 19:38:43 +02:00
Krasimir Angelov
5d912f78a4 floating point numerals 2023-07-24 20:06:01 +02:00
Krasimir Angelov
645de9955a started a separate module for names 2023-07-24 17:24:13 +02:00
Aarne Ranta
edfe72514b fixed irreg verbs in DictFre; reject non-verbs in ParadigmsGer (check that infinitive ends -n) 2023-04-04 15:51:09 +02:00
Krasimir Angelov
95364e667c copy PastPartAP/PastPartAgentAP to ExtendGer 2023-03-21 07:58:55 +01:00
aarneranta
7b3b49400a added ExtendGer functions needed in Wikimini 2023-02-09 09:35:05 +01:00
Krasimir Angelov
828bf9c677 extend the names API 2023-02-07 08:47:34 +01:00
Krasimir Angelov
7085acacc9 added GN & SN categories for constructing names 2022-12-15 08:44:42 +01:00
Krasimir Angelov
7d9d2a2b5c support plural PNs 2022-10-21 21:48:51 +02:00
Krasimir Angelov
b066fb4d35 extended Numerals API. moved from the WordNet grammar 2022-10-21 20:50:49 +02:00
Hans Leiss
1cad178ec8 The glueing of preposition with definite article is now implemented using
NP.s : Bool => Case => Str  and   NP.w = WDefArt

np.s ! False : Case => Str is the ordinary paradigm; if the np has a
definite article, np.w = WDefArt, and np.s ! True : Case => Str is the
paradigm with definite article omitted, if np.a = Ag g Sg p.

Prepositions now have type

  Prep = {s : GenNum => Str ; s2 :Str ; c : Case ; isPrep : PrepType},

and |Prep| = |Case|*|isPrep| = 4 * 3 = 12, independent of |PCase| >= 18.

A preposition p with p.isPrep = isPrepDefArt has in p.s ! (GSg g) : Str
the preposition glued with definite article of a following np in singular.

The modified linearization categories for Prep, NP, Det, DAP, Quant,
Predet are no longer Prep', NP' etc., but Prep, NP etc. in CatGer.
They are now also used in gf-rgl/tests/german/TestLangGer.gf.
The previous auxiliary files abstract/Adjective'.gf etc. are removed.

BUT: for complexitiy reasons,
- the glueing is omitted in SlashV2VNP : V2V -> NP -> VPSlash -> VPSlash,
- SlashVP : NP -> SlashVP -> ClSlash (in SentenceGer and TestLanGer)
  are commented out.
SlashVP causes grammar compilation to crash due to memory limits, probably
because mkClause and its modification mkClSlash are too detailed.
2022-08-23 15:32:17 +02:00
Hans Leiss
787f9d10e8 The files for GrammarGer and AllGer (but not Construction, Documentation, Markup)
are edited to allow for glued Prep+DefArt, using new categories NP',Det',Quant',
Predet',DAP'.

The previous NP.s : Case => Str*Str allows parsing

   "in dem Meer" = in_Prep ++ (np.s ! Case).p1
   "im Meer"     = in_Prep ++ (np.s ! Case).p2,

but since only one of the strings of (np.s!Case) is used, the tree
contains a metavariable like ?2 (the grammar is "erasing"). (Similarly, if we used
NP.s : Case => Str and NP.s2 : Case => Str.)

To get rid of the metavariables, we have to choose BY A PARAMETER, say

    NP.s : droppedDefArt? => Case => Str

Using np.a = Ag g n p, the preposition can select between preposition
alone or preposition with definite article (glued or not), via

    Prep = {s : GenNum => Str ; s2 :Str ; c : Case ; isPrep : PrepType }

The combination is done in appPrepNP' and appPrep'. This is
independent of the number of glued Prep+DefArt. But LangGer compiles
now in 200s using 30% memory (without SlashV2VNP). Can AppPrepNP' (and
insertObjNP') be simplified?
2022-08-11 21:07:03 +02:00
Hans Leiss
ec41af609d 1. updated types in ../abstract/*'.gf to replace NP,Det,Quant,Predep,Prep,DAP by
their primed versions
2. implemented all linearizations to use the primed categories

This allows linearization with prep+defart's, but parsing gives metavariables
in parses (DetQuant ? NumSg) and (DetQuantOrd ? NumSg ord) for prep+defart.

Todo: make Quant.s and NP. depend on PronType = isCat | isPron | isPronDefArt.

Without SlashV2VNP', compiles in 84 sec and gives 3,6M VerbGer.gfo, 2,3M SentenceGer.gfo.

Uses |Prep'|=12 instead of |Prep|=18, |NP'|=72 instead of |NP|=54
2022-07-22 11:49:19 +02:00
Hans Leiss
8eee3df739 Modifications of Prep\', Predet\', Quant\', Det\', NP\' to remove PCase and use NP.s : Agr => Str * Str instead 2022-07-19 18:27:56 +02:00
Hans Leiss
1379ba6c77 (Ger) reflexive RNP in ExtraGer completed ;
improved Slash-rules in tests/german/TestLangGer
2022-07-16 12:18:13 +02:00
Hans Leiss
0e8ac21976 (Ger) small fix to make reimplementation of infinitives compile for 'present'
new SlashVP, RelSlash in tests/german/TestLangGer to control reflexives in relative clauses
2022-04-11 15:33:36 +02:00