FR time improvement (#635)

Summary:
Fixed recognition for month "Juil" (abbreviation of "Juillet")

Pull Request resolved: https://github.com/facebook/duckling/pull/635

Reviewed By: stroxler

Differential Revision: D30115291

Pulled By: chessai

fbshipit-source-id: e04d6e7952f85f4ca061540a3967908bcd4f1ebd
This commit is contained in:
Filipe Pereira 2021-08-04 17:17:38 -07:00 committed by Facebook GitHub Bot
parent fe4f77bdc0
commit a6499228af
3 changed files with 279 additions and 261 deletions

View File

@ -153,12 +153,12 @@ classifiers
likelihoods = HashMap.fromList [], n = 0}}),
("integer (numeric)",
Classifier{okData =
ClassData{prior = -0.479182684004732, unseen = -5.5053315359323625,
likelihoods = HashMap.fromList [("", 0.0)], n = 244},
ClassData{prior = -0.4620354595965587, unseen = -5.537334267018537,
likelihoods = HashMap.fromList [("", 0.0)], n = 252},
koData =
ClassData{prior = -0.9657156152016781,
unseen = -5.0238805208462765,
likelihoods = HashMap.fromList [("", 0.0)], n = 150}}),
ClassData{prior = -0.9942522733438669,
unseen = -5.0106352940962555,
likelihoods = HashMap.fromList [("", 0.0)], n = 148}}),
("the nth <day-of-week> of <month-or-greater>",
Classifier{okData =
ClassData{prior = 0.0, unseen = -1.6094379124341003,
@ -258,8 +258,8 @@ classifiers
likelihoods = HashMap.fromList [], n = 0}}),
("Juillet",
Classifier{okData =
ClassData{prior = 0.0, unseen = -3.258096538021482,
likelihoods = HashMap.fromList [("", 0.0)], n = 24},
ClassData{prior = 0.0, unseen = -3.4657359027997265,
likelihoods = HashMap.fromList [("", 0.0)], n = 30},
koData =
ClassData{prior = -infinity, unseen = -0.6931471805599453,
likelihoods = HashMap.fromList [], n = 0}}),
@ -615,249 +615,250 @@ classifiers
n = 2}}),
("intersect",
Classifier{okData =
ClassData{prior = -0.22468477946414347,
unseen = -6.911747300251674,
ClassData{prior = -0.22416866672945499,
unseen = -6.913737350659685,
likelihoods =
HashMap.fromList
[("intersect<dim time> du matin", -6.2176036074019905),
[("intersect<dim time> du matin", -6.219595639933231),
("<hour-of-day> <integer> (as relative minutes)intersect",
-5.812138499293826),
-5.814130531825066),
("<day-of-month> <named-month>d\233but de journ\233e",
-6.2176036074019905),
("hourday", -3.966311808795495),
("<day-of-month> <named-month>year", -5.524456426842045),
("apr\232s <time-of-day|day>le <time>", -5.301312875527835),
("dayhour", -1.9907698621338108),
-6.219595639933231),
("hourday", -3.9683038413267355),
("<day-of-month> <named-month>year", -5.526448459373285),
("apr\232s <time-of-day|day>le <time>", -5.303304908059076),
("dayhour", -1.9927618946650512),
("<datetime> - <datetime> (interval)Juillet",
-5.1189913187338805),
("daymonth", -2.751867704602264),
("monthyear", -4.713526210625716),
-5.120983351265121),
("daymonth", -2.738355550597539),
("monthyear", -4.715518243156957),
("<day-of-month> <named-month>d\233but de matin\233e",
-6.2176036074019905),
("dernier <cycle> de <time> (latent)year", -5.301312875527835),
("apr\232s <time-of-day|day>intersect", -5.812138499293826),
("aujourd'huimilieu d'apr\232s-midi", -6.2176036074019905),
-6.219595639933231),
("dernier <cycle> de <time> (latent)year", -5.303304908059076),
("apr\232s <time-of-day|day>intersect", -5.814130531825066),
("aujourd'huimilieu d'apr\232s-midi", -6.219595639933231),
("<day-of-month> <named-month>\224|vers <time-of-day>",
-4.713526210625716),
("dd mmyear", -4.964840638906622),
("Vendredi\224|vers <time-of-day>", -5.812138499293826),
("Mercredidu|dans le <part-of-day>", -6.2176036074019905),
("aujourd'huifin d'apr\232s-midi", -6.2176036074019905),
("day of month (premier)Novembre", -5.524456426842045),
-4.715518243156957),
("dd mmyear", -4.966832671437863),
("Vendredi\224|vers <time-of-day>", -5.814130531825066),
("Mercredidu|dans le <part-of-day>", -6.219595639933231),
("aujourd'huifin d'apr\232s-midi", -6.219595639933231),
("day of month (premier)Novembre", -5.526448459373285),
("le <day-of-month> (non ordinal)<dim time> du matin",
-6.2176036074019905),
("aujourd'huimilieu de matin\233e", -6.2176036074019905),
-6.219595639933231),
("aujourd'huimilieu de matin\233e", -6.219595639933231),
("hh(:|h)mm (time-of-day)<day-of-week> <day-of-month>",
-6.2176036074019905),
("le <day-of-month> (non ordinal)Fevrier", -4.138162065722154),
("Lundiday of month (premier)", -5.812138499293826),
-6.219595639933231),
("le <day-of-month> (non ordinal)Fevrier", -4.140154098253395),
("Lundiday of month (premier)", -5.814130531825066),
("<time-of-day> heuresdu|dans le <part-of-day>",
-5.524456426842045),
-5.526448459373285),
("<hour-of-day> et quart<dim time> <part-of-day>",
-5.812138499293826),
("le <time>du|dans le <part-of-day>", -5.524456426842045),
("aujourd'huifin de matin\233e", -6.2176036074019905),
("Marsyear", -5.812138499293826),
("aujourd'huifin de soir\233e", -6.2176036074019905),
("\224|vers <time-of-day>ce <part-of-day>", -5.524456426842045),
-5.814130531825066),
("le <time>du|dans le <part-of-day>", -5.526448459373285),
("aujourd'huifin de matin\233e", -6.219595639933231),
("Marsyear", -5.814130531825066),
("aujourd'huifin de soir\233e", -6.219595639933231),
("\224|vers <time-of-day>ce <part-of-day>", -5.526448459373285),
("<day-of-month> <named-month>d\233but d'apr\232s-midi",
-6.2176036074019905),
-6.219595639933231),
("le <day-of-month> (non ordinal)<dim time> du soir",
-5.524456426842045),
("intersectSeptembre", -5.812138499293826),
("aujourd'huid\233but de soir\233e", -6.2176036074019905),
("<day-of-week> <day-of-month>Fevrier", -5.812138499293826),
("<hour-of-day> et demice <part-of-day>", -5.812138499293826),
-5.526448459373285),
("intersectSeptembre", -5.814130531825066),
("aujourd'huid\233but de soir\233e", -6.219595639933231),
("<day-of-week> <day-of-month>Fevrier", -5.814130531825066),
("<hour-of-day> et demice <part-of-day>", -5.814130531825066),
("<dim time> <part-of-day>apr\232s <time-of-day|day>",
-6.2176036074019905),
("le <time>fin de matin\233e", -6.2176036074019905),
-6.219595639933231),
("le <time>fin de matin\233e", -6.219595639933231),
("Jeudide <time-of-day> - <time-of-day> (interval)",
-5.812138499293826),
("day of month (premier)Mars", -5.301312875527835),
("intersectmilieu de journ\233e", -6.2176036074019905),
("intersectfin de journ\233e", -6.2176036074019905),
-5.814130531825066),
("day of month (premier)Mars", -5.303304908059076),
("intersectmilieu de journ\233e", -6.219595639933231),
("intersectfin de journ\233e", -6.219595639933231),
("le <day-of-month> (non ordinal)<time-of-day> heures",
-6.2176036074019905),
("Octobreyear", -5.301312875527835),
("Jeudiapr\232s <time-of-day|day>", -5.301312875527835),
("Fevrierd\233but de matin\233e", -6.2176036074019905),
-6.219595639933231),
("Octobreyear", -5.303304908059076),
("Jeudiapr\232s <time-of-day|day>", -5.303304908059076),
("Fevrierd\233but de matin\233e", -6.219595639933231),
("de <datetime> - <datetime> (interval)Juillet",
-5.812138499293826),
-5.814130531825066),
("<hour-of-day> <integer> (as relative minutes)<day-of-week> <day-of-month>",
-6.2176036074019905),
("monthhour", -4.07753744390572),
("Marsintersect", -6.2176036074019905),
-6.219595639933231),
("monthhour", -4.07952947643696),
("Marsintersect", -6.219595639933231),
("Lundile <cycle> prochain|suivant|d'apr\232s",
-6.2176036074019905),
("le <time>fin d'apr\232s-midi", -6.2176036074019905),
("hourmonth", -4.713526210625716),
("<time-of-day> heuresle <time>", -4.713526210625716),
("dayday", -3.8662283502385124),
("Septembreyear", -5.812138499293826),
-6.219595639933231),
("le <time>fin d'apr\232s-midi", -6.219595639933231),
("hourmonth", -4.715518243156957),
("<time-of-day> heuresle <time>", -4.715518243156957),
("dayday", -3.868220382769753),
("Septembreyear", -5.814130531825066),
("aujourd'hui<hour-of-day> <integer> (as relative minutes)",
-5.812138499293826),
("hourhour", -3.691874963093735),
("Fevrierd\233but d'apr\232s-midi", -6.2176036074019905),
-5.814130531825066),
("hourhour", -3.6938669956249752),
("Fevrierd\233but d'apr\232s-midi", -6.219595639933231),
("<day-of-week> <day-of-month>\224|vers <time-of-day>",
-5.1189913187338805),
("<day-of-week> <day-of-month>Septembre", -6.2176036074019905),
("le <time>intersect", -5.812138499293826),
-5.120983351265121),
("<day-of-week> <day-of-month>Septembre", -6.219595639933231),
("le <time>intersect", -5.814130531825066),
("\224|vers <time-of-day><dim time> <part-of-day>",
-6.2176036074019905),
("aujourd'huiau d\233jeuner", -6.2176036074019905),
-6.219595639933231),
("aujourd'huiau d\233jeuner", -6.219595639933231),
("du dd au dd (interval) (latent month)Juillet",
-5.524456426842045),
("Vendrediday of month (premier)", -6.2176036074019905),
("le <day-of-month> (non ordinal)Avril", -6.2176036074019905),
("<time-of-day> heuresintersect", -5.301312875527835),
("<hour-of-day> et quartce <part-of-day>", -5.812138499293826),
("Jeudi\224|vers <time-of-day>", -6.2176036074019905),
("dayyear", -3.81970833460362),
("le <day-of-month> (non ordinal)Juin", -6.2176036074019905),
("Lundice|dans le <cycle>", -6.2176036074019905),
("apr\232s-demain\224|vers <time-of-day>", -5.812138499293826),
("intersectfin d'apr\232s-midi", -6.2176036074019905),
("le <ordinal> <cycle> de <time>year", -6.2176036074019905),
("intersectmilieu d'apr\232s-midi", -6.2176036074019905),
-5.526448459373285),
("Vendrediday of month (premier)", -6.219595639933231),
("le <day-of-month> (non ordinal)Avril", -6.219595639933231),
("<time-of-day> heuresintersect", -5.303304908059076),
("<hour-of-day> et quartce <part-of-day>", -5.814130531825066),
("Jeudi\224|vers <time-of-day>", -6.219595639933231),
("dayyear", -3.82170036713486),
("le <day-of-month> (non ordinal)Juin", -6.219595639933231),
("Lundice|dans le <cycle>", -6.219595639933231),
("apr\232s-demain\224|vers <time-of-day>", -5.814130531825066),
("intersectfin d'apr\232s-midi", -6.219595639933231),
("le <ordinal> <cycle> de <time>year", -6.219595639933231),
("intersectmilieu d'apr\232s-midi", -6.219595639933231),
("<hour-of-day> <integer> (as relative minutes)Jeudi",
-6.2176036074019905),
("le <time>milieu de journ\233e", -6.2176036074019905),
("aujourd'huid\233but de journ\233e", -6.2176036074019905),
("demain\224|vers <time-of-day>", -5.812138499293826),
("le <day-of-month> (non ordinal)Mars", -4.8313092462821),
-6.219595639933231),
("le <time>milieu de journ\233e", -6.219595639933231),
("aujourd'huid\233but de journ\233e", -6.219595639933231),
("demain\224|vers <time-of-day>", -5.814130531825066),
("le <day-of-month> (non ordinal)Mars", -4.83330127881334),
("le <day-of-month> (non ordinal)intersect",
-3.7752565720327858),
("hourminute", -6.2176036074019905),
("dd-dd <month>(interval)year", -6.2176036074019905),
("intersect<day-of-month> <named-month>", -5.812138499293826),
-3.7772486045640266),
("hourminute", -6.219595639933231),
("dd-dd <month>(interval)year", -6.219595639933231),
("intersect<day-of-month> <named-month>", -5.814130531825066),
("<hour-of-day> <integer> (as relative minutes)Samedi",
-6.2176036074019905),
("minutemonth", -5.812138499293826),
("minutehour", -4.60816569496789),
("Lundidu|dans le <part-of-day>", -6.2176036074019905),
("aujourd'huimilieu de journ\233e", -6.2176036074019905),
("Vendrediapr\232s <time-of-day|day>", -6.2176036074019905),
("Mars\224|vers <time-of-day>", -5.524456426842045),
("intersectd\233but de soir\233e", -6.2176036074019905),
-6.219595639933231),
("minutemonth", -5.814130531825066),
("minutehour", -4.61015772749913),
("Lundidu|dans le <part-of-day>", -6.219595639933231),
("aujourd'huimilieu de journ\233e", -6.219595639933231),
("Vendrediapr\232s <time-of-day|day>", -6.219595639933231),
("Mars\224|vers <time-of-day>", -5.526448459373285),
("intersectd\233but de soir\233e", -6.219595639933231),
("Mardile <cycle> prochain|suivant|d'apr\232s",
-5.524456426842045),
("aujourd'huifin de journ\233e", -6.2176036074019905),
("le <day-of-month> (non ordinal)Octobre", -6.2176036074019905),
("intersectdu|dans le <part-of-day>", -4.425844138173935),
-5.526448459373285),
("aujourd'huifin de journ\233e", -6.219595639933231),
("le <day-of-month> (non ordinal)Octobre", -6.219595639933231),
("intersectdu|dans le <part-of-day>", -4.427836170705175),
("le <day-of-month> \224 <datetime>du|dans le <part-of-day>",
-5.812138499293826),
("hh(:|h)mm (time-of-day)Jeudi", -6.2176036074019905),
("le <time>Juillet", -6.2176036074019905),
("Lundi<day-of-month> <named-month>", -6.2176036074019905),
-5.814130531825066),
("hh(:|h)mm (time-of-day)Jeudi", -6.219595639933231),
("le <time>Juillet", -6.219595639933231),
("Lundi<day-of-month> <named-month>", -6.219595639933231),
("Mercredile <cycle> prochain|suivant|d'apr\232s",
-5.524456426842045),
("Lundifin d'apr\232s-midi", -5.812138499293826),
("Lundile <time>", -5.812138499293826),
-5.526448459373285),
("Lundifin d'apr\232s-midi", -5.814130531825066),
("Lundile <time>", -5.814130531825066),
("Mardi<named-month|named-day> suivant|d'apr\232s",
-5.812138499293826),
("Mars<dim time> du matin", -6.2176036074019905),
("le <time>Novembre", -5.524456426842045),
("intersectd\233but d'apr\232s-midi", -6.2176036074019905),
("<datetime> - <datetime> (interval)Jeudi", -5.301312875527835),
-5.814130531825066),
("le <day-of-month> (non ordinal)Juillet", -6.219595639933231),
("Mars<dim time> du matin", -6.219595639933231),
("le <time>Novembre", -5.526448459373285),
("intersectd\233but d'apr\232s-midi", -6.219595639933231),
("<datetime> - <datetime> (interval)Jeudi", -5.303304908059076),
("Mercredi<named-month|named-day> suivant|d'apr\232s",
-5.812138499293826),
-5.814130531825066),
("<time-of-day> - <time-of-day> (interval)Jeudi",
-4.964840638906622),
("Samedi<day-of-month> <named-month>", -6.2176036074019905),
("<time-of-day> heuresce <time>", -6.2176036074019905),
("le <time>d\233but d'apr\232s-midi", -6.2176036074019905),
("day of month (premier)Juillet", -5.524456426842045),
-4.966832671437863),
("Samedi<day-of-month> <named-month>", -6.219595639933231),
("<time-of-day> heuresce <time>", -6.219595639933231),
("le <time>d\233but d'apr\232s-midi", -6.219595639933231),
("day of month (premier)Juillet", -5.526448459373285),
("<day-of-month> <named-month>du|dans le <part-of-day>",
-5.812138499293826),
("Fevriermilieu d'apr\232s-midi", -6.2176036074019905),
("Mercredi\224|vers <time-of-day>", -6.2176036074019905),
("intersectNovembre", -4.964840638906622),
("le <time><dim time> du matin", -6.2176036074019905),
("Fevrierfin d'apr\232s-midi", -6.2176036074019905),
-5.814130531825066),
("Fevriermilieu d'apr\232s-midi", -6.219595639933231),
("Mercredi\224|vers <time-of-day>", -6.219595639933231),
("intersectNovembre", -4.966832671437863),
("le <time><dim time> du matin", -6.219595639933231),
("Fevrierfin d'apr\232s-midi", -6.219595639933231),
("le <day-of-month> (non ordinal)\224|vers <time-of-day>",
-4.713526210625716),
-4.715518243156957),
("<day-of-month> <named-month>d\233but de soir\233e",
-6.2176036074019905),
("hierdu|dans le <part-of-day>", -6.2176036074019905),
("le <time>d\233but de soir\233e", -6.2176036074019905),
("Mercredice|dans le <cycle>", -6.2176036074019905),
("Fevrierfin de soir\233e", -6.2176036074019905),
("Mardice|dans le <cycle>", -6.2176036074019905),
("dayminute", -4.60816569496789),
("intersectd\233but de journ\233e", -6.2176036074019905),
("<ordinal> <cycle> de <time>year", -5.812138499293826),
("Fevriermilieu de matin\233e", -6.2176036074019905),
("le <time>\224|vers <time-of-day>", -5.1189913187338805),
-6.219595639933231),
("hierdu|dans le <part-of-day>", -6.219595639933231),
("le <time>d\233but de soir\233e", -6.219595639933231),
("Mercredice|dans le <cycle>", -6.219595639933231),
("Fevrierfin de soir\233e", -6.219595639933231),
("Mardice|dans le <cycle>", -6.219595639933231),
("dayminute", -4.61015772749913),
("intersectd\233but de journ\233e", -6.219595639933231),
("<ordinal> <cycle> de <time>year", -5.814130531825066),
("Fevriermilieu de matin\233e", -6.219595639933231),
("le <time>\224|vers <time-of-day>", -5.120983351265121),
("<day-of-month> <named-month><dim time> du matin",
-6.2176036074019905),
("intersectyear", -5.524456426842045),
("Fevrierfin de matin\233e", -6.2176036074019905),
("minuteday", -3.476763583476789),
("le <time>d\233but de matin\233e", -6.2176036074019905),
("Mardile <time>", -4.8313092462821),
("aujourd'hui\224|vers <time-of-day>", -5.301312875527835),
-6.219595639933231),
("intersectyear", -5.526448459373285),
("Fevrierfin de matin\233e", -6.219595639933231),
("minuteday", -3.47875561600803),
("le <time>d\233but de matin\233e", -6.219595639933231),
("Mardile <time>", -4.83330127881334),
("aujourd'hui\224|vers <time-of-day>", -5.303304908059076),
("<day-of-month> <named-month>milieu d'apr\232s-midi",
-6.2176036074019905),
("day of month (premier)intersect", -6.2176036074019905),
-6.219595639933231),
("day of month (premier)intersect", -6.219595639933231),
("<day-of-month> <named-month>fin d'apr\232s-midi",
-6.2176036074019905),
("day of month (premier)Janvier", -6.2176036074019905),
("le <time>milieu de matin\233e", -6.2176036074019905),
("aujourd'huid\233but de matin\233e", -5.1189913187338805),
("Fevrierd\233but de soir\233e", -6.2176036074019905),
("apr\232s <time-of-day|day>Jeudi", -5.812138499293826),
("Mercredile <time>", -4.8313092462821),
("le <time>fin de soir\233e", -6.2176036074019905),
-6.219595639933231),
("day of month (premier)Janvier", -6.219595639933231),
("le <time>milieu de matin\233e", -6.219595639933231),
("aujourd'huid\233but de matin\233e", -5.120983351265121),
("Fevrierd\233but de soir\233e", -6.219595639933231),
("apr\232s <time-of-day|day>Jeudi", -5.814130531825066),
("Mercredile <time>", -4.83330127881334),
("le <time>fin de soir\233e", -6.219595639933231),
("de <time-of-day> - <time-of-day> (interval)Jeudi",
-5.301312875527835),
-5.303304908059076),
("<day-of-month> <named-month>milieu de matin\233e",
-6.2176036074019905),
-6.219595639933231),
("<day-of-month> <named-month>fin de soir\233e",
-6.2176036074019905),
-6.219595639933231),
("<day-of-month> <named-month>fin de matin\233e",
-6.2176036074019905),
("<time-of-day> heuresce <part-of-day>", -5.812138499293826),
("Mercredi<day-of-month> <named-month>", -6.2176036074019905),
("aujourd'huid\233but d'apr\232s-midi", -6.2176036074019905),
("le <time>milieu d'apr\232s-midi", -6.2176036074019905),
("apr\232s <time-of-day|day>Novembre", -5.524456426842045),
-6.219595639933231),
("<time-of-day> heuresce <part-of-day>", -5.814130531825066),
("Mercredi<day-of-month> <named-month>", -6.219595639933231),
("aujourd'huid\233but d'apr\232s-midi", -6.219595639933231),
("le <time>milieu d'apr\232s-midi", -6.219595639933231),
("apr\232s <time-of-day|day>Novembre", -5.526448459373285),
("\224|vers <time-of-day>du|dans le <part-of-day>",
-5.1189913187338805),
-5.120983351265121),
("entre <time-of-day> et <time-of-day> (interval)Jeudi",
-5.812138499293826),
("intersectintersect", -6.2176036074019905),
("dayweek", -4.0203790300657705),
-5.814130531825066),
("intersectintersect", -6.219595639933231),
("dayweek", -4.022371062597012),
("entre <datetime> et <datetime> (interval)Juillet",
-5.812138499293826),
("intersectMars", -6.2176036074019905),
("weekyear", -4.8313092462821),
("le <time>Mars", -5.812138499293826),
("apr\232s le <day-of-month>Mars", -6.2176036074019905),
("hh(:|h)mm (time-of-day)intersect", -5.812138499293826),
-5.814130531825066),
("intersectMars", -6.219595639933231),
("weekyear", -4.83330127881334),
("le <time>Mars", -5.814130531825066),
("apr\232s le <day-of-month>Mars", -6.219595639933231),
("hh(:|h)mm (time-of-day)intersect", -5.814130531825066),
("<day-of-month> <named-month>fin de journ\233e",
-6.2176036074019905),
-6.219595639933231),
("<day-of-month> <named-month>milieu de journ\233e",
-6.2176036074019905),
("le <time>fin de journ\233e", -6.2176036074019905),
("dd/-mm\224|vers <time-of-day>", -5.812138499293826),
("intersectfin de matin\233e", -6.2176036074019905),
("Fevrierd\233but de journ\233e", -6.2176036074019905),
("Vendrediintersect", -6.2176036074019905),
("<day-of-month> <named-month>intersect", -6.2176036074019905),
("intersectfin de soir\233e", -6.2176036074019905),
("intersectmilieu de matin\233e", -6.2176036074019905),
("intersect\224|vers <time-of-day>", -5.524456426842045),
("le <time>year", -4.713526210625716),
("hh(:|h)mm (time-of-day)Samedi", -6.2176036074019905),
-6.219595639933231),
("le <time>fin de journ\233e", -6.219595639933231),
("dd/-mm\224|vers <time-of-day>", -5.814130531825066),
("intersectfin de matin\233e", -6.219595639933231),
("Fevrierd\233but de journ\233e", -6.219595639933231),
("Vendrediintersect", -6.219595639933231),
("<day-of-month> <named-month>intersect", -6.219595639933231),
("intersectfin de soir\233e", -6.219595639933231),
("intersectmilieu de matin\233e", -6.219595639933231),
("intersect\224|vers <time-of-day>", -5.526448459373285),
("le <time>year", -4.715518243156957),
("hh(:|h)mm (time-of-day)Samedi", -6.219595639933231),
("le <day-of-month> (non ordinal)apr\232s <time-of-day|day>",
-6.2176036074019905),
("Fevrierfin de journ\233e", -6.2176036074019905),
("Fevriermilieu de journ\233e", -6.2176036074019905),
("le <time>d\233but de journ\233e", -6.2176036074019905),
("intersectd\233but de matin\233e", -6.2176036074019905)],
n = 389},
-6.219595639933231),
("Fevrierfin de journ\233e", -6.219595639933231),
("Fevriermilieu de journ\233e", -6.219595639933231),
("le <time>d\233but de journ\233e", -6.219595639933231),
("intersectd\233but de matin\233e", -6.219595639933231)],
n = 390},
koData =
ClassData{prior = -1.6032966444120178, unseen = -6.045005314036012,
ClassData{prior = -1.6053479271825752, unseen = -6.045005314036012,
likelihoods =
HashMap.fromList
[("demain<time-of-day> heures", -5.349485653122436),
@ -1105,6 +1106,18 @@ classifiers
koData =
ClassData{prior = -infinity, unseen = -0.6931471805599453,
likelihoods = HashMap.fromList [], n = 0}}),
("DD month YY",
Classifier{okData =
ClassData{prior = 0.0, unseen = -1.6094379124341003,
likelihoods =
HashMap.fromList
[("integer (numeric)Octobreinteger (numeric)",
-0.6931471805599453),
("month", -0.6931471805599453)],
n = 1},
koData =
ClassData{prior = -infinity, unseen = -1.0986122886681098,
likelihoods = HashMap.fromList [], n = 0}}),
("noel",
Classifier{okData =
ClassData{prior = -0.2876820724517809,
@ -1123,15 +1136,15 @@ classifiers
likelihoods = HashMap.fromList [], n = 0}}),
("le <day-of-month> (non ordinal)",
Classifier{okData =
ClassData{prior = -0.35863380842406534, unseen = -4.02535169073515,
ClassData{prior = -0.3528213746227423, unseen = -4.04305126783455,
likelihoods =
HashMap.fromList
[("integer (numeric)", -9.53101798043249e-2),
("number (17..19)", -3.3141860046725258),
("number (0..16)", -3.3141860046725258)],
n = 51},
[("integer (numeric)", -9.352605801082348e-2),
("number (17..19)", -3.332204510175204),
("number (0..16)", -3.332204510175204)],
n = 52},
koData =
ClassData{prior = -1.1994169877900753, unseen = -3.295836866004329,
ClassData{prior = -1.213022639845854, unseen = -3.295836866004329,
likelihoods =
HashMap.fromList
[("integer (numeric)", -0.3677247801253174),
@ -1849,13 +1862,11 @@ classifiers
likelihoods = HashMap.fromList [], n = 0}}),
("Octobre",
Classifier{okData =
ClassData{prior = -9.53101798043249e-2,
unseen = -2.4849066497880004,
likelihoods = HashMap.fromList [("", 0.0)], n = 10},
ClassData{prior = 0.0, unseen = -2.5649493574615367,
likelihoods = HashMap.fromList [("", 0.0)], n = 11},
koData =
ClassData{prior = -2.3978952727983707,
unseen = -1.0986122886681098,
likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
ClassData{prior = -infinity, unseen = -0.6931471805599453,
likelihoods = HashMap.fromList [], n = 0}}),
("au d\233jeuner",
Classifier{okData =
ClassData{prior = -0.40546510810816444,
@ -2207,20 +2218,20 @@ classifiers
n = 42}}),
("<day-of-month> <named-month>",
Classifier{okData =
ClassData{prior = -0.3022808718729337, unseen = -4.718498871295094,
ClassData{prior = -0.2744368457017603, unseen = -4.820281565605037,
likelihoods =
HashMap.fromList
[("integer (numeric)Juin", -3.3232358401924436),
("integer (numeric)Juillet", -3.100092288878234),
("integer (numeric)Octobre", -3.100092288878234),
("integer (numeric)Avril", -3.6109179126442243),
("integer (numeric)Fevrier", -1.5740359853831845),
("month", -0.7582864827309068),
("integer (numeric)Septembre", -4.0163830207523885),
("integer (numeric)Mars", -1.936941479072553)],
n = 51},
[("integer (numeric)Juin", -3.4258899942525267),
("integer (numeric)Juillet", -2.414289082574047),
("integer (numeric)Octobre", -3.202746442938317),
("integer (numeric)Avril", -3.713572066704308),
("integer (numeric)Fevrier", -1.6766901394432678),
("month", -0.7517413448259981),
("integer (numeric)Septembre", -4.119037174812472),
("integer (numeric)Mars", -2.0395956331326364)],
n = 57},
koData =
ClassData{prior = -1.3437347467010947, unseen = -3.828641396489095,
ClassData{prior = -1.4271163556401458, unseen = -3.828641396489095,
likelihoods =
HashMap.fromList
[("number (0..16)Juillet", -2.4203681286504293),
@ -2454,39 +2465,38 @@ classifiers
likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
("le <time>",
Classifier{okData =
ClassData{prior = -0.23309388216737778,
unseen = -5.8522024797744745,
ClassData{prior = -0.2318016140573243, unseen = -5.857933154483459,
likelihoods =
HashMap.fromList
[("week", -2.591228241925377),
[("week", -2.596975384180945),
("<named-month|named-day> suivant|d'apr\232s",
-3.6521002026106397),
("<ordinal> <cycle> de <time>", -4.4630304188269685),
-3.657847344866208),
("<ordinal> <cycle> de <time>", -4.468777561082536),
("premi\232re quinzaine de <named-month>(interval)",
-5.156177599386914),
("intersect", -2.238406867302635),
("soir de no\235l", -5.156177599386914),
("en semaine", -3.4514295071484886),
("toussaint", -4.750712491278749), ("day", -1.2954478883463185),
-5.161924741642482),
("intersect", -2.2441540095582027),
("soir de no\235l", -5.161924741642482),
("en semaine", -3.457176649404057),
("toussaint", -4.756459633534318), ("day", -1.290723730734591),
("deuxi\232me quinzaine de <named-month>(interval)",
-5.156177599386914),
("<dim time> <part-of-day>", -3.2102674503316004),
("dd/-mm", -3.903414630891546),
("nth <day-of-week> of <month-or-greater>", -5.156177599386914),
("dd/-mm/-yyyy", -4.4630304188269685),
("dd mm yyyy", -3.903414630891546),
("day of month (premier)", -3.903414630891546),
("dd mm", -3.903414630891546), ("hour", -2.1857631338172125),
("month", -4.4630304188269685),
("dernier <cycle> de <time> (latent)", -4.239886867512759),
("<day-of-month> <named-month>", -2.591228241925377),
("<cycle> prochain|suivant|d'apr\232s", -2.8048023422234363),
("dernier week-end de <time>", -5.156177599386914),
("<ordinal> week-end de <time>", -4.750712491278749),
("<cycle> dernier", -4.057565310718804)],
n = 160},
-5.161924741642482),
("<dim time> <part-of-day>", -3.2160145925871686),
("dd/-mm", -3.909161773147114),
("nth <day-of-week> of <month-or-greater>", -5.161924741642482),
("dd/-mm/-yyyy", -4.468777561082536),
("dd mm yyyy", -3.909161773147114),
("day of month (premier)", -3.909161773147114),
("dd mm", -3.909161773147114), ("hour", -2.1915102760727807),
("month", -4.468777561082536),
("dernier <cycle> de <time> (latent)", -4.2456340097683265),
("<day-of-month> <named-month>", -2.5592350561980983),
("<cycle> prochain|suivant|d'apr\232s", -2.810549484479004),
("dernier week-end de <time>", -5.161924741642482),
("<ordinal> week-end de <time>", -4.756459633534318),
("<cycle> dernier", -4.0633124529743725)],
n = 161},
koData =
ClassData{prior = -1.5705980791178364, unseen = -4.718498871295094,
ClassData{prior = -1.575536360758419, unseen = -4.718498871295094,
likelihoods =
HashMap.fromList
[("<named-month|named-day> suivant|d'apr\232s",

View File

@ -111,6 +111,14 @@ allExamples = concat
, "2 mars"
, "le 2/3"
]
, examples (datetime (2013, 7, 5, 0, 0, 0) Day)
[ "le 5 juillet"
, "5 juillet"
, "5 juil"
, "5 jui"
, "5 juil."
, "5 jui."
]
, examples (datetime (2013, 3, 2, 5, 0, 0) Hour)
[ "le 2 mars à 5h"
, "2 mars à 5h"

View File

@ -1948,17 +1948,17 @@ ruleTimezone = Rule
ruleMonths :: [Rule]
ruleMonths = mkRuleMonths
[ ( "Janvier" , "janvier|janv\\.?" )
[ ( "Janvier" , "janvier|janv\\.?" )
, ( "Fevrier" , "f(é|e)vrier|f(é|e)v\\.?" )
, ( "Mars" , "mars|mar\\.?" )
, ( "Avril" , "avril|avr\\.?" )
, ( "Mai" , "mai" )
, ( "Juin" , "juin|jun\\.?" )
, ( "Juillet" , "juillet|juil?\\." )
, ( "Aout" , "ao(û|u)t|aou\\.?" )
, ( "Septembre" , "septembre|sept?\\.?" )
, ( "Octobre" , "octobre|oct\\.?" )
, ( "Novembre" , "novembre|nov\\.?" )
, ( "Mars" , "mars|mar\\.?" )
, ( "Avril" , "avril|avr\\.?" )
, ( "Mai" , "mai" )
, ( "Juin" , "juin|jun\\.?" )
, ( "Juillet" , "juillet|juil?\\.?" )
, ( "Aout" , "ao(û|u)t|aou\\.?" )
, ( "Septembre" , "septembre|sept?\\.?" )
, ( "Octobre" , "octobre|oct\\.?" )
, ( "Novembre" , "novembre|nov\\.?" )
, ( "Decembre" , "d(é|e)cembre|d(é|e)c\\.?" )
]