Fix german training

Author: Hubert De La Jonquiere

grammar/de/src/rules.rs

@@ -541,7 +541,7 @@ pub fn rules_time(b: &mut RuleSetBuilder<Dimension>) -> RustlingResult<()> {
                       |_| helpers::month_day(12, 24)
     );
     b.rule_1_terminal("three wise men",
-        b.reg(r#"(?:den )?heiligen? drei k[öo]nigen?"#)?,
+        b.reg(r#"(?:den )heiligen? drei k[öo]nigen?"#)?,
         |_| helpers::month_day(1, 6)
     );
     b.rule_1_terminal("new year's eve",
@@ -955,11 +955,30 @@ pub fn rules_time(b: &mut RuleSetBuilder<Dimension>) -> RustlingResult<()> {
              ordinal_check!(|ordinal: &OrdinalValue| 1 <= ordinal.value && ordinal.value <= 31),
              |time, ordinal| time.value().intersect(&helpers::day_of_month(ordinal.value().value as u32)?)
     );
-    // b.rule_2("<named-month> <day-of-month> (non ordinal)",
-    //          time_check!(form!(Form::Month(_))),
-    //          integer_check_by_range!(1, 31),
-    //          |time, integer| time.value().intersect(&helpers::day_of_month(integer.value().value as u32)?)
-    // );
+    b.rule_3("<named-month> <day-of-month> (non ordinal) <time>",
+             time_check!(form!(Form::Month(_))),
+             integer_check_by_range!(1, 31),
+             time_check!(),
+             |month, integer, time| month.value()
+                .intersect(&helpers::day_of_month(integer.value().value as u32)?)?
+                .intersect(time.value())
+    );
+    b.rule_3("<time> <named-month> <day-of-month> (non ordinal)",
+        time_check!(),
+        time_check!(form!(Form::Month(_))),
+        integer_check_by_range!(1, 31),
+             |time, month, integer| month.value()
+                .intersect(&helpers::day_of_month(integer.value().value as u32)?)?
+                .intersect(time.value())
+    );
+    b.rule_3("<day-of-week> <named-month> <day-of-month> (non ordinal)",
+        time_check!(form!(Form::DayOfWeek{..})),
+        time_check!(form!(Form::Month(_))),
+        integer_check_by_range!(1, 31),
+             |dow, month, integer| month.value()
+                .intersect(&helpers::day_of_month(integer.value().value as u32)?)?
+                .intersect(dow.value())
+    );
     b.rule_3("<day-of-month> (non ordinal) of <named-month>",
              integer_check_by_range!(1, 31),
              b.reg(r#"vom|von|im"#)?,

grammar/de/src/training.rs

@@ -58,28 +58,26 @@ pub fn examples_time(v: &mut Vec<::rustling::train::Example<Dimension>>) {
     example!(v, check_moment!(c, [2013, 2, 11]), "gestern");
     example!(v, check_moment!(c, [2013, 2, 13]), "morgen");
     example!(v, check_moment!(c, [2013, 2, 18]), "montag", "mo.", "diesen montag");
-    example!(v, check_moment!(c, [2013, 2, 18]), "Montag, Feb 18", "Montag, Februar 18");
+    example!(v, check_moment!(c, [2013, 2, 18]), "Montag Feb 18", "Montag Februar 18");
     example!(v, check_moment!(c, [2013, 2, 19]), "dienstag");
     example!(v, check_moment!(c, [2013, 2, 14]), "donnerstag", "do", "do.");
     example!(v, check_moment!(c, [2013, 2, 15]), "freitag", "fr.");
     example!(v, check_moment!(c, [2013, 2, 16]), "samstag", "sa.");
     example!(v, check_moment!(c, [2013, 2, 17]), "sonntag", "so.");
     example!(v, check_moment!(c, [2013, 3, 1]), "1 märz", "erster märz");
-    example!(v, check_moment!(c, [2013, 3, 3]), "märz 3");
     example!(v, check_moment!(c, [2015, 3, 3]), "märz 3 2015");
     example!(v, check_moment!(c, [2013, 2, 15]), "am 15ten");
-    example!(v, check_moment!(c, [2013, 2, 15]), "15. februar", "februar 15", "15te februar", "15.2.", "am 15.2.", "februar 15");
-    example!(v, check_moment!(c, [2013, 8, 8]), "Aug 8");
+    example!(v, check_moment!(c, [2013, 2, 15]), "15. februar", "15te februar", "15.2.", "am 15.2.");
     example!(v, check_moment!(c, [2014, 10]), "Oktober 2014");
     example!(v, check_moment!(c, [1974, 10, 31]), "31.10.1974", "31.10.74");
-    example!(v, check_moment!(c, [2015, 4, 14]), "14 april 2015", "April 14, 2015", "14te April 15");
+    example!(v, check_moment!(c, [2015, 4, 14]), "14 april 2015", "April 14 2015", "14te April 15");
     example!(v, check_moment!(c, [2013, 2, 19]), "nächsten dienstag");
     example!(v, check_moment!(c, [2013, 2, 22]), "übernächsten freitag");
     example!(v, check_moment!(c, [2013, 3]), "nächsten marz");
     example!(v, check_moment!(c, [2014, 3]), "übernächsten marz");
-    example!(v, check_moment!(c, [2013, 2, 10]), "Sonntag, Feb 10");
-    example!(v, check_moment!(c, [2013, 2, 13]), "Mittwoch, Feb 13");
-    example!(v, check_moment!(c, [2013, 2, 18]), "Montag, Feb 18");
+    example!(v, check_moment!(c, [2013, 2, 10]), "Sonntag Feb 10");
+    example!(v, check_moment!(c, [2013, 2, 13]), "Mittwoch Feb 13");
+    example!(v, check_moment!(c, [2013, 2, 18]), "Montag Feb 18");
     example!(v, check_moment!(c, [2013, 2, 11], Grain::Week), "diese woche");
     example!(v, check_moment!(c, [2013, 2, 18], Grain::Week), "kommende woche");
     example!(v, check_moment!(c, [2013, 2, 4], Grain::Week), "letzte woche");
@@ -194,8 +192,8 @@ pub fn examples_time(v: &mut Vec<::rustling::train::Example<Dimension>>) {
     example!(v, check_moment_span!(c, [2013, 3], [2013, 6]), "nächsten 3 monaten", "nächste drei monate", "kommenden drei monaten");
     example!(v, check_moment_span!(c, [2011], [2013]), "letzten 2 jahren", "letzten zwei jahre", "vergangenen zwei jahren");
     example!(v, check_moment_span!(c, [2014], [2017]), "nächsten 3 jahren", "kommenden drei jahren", "nächste drei jahre");
-    example!(v, check_moment_span!(c, [2013, 7, 13], [2013, 7, 16]), "13. - 15. Juli", "13ter bis 15ter Juli", "13 bis 15 Juli", "13 - 15 Juli", "Juli 13 - Juli 15");
-    example!(v, check_moment_span!(c, [2013, 8, 8], [2013, 8, 13]), "Aug 8 - Aug 12");
+    example!(v, check_moment_span!(c, [2013, 7, 13], [2013, 7, 16]), "13. - 15. Juli", "13ter bis 15ter Juli", "13 bis 15 Juli", "13 - 15 Juli", "13 Juli - 15 Juli");
+    example!(v, check_moment_span!(c, [2013, 8, 8], [2013, 8, 13]), "8 Aug - 12 Aug");
     example!(v, check_moment_span!(c, [2013, 2, 12, 9, 30], [2013, 2, 12, 11, 1]), "9:30 - 11:00");
     example!(v, check_moment_span!(c, [2013, 2, 14, 9, 30], [2013, 2, 14, 11, 1]),"am Donnerstag von 9:30 - 11:00", "am Donnerstag zwischen 9:30 und 11:00", "Donnerstag 9:30 - 11:00", "am Donnerstag nach 9:30 aber vor 11:00", "Donnerstag von 9:30 bis 11:00");
     example!(v, check_moment_span!(c, [2013, 2, 14, 9], [2013, 2, 14, 12]), "Donnerstag Vormittag von 9 bis 11");