From ef2b1b1b0e0828a61153dacad0563314e33f109e Mon Sep 17 00:00:00 2001
From: Julien Odent <jodent@fb.com>
Date: Fri, 28 Aug 2020 09:45:50 -0700
Subject: [PATCH] Time/FR: Some speed up

Summary: Guarding against grains, shortening regexes.

Reviewed By: jtliao

Differential Revision: D23387716

fbshipit-source-id: de84d0efa79c4ae10bd9fbf14e82a724fee1a1f2
---
 Duckling/Ranking/Classifiers/FR_XX.hs | 1190 +++++++++++--------------
 Duckling/Time/EN/Rules.hs             |    6 +-
 Duckling/Time/FR/Rules.hs             |   41 +-
 3 files changed, 541 insertions(+), 696 deletions(-)

diff --git a/Duckling/Ranking/Classifiers/FR_XX.hs b/Duckling/Ranking/Classifiers/FR_XX.hs
index 7ab67012..ce85c335 100644
--- a/Duckling/Ranking/Classifiers/FR_XX.hs
+++ b/Duckling/Ranking/Classifiers/FR_XX.hs
@@ -254,54 +254,37 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("entre <datetime> et <datetime> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.3429447511268303,
-                               unseen = -4.1588830833596715,
+                     ClassData{prior = -0.3483066942682157,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
                                    [("le <time>le <day-of-month> (non ordinal)",
-                                     -3.4499875458315876),
-                                    ("le <time>le <time>", -3.044522437723423),
-                                    ("dayday", -1.6582280766035324),
-                                    ("hourhour", -3.4499875458315876),
-                                    ("le <time>intersect", -3.4499875458315876),
-                                    ("miditime-of-day (latent)", -3.4499875458315876),
+                                     -2.890371757896165),
+                                    ("le <time>le <time>", -2.4849066497880004),
+                                    ("dayday", -1.0986122886681098),
+                                    ("hourhour", -2.890371757896165),
+                                    ("le <time>intersect", -2.890371757896165),
+                                    ("miditime-of-day (latent)", -2.890371757896165),
                                     ("intersectle <day-of-month> (non ordinal)",
-                                     -3.4499875458315876),
-                                    ("minutehour", -1.7452394535931621),
-                                    ("hh(:|h)mm (time-of-day)time-of-day (latent)",
-                                     -3.044522437723423),
-                                    ("<hour-of-day> <integer> (as relative minutes)<time-of-day> heures",
-                                     -2.7568403652716422),
+                                     -2.890371757896165),
                                     ("le <day-of-month> (non ordinal)le <day-of-month> (non ordinal)",
-                                     -2.7568403652716422),
-                                    ("hh(:|h)mm (time-of-day)<time-of-day> heures",
-                                     -2.7568403652716422),
-                                    ("intersectintersect", -3.4499875458315876),
-                                    ("intersectle <time>", -3.044522437723423),
-                                    ("<hour-of-day> <integer> (as relative minutes)time-of-day (latent)",
-                                     -3.044522437723423)],
-                               n = 22},
+                                     -2.1972245773362196),
+                                    ("intersectintersect", -2.890371757896165),
+                                    ("intersectle <time>", -2.4849066497880004)],
+                               n = 12},
                    koData =
-                     ClassData{prior = -1.2367626271489267,
-                               unseen = -3.6375861597263857,
+                     ClassData{prior = -1.2237754316221157,
+                               unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<hour-of-day> <integer> (as relative minutes)intersect",
-                                     -2.917770732084279),
-                                    ("dayday", -1.8191584434161694),
+                                   [("dayday", -1.2992829841302609),
                                     ("le <day-of-month> (non ordinal)intersect",
-                                     -2.512305623976115),
-                                    ("minutehour", -2.001480000210124),
-                                    ("hh(:|h)mm (time-of-day)time-of-day (latent)",
-                                     -2.917770732084279),
+                                     -1.9924301646902063),
                                     ("le <day-of-month> (non ordinal)le <time>",
-                                     -2.512305623976115),
+                                     -1.9924301646902063),
                                     ("le <day-of-month> (non ordinal)le <day-of-month> (non ordinal)",
-                                     -2.917770732084279),
-                                    ("hh(:|h)mm (time-of-day)intersect", -2.917770732084279),
-                                    ("<hour-of-day> <integer> (as relative minutes)time-of-day (latent)",
-                                     -2.917770732084279)],
-                               n = 9}}),
+                                     -2.3978952727983707)],
+                               n = 5}}),
        ("soir",
         Classifier{okData =
                      ClassData{prior = -0.1823215567939546, unseen = -2.833213344056216,
@@ -336,27 +319,25 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<named-month|named-day> suivant|d'apr\232s",
         Classifier{okData =
-                     ClassData{prior = -0.10178269430994236,
-                               unseen = -4.189654742026425,
+                     ClassData{prior = -6.899287148695143e-2,
+                               unseen = -4.1588830833596715,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersect", -2.5649493574615367),
-                                    ("en semaine", -1.9771626925594177),
-                                    ("Mercredi", -3.0757749812275272),
-                                    ("Mardi", -3.0757749812275272),
-                                    ("intersect by 'de' or ','", -2.5649493574615367),
-                                    ("day", -0.807091439909163),
-                                    ("le <time>", -1.9771626925594177)],
+                                   [("intersect", -2.5336968139574325),
+                                    ("en semaine", -1.9459101490553135),
+                                    ("Mercredi", -3.044522437723423), ("Mardi", -3.044522437723423),
+                                    ("intersect by 'de' or ','", -2.5336968139574325),
+                                    ("day", -0.7758388964050588),
+                                    ("le <time>", -1.9459101490553135)],
                                n = 28},
                    koData =
-                     ClassData{prior = -2.3353749158170367, unseen = -2.772588722239781,
+                     ClassData{prior = -2.70805020110221, unseen = -2.4849066497880004,
                                likelihoods =
                                  HashMap.fromList
-                                   [("en semaine", -2.0149030205422647),
-                                    ("day", -1.6094379124341003), ("hour", -2.0149030205422647),
-                                    ("<time-of-day> heures", -2.0149030205422647),
-                                    ("le <time>", -2.0149030205422647)],
-                               n = 3}}),
+                                   [("en semaine", -1.7047480922384253),
+                                    ("day", -1.2992829841302609),
+                                    ("le <time>", -1.7047480922384253)],
+                               n = 2}}),
        ("Samedi",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -400,6 +381,34 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("apr\232s <time-of-day|day>",
+        Classifier{okData =
+                     ClassData{prior = -0.3677247801253174, unseen = -4.204692619390966,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("intersect", -1.7047480922384253),
+                                    ("hh(:|h)mm (time-of-day)", -2.803360380906535),
+                                    ("midi", -3.4965075614664802), ("day", -2.803360380906535),
+                                    ("time-of-day (latent)", -2.803360380906535),
+                                    ("hour", -1.4170660197866443), ("minute", -1.8870696490323797),
+                                    ("<time-of-day> heures", -2.803360380906535),
+                                    ("le <time>", -3.0910424533583156),
+                                    ("<hour-of-day> <integer> (as relative minutes)",
+                                     -2.580216829592325)],
+                               n = 27},
+                   koData =
+                     ClassData{prior = -1.1786549963416462,
+                               unseen = -3.6109179126442243,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("intersect", -2.4849066497880004),
+                                    ("le <day-of-month> (non ordinal)", -2.890371757896165),
+                                    ("day", -2.890371757896165),
+                                    ("time-of-day (latent)", -1.9740810260220096),
+                                    ("au d\233jeuner", -2.890371757896165),
+                                    ("hour", -1.0986122886681098),
+                                    ("<time-of-day> heures", -1.9740810260220096)],
+                               n = 12}}),
        ("de <time-of-day> - <time-of-day> (interval)",
         Classifier{okData =
                      ClassData{prior = -0.587786664902119, unseen = -3.8066624897703196,
@@ -444,35 +453,20 @@ classifiers
                                n = 12}}),
        ("<datetime>-dd <month>(interval)",
         Classifier{okData =
-                     ClassData{prior = -1.2237754316221157,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = 0.0, unseen = -2.70805020110221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.2992829841302609),
+                                   [("daymonth", -0.8472978603872037),
                                     ("day of month (premier)number (0..16)Juillet",
-                                     -1.9924301646902063),
+                                     -1.540445040947149),
                                     ("<day-of-month> <named-month>integer (numeric)Juillet",
-                                     -1.9924301646902063),
+                                     -1.540445040947149),
                                     ("day of month (premier)integer (numeric)Juillet",
-                                     -2.3978952727983707)],
+                                     -1.9459101490553135)],
                                n = 5},
                    koData =
-                     ClassData{prior = -0.3483066942682157,
-                               unseen = -3.6109179126442243,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("Juilletinteger (numeric)Juillet", -2.4849066497880004),
-                                    ("time-of-day (latent)integer (numeric)Septembre",
-                                     -2.890371757896165),
-                                    ("hourmonth", -1.791759469228055),
-                                    ("monthmonth", -2.4849066497880004),
-                                    ("year (latent)integer (numeric)Juillet", -1.9740810260220096),
-                                    ("time-of-day (latent)integer (numeric)Juillet",
-                                     -1.9740810260220096),
-                                    ("yearmonth", -1.791759469228055),
-                                    ("year (latent)integer (numeric)Septembre",
-                                     -2.890371757896165)],
-                               n = 12}}),
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("semaine (grain)",
         Classifier{okData =
                      ClassData{prior = -7.79615414697118e-2,
@@ -507,106 +501,63 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by 'mais/par exemple/plut\244t'",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.6888794541139363,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -2.9704144655697013),
-                                    ("Jeudientre <datetime> et <datetime> (interval)",
-                                     -1.466337068793427),
+                                   [("dayhour", -2.3978952727983707),
                                     ("le <day-of-month> (non ordinal)\224|vers <time-of-day>",
-                                     -2.9704144655697013),
-                                    ("dayminute", -0.8303483020734304),
+                                     -2.3978952727983707),
+                                    ("dayminute", -0.8938178760220964),
                                     ("Jeudientre <time-of-day> et <time-of-day> (interval)",
-                                     -1.466337068793427)],
-                               n = 17},
+                                     -0.8938178760220964)],
+                               n = 9},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.791759469228055,
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("de <datetime> - <datetime> (interval)",
         Classifier{okData =
-                     ClassData{prior = -1.6094379124341003, unseen = -4.23410650459726,
+                     ClassData{prior = -1.0560526742493137,
+                               unseen = -3.6635616461296463,
                                likelihoods =
                                  HashMap.fromList
                                    [("day of month (premier)<day-of-week> <day-of-month>",
-                                     -3.5263605246161616),
+                                     -2.9444389791664407),
                                     ("hh(:|h)mm (time-of-day)<hour-of-day> <integer> (as relative minutes)",
-                                     -3.5263605246161616),
-                                    ("minuteminute", -2.6100697927420065),
+                                     -2.9444389791664407),
+                                    ("minuteminute", -2.0281482472922856),
                                     ("hh(:|h)mm (time-of-day)hh(:|h)mm (time-of-day)",
-                                     -3.5263605246161616),
-                                    ("dayday", -2.6100697927420065),
+                                     -2.9444389791664407),
+                                    ("dayday", -2.0281482472922856),
                                     ("<day-of-month> <named-month>day of month (premier)",
-                                     -3.5263605246161616),
-                                    ("minutehour", -3.120895416507997),
-                                    ("<hour-of-day> <integer> (as relative minutes)<time-of-day> heures",
-                                     -3.5263605246161616),
+                                     -2.9444389791664407),
                                     ("<hour-of-day> <integer> (as relative minutes)hh(:|h)mm (time-of-day)",
-                                     -3.5263605246161616),
-                                    ("hh(:|h)mm (time-of-day)<time-of-day> heures",
-                                     -3.5263605246161616),
+                                     -2.9444389791664407),
                                     ("<hour-of-day> <integer> (as relative minutes)<hour-of-day> <integer> (as relative minutes)",
-                                     -3.5263605246161616),
-                                    ("<day-of-month> <named-month>intersect", -3.5263605246161616),
-                                    ("intersect<day-of-week> <day-of-month>", -3.5263605246161616)],
-                               n = 10},
+                                     -2.9444389791664407),
+                                    ("<day-of-month> <named-month>intersect", -2.9444389791664407),
+                                    ("intersect<day-of-week> <day-of-month>", -2.9444389791664407)],
+                               n = 8},
                    koData =
