Commit Graph

35 Commits

Author SHA1 Message Date
Aarne Ranta
687f0cefc8 lost AP.ext in CompAP restored, Inv worder still to be fixed 2024-07-22 21:10:50 +02: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
21db782ef5 (Ger) Some lincats changed to remove number in plural; DetQuant and DetQuantOrd reimplemented 2023-12-22 22:44:28 +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
Hans Leiss
c659270fcc Synchronized remote master; then pulled and resolved conflicts 2023-08-05 15:46:12 +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
7778e6138c (Ger) reimplementation of infinitives to improve compilation
- removed Control and treat control verbs with VPSlash.objCtrl:Bool

- combined VP.inf and VP.infExt to VP.inf with inplace/extracted parts
  depending on Agr, to subj/obj-control reflexives in infinitival complements

- AllGer compiles from src in 250s (SlashV2VNP!), .gfo loads in 15s on x86_64
2022-04-06 12:55:48 +02:00
aarneranta
a3701d1a48 bug fix in VerbGer: added fields of CN to CompCN 2021-06-09 18:25:06 +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
45e6bfdec5 (Ger) Correction of VP paradigm with modal verbs
The inf part of VPC is split into inf,inf2:Str to correct

    hat ... wollen lesen         => hat ... lesen wollen
    wird ... wollen haben lesen  => wird ... haben lesen wollen
                                    (for: lesen wollen|gewollt haben)

Changed useVP and mkClause of ResGer and MkVPS of ExtraGer.
(ExtraGer.DisToCl needs to be adapted, but best by unification with mkClause.)
See also tests/german/vp-paradigm.*
2019-07-06 15:29:23 +02:00
Hans Leiss
03e404e518 Improving pronoun-switch and partial ordering of objects in Ger 2019-06-29 20:40:46 +02:00
Inari Listenmaa
3089155590 (Ger) Agreement with ReflVP + ComplSlash
ComplSlash ( … ReflVP … ) X:    reflexive should agree with X
ReflVP ... ( … ComplSlash … X): reflexive should agree with subject
2018-05-01 16:38:17 +02:00
aarne
df39e466bb some new functionalities in Ger 2017-06-05 12:46:53 +00:00
aarne
d37d00b6db extrapos field added in German UseComp 2016-11-06 18:11:31 +00:00
scharolta_siencnik
dc143dcb02 German resource grammar: major changes. 2015-07-23 15:50:05 +00:00
andrea.christina.unger
6f8f9da3ff added auxV2V (parallel to auxVV) 2015-05-27 14:47:35 +00:00
aarne
89fba60b19 ExtAdvVP added to some languages where it was missing 2014-12-08 13:21:28 +00:00
aarne
93ce3c12f9 more fine-grained place of German negation 2013-03-07 20:47:21 +00:00
aarne
9c07e219a5 added UseCopula to Fin,Ger,romance since needed in YAQL 2012-11-13 09:48:26 +00:00
kr.angelov
9e65cf21d5 added AdvVPSlash and AdVVPSlash to VerbGer and an extended version of PPartNP which uses VPSlash in ParseEngGer. I guess the definitions so they might not be quite correct 2012-09-27 11:44:25 +00:00
aarne
86a14126f6 missing rule: Verb.VPSlashPrep, implemented in Eng Scand Ger. Also helped detect a bug and its fix in object insertion in Eng and Scand, which had caused wrong word orders in Verb.Slash2V3 (*he gave to me it). Fix remains to do in Ger, and also the new rule in other languages. 2012-09-22 21:35:28 +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
04db1cffaf comma in embedded sentence in Ger 2012-05-27 21:15:03 +00:00
aarne
099d24602b Ger negation adjusted once more 2012-05-27 21:09:17 +00:00
aarne
cb0601bb47 Erzsébet's fixes to Ger 2012-05-26 08:57:01 +00:00
aarne
8a932e3c30 CompCN added to Ger Fin Dut Rus Pol 2010-12-07 20:23:57 +00:00
aarne
823e6822c8 corrected IrregGer.wissen_V 2010-08-24 14:40:50 +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
a1fdeb6704 next-lib renamed to lib, lib to old-lib 2009-06-22 15:39:08 +00:00