Commit Graph

47 Commits

Author SHA1 Message Date
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 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 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 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 fb398c603e The new Decimal API 2023-08-21 20:14:26 +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 7d9d2a2b5c support plural PNs 2022-10-21 21:48:51 +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
krangelov 9d657a6f24 move UseDAP, UseDAPMasc, UseDAPFem to the RGL and implement it for several new languages 2021-04-27 18:00:54 +02:00
aarneranta 1f030252a1 fixed genitive es/en in German adjectives and determiners 2020-04-14 16:32:17 +02:00
Hans Leiss 8fb8ddd808 Ger: improved infinitives (and passives); tests with more verbs in testing/german
- NP: added field isLight in order to push negation behind light nps;
  this had been done in gf-3.9 using field isPron, but isPron is now
  used to put accusative pronoun before dative pronoun. Removed field
  adv: adverbial extensions cannot be extracted (todo: also for CN).
  Reduced isLight*isPron to w:Weight with 3 values: WPron, WLight, WHeavy.

- added param Control and field ctrl:Control to classify V2V-verbs into
  subject- and object-contol verbs, use ctrl to make reflexives agree
  with subject resp. object in VPSlash, and refine ComplSlash.

- Verb: new versions of ComplVV, SlashV2V and SlashVV to give better
  (nested) infinitives (extracting infzu and correcting object order).
  a) nested SlashVV doesn't work properly;
  b) SlashV2VNP may have to be commented out to prevent a stack overflow
     when compiling.
  Intended change of SlashV2VNP in tests/german/TestLangGer could not
  be tested due to size problems with the compiler.

- VP: changed field a1 : Polarity => Str to a1:Str to collect the adverbs
  coming before negation, using (negation : Polarity => Str) in mkClause.
  Use objCtrl:Bool instead of missingAdv to let reflexives agree with object.

- ResGer: insertObjNP reorganized, infzuVP added

- DictVerbsGer: some corrections (helft -> hilft, *sprecht -> *spricht)

- Some potential passive rules in tests/german/TestLangGer|Eng

- ExtraGer needs to be cleaned up with repect to the modified mkClause.
2019-09-18 15:16:42 +02:00
Hans Leiss 03e404e518 Improving pronoun-switch and partial ordering of objects in Ger 2019-06-29 20:40:46 +02:00
Aarne Ranta 3949424a78 fixed Ger SentCN and AdvCN, which erased their earlier modifiers 2018-06-05 18:19:09 +02:00
Aarne Ranta 4da5677697 some fixes in German 2017-10-25 11:09:13 +02:00
aarne 8bbb2a1277 restoring the discontinuous Ger NP parts in some linearizations 2015-07-27 09:14:10 +00:00
scharolta_siencnik dc143dcb02 German resource grammar: major changes. 2015-07-23 15:50:05 +00:00
aarne aa8c214671 German relative "was" in RelS 2015-07-21 15:00:35 +00:00
aarne 03b15a8683 missing syntax functions in Chi and some other languages 2014-12-08 10:19:38 +00:00
aarne f3d4c7f4d7 added the constructor Noun.NumeralSuperlOrd for phrases like "third largest", which have special linearizations in many languages e.g. German (drittgrösste) and Finnish (kolmanneksi suurin). Implemented for Chi (to check), Dut, Eng, Fin, Ger, Romance, Scand so far 2014-08-24 14:32:44 +00:00
aarne 29f8a7b33f several fixes in German RGL: compound verbs added; compound forms of nouns added; made dative -e optional; made mkV Str V recognize which prefixes are certainly not movable ones ((be,er,ge,ver,zer) 2014-05-29 10:21:49 +00:00
aarne bee9db74f9 a couple of fixes in Ger 2013-04-05 08:38:13 +00:00
aarne 16b8296562 a typo in ParadigmsGer.mkV2 ; added comma in NounGer.RelCN 2013-03-10 16:17:28 +00:00
aarne d2ca42bed9 Ger Quant sp field gets a Boolean to manage the use of numerals like in English 2013-01-26 10:52:31 +00:00
aarne c479da280d adjusting German negation place for some indefinite determiners; this is difficult and not yet conclusive 2012-05-28 09:17:19 +00:00
aarne cb0601bb47 Erzsébet's fixes to Ger 2012-05-26 08:57:01 +00:00
aarne 88e97ba120 another fix in Ger Quant, for "gute Häuser" 2012-05-08 13:45:31 +00:00
aarne 453e204813 adjective form with Ger determiners 2012-05-08 11:54:36 +00:00
aarne 31e8793cad substantival IndefArt in Ger (einer, eines, eine); DetNPMasc and DetNPFem in Extra 2012-04-10 20:50:50 +00:00
aarne a6e2d5a879 updates in Phrasebook and resources 2010-08-25 09:08:31 +00:00
aarne 731f7233b7 heavy/light NP distinction in Ger to control the place of negation 2010-05-29 09:43:42 +00:00
aarne e6dfb602aa German preposition contractions 2010-05-26 09:37:17 +00:00
aarne 1125dabaf8 agreement in German Predet 2010-01-05 13:35:24 +00:00
aarne 19c1a8cba8 replaced German Agr record by an algebraic type 2009-12-16 15:45:29 +00:00
aarne a1fdeb6704 next-lib renamed to lib, lib to old-lib 2009-06-22 15:39:08 +00:00