-                     ClassData{prior = -0.2231435513142097, unseen = -4.859812404361672,
+                     ClassData{prior = -0.4274440148269396, unseen = -3.970291913552122,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<hour-of-day> <integer> (as relative minutes)intersect",
-                                     -4.1588830833596715),
-                                    ("<day-of-month> <named-month>time-of-day (latent)",
-                                     -4.1588830833596715),
-                                    ("time-of-day (latent)<day-of-month> <named-month>",
-                                     -4.1588830833596715),
-                                    ("hourday", -3.0602707946915624),
-                                    ("dayhour", -3.7534179752515073),
-                                    ("yearhour", -3.7534179752515073),
-                                    ("time-of-day (latent)year (latent)", -3.7534179752515073),
-                                    ("day of month (premier)time-of-day (latent)",
-                                     -4.1588830833596715),
-                                    ("houryear", -3.7534179752515073),
-                                    ("time-of-day (latent)intersect", -3.7534179752515073),
-                                    ("<day-of-week> <day-of-month>Dimanche", -4.1588830833596715),
-                                    ("year (latent)intersect", -3.7534179752515073),
-                                    ("yearyear", -3.7534179752515073),
+                                   [("<day-of-week> <day-of-month>Dimanche", -3.258096538021482),
+                                    ("yearyear", -2.8526314299133175),
                                     ("time-of-day (latent)time-of-day (latent)",
-                                     -3.7534179752515073),
-                                    ("dayday", -2.367123614131617),
-                                    ("year (latent)year (latent)", -3.7534179752515073),
+                                     -2.8526314299133175),
+                                    ("dayday", -1.466337068793427),
+                                    ("year (latent)year (latent)", -2.8526314299133175),
                                     ("<day-of-week> <day-of-month><day-of-week> <day-of-month>",
-                                     -4.1588830833596715),
-                                    ("hourhour", -3.7534179752515073),
-                                    ("time-of-day (latent)<day-of-week> <day-of-month>",
-                                     -4.1588830833596715),
+                                     -3.258096538021482),
+                                    ("hourhour", -2.8526314299133175),
                                     ("day of month (premier)<day-of-month> <named-month>",
-                                     -4.1588830833596715),
-                                    ("dayyear", -4.1588830833596715),
-                                    ("minutehour", -2.6548056865833978),
-                                    ("hh(:|h)mm (time-of-day)time-of-day (latent)",
-                                     -3.7534179752515073),
-                                    ("year (latent)<day-of-week> <day-of-month>",
-                                     -4.1588830833596715),
-                                    ("year (latent)time-of-day (latent)", -3.7534179752515073),
-                                    ("<hour-of-day> <integer> (as relative minutes)<time-of-day> heures",
-                                     -4.1588830833596715),
-                                    ("day of month (premier)intersect", -3.7534179752515073),
-                                    ("hh(:|h)mm (time-of-day)<time-of-day> heures",
-                                     -4.1588830833596715),
-                                    ("intersectintersect", -3.7534179752515073),
-                                    ("day of month (premier)year (latent)", -4.1588830833596715),
-                                    ("year (latent)<day-of-month> <named-month>",
-                                     -4.1588830833596715),
-                                    ("hh(:|h)mm (time-of-day)intersect", -4.1588830833596715),
-                                    ("yearday", -3.0602707946915624),
-                                    ("day of month (premier)Mercredi", -4.1588830833596715),
-                                    ("<hour-of-day> <integer> (as relative minutes)time-of-day (latent)",
-                                     -3.7534179752515073),
-                                    ("intersectMercredi", -4.1588830833596715),
-                                    ("time-of-day (latent)Dimanche", -4.1588830833596715),
-                                    ("<day-of-week> <day-of-month>intersect", -3.7534179752515073),
-                                    ("year (latent)Dimanche", -4.1588830833596715)],
-                               n = 40}}),
+                                     -3.258096538021482),
+                                    ("day of month (premier)intersect", -2.8526314299133175),
+                                    ("intersectintersect", -2.8526314299133175),
+                                    ("day of month (premier)Mercredi", -3.258096538021482),
+                                    ("intersectMercredi", -3.258096538021482),
+                                    ("<day-of-week> <day-of-month>intersect", -2.8526314299133175)],
+                               n = 15}}),
        ("<ordinal> <cycle> de <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.890371757896165,
@@ -653,341 +604,326 @@ classifiers
                                n = 2}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.21495665270962766, unseen = -6.97354301952014,
