Commit Graph
42 Commits
Author SHA1 Message Date
Hans Leiss 4bf528a429 (Ger) Implemented QVP in Question, GenIP and GenModIP in Extend 2025-09-28 18:15:45 +02:00
Hans Leiss 7e52a4759c (Ger) Corrections in Cat, Res, Lexicon, Structural, Morpho, Paradigms and Questions 2025-09-21 21:05:43 +02:00
Hans Leiss 35f3b5e206 (Ger) Added missing linearizations pot21 to pot5plus 2025-03-16 15:34:46 +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 c204bcc753 Synchronize ordinals with master 2023-12-27 12:18:11 +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
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
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 529f315c7a Merge branch 'master' into reflexiveNPs 2022-07-16 13:20:31 +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
Hans Leiss b8ddf4304b (Ger) Small fix to get 'present' installed
new SlashVP, RelSlash in tests/german/TestLangGer.gf to control reflexives in relative clauses
2022-04-11 12:27:39 +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
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 d9928919e3 (Ger) Readjusting accdatV3 in ParadigmsGer and modifying V3-examples in LexiconGer instead
ParadigmsGer had two constructions of verbs v:V3 with dat- and acc-object nps,

(1)      mkV3 : V -> V3 = \v -> mkV3 v accPrep datPrep ;
(2)  accdatV3 : V -> V3 = \v -> mkV3 v datPrep accPrep ;  -- (no prepositions)

In a previous patch, I had replaced (accdatV3 v) to (mkV3 v accPrep datPrep), as the
name suggested. (This actually was the meaning of accdatV3 in gf-3.2, which had only
a non-overloaded mkV3 : V -> Prep -> Prep -> V3.)

The reason for having two constructions for dat+acc-verbs in Ger seems to be *Eng*:
for English, ditransitive V3-verbs are defined by

(2')     mkV3 : V -> V3 = \v -> mkV3 v noPrep noPrep ;

like "to give sb sth", where the indirect argument comes first (c2=indir), the direct
second (c3=dir), corresponding to c2=datPrep, c3=accPrep in Ger; apparently, this was
meant by the comment (no prepositions) in (2). Other V3-verbs in Eng are defined by

(1')    mkV3 : V -> Prep -> V3 = \v,p -> mkV3 v noPrep p ;

like "to give sth to sb", so that (c2=dir), (c3=indir-with preposition),
corresponding to c2=acc,c3=dat in Ger, i.e. (1).

In order to get trees with equal meaning in Ger and Eng, the direct and indirect
arguments of corresponding verbs must match. Therefore, some V3-verbs in Ger have to
be defined using (1), others using (2), although they syntactically behave similar.

This patch therefore reinstalls (1) and (2), and changes the V3 in LexiconGer to:

  give_V3 = accdatV3 Irreg.geben_V ; -- c2=datPrep, c3=accPrep, to fit
             -- to Eng ditransitive: give sb(indir) sth(dir) (no preposition)

  sell_V3 = mkV3 (no_geV (regV "verkaufen")) ;    -- Eng: mkV3 v noPrep toPrep
  send_V3 = mkV3 (regV "schicken") ; -- Ger mkV3 v = Ger: mkV3 v accPrep datPrep
2019-07-08 16:09:17 +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 2a1c22c5ca fixed the syntax error with --# notpresent in ResGer 2019-07-04 14:15:50 +02:00
Hans Leiss 07aa656687 updated tests/german/object-order.README 2019-07-04 10:19:24 +02:00
Hans Leiss b521089274 Added tests for pronoun-switch and object ordering in Ger (see tests/object-order.*) 2019-07-03 19:16:35 +02:00
Hans Leiss d3c6dddf2c removed comment from ResGer 2019-07-01 17:39:42 +02:00
Hans Leiss 03e404e518 Improving pronoun-switch and partial ordering of objects in Ger 2019-06-29 20:40:46 +02:00
leiss 4d7ced4e4e partial implementation of Ancient Greek RGL 2016-05-25 12:35:37 +00:00
leiss 2426e9606f a dictionary with over 6000 German verbs with subcategorizations 2015-05-20 09:45:38 +00:00