+                     ClassData{prior = -0.21850556309818536, unseen = -6.90975328164481,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<day-of-month> <named-month><dim time> <part-of-day>",
-                                     -6.279459070741808),
-                                    ("intersect<dim time> du matin", -6.279459070741808),
+                                   [("intersect<dim time> du matin", -6.215607598755275),
                                     ("<hour-of-day> <integer> (as relative minutes)intersect",
-                                     -5.8739939626336435),
+                                     -5.810142490647111),
                                     ("<day-of-month> <named-month>d\233but de journ\233e",
-                                     -6.279459070741808),
-                                    ("hourday", -4.028167272135313),
-                                    ("<day-of-month> <named-month>year", -5.586311890181863),
-                                    ("dayhour", -1.9163604459534453),
+                                     -6.215607598755275),
+                                    ("hourday", -3.96431580014878),
+                                    ("<day-of-month> <named-month>year", -5.52246041819533),
+                                    ("apr\232s <time-of-day|day>le <time>", -5.29931686688112),
+                                    ("dayhour", -1.9887738534870956),
                                     ("<datetime> - <datetime> (interval)Juillet",
-                                     -5.180846782073698),
-                                    ("daymonth", -2.8137231679420815),
-                                    ("monthyear", -4.7753816739655335),
+                                     -5.116995310087166),
+                                    ("daymonth", -2.749871695955549),
+                                    ("monthyear", -4.711530201979001),
                                     ("<day-of-month> <named-month>d\233but de matin\233e",
-                                     -6.279459070741808),
-                                    ("dernier <cycle> de <time> (latent)year", -5.363168338867653),
-                                    ("aujourd'huimilieu d'apr\232s-midi", -6.279459070741808),
+                                     -6.215607598755275),
+                                    ("dernier <cycle> de <time> (latent)year", -5.29931686688112),
+                                    ("apr\232s <time-of-day|day>intersect", -5.810142490647111),
+                                    ("aujourd'huimilieu d'apr\232s-midi", -6.215607598755275),
                                     ("<day-of-month> <named-month>\224|vers <time-of-day>",
-                                     -4.7753816739655335),
-                                    ("dd mmyear", -5.02669610224644),
-                                    ("Vendredi\224|vers <time-of-day>", -5.8739939626336435),
-                                    ("Mercredidu|dans le <part-of-day>", -6.279459070741808),
-                                    ("aujourd'huifin d'apr\232s-midi", -6.279459070741808),
-                                    ("day of month (premier)Novembre", -5.586311890181863),
+                                     -4.711530201979001),
+                                    ("dd mmyear", -4.962844630259907),
+                                    ("Vendredi\224|vers <time-of-day>", -5.810142490647111),
+                                    ("Mercredidu|dans le <part-of-day>", -6.215607598755275),
+                                    ("aujourd'huifin d'apr\232s-midi", -6.215607598755275),
+                                    ("day of month (premier)Novembre", -5.52246041819533),
                                     ("le <day-of-month> (non ordinal)<dim time> du matin",
-                                     -6.279459070741808),
-                                    ("aujourd'huimilieu de matin\233e", -6.279459070741808),
+                                     -6.215607598755275),
+                                    ("aujourd'huimilieu de matin\233e", -6.215607598755275),
                                     ("hh(:|h)mm (time-of-day)<day-of-week> <day-of-month>",
-                                     -6.279459070741808),
-                                    ("le <day-of-month> (non ordinal)Fevrier", -4.200017529061972),
-                                    ("Mars<dim time> <part-of-day>", -6.279459070741808),
-                                    ("Lundiday of month (premier)", -5.8739939626336435),
+                                     -6.215607598755275),
+                                    ("le <day-of-month> (non ordinal)Fevrier", -4.13616605707544),
+                                    ("Lundiday of month (premier)", -5.810142490647111),
                                     ("<time-of-day> heuresdu|dans le <part-of-day>",
-                                     -5.586311890181863),
+                                     -5.52246041819533),
                                     ("<hour-of-day> et quart<dim time> <part-of-day>",
-                                     -5.8739939626336435),
-                                    ("le <time>du|dans le <part-of-day>", -5.586311890181863),
-                                    ("aujourd'huifin de matin\233e", -6.279459070741808),
-                                    ("Marsyear", -5.8739939626336435),
-                                    ("aujourd'huifin de soir\233e", -6.279459070741808),
-                                    ("\224|vers <time-of-day>ce <part-of-day>", -5.586311890181863),
+                                     -5.810142490647111),
+                                    ("le <time>du|dans le <part-of-day>", -5.52246041819533),
+                                    ("aujourd'huifin de matin\233e", -6.215607598755275),
+                                    ("Marsyear", -5.810142490647111),
+                                    ("aujourd'huifin de soir\233e", -6.215607598755275),
+                                    ("\224|vers <time-of-day>ce <part-of-day>", -5.52246041819533),
                                     ("<day-of-month> <named-month>d\233but d'apr\232s-midi",
-                                     -6.279459070741808),
+                                     -6.215607598755275),
                                     ("le <day-of-month> (non ordinal)<dim time> du soir",
-                                     -5.586311890181863),
-                                    ("intersectSeptembre", -5.8739939626336435),
-                                    ("aujourd'huid\233but de soir\233e", -6.279459070741808),
-                                    ("<day-of-week> <day-of-month>Fevrier", -5.8739939626336435),
-                                    ("<hour-of-day> et demice <part-of-day>", -5.8739939626336435),
-                                    ("apr\232s <time-of-day>Jeudi", -5.8739939626336435),
-                                    ("le <time>fin de matin\233e", -6.279459070741808),
+                                     -5.52246041819533),
+                                    ("intersectSeptembre", -5.810142490647111),
+                                    ("aujourd'huid\233but de soir\233e", -6.215607598755275),
+                                    ("<day-of-week> <day-of-month>Fevrier", -5.810142490647111),
+                                    ("<hour-of-day> et demice <part-of-day>", -5.810142490647111),
+                                    ("<dim time> <part-of-day>apr\232s <time-of-day|day>",
+                                     -6.215607598755275),
+                                    ("le <time>fin de matin\233e", -6.215607598755275),
                                     ("Jeudide <time-of-day> - <time-of-day> (interval)",
-                                     -5.8739939626336435),
-                                    ("day of month (premier)Mars", -5.363168338867653),
-                                    ("intersectmilieu de journ\233e", -6.279459070741808),
-                                    ("intersectfin de journ\233e", -6.279459070741808),
+                                     -5.810142490647111),
+                                    ("day of month (premier)Mars", -5.29931686688112),
+                                    ("intersectmilieu de journ\233e", -6.215607598755275),
+                                    ("intersectfin de journ\233e", -6.215607598755275),
                                     ("le <day-of-month> (non ordinal)<time-of-day> heures",
-                                     -6.279459070741808),
-                                    ("Octobreyear", -5.363168338867653),
-                                    ("Fevrierd\233but de matin\233e", -6.279459070741808),
+                                     -6.215607598755275),
+                                    ("Octobreyear", -5.29931686688112),
+                                    ("Jeudiapr\232s <time-of-day|day>", -5.29931686688112),
+                                    ("Fevrierd\233but de matin\233e", -6.215607598755275),
                                     ("de <datetime> - <datetime> (interval)Juillet",
-                                     -5.8739939626336435),
+                                     -5.810142490647111),
                                     ("<hour-of-day> <integer> (as relative minutes)<day-of-week> <day-of-month>",
-                                     -6.279459070741808),
-                                    ("monthhour", -4.082234493405589),
-                                    ("Marsintersect", -6.279459070741808),
+                                     -6.215607598755275),
+                                    ("monthhour", -4.075541435259004),
+                                    ("Marsintersect", -6.215607598755275),
                                     ("Lundile <cycle> prochain|suivant|d'apr\232s",
-                                     -6.279459070741808),
-                                    ("le <time>fin d'apr\232s-midi", -6.279459070741808),
-                                    ("hourmonth", -4.7753816739655335),
-                                    ("<time-of-day> heuresle <time>", -4.7753816739655335),
-                                    ("entre <datetime> et <datetime> (interval)Jeudi",
-                                     -5.8739939626336435),
-                                    ("dayday", -3.9280838135783305),
-                                    ("Septembreyear", -5.8739939626336435),
+                                     -6.215607598755275),
+                                    ("le <time>fin d'apr\232s-midi", -6.215607598755275),
+                                    ("hourmonth", -4.711530201979001),
+                                    ("<time-of-day> heuresle <time>", -4.711530201979001),
+                                    ("dayday", -3.8642323415917974),
+                                    ("Septembreyear", -5.810142490647111),
                                     ("aujourd'hui<hour-of-day> <integer> (as relative minutes)",
-                                     -5.8739939626336435),
-                                    ("apr\232s <time-of-day>Novembre", -5.586311890181863),
-                                    ("hourhour", -3.7537304264335525),
-                                    ("Fevrierd\233but d'apr\232s-midi", -6.279459070741808),
+                                     -5.810142490647111),
+                                    ("hourhour", -3.68987895444702),
+                                    ("Fevrierd\233but d'apr\232s-midi", -6.215607598755275),
                                     ("<day-of-week> <day-of-month>\224|vers <time-of-day>",
-                                     -5.180846782073698),
-                                    ("<day-of-week> <day-of-month>Septembre", -6.279459070741808),
-                                    ("le <time>intersect", -5.8739939626336435),
+                                     -5.116995310087166),
+                                    ("<day-of-week> <day-of-month>Septembre", -6.215607598755275),
+                                    ("le <time>intersect", -5.810142490647111),
                                     ("\224|vers <time-of-day><dim time> <part-of-day>",
-                                     -6.279459070741808),
-                                    ("aujourd'huiau d\233jeuner", -6.279459070741808),
+                                     -6.215607598755275),
+                                    ("aujourd'huiau d\233jeuner", -6.215607598755275),
                                     ("du dd au dd (interval) (latent month)Juillet",
-                                     -5.586311890181863),
-                                    ("Vendrediday of month (premier)", -6.279459070741808),
-                                    ("le <day-of-month> (non ordinal)Avril", -6.279459070741808),
-                                    ("<time-of-day> heuresintersect", -5.363168338867653),
-                                    ("<hour-of-day> et quartce <part-of-day>", -5.8739939626336435),
-                                    ("Jeudi\224|vers <time-of-day>", -6.279459070741808),
-                                    ("dayyear", -3.8815637979434374),
-                                    ("le <day-of-month> (non ordinal)Juin", -6.279459070741808),
-                                    ("Lundice|dans le <cycle>", -6.279459070741808),
-                                    ("apr\232s-demain\224|vers <time-of-day>", -5.8739939626336435),
-                                    ("intersectfin d'apr\232s-midi", -6.279459070741808),
-                                    ("le <ordinal> <cycle> de <time>year", -6.279459070741808),
-                                    ("intersectmilieu d'apr\232s-midi", -6.279459070741808),
+                                     -5.52246041819533),
+                                    ("Vendrediday of month (premier)", -6.215607598755275),
+                                    ("le <day-of-month> (non ordinal)Avril", -6.215607598755275),
+                                    ("<time-of-day> heuresintersect", -5.29931686688112),
+                                    ("<hour-of-day> et quartce <part-of-day>", -5.810142490647111),
+                                    ("Jeudi\224|vers <time-of-day>", -6.215607598755275),
+                                    ("dayyear", -3.817712325956905),
+                                    ("le <day-of-month> (non ordinal)Juin", -6.215607598755275),
+                                    ("Lundice|dans le <cycle>", -6.215607598755275),
+                                    ("apr\232s-demain\224|vers <time-of-day>", -5.810142490647111),
+                                    ("intersectfin d'apr\232s-midi", -6.215607598755275),
+                                    ("le <ordinal> <cycle> de <time>year", -6.215607598755275),
+                                    ("intersectmilieu d'apr\232s-midi", -6.215607598755275),
                                     ("<hour-of-day> <integer> (as relative minutes)Jeudi",
-                                     -6.279459070741808),
-                                    ("le <time>milieu de journ\233e", -6.279459070741808),
-                                    ("aujourd'huid\233but de journ\233e", -6.279459070741808),
-                                    ("demain\224|vers <time-of-day>", -5.8739939626336435),
-                                    ("le <day-of-month> (non ordinal)Mars", -4.893164709621917),
+                                     -6.215607598755275),
+                                    ("le <time>milieu de journ\233e", -6.215607598755275),
+                                    ("aujourd'huid\233but de journ\233e", -6.215607598755275),
+                                    ("demain\224|vers <time-of-day>", -5.810142490647111),
+                                    ("le <day-of-month> (non ordinal)Mars", -4.829313237635384),
                                     ("le <day-of-month> (non ordinal)intersect",
-                                     -3.7945524209538077),
-                                    ("hourminute", -6.279459070741808),
-                                    ("dd-dd <month>(interval)year", -6.279459070741808),
-                                    ("intersect<day-of-month> <named-month>", -5.8739939626336435),
+                                     -3.7732605633860707),
+                                    ("hourminute", -6.215607598755275),
+                                    ("dd-dd <month>(interval)year", -6.215607598755275),
+                                    ("intersect<day-of-month> <named-month>", -5.810142490647111),
                                     ("<hour-of-day> <integer> (as relative minutes)Samedi",
-                                     -6.279459070741808),
-                                    ("minutemonth", -5.8739939626336435),
-                                    ("\224|vers <time-of-day>demain", -6.279459070741808),
-                                    ("minutehour", -4.670021158307708),
-                                    ("Lundidu|dans le <part-of-day>", -6.279459070741808),
-                                    ("aujourd'huimilieu de journ\233e", -6.279459070741808),
-                                    ("Mars\224|vers <time-of-day>", -5.586311890181863),
-                                    ("intersectd\233but de soir\233e", -6.279459070741808),
+                                     -6.215607598755275),
+                                    ("minutemonth", -5.810142490647111),
+                                    ("minutehour", -4.6061696863211745),
+                                    ("Lundidu|dans le <part-of-day>", -6.215607598755275),
+                                    ("aujourd'huimilieu de journ\233e", -6.215607598755275),
+                                    ("Vendrediapr\232s <time-of-day|day>", -6.215607598755275),
+                                    ("Mars\224|vers <time-of-day>", -5.52246041819533),
+                                    ("intersectd\233but de soir\233e", -6.215607598755275),
                                     ("Mardile <cycle> prochain|suivant|d'apr\232s",
-                                     -5.586311890181863),
-                                    ("aujourd'huifin de journ\233e", -6.279459070741808),
-                                    ("le <day-of-month> (non ordinal)Octobre", -6.279459070741808),
-                                    ("intersectdu|dans le <part-of-day>", -4.487699601513753),
+                                     -5.52246041819533),
+                                    ("aujourd'huifin de journ\233e", -6.215607598755275),
+                                    ("le <day-of-month> (non ordinal)Octobre", -6.215607598755275),
+                                    ("intersectdu|dans le <part-of-day>", -4.4238481295272205),
                                     ("le <day-of-month> \224 <datetime>du|dans le <part-of-day>",
-                                     -5.8739939626336435),
-                                    ("hh(:|h)mm (time-of-day)Jeudi", -6.279459070741808),
-                                    ("le <day-of-month> (non ordinal)apr\232s <time-of-day>",
-                                     -6.279459070741808),
-                                    ("le <time>Juillet", -6.279459070741808),
-                                    ("Lundi<day-of-month> <named-month>", -6.279459070741808),
+                                     -5.810142490647111),
+                                    ("hh(:|h)mm (time-of-day)Jeudi", -6.215607598755275),
+                                    ("le <time>Juillet", -6.215607598755275),
+                                    ("Lundi<day-of-month> <named-month>", -6.215607598755275),
                                     ("Mercredile <cycle> prochain|suivant|d'apr\232s",
-                                     -5.586311890181863),
-                                    ("Lundifin d'apr\232s-midi", -5.8739939626336435),
-                                    ("Lundile <time>", -5.8739939626336435),
-                                    ("le <day-of-month> (non ordinal)<dim time> <part-of-day>",
-                                     -4.139392907245537),
+                                     -5.52246041819533),
+                                    ("Lundifin d'apr\232s-midi", -5.810142490647111),
+                                    ("Lundile <time>", -5.810142490647111),
                                     ("Mardi<named-month|named-day> suivant|d'apr\232s",
-                                     -5.8739939626336435),
-                                    ("apr\232s <time-of-day>le <time>", -5.363168338867653),
-                                    ("Mars<dim time> du matin", -6.279459070741808),
-                                    ("le <time>Novembre", -5.586311890181863),
-                                    ("intersectd\233but d'apr\232s-midi", -6.279459070741808),
-                                    ("<datetime> - <datetime> (interval)Jeudi", -5.363168338867653),
+                                     -5.810142490647111),
+                                    ("Mars<dim time> du matin", -6.215607598755275),
+                                    ("le <time>Novembre", -5.52246041819533),
+                                    ("intersectd\233but d'apr\232s-midi", -6.215607598755275),
+                                    ("<datetime> - <datetime> (interval)Jeudi", -5.29931686688112),
                                     ("Mercredi<named-month|named-day> suivant|d'apr\232s",
-                                     -5.8739939626336435),
+                                     -5.810142490647111),
                                     ("<time-of-day> - <time-of-day> (interval)Jeudi",
-                                     -5.02669610224644),
-                                    ("Samedi<day-of-month> <named-month>", -6.279459070741808),
-                                    ("<hour-of-day> et quartdemain", -5.8739939626336435),
-                                    ("<time-of-day> heuresce <time>", -6.279459070741808),
-                                    ("le <time>d\233but d'apr\232s-midi", -6.279459070741808),
-                                    ("day of month (premier)Juillet", -5.586311890181863),
+                                     -4.962844630259907),
+                                    ("Samedi<day-of-month> <named-month>", -6.215607598755275),
+                                    ("<time-of-day> heuresce <time>", -6.215607598755275),
+                                    ("le <time>d\233but d'apr\232s-midi", -6.215607598755275),
+                                    ("day of month (premier)Juillet", -5.52246041819533),
                                     ("<day-of-month> <named-month>du|dans le <part-of-day>",
-                                     -5.8739939626336435),
-                                    ("Fevriermilieu d'apr\232s-midi", -6.279459070741808),
-                                    ("Mercredi\224|vers <time-of-day>", -6.279459070741808),
-                                    ("intersectNovembre", -5.02669610224644),
-                                    ("le <time><dim time> du matin", -6.279459070741808),
-                                    ("Fevrierfin d'apr\232s-midi", -6.279459070741808),
-                                    ("apr\232s <time-of-day>intersect", -5.8739939626336435),
+                                     -5.810142490647111),
+                                    ("Fevriermilieu d'apr\232s-midi", -6.215607598755275),
+                                    ("Mercredi\224|vers <time-of-day>", -6.215607598755275),
+                                    ("intersectNovembre", -4.962844630259907),
+                                    ("le <time><dim time> du matin", -6.215607598755275),
+                                    ("Fevrierfin d'apr\232s-midi", -6.215607598755275),
                                     ("le <day-of-month> (non ordinal)\224|vers <time-of-day>",
-                                     -4.7753816739655335),
+                                     -4.711530201979001),
                                     ("<day-of-month> <named-month>d\233but de soir\233e",
-                                     -6.279459070741808),
-                                    ("hierdu|dans le <part-of-day>", -6.279459070741808),
-                                    ("le <time>d\233but de soir\233e", -6.279459070741808),
-                                    ("Mercredice|dans le <cycle>", -6.279459070741808),
-                                    ("Fevrierfin de soir\233e", -6.279459070741808),
-                                    ("intersect<dim time> <part-of-day>", -6.279459070741808),
-                                    ("Mardice|dans le <cycle>", -6.279459070741808),
-                                    ("dayminute", -4.670021158307708),
-                                    ("intersectd\233but de journ\233e", -6.279459070741808),
-                                    ("<ordinal> <cycle> de <time>year", -5.8739939626336435),
-                                    ("Fevriermilieu de matin\233e", -6.279459070741808),
-                                    ("le <time>\224|vers <time-of-day>", -5.180846782073698),
+                                     -6.215607598755275),
+                                    ("hierdu|dans le <part-of-day>", -6.215607598755275),
+                                    ("le <time>d\233but de soir\233e", -6.215607598755275),
+                                    ("Mercredice|dans le <cycle>", -6.215607598755275),
+                                    ("Fevrierfin de soir\233e", -6.215607598755275),
+                                    ("Mardice|dans le <cycle>", -6.215607598755275),
+                                    ("dayminute", -4.6061696863211745),
+                                    ("intersectd\233but de journ\233e", -6.215607598755275),
+                                    ("<ordinal> <cycle> de <time>year", -5.810142490647111),
+                                    ("Fevriermilieu de matin\233e", -6.215607598755275),
+                                    ("le <time>\224|vers <time-of-day>", -5.116995310087166),
                                     ("<day-of-month> <named-month><dim time> du matin",
-                                     -6.279459070741808),
-                                    ("intersectyear", -5.586311890181863),
-                                    ("Fevrierfin de matin\233e", -6.279459070741808),
-                                    ("minuteday", -3.3350200915753674),
-                                    ("le <time>d\233but de matin\233e", -6.279459070741808),
-                                    ("Mardile <time>", -4.893164709621917),
-                                    ("aujourd'hui\224|vers <time-of-day>", -5.363168338867653),
+                                     -6.215607598755275),
+                                    ("intersectyear", -5.52246041819533),
+                                    ("Fevrierfin de matin\233e", -6.215607598755275),
+                                    ("minuteday", -3.4747675748300746),
+                                    ("le <time>d\233but de matin\233e", -6.215607598755275),
+                                    ("Mardile <time>", -4.829313237635384),
+                                    ("aujourd'hui\224|vers <time-of-day>", -5.29931686688112),
                                     ("<day-of-month> <named-month>milieu d'apr\232s-midi",
-                                     -6.279459070741808),
-                                    ("day of month (premier)intersect", -6.279459070741808),
+                                     -6.215607598755275),
+                                    ("day of month (premier)intersect", -6.215607598755275),
                                     ("<day-of-month> <named-month>fin d'apr\232s-midi",
-                                     -6.279459070741808),
-                                    ("day of month (premier)Janvier", -6.279459070741808),
-                                    ("de <datetime> - <datetime> (interval)Jeudi",
-                                     -5.8739939626336435),
-                                    ("le <time>milieu de matin\233e", -6.279459070741808),
-                                    ("aujourd'huid\233but de matin\233e", -5.180846782073698),
-                                    ("Fevrierd\233but de soir\233e", -6.279459070741808),
-                                    ("Jeudiapr\232s <time-of-day>", -5.363168338867653),
-                                    ("Mercredile <time>", -4.893164709621917),
-                                    ("<dim time> <part-of-day>apr\232s <time-of-day>",
-                                     -6.279459070741808),
-                                    ("le <time>fin de soir\233e", -6.279459070741808),
+                                     -6.215607598755275),
+                                    ("day of month (premier)Janvier", -6.215607598755275),
+                                    ("le <time>milieu de matin\233e", -6.215607598755275),
+                                    ("aujourd'huid\233but de matin\233e", -5.116995310087166),
+                                    ("Fevrierd\233but de soir\233e", -6.215607598755275),
+                                    ("apr\232s <time-of-day|day>Jeudi", -5.810142490647111),
+                                    ("Mercredile <time>", -4.829313237635384),
+                                    ("le <time>fin de soir\233e", -6.215607598755275),
                                     ("de <time-of-day> - <time-of-day> (interval)Jeudi",
-                                     -5.363168338867653),
+                                     -5.29931686688112),
                                     ("<day-of-month> <named-month>milieu de matin\233e",
-                                     -6.279459070741808),
+                                     -6.215607598755275),
                                     ("<day-of-month> <named-month>fin de soir\233e",
-                                     -6.279459070741808),
+                                     -6.215607598755275),
                                     ("<day-of-month> <named-month>fin de matin\233e",
-                                     -6.279459070741808),
-                                    ("<time-of-day> heuresce <part-of-day>", -5.8739939626336435),
-                                    ("Mercredi<day-of-month> <named-month>", -6.279459070741808),
-                                    ("aujourd'huid\233but d'apr\232s-midi", -6.279459070741808),
-                                    ("le <time>milieu d'apr\232s-midi", -6.279459070741808),
+                                     -6.215607598755275),
+                                    ("<time-of-day> heuresce <part-of-day>", -5.810142490647111),
+                                    ("Mercredi<day-of-month> <named-month>", -6.215607598755275),
+                                    ("aujourd'huid\233but d'apr\232s-midi", -6.215607598755275),
+                                    ("le <time>milieu d'apr\232s-midi", -6.215607598755275),
+                                    ("apr\232s <time-of-day|day>Novembre", -5.52246041819533),
                                     ("\224|vers <time-of-day>du|dans le <part-of-day>",
-                                     -5.180846782073698),
+                                     -5.116995310087166),
                                     ("entre <time-of-day> et <time-of-day> (interval)Jeudi",
-                                     -5.8739939626336435),
-                                    ("intersectintersect", -6.279459070741808),
-                                    ("dayweek", -4.082234493405589),
+                                     -5.810142490647111),
+                                    ("intersectintersect", -6.215607598755275),
+                                    ("dayweek", -4.018383021419056),
                                     ("entre <datetime> et <datetime> (interval)Juillet",
-                                     -5.8739939626336435),
-                                    ("intersectMars", -6.279459070741808),
-                                    ("weekyear", -4.893164709621917),
-                                    ("le <time>Mars", -5.8739939626336435),
-                                    ("apr\232s le <day-of-month>Mars", -6.279459070741808),
-                                    ("hh(:|h)mm (time-of-day)intersect", -5.8739939626336435),
+                                     -5.810142490647111),
+                                    ("intersectMars", -6.215607598755275),
+                                    ("weekyear", -4.829313237635384),
+                                    ("le <time>Mars", -5.810142490647111),
+                                    ("apr\232s le <day-of-month>Mars", -6.215607598755275),
+                                    ("hh(:|h)mm (time-of-day)intersect", -5.810142490647111),
                                     ("<day-of-month> <named-month>fin de journ\233e",
-                                     -6.279459070741808),
+                                     -6.215607598755275),
                                     ("<day-of-month> <named-month>milieu de journ\233e",
-                                     -6.279459070741808),
-                                    ("le <time>fin de journ\233e", -6.279459070741808),
-                                    ("dd/-mm\224|vers <time-of-day>", -5.8739939626336435),
-                                    ("intersectfin de matin\233e", -6.279459070741808),
-                                    ("Fevrierd\233but de journ\233e", -6.279459070741808),
-                                    ("Vendrediintersect", -6.279459070741808),
-                                    ("<day-of-month> <named-month>intersect", -6.279459070741808),
-                                    ("intersectfin de soir\233e", -6.279459070741808),
-                                    ("intersectmilieu de matin\233e", -6.279459070741808),
-                                    ("intersect\224|vers <time-of-day>", -5.586311890181863),
-                                    ("le <time>year", -4.7753816739655335),
-                                    ("Vendrediapr\232s <time-of-day>", -6.279459070741808),
-                                    ("hh(:|h)mm (time-of-day)Samedi", -6.279459070741808),
-                                    ("le <time><dim time> <part-of-day>", -6.279459070741808),
-                                    ("Fevrierfin de journ\233e", -6.279459070741808),
-                                    ("Fevriermilieu de journ\233e", -6.279459070741808),
-                                    ("le <time>d\233but de journ\233e", -6.279459070741808),
-                                    ("intersectd\233but de matin\233e", -6.279459070741808)],
-                               n = 417},
+                                     -6.215607598755275),
+                                    ("le <time>fin de journ\233e", -6.215607598755275),
+                                    ("dd/-mm\224|vers <time-of-day>", -5.810142490647111),
+                                    ("intersectfin de matin\233e", -6.215607598755275),
+                                    ("Fevrierd\233but de journ\233e", -6.215607598755275),
+                                    ("Vendrediintersect", -6.215607598755275),
+                                    ("<day-of-month> <named-month>intersect", -6.215607598755275),
+                                    ("intersectfin de soir\233e", -6.215607598755275),
+                                    ("intersectmilieu de matin\233e", -6.215607598755275),
+                                    ("intersect\224|vers <time-of-day>", -5.52246041819533),
+                                    ("le <time>year", -4.711530201979001),
+                                    ("hh(:|h)mm (time-of-day)Samedi", -6.215607598755275),
+                                    ("le <day-of-month> (non ordinal)apr\232s <time-of-day|day>",
+                                     -6.215607598755275),
+                                    ("Fevrierfin de journ\233e", -6.215607598755275),
+                                    ("Fevriermilieu de journ\233e", -6.215607598755275),
+                                    ("le <time>d\233but de journ\233e", -6.215607598755275),
+                                    ("intersectd\233but de matin\233e", -6.215607598755275)],
+                               n = 389},
                    koData =
-                     ClassData{prior = -1.6428726885203377, unseen = -6.073044534100405,
+                     ClassData{prior = -1.6282080151160907, unseen = -6.025865973825314,
                                likelihoods =
                                  HashMap.fromList
-                                   [("demain<time-of-day> heures", -5.377590547442544),
-                                    ("hourday", -3.180365970106325),
-                                    ("<day-of-month> <named-month>year", -5.377590547442544),
-                                    ("demainavant <time-of-day>", -5.377590547442544),
-                                    ("dayhour", -2.851861903134289),
+                                   [("demain<time-of-day> heures", -5.330300412401088),
+                                    ("hourday", -3.1902342489048165),
+                                    ("<day-of-month> <named-month>year", -5.330300412401088),
+                                    ("demainavant <time-of-day>", -5.330300412401088),
+                                    ("dayhour", -2.804571768092832),
                                     ("<time-of-day> - <time-of-day> (interval)Juillet",
-                                     -4.461299815568389),
+                                     -4.414009680526933),
                                     ("Jeudi<time-of-day> - <time-of-day> (interval)",
-                                     -4.97212543933438),
-                                    ("daymonth", -3.768152635008444),
-                                    ("monthyear", -4.684443366882599),
-                                    ("le <cycle> de <time>Octobre", -4.97212543933438),
-                                    ("houryear", -4.97212543933438),
+                                     -4.924835304292923),
+                                    ("daymonth", -3.944006051281197),
+                                    ("monthyear", -4.637153231841142),
+                                    ("le <cycle> de <time>Octobre", -4.924835304292923),
+                                    ("houryear", -5.330300412401088),
                                     ("<time-of-day> heuresdu|dans le <part-of-day>",
-                                     -4.684443366882599),
-                                    ("le <time>du|dans le <part-of-day>", -4.97212543933438),
-                                    ("Marsyear", -5.377590547442544),
-                                    ("Dimanche<day-of-month> <named-month>", -4.97212543933438),
+                                     -4.637153231841142),
+                                    ("le <time>du|dans le <part-of-day>", -4.924835304292923),
+                                    ("Marsyear", -5.330300412401088),
+                                    ("Dimanche<day-of-month> <named-month>", -4.924835304292923),
                                     ("<time-of-day> heuresle <day-of-month> (non ordinal)",
-                                     -4.461299815568389),
+                                     -4.414009680526933),
+                                    ("<dim time> <part-of-day>apr\232s <time-of-day|day>",
+                                     -5.330300412401088),
                                     ("le <day-of-month> (non ordinal)<time-of-day> heures",
-                                     -5.377590547442544),
-                                    ("aujourd'huidu|dans le <part-of-day>", -4.97212543933438),
+                                     -5.330300412401088),
+                                    ("Jeudiapr\232s <time-of-day|day>", -4.924835304292923),
+                                    ("aujourd'huidu|dans le <part-of-day>", -4.924835304292923),
                                     ("de <datetime> - <datetime> (interval)Juillet",
-                                     -4.124827578947176),
-                                    ("monthhour", -3.991296186322654),
-                                    ("hourmonth", -3.6728424552041194),
+                                     -4.924835304292923),
+                                    ("monthhour", -3.944006051281197),
+                                    ("hourmonth", -3.944006051281197),
                                     ("Vendredi<time-of-day> - <time-of-day> (interval)",
-                                     -4.124827578947176),
-                                    ("dayday", -3.768152635008444),
-                                    ("Septembreyear", -5.377590547442544),
-                                    ("hourhour", -3.768152635008444),
-                                    ("\224|vers <time-of-day>Jeudi", -4.684443366882599),
-                                    ("dayyear", -4.124827578947176),
-                                    ("le lendemain du <time>Fevrier", -5.377590547442544),
-                                    ("demain\224|vers <time-of-day>", -4.97212543933438),
-                                    ("Mars\224|vers <time-of-day>", -4.278978258774435),
-                                    ("Lundi<datetime> - <datetime> (interval)", -4.97212543933438),
-                                    ("intersect by 'de' or ','year", -4.97212543933438),
-                                    ("hh(:|h)mm (time-of-day)Jeudi", -5.377590547442544),
-                                    ("weekmonth", -4.97212543933438),
-                                    ("le <day-of-month> (non ordinal)Juillet", -4.97212543933438),
-                                    ("le <day-of-month> (non ordinal)year", -4.97212543933438),
+                                     -4.07753744390572),
+                                    ("dayday", -3.7208624999669873),
+                                    ("Septembreyear", -5.330300412401088),
+                                    ("hourhour", -3.7208624999669873),
+                                    ("\224|vers <time-of-day>Jeudi", -4.637153231841142),
+                                    ("dayyear", -4.231688123732978),
+                                    ("demain\224|vers <time-of-day>", -4.924835304292923),
+                                    ("\224|vers <time-of-day>demain", -5.330300412401088),
+                                    ("Mars\224|vers <time-of-day>", -4.231688123732978),
+                                    ("Lundi<datetime> - <datetime> (interval)", -4.924835304292923),
+                                    ("intersect by 'de' or ','year", -4.924835304292923),
+                                    ("apr\232s <time-of-day|day>le <day-of-month> (non ordinal)",
+                                     -4.924835304292923),
+                                    ("hh(:|h)mm (time-of-day)Jeudi", -5.330300412401088),
+                                    ("weekmonth", -4.924835304292923),
+                                    ("le <day-of-month> (non ordinal)Juillet", -4.924835304292923),
+                                    ("le <day-of-month> (non ordinal)year", -4.924835304292923),
                                     ("<time-of-day> - <time-of-day> (interval)Septembre",
-                                     -5.377590547442544),
+                                     -5.330300412401088),
                                     ("Samedi<time-of-day> - <time-of-day> (interval)",
-                                     -4.97212543933438),
-                                    ("<time-of-day> heuresdd/-mm", -5.377590547442544),
+                                     -4.924835304292923),
+                                    ("<time-of-day> heuresdd/-mm", -5.330300412401088),
+                                    ("<hour-of-day> et quartdemain", -4.924835304292923),
                                     ("<time-of-day> - <time-of-day> (interval)du|dans le <part-of-day>",
-                                     -4.97212543933438),
-                                    ("yearmonth", -5.377590547442544),
-                                    ("intersectyear", -5.377590547442544),
-                                    ("minuteday", -5.377590547442544),
-                                    ("Mardile <time>", -5.377590547442544),
-                                    ("Fevrierdu|dans le <part-of-day>", -4.97212543933438),
-                                    ("aujourd'hui\224|vers <time-of-day>", -4.97212543933438),
-                                    ("<datetime>-dd <month>(interval)year", -4.97212543933438),
-                                    ("Jeudiapr\232s <time-of-day>", -4.97212543933438),
-                                    ("Mercredile <time>", -5.377590547442544),
+                                     -4.924835304292923),
+                                    ("yearmonth", -5.330300412401088),
+                                    ("intersectyear", -5.330300412401088),
+                                    ("minuteday", -4.414009680526933),
+                                    ("Mardile <time>", -5.330300412401088),
+                                    ("Fevrierdu|dans le <part-of-day>", -4.924835304292923),
+                                    ("aujourd'hui\224|vers <time-of-day>", -4.924835304292923),
+                                    ("Mercredile <time>", -5.330300412401088),
                                     ("le <day-of-month> (non ordinal)avant <time-of-day>",
-                                     -5.377590547442544),
-                                    ("<dim time> <part-of-day>apr\232s <time-of-day>",
-                                     -5.377590547442544),
-                                    ("Mercredi<day-of-month> <named-month>", -4.684443366882599),
-                                    ("<day-of-week> <day-of-month>Juillet", -4.278978258774435),
+                                     -5.330300412401088),
+                                    ("Mercredi<day-of-month> <named-month>", -4.637153231841142),
+                                    ("<day-of-week> <day-of-month>Juillet", -4.231688123732978),
                                     ("<time-of-day> - <time-of-day> (interval)intersect",
-                                     -5.377590547442544),
-                                    ("Fevrieryear", -5.377590547442544),
-                                    ("Jeudi<time-of-day> heures", -4.97212543933438),
-                                    ("apr\232s <time-of-day>le <day-of-month> (non ordinal)",
-                                     -4.97212543933438),
-                                    ("avant <time-of-day>Jeudi", -5.377590547442544),
-                                    ("de <datetime> - <datetime> (interval)<day-of-month> <named-month>",
-                                     -5.377590547442544),
+                                     -5.330300412401088),
+                                    ("Fevrieryear", -5.330300412401088),
+                                    ("Jeudi<time-of-day> heures", -4.924835304292923),
+                                    ("avant <time-of-day>Jeudi", -5.330300412401088),
                                     ("<dim time> <part-of-day><time-of-day> heures",
-                                     -5.377590547442544),
-                                    ("<time-of-day> heuresJeudi", -4.278978258774435)],
-                               n = 100}}),
+                                     -5.330300412401088),
+                                    ("<time-of-day> heuresJeudi", -4.231688123732978)],
+                               n = 95}}),
        ("Janvier",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -1045,26 +981,25 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("le <day-of-month> \224 <datetime>",
         Classifier{okData =
-                     ClassData{prior = -0.325422400434628, unseen = -3.58351893845611,
+                     ClassData{prior = -8.701137698962981e-2,
+                               unseen = -3.367295829986474,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)<time-of-day> heures", -1.9459101490553135),
-                                    ("integer (numeric)<dim time> du soir", -2.8622008809294686),
-                                    ("integer (numeric)intersect", -2.456735772821304),
-                                    ("integer (numeric)<dim time> du matin", -2.8622008809294686),
-                                    ("hour", -0.916290731874155),
-                                    ("integer (numeric)time-of-day (latent)", -2.169053700369523),
-                                    ("integer (numeric)<dim time> <part-of-day>",
-                                     -2.456735772821304)],
-                               n = 13},
+                                   [("integer (numeric)<time-of-day> heures", -1.7227665977411035),
+                                    ("integer (numeric)<dim time> du soir", -2.639057329615259),
+                                    ("integer (numeric)intersect", -2.2335922215070942),
+                                    ("integer (numeric)<dim time> du matin", -2.639057329615259),
+                                    ("hour", -0.8472978603872037),
+                                    ("integer (numeric)time-of-day (latent)", -1.9459101490553135)],
+                               n = 11},
                    koData =
-                     ClassData{prior = -1.2809338454620642, unseen = -2.995732273553991,
+                     ClassData{prior = -2.4849066497880004,
+                               unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)year (latent)", -1.3350010667323402),
-                                    ("year", -1.3350010667323402), ("hour", -2.2512917986064953),
-                                    ("integer (numeric)time-of-day (latent)", -2.2512917986064953)],
-                               n = 5}}),
+                                   [("hour", -1.3862943611198906),
+                                    ("integer (numeric)time-of-day (latent)", -1.3862943611198906)],
+                               n = 1}}),
        ("yyyy-mm-dd",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -1098,12 +1033,12 @@ classifiers
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -3.2188758248682006,
+                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.13353139262452263),
-                                    ("number (0..16)", -2.0794415416798357)],
-                               n = 22}}),
+                                   [("integer (numeric)", -0.1823215567939546),
+                                    ("number (0..16)", -1.791759469228055)],
+                               n = 10}}),
        ("soir de no\235l",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -1386,42 +1321,24 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<datetime>-<day-of-week> dd <month>(interval)",
         Classifier{okData =
-                     ClassData{prior = -0.6931471805599453,
-                               unseen = -3.4339872044851463,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
                                    [("intersectMercrediinteger (numeric)Juillet",
-                                     -2.3025850929940455),
+                                     -1.9924301646902063),
                                     ("<day-of-week> <day-of-month>Dimancheordinal (digits)Juillet",
-                                     -2.70805020110221),
+                                     -2.3978952727983707),
                                     ("day of month (premier)Mercrediinteger (numeric)Juillet",
-                                     -2.0149030205422647),
-                                    ("daydaymonth", -1.2039728043259361),
+                                     -1.7047480922384253),
+                                    ("daydaymonth", -0.8938178760220964),
                                     ("<day-of-week> <day-of-month>Mercrediordinal (digits)Juillet",
-                                     -2.70805020110221),
+                                     -2.3978952727983707),
                                     ("<day-of-week> <day-of-month>Dimancheinteger (numeric)Juillet",
-                                     -2.70805020110221)],
+                                     -2.3978952727983707)],
                                n = 8},
                    koData =
-                     ClassData{prior = -0.6931471805599453,
-                               unseen = -3.4339872044851463,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)Dimancheordinal (digits)Juillet",
-                                     -2.70805020110221),
-                                    ("time-of-day (latent)Dimancheinteger (numeric)Juillet",
-                                     -2.3025850929940455),
-                                    ("year (latent)Dimancheordinal (digits)Juillet",
-                                     -2.70805020110221),
-                                    ("hourdaymonth", -1.791759469228055),
-                                    ("year (latent)Dimancheinteger (numeric)Juillet",
-                                     -2.3025850929940455),
-                                    ("year (latent)Mercrediordinal (digits)Juillet",
-                                     -2.70805020110221),
-                                    ("time-of-day (latent)Mercrediordinal (digits)Juillet",
-                                     -2.70805020110221),
-                                    ("yeardaymonth", -1.791759469228055)],
-                               n = 8}}),
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<dim time> du soir",
         Classifier{okData =
                      ClassData{prior = -0.3364722366212129, unseen = -2.639057329615259,
@@ -1618,125 +1535,90 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<dim time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.1823215567939546, unseen = -5.730099782973574,
+                     ClassData{prior = -2.941388520629334e-2,
+                               unseen = -5.278114659230518,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Mercredisoir", -5.033700567027251),
+                                   [("Mercredisoir", -4.579852378003801),
                                     ("<day-of-month> <named-month>d\233but de journ\233e",
-                                     -5.033700567027251),
-                                    ("dayhour", -1.5073400424110905),
+                                     -4.579852378003801),
+                                    ("dayhour", -1.05349185338764),
                                     ("<day-of-month> <named-month>d\233but de matin\233e",
-                                     -5.033700567027251),
-                                    ("aujourd'huimilieu d'apr\232s-midi", -5.033700567027251),
-                                    ("Mercredidu|dans le <part-of-day>", -5.033700567027251),
-                                    ("aujourd'huifin d'apr\232s-midi", -5.033700567027251),
-                                    ("aujourd'huimilieu de matin\233e", -5.033700567027251),
-                                    ("<time-of-day> heuresdu|dans le <part-of-day>",
-                                     -4.340553386467307),
-                                    ("le <time>du|dans le <part-of-day>", -4.340553386467307),
-                                    ("aujourd'huifin de matin\233e", -5.033700567027251),
-                                    ("aujourd'huifin de soir\233e", -5.033700567027251),
-                                    ("\224|vers <time-of-day>ce <part-of-day>", -4.340553386467307),
+                                     -4.579852378003801),
+                                    ("aujourd'huimilieu d'apr\232s-midi", -4.579852378003801),
+                                    ("Mercredidu|dans le <part-of-day>", -4.579852378003801),
+                                    ("aujourd'huifin d'apr\232s-midi", -4.579852378003801),
+                                    ("aujourd'huimilieu de matin\233e", -4.579852378003801),
+                                    ("le <time>du|dans le <part-of-day>", -4.174387269895637),
+                                    ("aujourd'huifin de matin\233e", -4.579852378003801),
+                                    ("aujourd'huifin de soir\233e", -4.579852378003801),
                                     ("<day-of-month> <named-month>d\233but d'apr\232s-midi",
-                                     -5.033700567027251),
-                                    ("demainsoir", -5.033700567027251),
-                                    ("aujourd'huid\233but de soir\233e", -5.033700567027251),
-                                    ("Lundimatin", -5.033700567027251),
-                                    ("<hour-of-day> et demice <part-of-day>", -4.628235458919088),
-                                    ("le <time>fin de matin\233e", -5.033700567027251),
-                                    ("intersectmilieu de journ\233e", -5.033700567027251),
-                                    ("intersectfin de journ\233e", -5.033700567027251),
-                                    ("Fevrierd\233but de matin\233e", -5.033700567027251),
-                                    ("monthhour", -3.241941097799197),
-                                    ("le <time>fin d'apr\232s-midi", -5.033700567027251),
-                                    ("hourhour", -2.5487939172392515),
-                                    ("Fevrierd\233but d'apr\232s-midi", -5.033700567027251),
-                                    ("aujourd'huiau d\233jeuner", -5.033700567027251),
-                                    ("<hour-of-day> et quartce <part-of-day>", -4.628235458919088),
-                                    ("intersectfin d'apr\232s-midi", -5.033700567027251),
-                                    ("intersectmilieu d'apr\232s-midi", -5.033700567027251),
-                                    ("le <time>milieu de journ\233e", -5.033700567027251),
-                                    ("aujourd'huid\233but de journ\233e", -5.033700567027251),
-                                    ("demainapr\232s-midi", -5.033700567027251),
-                                    ("minutehour", -3.4242626545931514),
-                                    ("Lundidu|dans le <part-of-day>", -5.033700567027251),
-                                    ("aujourd'huimilieu de journ\233e", -5.033700567027251),
-                                    ("intersectd\233but de soir\233e", -5.033700567027251),
-                                    ("aujourd'huifin de journ\233e", -5.033700567027251),
-                                    ("intersectdu|dans le <part-of-day>", -3.241941097799197),
-                                    ("le <day-of-month> \224 <datetime>du|dans le <part-of-day>",
-                                     -4.628235458919088),
-                                    ("Lundifin d'apr\232s-midi", -4.628235458919088),
-                                    ("intersectd\233but d'apr\232s-midi", -5.033700567027251),
-                                    ("le <time>d\233but d'apr\232s-midi", -5.033700567027251),
+                                     -4.579852378003801),
+                                    ("demainsoir", -4.579852378003801),
+                                    ("aujourd'huid\233but de soir\233e", -4.579852378003801),
+                                    ("Lundimatin", -4.579852378003801),
+                                    ("le <time>fin de matin\233e", -4.579852378003801),
+                                    ("intersectmilieu de journ\233e", -4.579852378003801),
+                                    ("intersectfin de journ\233e", -4.579852378003801),
+                                    ("le <time>fin d'apr\232s-midi", -4.579852378003801),
+                                    ("aujourd'huiau d\233jeuner", -4.579852378003801),
+                                    ("intersectfin d'apr\232s-midi", -4.579852378003801),
+                                    ("intersectmilieu d'apr\232s-midi", -4.579852378003801),
+                                    ("le <time>milieu de journ\233e", -4.579852378003801),
+                                    ("aujourd'huid\233but de journ\233e", -4.579852378003801),
+                                    ("demainapr\232s-midi", -4.579852378003801),
+                                    ("Lundidu|dans le <part-of-day>", -4.579852378003801),
+                                    ("aujourd'huimilieu de journ\233e", -4.579852378003801),
+                                    ("intersectd\233but de soir\233e", -4.579852378003801),
+                                    ("aujourd'huifin de journ\233e", -4.579852378003801),
+                                    ("intersectdu|dans le <part-of-day>", -4.174387269895637),
+                                    ("Lundifin d'apr\232s-midi", -4.174387269895637),
+                                    ("intersectd\233but d'apr\232s-midi", -4.579852378003801),
+                                    ("le <time>d\233but d'apr\232s-midi", -4.579852378003801),
                                     ("<day-of-month> <named-month>du|dans le <part-of-day>",
-                                     -4.628235458919088),
-                                    ("Fevriermilieu d'apr\232s-midi", -5.033700567027251),
-                                    ("Fevrierfin d'apr\232s-midi", -5.033700567027251),
+                                     -4.174387269895637),
                                     ("<day-of-month> <named-month>d\233but de soir\233e",
-                                     -5.033700567027251),
-                                    ("hierdu|dans le <part-of-day>", -5.033700567027251),
-                                    ("le <time>d\233but de soir\233e", -5.033700567027251),
-                                    ("Fevrierfin de soir\233e", -5.033700567027251),
-                                    ("intersectd\233but de journ\233e", -5.033700567027251),
-                                    ("Fevriermilieu de matin\233e", -5.033700567027251),
-                                    ("Fevrierfin de matin\233e", -5.033700567027251),
-                                    ("le <time>d\233but de matin\233e", -5.033700567027251),
+                                     -4.579852378003801),
+                                    ("hierdu|dans le <part-of-day>", -4.579852378003801),
+                                    ("le <time>d\233but de soir\233e", -4.579852378003801),
+                                    ("intersectd\233but de journ\233e", -4.579852378003801),
+                                    ("le <time>d\233but de matin\233e", -4.579852378003801),
                                     ("<day-of-month> <named-month>milieu d'apr\232s-midi",
-                                     -5.033700567027251),
+                                     -4.579852378003801),
                                     ("<day-of-month> <named-month>fin d'apr\232s-midi",
-                                     -5.033700567027251),
-                                    ("le <time>milieu de matin\233e", -5.033700567027251),
-                                    ("aujourd'huid\233but de matin\233e", -3.9350882783591423),
-                                    ("Fevrierd\233but de soir\233e", -5.033700567027251),
-                                    ("le <time>fin de soir\233e", -5.033700567027251),
+                                     -4.579852378003801),
+                                    ("le <time>milieu de matin\233e", -4.579852378003801),
+                                    ("aujourd'huid\233but de matin\233e", -3.481240089335692),
+                                    ("le <time>fin de soir\233e", -4.579852378003801),
                                     ("<day-of-month> <named-month>milieu de matin\233e",
-                                     -5.033700567027251),
+                                     -4.579852378003801),
                                     ("<day-of-month> <named-month>fin de soir\233e",
-                                     -5.033700567027251),
+                                     -4.579852378003801),
                                     ("<day-of-month> <named-month>fin de matin\233e",
-                                     -5.033700567027251),
-                                    ("<time-of-day> heuresce <part-of-day>", -4.628235458919088),
-                                    ("aujourd'huid\233but d'apr\232s-midi", -5.033700567027251),
-                                    ("le <time>milieu d'apr\232s-midi", -5.033700567027251),
-                                    ("\224|vers <time-of-day>du|dans le <part-of-day>",
-                                     -3.9350882783591423),
-                                    ("Jeudimatin", -5.033700567027251),
+                                     -4.579852378003801),
+                                    ("aujourd'huid\233but d'apr\232s-midi", -4.579852378003801),
+                                    ("le <time>milieu d'apr\232s-midi", -4.579852378003801),
+                                    ("Jeudimatin", -4.579852378003801),
                                     ("<day-of-month> <named-month>fin de journ\233e",
-                                     -5.033700567027251),
+                                     -4.579852378003801),
                                     ("<day-of-month> <named-month>milieu de journ\233e",
-                                     -5.033700567027251),
-                                    ("le <time>fin de journ\233e", -5.033700567027251),
-                                    ("Lundiapr\232s-midi", -5.033700567027251),
-                                    ("intersectfin de matin\233e", -5.033700567027251),
-                                    ("Fevrierd\233but de journ\233e", -5.033700567027251),
-                                    ("intersectfin de soir\233e", -5.033700567027251),
-                                    ("intersectmilieu de matin\233e", -5.033700567027251),
-                                    ("intersectapr\232s-midi", -4.340553386467307),
-                                    ("Fevrierfin de journ\233e", -5.033700567027251),
-                                    ("Fevriermilieu de journ\233e", -5.033700567027251),
-                                    ("le <time>d\233but de journ\233e", -5.033700567027251),
-                                    ("intersectd\233but de matin\233e", -5.033700567027251),
-                                    ("hiersoir", -5.033700567027251)],
-                               n = 110},
+                                     -4.579852378003801),
+                                    ("le <time>fin de journ\233e", -4.579852378003801),
+                                    ("Lundiapr\232s-midi", -4.579852378003801),
+                                    ("intersectfin de matin\233e", -4.579852378003801),
+                                    ("intersectfin de soir\233e", -4.579852378003801),
+                                    ("intersectmilieu de matin\233e", -4.579852378003801),
+                                    ("le <time>d\233but de journ\233e", -4.579852378003801),
+                                    ("intersectd\233but de matin\233e", -4.579852378003801),
+                                    ("hiersoir", -4.579852378003801)],
+                               n = 67},
                    koData =
-                     ClassData{prior = -1.791759469228055, unseen = -4.882801922586371,
+                     ClassData{prior = -3.5409593240373143, unseen = -4.189654742026425,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -3.776585034533042),
-                                    ("<time-of-day> heuresdu|dans le <part-of-day>",
-                                     -3.488902962081261),
-                                    ("le <time>du|dans le <part-of-day>", -3.776585034533042),
-                                    ("aujourd'huidu|dans le <part-of-day>", -3.776585034533042),
-                                    ("monthhour", -3.776585034533042),
-                                    ("\224|vers <time-of-day>apr\232s-midi", -3.488902962081261),
-                                    ("hourhour", -2.477302050402781),
-                                    ("minutehour", -2.677972745864932),
-                                    ("<time-of-day> - <time-of-day> (interval)du|dans le <part-of-day>",
-                                     -3.776585034533042),
-                                    ("Fevrierdu|dans le <part-of-day>", -3.776585034533042),
-                                    ("<time> timezoneapr\232s-midi", -2.677972745864932)],
-                               n = 22}}),
+                                   [("dayhour", -3.0757749812275272),
+                                    ("aujourd'huidu|dans le <part-of-day>", -3.0757749812275272)],
+                               n = 2}}),
        ("jour de l'an",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -1746,19 +1628,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.4340384805522204, unseen = -4.553876891600541,
+                     ClassData{prior = -0.38348620138938916,
+                               unseen = -4.553876891600541,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -0.13657553500575073),
                                     ("number (0..16)", -2.0583881324820035)],
                                n = 92},
                    koData =
-                     ClassData{prior = -1.0438040521731147, unseen = -3.970291913552122,
+                     ClassData{prior = -1.144074662744867, unseen = -3.828641396489095,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.262364264467491),
-                                    ("number (0..16)", -1.466337068793427)],
-                               n = 50}}),
+                                   [("integer (numeric)", -0.2803019651541584),
+                                    ("number (0..16)", -1.4087672169719492)],
+                               n = 43}}),
        ("apr\232s-demain",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -1979,22 +1862,21 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("le lendemain du <time>",
         Classifier{okData =
-                     ClassData{prior = -1.0986122886681098,
-                               unseen = -2.1972245773362196,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("day", -1.3862943611198906),
-                                    ("<day-of-month> <named-month>", -1.3862943611198906)],
+                                   [("day", -1.0986122886681098),
+                                    ("<day-of-month> <named-month>", -1.0986122886681098)],
                                n = 1},
                    koData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -2.3978952727983707,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("year (latent)", -1.6094379124341003),
-                                    ("time-of-day (latent)", -1.6094379124341003),
-                                    ("year", -1.6094379124341003), ("hour", -1.6094379124341003)],
-                               n = 2}}),
+                                   [("year (latent)", -1.0986122886681098),
+                                    ("year", -1.0986122886681098)],
+                               n = 1}}),
        ("le <cycle> prochain|suivant|d'apr\232s",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.970291913552122,
@@ -2011,34 +1893,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -2.1972245773362196,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("apr\232s <time-of-day>",
-        Classifier{okData =
-                     ClassData{prior = -0.3677247801253174, unseen = -4.204692619390966,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("intersect", -1.7047480922384253),
-                                    ("hh(:|h)mm (time-of-day)", -2.803360380906535),
-                                    ("midi", -3.4965075614664802), ("day", -2.803360380906535),
-                                    ("time-of-day (latent)", -2.803360380906535),
-                                    ("hour", -1.4170660197866443), ("minute", -1.8870696490323797),
-                                    ("<time-of-day> heures", -2.803360380906535),
-                                    ("le <time>", -3.0910424533583156),
-                                    ("<hour-of-day> <integer> (as relative minutes)",
-                                     -2.580216829592325)],
-                               n = 27},
-                   koData =
-                     ClassData{prior = -1.1786549963416462,
-                               unseen = -3.6109179126442243,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("intersect", -2.4849066497880004),
-                                    ("le <day-of-month> (non ordinal)", -2.890371757896165),
-                                    ("day", -2.890371757896165),
-                                    ("time-of-day (latent)", -1.9740810260220096),
-                                    ("au d\233jeuner", -2.890371757896165),
-                                    ("hour", -1.0986122886681098),
-                                    ("<time-of-day> heures", -1.9740810260220096)],
-                               n = 12}}),
        ("dd/-mm",
         Classifier{okData =
                      ClassData{prior = -0.7375989431307791,
@@ -2131,26 +1985,21 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 22}}),
        ("<named-month|named-day> dernier|pass\233",
         Classifier{okData =
-                     ClassData{prior = -2.3025850929940455,
-                               unseen = -2.5649493574615367,
+                     ClassData{prior = -1.791759469228055, unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
-                                   [("day", -1.791759469228055), ("Dimanche", -1.791759469228055)],
+                                   [("day", -1.3862943611198906),
+                                    ("Dimanche", -1.3862943611198906)],
                                n = 1},
                    koData =
-                     ClassData{prior = -0.10536051565782628,
-                               unseen = -3.367295829986474,
+                     ClassData{prior = -0.1823215567939546, unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("year (latent)", -2.639057329615259),
-                                    ("en semaine", -2.2335922215070942),
-                                    ("day", -1.7227665977411035),
-                                    ("\224|vers <time-of-day>", -2.639057329615259),
-                                    ("time-of-day (latent)", -2.639057329615259),
-                                    ("year", -2.639057329615259), ("hour", -1.7227665977411035),
-                                    ("<time-of-day> heures", -2.2335922215070942),
-                                    ("le <time>", -2.2335922215070942)],
-                               n = 9}}),
+                                   [("year (latent)", -2.0794415416798357),
+                                    ("en semaine", -1.6739764335716716),
+                                    ("day", -1.1631508098056809), ("year", -2.0794415416798357),
+                                    ("le <time>", -1.6739764335716716)],
+                               n = 5}}),
        ("milieu de journ\233e",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2546,8 +2395,8 @@ classifiers
                                unseen = -5.262690188904886,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -0.7576857016975165),
-                                    ("apr\232s <time-of-day>", -3.871201010907891),
+                                   [("apr\232s <time-of-day|day>", -3.871201010907891),
+                                    ("time-of-day (latent)", -0.7576857016975165),
                                     ("hour", -0.7036184804272406),
                                     ("avant <time-of-day>", -4.1588830833596715)],
                                n = 94},
@@ -2556,8 +2405,8 @@ classifiers
                                unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -1.4469189829363254),
-                                    ("apr\232s <time-of-day>", -1.916922612182061),
+                                   [("apr\232s <time-of-day|day>", -1.916922612182061),
+                                    ("time-of-day (latent)", -1.4469189829363254),
                                     ("hour", -0.7537718023763802),
                                     ("avant <time-of-day>", -1.916922612182061)],
                                n = 15}}),
@@ -2572,55 +2421,52 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("le <time>",
         Classifier{okData =
-                     ClassData{prior = -0.2318016140573243, unseen = -5.855071922202427,
+                     ClassData{prior = -0.22440062250426085, unseen = -5.84354441703136,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.5941059417529924),
+                                   [("week", -2.5825451193519164),
                                     ("<named-month|named-day> suivant|d'apr\232s",
-                                     -3.654977902438255),
-                                    ("<ordinal> <cycle> de <time>", -4.465908118654584),
+                                     -3.643417080037179),
+                                    ("<ordinal> <cycle> de <time>", -4.454347296253507),
                                     ("premi\232re quinzaine de <named-month>(interval)",
-                                     -5.159055299214529),
-                                    ("intersect", -2.2146163200480884),
-                                    ("soir de no\235l", -5.159055299214529),
-                                    ("en semaine", -3.454307206976104),
-                                    ("toussaint", -4.7535901911063645),
-                                    ("day", -1.3089076975044704),
+                                     -5.147494476813453),
+                                    ("intersect", -2.229723744729174),
+                                    ("soir de no\235l", -5.147494476813453),
+                                    ("en semaine", -3.442746384575028),
+                                    ("toussaint", -4.742029368705289), ("day", -1.2973468751033945),
                                     ("deuxi\232me quinzaine de <named-month>(interval)",
-                                     -5.159055299214529),
-                                    ("<dim time> <part-of-day>", -3.144152278672264),
-                                    ("dd/-mm", -3.906292330719161),
-                                    ("dd/-mm/-yyyy", -4.465908118654584),
-                                    ("dd mm yyyy", -3.906292330719161),
-                                    ("day of month (premier)", -3.906292330719161),
-                                    ("dd mm", -3.906292330719161), ("hour", -2.1386304130701665),
-                                    ("month", -4.465908118654584),
-                                    ("dernier <cycle> de <time> (latent)", -4.242764567340374),
-                                    ("<day-of-month> <named-month>", -2.5941059417529924),
-                                    ("<cycle> prochain|suivant|d'apr\232s", -2.8076800420510515),
-                                    ("dernier week-end de <time>", -5.159055299214529),
-                                    ("<ordinal> week-end de <time>", -4.7535901911063645),
-                                    ("<cycle> dernier", -4.060443010546419)],
-                               n = 161},
+                                     -5.147494476813453),
+                                    ("<dim time> <part-of-day>", -3.2015843277581397),
+                                    ("dd/-mm", -3.894731508318085),
+                                    ("dd/-mm/-yyyy", -4.454347296253507),
+                                    ("dd mm yyyy", -3.894731508318085),
+                                    ("day of month (premier)", -3.894731508318085),
+                                    ("dd mm", -3.894731508318085), ("hour", -2.177080011243752),
+                                    ("month", -4.454347296253507),
+                                    ("dernier <cycle> de <time> (latent)", -4.231203744939298),
+                                    ("<day-of-month> <named-month>", -2.5825451193519164),
+                                    ("<cycle> prochain|suivant|d'apr\232s", -2.7961192196499756),
+                                    ("dernier week-end de <time>", -5.147494476813453),
+                                    ("<ordinal> week-end de <time>", -4.742029368705289),
+                                    ("<cycle> dernier", -4.048882188145344)],
+                               n = 159},
                    koData =
-                     ClassData{prior = -1.575536360758419, unseen = -4.709530201312334,
+                     ClassData{prior = -1.604425370610556, unseen = -4.672828834461907,
                                likelihoods =
                                  HashMap.fromList
                                    [("<named-month|named-day> suivant|d'apr\232s",
-                                     -4.007333185232471),
-                                    ("intersect", -3.6018680771243066),
-                                    ("en semaine", -1.927891643552635),
-                                    ("day", -1.3682758556172123),
-                                    ("<dim time> <part-of-day>", -3.6018680771243066),
-                                    ("dd/-mm", -3.3141860046725258),
+                                     -3.970291913552122),
+                                    ("intersect", -3.5648268054439574),
+                                    ("en semaine", -1.890850371872286),
+                                    ("day", -1.3312345839368633), ("dd/-mm", -3.2771447329921766),
                                     ("<named-month|named-day> dernier|pass\233",
-                                     -3.6018680771243066),
-                                    ("day of month (premier)", -4.007333185232471),
-                                    ("dd mm", -3.3141860046725258), ("hour", -1.927891643552635),
-                                    ("<day-of-month> <named-month>", -3.6018680771243066),
+                                     -3.5648268054439574),
+                                    ("day of month (premier)", -3.970291913552122),
+                                    ("dd mm", -3.2771447329921766), ("hour", -2.0243817644968085),
+                                    ("<day-of-month> <named-month>", -3.5648268054439574),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.2155737160044158)],
-                               n = 42}}),
+                                     -2.178532444324067)],
+                               n = 40}}),
        ("apr\232s le <day-of-month>",
         Classifier{okData =
                      ClassData{prior = -0.40546510810816444,
diff --git a/Duckling/Time/EN/Rules.hs b/Duckling/Time/EN/Rules.hs
index 3c5f0c6d..10a95379 100644
--- a/Duckling/Time/EN/Rules.hs
+++ b/Duckling/Time/EN/Rules.hs
@@ -1292,10 +1292,8 @@ ruleIntervalSlash = Rule
     , Predicate isNotLatent
     ]
   , prod = \tokens -> case tokens of
-      (Token Time td1:_:Token Time td2:_) ->
-        if sameGrain td1 td2 then
-          Token Time <$> interval TTime.Closed td1 td2
-        else Nothing
+      (Token Time td1:_:Token Time td2:_) | sameGrain td1 td2 ->
+        Token Time <$> interval TTime.Closed td1 td2
       _ -> Nothing
   }
 
diff --git a/Duckling/Time/FR/Rules.hs b/Duckling/Time/FR/Rules.hs
index d0581994..77dac802 100644
--- a/Duckling/Time/FR/Rules.hs
+++ b/Duckling/Time/FR/Rules.hs
@@ -202,7 +202,7 @@ ruleLeLendemainDuTime = Rule
   { name = "le lendemain du <time>"
   , pattern =
     [ regex "(le|au)? ?lendemain du"
-    , dimension Time
+    , Predicate $ isGrainCoarserThan TG.Hour
     ]
   , prod = \tokens -> case tokens of
       (_:Token Time td:_) ->
@@ -231,8 +231,7 @@ ruleCeTime = Rule
     , dimension Time
     ]
   , prod = \tokens -> case tokens of
-      (_:Token Time td:_) ->
-        tt $ predNth 0 False td
+      (_:Token Time td:_) -> tt $ predNth 0 False td
       _ -> Nothing
   }
 
@@ -341,7 +340,8 @@ ruleEntreDatetimeEtDatetimeInterval = Rule
     , dimension Time
     ]
   , prod = \case
-      (_:Token Time td1:_:Token Time td2:_) ->
+      (_:Token Time td1:_:Token Time td2:_)
+        | sameGrain td1 td2 ->
         Token Time <$> interval TTime.Closed td1 td2
       _ -> Nothing
   }
@@ -352,7 +352,7 @@ ruleDuDatetimedayofweekDdMonthinterval = Rule
   , pattern =
     [ regex "du"
     , dimension Time
-    , regex "\\-|au|jusqu'au"
+    , regex "\\-|(jusqu')?au"
     , Predicate isADayOfWeek
     , Predicate isDOMValue
     , Predicate isAMonth
@@ -371,7 +371,7 @@ ruleDuDdAuDdLatentMonthInterval = Rule
   , pattern =
     [ regex "du"
     , Predicate isDOMValue
-    , regex "au|jusqu'au"
+    , regex "(jusqu')?au"
     , Predicate isDOMValue
     ]
   , prod = \case
@@ -386,7 +386,7 @@ ruleDatetimedayofweekDdMonthinterval :: Rule
 ruleDatetimedayofweekDdMonthinterval = Rule
   { name = "<datetime>-<day-of-week> dd <month>(interval)"
   , pattern =
-    [ dimension Time
+    [ Predicate $ isGrainOfTime TG.Day
     , regex "\\-|(jusqu')?au"
     , Predicate isADayOfWeek
     , Predicate isDOMValue
@@ -422,8 +422,8 @@ ruleDatetimeddMonthinterval :: Rule
 ruleDatetimeddMonthinterval = Rule
   { name = "<datetime>-dd <month>(interval)"
   , pattern =
-    [ dimension Time
-    , regex "\\-|au|jusqu'au"
+    [ Predicate $ isGrainOfTime TG.Day
+    , regex "\\-|(jusqu')?au"
     , Predicate isDOMValue
     , Predicate isAMonth
     ]
@@ -852,7 +852,7 @@ ruleNamedmonthnameddayDernierpass :: Rule
 ruleNamedmonthnameddayDernierpass = Rule
   { name = "<named-month|named-day> dernier|passé"
   , pattern =
-    [ dimension Time
+    [ Predicate $ isGrainCoarserThan TG.Hour
     , regex "derni(e|é|è)re?|pass(é|e)e?"
     ]
   , prod = \tokens -> case tokens of
@@ -905,7 +905,7 @@ ruleDdddMonthinterval = Rule
   { name = "dd-dd <month>(interval)"
   , pattern =
     [ regex "(3[01]|[12]\\d|0?[1-9])"
-    , regex "\\-|au|jusqu'au"
+    , regex "\\-|(jusqu')?au"
     , regex "(3[01]|[12]\\d|0?[1-9])"
     , Predicate isAMonth
     ]
@@ -938,7 +938,7 @@ ruleDuDddayofweekDdMonthinterval = Rule
   , pattern =
     [ regex "du"
     , regex "(3[01]|[12]\\d|0?[1-9])"
-    , regex "\\-|au|jusqu'au"
+    , regex "\\-|(jusqu')?au"
     , Predicate isADayOfWeek
     , regex "(3[01]|[12]\\d|0?[1-9])"
     , Predicate isAMonth
@@ -1039,7 +1039,7 @@ ruleDemain :: Rule
 ruleDemain = Rule
   { name = "demain"
   , pattern =
-    [ regex "(demain)|(le lendemain)"
+    [ regex "(le len)?demain"
     ]
   , prod = \_ -> tt $ cycleNth TG.Day 1
   }
@@ -1048,7 +1048,7 @@ ruleNamedmonthnameddaySuivantdaprs :: Rule
 ruleNamedmonthnameddaySuivantdaprs = Rule
   { name = "<named-month|named-day> suivant|d'après"
   , pattern =
-    [ dimension Time
+    [ Predicate $ isGrainCoarserThan TG.Hour
     , regex "suivante?s?|d'apr(e|é|è)s"
     ]
   , prod = \tokens -> case tokens of
@@ -1101,7 +1101,7 @@ ruleDimTimeDuSoir = Rule
 
 ruleAprsTimeofday :: Rule
 ruleAprsTimeofday = Rule
-  { name = "après <time-of-day>"
+  { name = "après <time-of-day|day>"
   , pattern =
     [ regex "(apr(e|è)s|(a|à) partir de|(un peu )?plus tard que)"
     , dimension Time
@@ -1170,7 +1170,8 @@ ruleDeDatetimeDatetimeInterval = Rule
     , dimension Time
     ]
   , prod = \tokens -> case tokens of
-      (_:Token Time td1:_:Token Time td2:_) ->
+      (_:Token Time td1:_:Token Time td2:_)
+        | sameGrain td1 td2 ->
         Token Time <$> interval TTime.Closed td1 td2
       _ -> Nothing
   }
@@ -1215,7 +1216,7 @@ ruleLeDayofmonthDatetime = Rule
     [ regex "le"
     , Predicate isDOMInteger
     , regex "(a|à)"
-    , dimension Time
+    , Predicate $ isGrainFinerThan TG.Day
     ]
   , prod = \tokens -> case tokens of
       (_:token:_:Token Time td:_) -> do
@@ -1317,7 +1318,7 @@ ruleDimTimePartofday :: Rule
 ruleDimTimePartofday = Rule
   { name = "<dim time> <part-of-day>"
   , pattern =
-    [ dimension Time
+    [ Predicate $ isGrainOfTime TG.Day
     , Predicate isAPartOfDay
     ]
   , prod = \tokens -> case tokens of
@@ -1705,7 +1706,7 @@ ruleLeVeilleDuTime = Rule
   { name = "le veille du <time>"
   , pattern =
     [ regex "(la )?veille du"
-    , dimension Time
+    , Predicate $ isGrainCoarserThan TG.Hour
     ]
   , prod = \tokens -> case tokens of
       (_:Token Time td:_) ->
@@ -1806,7 +1807,7 @@ ruleDayofweekErdayofweekDdMonthinterval = Rule
   , pattern =
     [ Predicate isADayOfWeek
     , regex "premier|prem\\.?|1er|1 er"
-    , regex "\\-|au|jusqu'au"
+    , regex "\\-|(jusqu')?au"
     , Predicate isADayOfWeek
     , regex "(3[01]|[12]\\d|0?[1-9])"
     , Predicate isAMonth