From fe4f77bdc0f873549150ca311a9783332b7b6776 Mon Sep 17 00:00:00 2001
From: Filipe Pereira <4221949+fil090302@users.noreply.github.com>
Date: Wed, 4 Aug 2021 17:12:58 -0700
Subject: [PATCH] PT time improvements (#633)

Summary:
New rules for PT time expressions like "5 Maio", "Maio 5", "5 Maio 2022".

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

Reviewed By: stroxler

Differential Revision: D30114330

Pulled By: chessai

fbshipit-source-id: f56418d95efa1d7488957b8b8083daec3193949b
---
 Duckling/Ranking/Classifiers/PT_XX.hs | 742 ++++++++++++++------------
 Duckling/Time/PT/Corpus.hs            |  13 +
 Duckling/Time/PT/Rules.hs             |  50 +-
 3 files changed, 457 insertions(+), 348 deletions(-)

diff --git a/Duckling/Ranking/Classifiers/PT_XX.hs b/Duckling/Ranking/Classifiers/PT_XX.hs
index 8ee478e5..dd06d1af 100644
--- a/Duckling/Ranking/Classifiers/PT_XX.hs
+++ b/Duckling/Ranking/Classifiers/PT_XX.hs
@@ -83,9 +83,9 @@ classifiers
                                n = 7}}),
        ("de <year>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -4.430816798843313,
+                     ClassData{prior = 0.0, unseen = -4.442651256490317,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 82},
+                               n = 83},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -103,11 +103,10 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.23299584775722143,
-                               unseen = -5.318119993844216,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 202},
+                     ClassData{prior = -0.2212726433783981, unseen = -5.375278407684165,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 214},
                    koData =
-                     ClassData{prior = -1.5709716316063043, unseen = -4.007333185232471,
+                     ClassData{prior = -1.6169567448481277, unseen = -4.007333185232471,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 53}}),
        ("the day before yesterday",
         Classifier{okData =
@@ -210,119 +209,123 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Julho",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.890371757896165,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 16},
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 21},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by `da` or `de`",
         Classifier{okData =
-                     ClassData{prior = -1.9568392195875037,
-                               unseen = -4.8283137373023015,
+                     ClassData{prior = -1.9564365620423008, unseen = -4.852030263919617,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -3.028522096376982),
-                                    ("<day-of-month> de <named-month>two time tokens separated by \",\"2",
-                                     -4.127134385045092),
-                                    ("<day-of-month> de <named-month>intersect",
-                                     -4.127134385045092),
-                                    ("dd-dd <month> de (interval)year", -4.127134385045092),
-                                    ("<day-of-month> de <named-month>two time tokens separated by \",\"",
-                                     -4.127134385045092),
-                                    ("dayday", -3.4339872044851463),
-                                    ("Quart-feira<cycle> (que vem)", -4.127134385045092),
-                                    ("dayyear", -2.1122313645028266),
-                                    ("quarteryear", -4.127134385045092),
-                                    ("dd-dd <month>(interval)year", -4.127134385045092),
-                                    ("<ordinal> trimestreyear", -4.127134385045092),
-                                    ("day of month (1st)Mar\231o", -3.4339872044851463),
-                                    ("two time tokens separated by \",\"2year", -3.721669276936927),
-                                    ("intersectyear", -4.127134385045092),
-                                    ("<day-of-month> de <named-month>year", -2.740840023925201),
+                                   [("daymonth", -3.0524276172305362),
+                                    ("dd-dd <month> de (interval)year", -4.151039905898646),
+                                    ("dayday", -3.457892725338701),
+                                    ("Quart-feira<cycle> (que vem)", -4.151039905898646),
+                                    ("dayyear", -2.07159836421881),
+                                    ("quarteryear", -4.151039905898646),
+                                    ("dd-dd <month>(interval)year", -4.151039905898646),
+                                    ("<ordinal> trimestreyear", -4.151039905898646),
+                                    ("<day-of-month> (ordinal or number) de <named-month>year",
+                                     -2.7647455447787554),
+                                    ("day of month (1st)Mar\231o", -3.457892725338701),
+                                    ("two time tokens separated by \",\"2year",
+                                     -3.7455747977904816),
+                                    ("intersectyear", -4.151039905898646),
                                     ("dia <day-of-month> (non ordinal)Fevereiro",
-                                     -3.721669276936927),
-                                    ("two time tokens separated by \",\"year", -3.721669276936927),
-                                    ("Domingo<cycle> passado", -4.127134385045092),
-                                    ("dayweek", -3.4339872044851463),
-                                    ("Quart-feiraproximo <cycle> ", -4.127134385045092)],
-                               n = 26},
+                                     -3.7455747977904816),
+                                    ("<day-of-month> (ordinal or number) <named-month>year",
+                                     -4.151039905898646),
+                                    ("two time tokens separated by \",\"year", -3.7455747977904816),
+                                    ("Domingo<cycle> passado", -4.151039905898646),
+                                    ("dayweek", -3.457892725338701),
+                                    ("<day-of-month> (ordinal or number) de <named-month>two time tokens separated by \",\"2",
+                                     -4.151039905898646),
+                                    ("<day-of-month> (ordinal or number) de <named-month>intersect",
+                                     -4.151039905898646),
+                                    ("Quart-feiraproximo <cycle> ", -4.151039905898646),
+                                    ("<day-of-month> (ordinal or number) de <named-month>two time tokens separated by \",\"",
+                                     -4.151039905898646)],
+                               n = 27},
                    koData =
-                     ClassData{prior = -0.15234072458201878,
-                               unseen = -5.963579343618447,
+                     ClassData{prior = -0.15240700022243142,
+                               unseen = -5.996452088619021,
                                likelihoods =
                                  HashMap.fromList
                                    [("time-of-day (latent)<datetime> - <datetime> (interval)",
-                                     -4.862393050955164),
-                                    ("hourday", -3.1277919955670574),
-                                    ("year (latent)Abril", -4.862393050955164),
-                                    ("year (latent)Julho", -3.396055982161737),
-                                    ("time-of-day (latent)Fevereiro", -4.01509519056796),
-                                    ("monthday", -4.574710978503383),
-                                    ("monthyear", -3.6584202466292277),
-                                    ("yearhour", -3.8815637979434374),
+                                     -4.895349138638459),
+                                    ("hourday", -3.160748083250353),
+                                    ("year (latent)Abril", -4.895349138638459),
+                                    ("year (latent)Julho", -3.3549040976913105),
+                                    ("time-of-day (latent)Fevereiro", -4.048051278251256),
+                                    ("monthday", -4.6076670661866785),
+                                    ("monthyear", -3.5960661545081987),
+                                    ("yearhour", -3.914519885626733),
                                     ("entre <datetime> e <datetime> (interval)Julho",
-                                     -3.6584202466292277),
-                                    ("houryear", -3.3219480100080148),
-                                    ("year (latent)Maio", -4.351567427189173),
+                                     -3.6913763343125234),
+                                    ("houryear", -3.3549040976913105),
+                                    ("year (latent)Maio", -4.202201958078514),
                                     ("time-of-day (latent)two time tokens separated by \",\"2",
-                                     -4.862393050955164),
-                                    ("Setembroyear", -4.169245870395218),
-                                    ("time-of-day (latent)Setembro", -4.169245870395218),
-                                    ("time-of-day (latent)intersect", -3.3219480100080148),
+                                     -4.895349138638459),
+                                    ("Setembroyear", -4.202201958078514),
+                                    ("time-of-day (latent)Setembro", -4.202201958078514),
+                                    ("time-of-day (latent)intersect", -3.2859112262043593),
                                     ("year (latent)<time-of-day> <part-of-day>",
-                                     -5.267858159063328),
-                                    ("\224s <time-of-day>Julho", -4.574710978503383),
-                                    ("year (latent)intersect", -4.574710978503383),
-                                    ("Setembrointersect", -5.267858159063328),
+                                     -5.300814246746624),
+                                    ("\224s <time-of-day>Julho", -4.6076670661866785),
+                                    ("year (latent)intersect", -4.6076670661866785),
+                                    ("Setembrointersect", -5.300814246746624),
                                     ("intersect by `da` or `de`two time tokens separated by \",\"",
-                                     -5.267858159063328),
+                                     -5.300814246746624),
                                     ("year (latent)amanh\227 pela <part-of-day>",
-                                     -5.267858159063328),
-                                    ("hourmonth", -1.7713505975968478),
+                                     -5.300814246746624),
+                                    ("hourmonth", -1.7598549227093099),
                                     ("time-of-day (latent)intersect by `da` or `de`",
-                                     -3.4760986898352733),
-                                    ("monthmonth", -5.267858159063328),
+                                     -3.509054777518569),
+                                    ("monthmonth", -5.300814246746624),
                                     ("Setembrotwo time tokens separated by \",\"2",
-                                     -5.267858159063328),
-                                    ("year (latent)Fevereiro", -4.01509519056796),
-                                    ("time-of-day (latent)Dezembro", -5.267858159063328),
-                                    ("dayyear", -5.267858159063328),
-                                    ("time-of-day (latent)Julho", -3.563110066824903),
-                                    ("time-of-day (latent)Abril", -4.862393050955164),
-                                    ("passado <cycle>year", -5.267858159063328),
-                                    ("year (latent)<dim time> da manha", -5.267858159063328),
-                                    ("time-of-day (latent)Mar\231o", -4.169245870395218),
-                                    ("year (latent)Janeiro", -5.267858159063328),
-                                    ("year (latent)Dezembro", -5.267858159063328),
+                                     -5.300814246746624),
+                                    ("year (latent)Fevereiro", -4.048051278251256),
+                                    ("time-of-day (latent)Dezembro", -5.300814246746624),
+                                    ("dayyear", -5.300814246746624),
+                                    ("time-of-day (latent)Julho", -3.509054777518569),
+                                    ("time-of-day (latent)Abril", -4.895349138638459),
+                                    ("passado <cycle>year", -5.300814246746624),
+                                    ("year (latent)<dim time> da manha", -5.300814246746624),
+                                    ("<day-of-month> (ordinal or number) de <named-month>year",
+                                     -5.300814246746624),
+                                    ("time-of-day (latent)Mar\231o", -4.202201958078514),
+                                    ("year (latent)Janeiro", -5.300814246746624),
+                                    ("year (latent)Dezembro", -5.300814246746624),
                                     ("entre <datetime> e <datetime> (interval)Janeiro",
-                                     -5.267858159063328),
-                                    ("yearmonth", -2.1998052239297112),
-                                    ("two time tokens separated by \",\"2year", -4.862393050955164),
+                                     -5.300814246746624),
+                                    ("yearmonth", -2.1872989375362493),
+                                    ("two time tokens separated by \",\"2year", -4.895349138638459),
                                     ("Setembrotwo time tokens separated by \",\"",
-                                     -5.267858159063328),
-                                    ("intersect by `da` or `de`intersect", -5.267858159063328),
-                                    ("intersectyear", -5.267858159063328),
+                                     -5.300814246746624),
+                                    ("intersect by `da` or `de`intersect", -5.300814246746624),
+                                    ("intersectyear", -5.300814246746624),
                                     ("intersect by `da` or `de`two time tokens separated by \",\"2",
-                                     -5.267858159063328),
-                                    ("time-of-day (latent)Maio", -4.351567427189173),
-                                    ("<day-of-month> de <named-month>year", -5.267858159063328),
-                                    ("antes das <time-of-day>Julho", -4.01509519056796),
-                                    ("Maioyear", -4.862393050955164),
-                                    ("year (latent)Setembro", -4.169245870395218),
-                                    ("\224s <time-of-day>Janeiro", -5.267858159063328),
-                                    ("two time tokens separated by \",\"year", -4.862393050955164),
+                                     -5.300814246746624),
+                                    ("time-of-day (latent)Maio", -4.202201958078514),
+                                    ("antes das <time-of-day>Julho", -4.048051278251256),
+                                    ("Maioyear", -4.6076670661866785),
+                                    ("year (latent)Setembro", -4.202201958078514),
+                                    ("\224s <time-of-day>Janeiro", -5.300814246746624),
+                                    ("two time tokens separated by \",\"year", -4.895349138638459),
                                     ("time-of-day (latent)two time tokens separated by \",\"",
-                                     -4.862393050955164),
-                                    ("intersect by `da` or `de`year", -3.763780762287054),
+                                     -4.895349138638459),
+                                    ("intersect by `da` or `de`year", -3.7967368499703498),
                                     ("year (latent)<datetime> - <datetime> (interval)",
-                                     -4.862393050955164),
-                                    ("yearday", -5.267858159063328),
-                                    ("time-of-day (latent)Janeiro", -5.267858159063328),
-                                    ("Julhoyear", -5.267858159063328),
+                                     -4.895349138638459),
+                                    ("yearday", -5.300814246746624),
+                                    ("time-of-day (latent)Janeiro", -5.300814246746624),
+                                    ("Julhoyear", -5.300814246746624),
                                     ("de <datetime> - <datetime> (interval)Julho",
-                                     -5.267858159063328),
-                                    ("year (latent)Mar\231o", -4.169245870395218)],
-                               n = 158}}),
+                                     -5.300814246746624),
+                                    ("year (latent)Mar\231o", -4.202201958078514)],
+                               n = 164}}),
        ("<hour-of-day> and half",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1354942159291497,
@@ -335,6 +338,24 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("<day-of-month> (ordinal or number) <named-month>",
+        Classifier{okData =
+                     ClassData{prior = -0.6190392084062235, unseen = -2.995732273553991,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("integer (0..19)Maio", -2.2512917986064953),
+                                    ("integer (numeric)Julho", -2.2512917986064953),
+                                    ("month", -0.8649974374866046),
+                                    ("integer (0..19)Julho", -2.2512917986064953),
+                                    ("integer (numeric)Maio", -1.3350010667323402)],
+                               n = 7},
+                   koData =
+                     ClassData{prior = -0.7731898882334817, unseen = -2.890371757896165,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("integer (numeric)Julho", -0.8873031950009028),
+                                    ("month", -0.8873031950009028)],
+                               n = 6}}),
        ("semana (grain)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.995732273553991,
@@ -348,18 +369,18 @@ classifiers
                                unseen = -3.6375861597263857,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearSexta-feira", -2.917770732084279),
+                                   [("Segunda-feira<day-of-month> (ordinal or number) de <named-month>",
+                                     -2.917770732084279),
+                                    ("yearSexta-feira", -2.917770732084279),
                                     ("dayday", -1.3083328196501787),
                                     ("de <year>Sexta-feira", -2.917770732084279),
+                                    ("Sexta-feira<day-of-month> (ordinal or number) de <named-month>",
+                                     -2.512305623976115),
                                     ("Sexta-feiraintersect", -2.512305623976115),
                                     ("intersectSexta-feira", -2.917770732084279),
-                                    ("Sexta-feira<day-of-month> de <named-month>",
-                                     -2.512305623976115),
                                     ("Sexta-feiraintersect by `da` or `de`", -2.512305623976115),
                                     ("intersect by `da` or `de`Sexta-feira", -2.917770732084279),
-                                    ("yearday", -2.512305623976115),
-                                    ("Segunda-feira<day-of-month> de <named-month>",
-                                     -2.917770732084279)],
+                                    ("yearday", -2.512305623976115)],
                                n = 11},
                    koData =
                      ClassData{prior = -0.4382549309311553, unseen = -4.02535169073515,
@@ -384,11 +405,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (0..19)",
         Classifier{okData =
-                     ClassData{prior = -1.9048194970694474e-2,
-                               unseen = -3.9889840465642745,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 52},
+                     ClassData{prior = -1.7699577099400975e-2,
+                               unseen = -4.060443010546419,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 56},
                    koData =
-                     ClassData{prior = -3.970291913552122, unseen = -1.0986122886681098,
+                     ClassData{prior = -4.04305126783455, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("desde <month> dd-dd (interval)",
         Classifier{okData =
@@ -402,40 +423,12 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("<day-of-month> de <named-month>",
-        Classifier{okData =
-                     ClassData{prior = -0.2682639865946794, unseen = -4.189654742026425,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("integer (numeric)Fevereiro", -2.228477120840324),
-                                    ("integer (numeric)Mar\231o", -3.0757749812275272),
-                                    ("integer (0..19)Maio", -3.0757749812275272),
-                                    ("integer (numeric)Abril", -3.481240089335692),
-                                    ("integer (numeric)Julho", -3.481240089335692),
-                                    ("integer (numeric)Dezembro", -3.481240089335692),
-                                    ("integer (numeric)Janeiro", -3.481240089335692),
-                                    ("month", -0.878550403891308),
-                                    ("integer (0..19)Julho", -3.481240089335692),
-                                    ("integer (0..19)Abril", -3.481240089335692),
-                                    ("integer (numeric)Maio", -3.0757749812275272),
-                                    ("integer (0..19)Mar\231o", -2.7880929087757464),
-                                    ("integer (numeric)Setembro", -2.382627800667582)],
-                               n = 26},
-                   koData =
-                     ClassData{prior = -1.4469189829363254,
-                               unseen = -3.4011973816621555,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("integer (numeric)Julho", -1.1700712526502546),
-                                    ("month", -1.1700712526502546)],
-                               n = 8}}),
        ("<time-of-day> <part-of-day>",
         Classifier{okData =
                      ClassData{prior = -0.3437715391028245, unseen = -4.61512051684126,
                                likelihoods =
                                  HashMap.fromList
                                    [("<hour-of-day> and quinzeafternoon", -2.995732273553991),
-                                    ("<day-of-month> de <named-month>morning", -3.912023005428146),
                                     ("dayhour", -3.2188758248682006),
                                     ("\224s <time-of-day>morning", -3.2188758248682006),
                                     ("hourhour", -1.8325814637483102),
@@ -444,6 +437,8 @@ classifiers
                                     ("time-of-day (latent)morning", -3.2188758248682006),
                                     ("time-of-day (latent)evening", -3.506557897319982),
                                     ("\224s <time-of-day>afternoon", -2.3025850929940455),
+                                    ("<day-of-month> (ordinal or number) de <named-month>morning",
+                                     -3.912023005428146),
                                     ("dia <day-of-month> de <named-month>morning",
                                      -3.912023005428146),
                                     ("time-of-day (latent)afternoon", -3.506557897319982),
@@ -482,8 +477,8 @@ classifiers
                                n = 2}}),
        ("Maio",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -545,136 +540,147 @@ classifiers
                                n = 7}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -1.281981514494508, unseen = -5.225746673713201,
+                     ClassData{prior = -1.2729656758128873, unseen = -5.288267030694535,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<day-of-month> de <named-month>in the <part-of-day>",
-                                     -4.121743536410215),
-                                    ("dayhour", -2.4477671028385437),
-                                    ("<day-of-month> de <named-month>two time tokens separated by \",\"2",
-                                     -4.527208644518379),
+                                   [("dayhour", -2.5106150064982073),
                                     ("nowquinze para as <hour-of-day> (as relative minutes)",
-                                     -4.527208644518379),
-                                    ("Quart-feiraamanh\227 pela <part-of-day>", -4.527208644518379),
-                                    ("now\224s <time-of-day>", -4.121743536410215),
-                                    ("<day-of-month> de <named-month>intersect",
-                                     -4.527208644518379),
-                                    ("now<hour-of-day> and 3/4", -4.527208644518379),
-                                    ("<day-of-month> de <named-month>two time tokens separated by \",\"",
-                                     -4.527208644518379),
-                                    ("Segunda-feirain the <part-of-day>", -4.527208644518379),
-                                    ("Quart-feira<time-of-day> <part-of-day>", -4.527208644518379),
-                                    ("yearSexta-feira", -4.527208644518379),
-                                    ("dayday", -3.0231312477421053),
-                                    ("hourhour", -4.527208644518379),
-                                    ("dayyear", -2.512305623976115),
-                                    ("de <year>Sexta-feira", -4.527208644518379),
-                                    ("quarteryear", -4.527208644518379),
-                                    ("minutehour", -3.2744456760230114),
+                                     -4.590056548178043),
+                                    ("Quart-feiraamanh\227 pela <part-of-day>", -4.590056548178043),
+                                    ("now\224s <time-of-day>", -4.1845914400698785),
+                                    ("now<hour-of-day> and 3/4", -4.590056548178043),
+                                    ("Segunda-feirain the <part-of-day>", -4.590056548178043),
+                                    ("Quart-feira<time-of-day> <part-of-day>", -4.590056548178043),
+                                    ("yearSexta-feira", -4.590056548178043),
+                                    ("dayday", -3.0859791514017694),
+                                    ("hourhour", -4.590056548178043),
+                                    ("dayyear", -2.392831970841824),
+                                    ("de <year>Sexta-feira", -4.590056548178043),
+                                    ("quarteryear", -4.590056548178043),
+                                    ("minutehour", -3.337293579682675),
                                     ("<hour-of-day> and quinzein the <part-of-day>",
-                                     -4.121743536410215),
+                                     -4.1845914400698785),
+                                    ("Sexta-feira<day-of-month> (ordinal or number) de <named-month>",
+                                     -4.590056548178043),
                                     ("intersect by `da` or `de`in the <part-of-day>",
-                                     -4.121743536410215),
-                                    ("now<hour-of-day> and <relative minutes>", -4.527208644518379),
-                                    ("tomorrow<time-of-day> horas", -4.121743536410215),
-                                    ("dd-dd <month> de (interval)de <year>", -4.527208644518379),
+                                     -4.1845914400698785),
+                                    ("<day-of-month> (ordinal or number) de <named-month>year",
+                                     -4.590056548178043),
+                                    ("now<hour-of-day> and <relative minutes>", -4.590056548178043),
+                                    ("tomorrow<time-of-day> horas", -4.1845914400698785),
+                                    ("dd-dd <month> de (interval)de <year>", -4.590056548178043),
                                     ("now<integer> para as <hour-of-day> (as relative minutes)",
-                                     -4.527208644518379),
-                                    ("\224s <time-of-day>in the <part-of-day>", -3.834061463958434),
-                                    ("Sexta-feiraintersect", -4.527208644518379),
-                                    ("dayminute", -3.2744456760230114),
-                                    ("<ordinal> trimestrede <year>", -4.527208644518379),
-                                    ("intersectSexta-feira", -4.527208644518379),
-                                    ("Sexta-feira<day-of-month> de <named-month>",
-                                     -4.527208644518379),
-                                    ("dd-dd <month>(interval)de <year>", -4.527208644518379),
-                                    ("Sexta-feiraintersect by `da` or `de`", -4.527208644518379),
-                                    ("intersect by `da` or `de`Sexta-feira", -4.527208644518379),
+                                     -4.590056548178043),
+                                    ("\224s <time-of-day>in the <part-of-day>", -3.896909367618098),
+                                    ("Sexta-feiraintersect", -4.590056548178043),
+                                    ("dayminute", -3.337293579682675),
+                                    ("<ordinal> trimestrede <year>", -4.590056548178043),
+                                    ("<day-of-month> (ordinal or number) de <named-month>de <year>",
+                                     -3.2037621870581527),
+                                    ("intersectSexta-feira", -4.590056548178043),
+                                    ("dd-dd <month>(interval)de <year>", -4.590056548178043),
+                                    ("Sexta-feiraintersect by `da` or `de`", -4.590056548178043),
+                                    ("<day-of-month> (ordinal or number) <named-month>year",
+                                     -4.590056548178043),
+                                    ("intersect by `da` or `de`Sexta-feira", -4.590056548178043),
+                                    ("<day-of-month> (ordinal or number) de <named-month>in the <part-of-day>",
+                                     -4.1845914400698785),
                                     ("dia <day-of-month> de <named-month>in the <part-of-day>",
-                                     -4.121743536410215),
-                                    ("yearday", -4.121743536410215),
+                                     -4.1845914400698785),
+                                    ("<day-of-month> (ordinal or number) <named-month>de <year>",
+                                     -4.590056548178043),
+                                    ("yearday", -4.1845914400698785),
+                                    ("<day-of-month> (ordinal or number) de <named-month>two time tokens separated by \",\"2",
+                                     -4.590056548178043),
+                                    ("<day-of-month> (ordinal or number) de <named-month>intersect",
+                                     -4.590056548178043),
                                     ("two time tokens separated by \",\"de <year>",
-                                     -4.121743536410215),
-                                    ("Quart-feira\224s <time-of-day>", -4.527208644518379),
-                                    ("<day-of-month> de <named-month>de <year>",
-                                     -3.1409142833984887),
-                                    ("Quart-feira<dim time> da manha", -4.527208644518379),
-                                    ("tomorrowdepois das <time-of-day>", -4.121743536410215),
+                                     -4.1845914400698785),
+                                    ("Quart-feira\224s <time-of-day>", -4.590056548178043),
+                                    ("Quart-feira<dim time> da manha", -4.590056548178043),
+                                    ("<day-of-month> (ordinal or number) de <named-month>two time tokens separated by \",\"",
+                                     -4.590056548178043),
+                                    ("tomorrowdepois das <time-of-day>", -4.1845914400698785),
                                     ("<hour-of-day> and <relative minutes>in the <part-of-day>",
-                                     -4.121743536410215),
+                                     -4.1845914400698785),
                                     ("two time tokens separated by \",\"2de <year>",
-                                     -4.121743536410215),
-                                    ("intersectde <year>", -4.527208644518379)],
-                               n = 53},
+                                     -4.1845914400698785),
+                                    ("intersectde <year>", -4.590056548178043)],
+                               n = 56},
                    koData =
-                     ClassData{prior = -0.3250197428894252, unseen = -5.87493073085203,
+                     ClassData{prior = -0.3285040669720361, unseen = -5.924255797414532,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -3.4742225166770453),
-                                    ("dayhour", -3.7926762477955798),
-                                    ("daymonth", -5.178970608915471),
-                                    ("monthday", -4.080358320247361),
-                                    ("monthyear", -3.4742225166770453),
-                                    ("now\224s <time-of-day>", -4.773505500807306),
+                                   [("hourday", -3.3566290621822787),
+                                    ("dayhour", -3.8421368779639797),
+                                    ("daymonth", -5.2284312390838705),
+                                    ("monthday", -4.1298189504157605),
+                                    ("monthyear", -3.282521090028557),
+                                    ("<day-of-month> (ordinal or number) de <named-month>\224s <time-of-day>",
+                                     -5.2284312390838705),
+                                    ("now\224s <time-of-day>", -4.822966130975706),
                                     ("entre <datetime> e <datetime> (interval)Julho",
-                                     -3.56953269648137),
-                                    ("houryear", -3.233060459860157),
-                                    ("Dezembro\224s <time-of-day>", -5.178970608915471),
-                                    ("\224s <time-of-day>Julho", -4.773505500807306),
-                                    ("<time-of-day> am|pm<day-of-month> de <named-month>",
-                                     -4.485823428355525),
-                                    ("Fevereiroin the <part-of-day>", -4.773505500807306),
-                                    ("de <year>antes das <time-of-day>", -2.4381305849902697),
-                                    ("monthhour", -3.9262076404201025),
-                                    ("Setembrointersect", -5.178970608915471),
+                                     -3.61899332664977),
+                                    ("houryear", -3.2135282185416054),
+                                    ("Dezembro\224s <time-of-day>", -5.2284312390838705),
+                                    ("\224s <time-of-day>Julho", -4.822966130975706),
+                                    ("Fevereiroin the <part-of-day>", -4.822966130975706),
+                                    ("de <year>antes das <time-of-day>", -2.487591215158669),
+                                    ("monthhour", -3.9756682705885025),
+                                    ("Setembrointersect", -5.2284312390838705),
                                     ("intersect by `da` or `de`two time tokens separated by \",\"",
-                                     -5.178970608915471),
-                                    ("hourmonth", -3.3071684320138792),
-                                    ("Julhode <year>", -5.178970608915471),
+                                     -5.2284312390838705),
+                                    ("hourmonth", -3.3566290621822787),
+                                    ("Julhode <year>", -5.2284312390838705),
                                     ("<time-of-day> am|pmintersect by `da` or `de`",
-                                     -4.485823428355525),
+                                     -4.535284058523925),
                                     ("Setembrotwo time tokens separated by \",\"2",
-                                     -5.178970608915471),
-                                    ("dayyear", -5.178970608915471),
+                                     -5.2284312390838705),
+                                    ("dayyear", -5.2284312390838705),
                                     ("intersect by `da` or `de`\224s <time-of-day>",
-                                     -5.178970608915471),
-                                    ("passado <cycle>year", -5.178970608915471),
-                                    ("de <year>o <ordinal> <cycle> de <time>", -4.773505500807306),
+                                     -5.2284312390838705),
+                                    ("passado <cycle>year", -5.2284312390838705),
+                                    ("de <year>o <ordinal> <cycle> de <time>", -4.822966130975706),
                                     ("intersect by `da` or `de`in the <part-of-day>",
-                                     -4.773505500807306),
-                                    ("Setembrode <year>", -4.080358320247361),
-                                    ("now<hour-of-day> and <relative minutes>", -5.178970608915471),
-                                    ("yearmonth", -2.4381305849902697),
-                                    ("Ter\231a-feiraright now", -5.178970608915471),
-                                    ("Sexta-feiraintersect", -5.178970608915471),
-                                    ("dayminute", -4.773505500807306),
+                                     -4.822966130975706),
+                                    ("Setembrode <year>", -4.1298189504157605),
+                                    ("now<hour-of-day> and <relative minutes>",
+                                     -5.2284312390838705),
+                                    ("yearmonth", -2.487591215158669),
+                                    ("Ter\231a-feiraright now", -5.2284312390838705),
+                                    ("Sexta-feiraintersect", -5.2284312390838705),
+                                    ("dayminute", -4.822966130975706),
                                     ("Setembrotwo time tokens separated by \",\"",
-                                     -5.178970608915471),
-                                    ("intersect by `da` or `de`intersect", -5.178970608915471),
-                                    ("intersectSexta-feira", -4.773505500807306),
+                                     -5.2284312390838705),
+                                    ("intersect by `da` or `de`intersect", -5.2284312390838705),
+                                    ("<day-of-month> (ordinal or number) de <named-month>de <year>",
+                                     -5.2284312390838705),
+                                    ("intersectSexta-feira", -4.822966130975706),
                                     ("intersect by `da` or `de`two time tokens separated by \",\"2",
-                                     -5.178970608915471),
-                                    ("yearo <ordinal> <cycle> de <time>", -4.773505500807306),
-                                    ("passado <cycle>de <year>", -5.178970608915471),
-                                    ("Sexta-feiraintersect by `da` or `de`", -4.080358320247361),
-                                    ("intersect by `da` or `de`Sexta-feira", -4.2626798770413155),
+                                     -5.2284312390838705),
+                                    ("yearo <ordinal> <cycle> de <time>", -4.822966130975706),
+                                    ("Maioyear", -4.822966130975706),
+                                    ("passado <cycle>de <year>", -5.2284312390838705),
+                                    ("Sexta-feiraintersect by `da` or `de`", -4.1298189504157605),
+                                    ("intersect by `da` or `de`Sexta-feira", -4.312140507209715),
+                                    ("<time-of-day> am|pm<day-of-month> (ordinal or number) <named-month>",
+                                     -4.822966130975706),
+                                    ("intersect by `da` or `de`year", -5.2284312390838705),
                                     ("two time tokens separated by \",\"de <year>",
-                                     -4.773505500807306),
-                                    ("intersect by `da` or `de`de <year>", -3.6748932121391964),
-                                    ("<day-of-month> de <named-month>\224s <time-of-day>",
-                                     -5.178970608915471),
-                                    ("yearquarter", -2.158545722771108),
+                                     -4.822966130975706),
+                                    ("intersect by `da` or `de`de <year>", -3.7243538423075964),
+                                    ("yearquarter", -2.2080063529395075),
                                     ("de <datetime> - <datetime> (interval)Julho",
-                                     -5.178970608915471),
-                                    ("daynograin", -5.178970608915471),
-                                    ("yearantes das <time-of-day>", -2.3457572648592544),
-                                    ("Maiode <year>", -4.773505500807306),
-                                    ("<day-of-month> de <named-month>de <year>",
-                                     -5.178970608915471),
+                                     -5.2284312390838705),
+                                    ("daynograin", -5.2284312390838705),
+                                    ("yearantes das <time-of-day>", -2.395217895027654),
+                                    ("Maiode <year>", -4.535284058523925),
                                     ("two time tokens separated by \",\"2de <year>",
-                                     -4.773505500807306),
-                                    ("intersectde <year>", -5.178970608915471)],
-                               n = 138}}),
+                                     -4.822966130975706),
+                                    ("intersectde <year>", -5.2284312390838705),
+                                    ("<time-of-day> am|pm<day-of-month> (ordinal or number) de <named-month>",
+                                     -4.535284058523925)],
+                               n = 144}}),
        ("<ordinal> <cycle> de <year> - <ordinal> <cycle> de <year>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -4.174387269895637,
@@ -710,18 +716,18 @@ classifiers
                                unseen = -3.6375861597263857,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearSexta-feira", -2.917770732084279),
+                                   [("Segunda-feira<day-of-month> (ordinal or number) de <named-month>",
+                                     -2.917770732084279),
+                                    ("yearSexta-feira", -2.917770732084279),
                                     ("dayday", -1.3083328196501787),
                                     ("de <year>Sexta-feira", -2.917770732084279),
+                                    ("Sexta-feira<day-of-month> (ordinal or number) de <named-month>",
+                                     -2.512305623976115),
                                     ("Sexta-feiraintersect", -2.512305623976115),
                                     ("intersectSexta-feira", -2.917770732084279),
-                                    ("Sexta-feira<day-of-month> de <named-month>",
-                                     -2.512305623976115),
                                     ("Sexta-feiraintersect by `da` or `de`", -2.512305623976115),
                                     ("intersect by `da` or `de`Sexta-feira", -2.917770732084279),
-                                    ("yearday", -2.512305623976115),
-                                    ("Segunda-feira<day-of-month> de <named-month>",
-                                     -2.917770732084279)],
+                                    ("yearday", -2.512305623976115)],
                                n = 11},
                    koData =
                      ClassData{prior = -0.4382549309311553, unseen = -4.02535169073515,
@@ -742,14 +748,14 @@ classifiers
                      ClassData{prior = -infinity, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -4.143134726391533,
+                     ClassData{prior = 0.0, unseen = -4.174387269895637,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.4135623183407838),
-                                    ("integer (0..19)", -1.3545456628053103),
-                                    ("negative numbers", -3.028522096376982),
-                                    ("tens (20..90)", -3.4339872044851463)],
-                               n = 58}}),
+                                   [("integer (numeric)", -0.39768296766610944),
+                                    ("integer (0..19)", -1.3862943611198906),
+                                    ("negative numbers", -3.0602707946915624),
+                                    ("tens (20..90)", -3.4657359027997265)],
+                               n = 60}}),
        ("n[ao] <date>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -776,7 +782,6 @@ classifiers
                                likelihoods =
                                  HashMap.fromList
                                    [("<hour-of-day> and quinzeafternoon", -3.054001181677967),
-                                    ("<day-of-month> de <named-month>morning", -3.970291913552122),
                                     ("dayhour", -2.871679624884012),
                                     ("\224s <time-of-day>morning", -3.2771447329921766),
                                     ("hourhour", -1.890850371872286),
@@ -786,6 +791,8 @@ classifiers
                                     ("time-of-day (latent)morning", -3.2771447329921766),
                                     ("time-of-day (latent)evening", -3.5648268054439574),
                                     ("\224s <time-of-day>afternoon", -2.3608540011180215),
+                                    ("<day-of-month> (ordinal or number) de <named-month>morning",
+                                     -3.970291913552122),
                                     ("dia <day-of-month> de <named-month>morning",
                                      -3.970291913552122),
                                     ("yesterdayevening", -3.970291913552122),
@@ -890,6 +897,35 @@ classifiers
                                    [("ordinals (1..10)trimestre (grain)", -0.6931471805599453),
                                     ("quarter", -0.6931471805599453)],
                                n = 50}}),
+       ("<day-of-month> (ordinal or number) de <named-month>",
+        Classifier{okData =
+                     ClassData{prior = -0.24362208265775043,
+                               unseen = -4.290459441148391,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("integer (numeric)Fevereiro", -2.330755969960742),
+                                    ("integer (numeric)Mar\231o", -3.1780538303479458),
+                                    ("integer (0..19)Maio", -3.1780538303479458),
+                                    ("integer (numeric)Abril", -3.58351893845611),
+                                    ("integer (numeric)Julho", -3.1780538303479458),
+                                    ("ordinals (1..10)Mar\231o", -3.58351893845611),
+                                    ("integer (numeric)Dezembro", -3.58351893845611),
+                                    ("integer (numeric)Janeiro", -3.58351893845611),
+                                    ("month", -0.8754687373538999),
+                                    ("integer (0..19)Julho", -3.58351893845611),
+                                    ("integer (0..19)Abril", -3.58351893845611),
+                                    ("integer (numeric)Maio", -2.890371757896165),
+                                    ("integer (0..19)Mar\231o", -2.890371757896165),
+                                    ("integer (numeric)Setembro", -2.4849066497880004)],
+                               n = 29},
+                   koData =
+                     ClassData{prior = -1.5314763709643884,
+                               unseen = -3.4339872044851463,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("integer (numeric)Julho", -1.2039728043259361),
+                                    ("month", -1.2039728043259361)],
+                               n = 8}}),
        ("now",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -958,29 +994,32 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("antes das <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -2.691243082785829, unseen = -3.1780538303479458,
+                     ClassData{prior = -2.740840023925201, unseen = -3.2188758248682006,
                                likelihoods =
                                  HashMap.fromList
-                                   [("midnight", -2.03688192726104), ("noon", -2.03688192726104),
-                                    ("hour", -1.5260563034950494)],
+                                   [("midnight", -2.0794415416798357),
+                                    ("noon", -2.0794415416798357), ("hour", -1.5686159179138452)],
                                n = 4},
                    koData =
-                     ClassData{prior = -7.020425867324857e-2,
-                               unseen = -4.836281906951478,
+                     ClassData{prior = -6.669137449867228e-2,
+                               unseen = -4.890349128221754,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<ordinal> <cycle> <time>", -2.120263536200091),
-                                    ("intersect by `da` or `de`", -2.8824035882469876),
-                                    ("<day-of-month> de <named-month>", -3.4420193761824103),
-                                    ("<ordinal> <cycle> de <time>", -2.2633643798407643),
-                                    ("year (latent)", -3.4420193761824103),
-                                    ("<ordinal> trimestre <year>", -2.7488721956224653),
-                                    ("<ordinal> trimestre", -2.7488721956224653),
-                                    ("day", -3.4420193761824103), ("quarter", -1.4961092271270973),
-                                    ("time-of-day (latent)", -3.4420193761824103),
-                                    ("year", -3.4420193761824103), ("hour", -2.8824035882469876),
-                                    ("month", -1.995100393246085)],
-                               n = 55}}),
+                                   [("<ordinal> <cycle> <time>", -2.174751721484161),
+                                    ("intersect by `da` or `de`", -2.9368917735310576),
+                                    ("<day-of-month> (ordinal or number) <named-month>",
+                                     -3.4965075614664802),
+                                    ("<ordinal> <cycle> de <time>", -2.3178525651248343),
+                                    ("year (latent)", -3.4965075614664802),
+                                    ("<ordinal> trimestre <year>", -2.803360380906535),
+                                    ("<ordinal> trimestre", -2.803360380906535),
+                                    ("<day-of-month> (ordinal or number) de <named-month>",
+                                     -3.4965075614664802),
+                                    ("day", -2.9368917735310576), ("quarter", -1.550597412411167),
+                                    ("time-of-day (latent)", -3.4965075614664802),
+                                    ("year", -3.4965075614664802), ("hour", -2.9368917735310576),
+                                    ("month", -2.049588578530155)],
+                               n = 58}}),
        ("dd-dd <month>(interval)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -1040,13 +1079,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("ordinals (1..10)",
         Classifier{okData =
-                     ClassData{prior = -0.25131442828090605,
-                               unseen = -4.672828834461907,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 105},
+                     ClassData{prior = -0.24183568432636227, unseen = -4.68213122712422,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 106},
                    koData =
-                     ClassData{prior = -1.5040773967762742,
-                               unseen = -3.4657359027997265,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 30}}),
+                     ClassData{prior = -1.5379789484519555,
+                               unseen = -3.4339872044851463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 29}}),
        ("<integer> para as <hour-of-day> (as relative minutes)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.4849066497880004,
@@ -1076,8 +1114,9 @@ classifiers
                                likelihoods =
                                  HashMap.fromList
                                    [("intersect by `da` or `de`", -2.70805020110221),
-                                    ("<day-of-month> de <named-month>", -2.70805020110221),
                                     ("intersect", -2.70805020110221),
+                                    ("<day-of-month> (ordinal or number) de <named-month>",
+                                     -2.70805020110221),
                                     ("dia <day-of-month> de <named-month>", -2.70805020110221),
                                     ("day", -2.0149030205422647),
                                     ("time-of-day (latent)", -2.0149030205422647),
@@ -1213,20 +1252,21 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -1.2163953243244932, unseen = -3.332204510175204,
+                     ClassData{prior = -1.2407867774486523, unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -1.0986122886681098),
                                     ("integer (0..19)", -0.46262352194811296)],
                                n = 24},
                    koData =
-                     ClassData{prior = -0.3513978868378886, unseen = -4.110873864173311,
+                     ClassData{prior = -0.34130316389087856,
+                               unseen = -4.143134726391533,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.3101549283038396),
-                                    ("integer (0..19)", -1.455287232606842),
-                                    ("tens (20..90)", -3.4011973816621555)],
-                               n = 57}}),
+                                   [("integer (numeric)", -0.29849298855599654),
+                                    ("integer (0..19)", -1.488077055429833),
+                                    ("tens (20..90)", -3.4339872044851463)],
+                               n = 59}}),
        ("<hour-of-day> and <relative minutes>",
         Classifier{okData =
                      ClassData{prior = -0.2719337154836418, unseen = -3.713572066704308,
@@ -1255,12 +1295,13 @@ classifiers
                                n = 5}}),
        ("year",
         Classifier{okData =
-                     ClassData{prior = -5.959209720224566e-2,
-                               unseen = -4.7535901911063645,
+                     ClassData{prior = -5.8107630807280694e-2,
+                               unseen = -4.77912349311153,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 114},
+                               n = 117},
                    koData =
-                     ClassData{prior = -2.849880396541428, unseen = -2.1972245773362196,
+                     ClassData{prior = -2.8743714165497236,
+                               unseen = -2.1972245773362196,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
                                n = 7}}),
        ("<integer> <unit-of-duration>",
@@ -1620,7 +1661,7 @@ classifiers
                                     ("hh(:|.|h)mm (time-of-day)hh(:|.|h)mm (time-of-day)",
                                      -5.8289456176102075),
                                     ("monthmonth", -2.332438056143727),
-                                    ("<day-of-month> de <named-month><day-of-month> de <named-month>",
+                                    ("<day-of-month> (ordinal or number) de <named-month><day-of-month> (ordinal or number) de <named-month>",
                                      -5.8289456176102075),
                                     ("<ordinal> trimestre <year><ordinal> trimestre <year>",
                                      -3.4775703604467294),
@@ -1648,89 +1689,96 @@ classifiers
                                     ("daymonth", -4.532599493153256),
                                     ("monthday", -4.127134385045092),
                                     ("year<ordinal> <cycle> de <time>", -2.45315795147342),
-                                    ("<day-of-month> de <named-month>intersect by `da` or `de`",
-                                     -4.127134385045092),
+                                    ("Dezembro<day-of-month> (ordinal or number) de <named-month>",
+                                     -4.532599493153256),
                                     ("monthhour", -4.127134385045092),
                                     ("de <year><ordinal> <cycle> <time>", -2.45315795147342),
                                     ("monthmonth", -4.532599493153256),
                                     ("hourhour", -4.532599493153256),
                                     ("dayyear", -4.532599493153256),
-                                    ("Dezembro<day-of-month> de <named-month>", -4.532599493153256),
+                                    ("intersect by `da` or `de`<day-of-month> (ordinal or number) de <named-month>",
+                                     -4.127134385045092),
                                     ("de <year><ordinal> <cycle> de <time>", -2.45315795147342),
                                     ("yearmonth", -1.0360919316867756),
-                                    ("intersect by `da` or `de`<day-of-month> de <named-month>",
-                                     -4.127134385045092),
                                     ("intersect by `da` or `de`intersect by `da` or `de`",
                                      -4.127134385045092),
                                     ("year<ordinal> <cycle> <time>", -2.181224235989778),
                                     ("Dezembrointersect by `da` or `de`", -4.127134385045092),
-                                    ("dd[/-]mmyear", -4.532599493153256)],
+                                    ("dd[/-]mmyear", -4.532599493153256),
+                                    ("<day-of-month> (ordinal or number) de <named-month>intersect by `da` or `de`",
+                                     -4.127134385045092)],
                                n = 75}}),
        ("entre <datetime> e <datetime> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.3171961329649449, unseen = -6.159095388491933,
+                     ClassData{prior = -0.3371303478657622, unseen = -6.163314804034641,
                                likelihoods =
                                  HashMap.fromList
                                    [("<ordinal> <cycle> <time><ordinal> trimestre <year>",
-                                     -3.4489287844833454),
+                                     -3.4531571205928664),
                                     ("<ordinal> trimestre <year><ordinal> <cycle> <time>",
-                                     -3.4489287844833454),
-                                    ("year<ordinal> <cycle> de <time>", -3.2666072276893905),
-                                    ("quarterquarter", -1.3948050507877991),
+                                     -3.4531571205928664),
+                                    ("year<ordinal> <cycle> de <time>", -3.270835563798912),
+                                    ("quarterquarter", -1.3990333868973204),
                                     ("<ordinal> <cycle> <time><ordinal> <cycle> <time>",
-                                     -2.7896831555990813),
-                                    ("monthmonth", -2.2251533528612297),
+                                     -2.7939114917086023),
+                                    ("monthmonth", -2.2293816889707507),
                                     ("<ordinal> trimestre <year><ordinal> trimestre <year>",
-                                     -3.4489287844833454),
+                                     -3.4531571205928664),
                                     ("<ordinal> trimestre <year><ordinal> <cycle> de <time>",
-                                     -3.5920296281240187),
+                                     -3.5962579642335397),
                                     ("<ordinal> <cycle> <time><ordinal> <cycle> de <time>",
-                                     -2.938103160717355),
+                                     -2.942331496826876),
                                     ("<ordinal> <cycle> de <time><ordinal> <cycle> <time>",
-                                     -2.938103160717355),
-                                    ("year<ordinal> trimestre <year>", -3.2666072276893905),
+                                     -2.942331496826876),
+                                    ("year<ordinal> trimestre <year>", -3.270835563798912),
                                     ("<ordinal> <cycle> de <time><ordinal> <cycle> de <time>",
-                                     -2.938103160717355),
-                                    ("year<ordinal> <cycle> <time>", -3.2666072276893905),
-                                    ("yearquarter", -2.205735267004128),
+                                     -2.942331496826876),
+                                    ("year<ordinal> <cycle> <time>", -3.270835563798912),
+                                    ("yearquarter", -2.209963603113649),
                                     ("<ordinal> <cycle> de <time><ordinal> trimestre <year>",
-                                     -3.5920296281240187)],
+                                     -3.5962579642335397)],
                                n = 217},
                    koData =
-                     ClassData{prior = -1.3026443318329657, unseen = -5.303304908059076,
+                     ClassData{prior = -1.2511195827516381,
+                               unseen = -5.3706380281276624,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -3.912023005428146),
-                                    ("monthday", -4.605170185988091),
-                                    ("monthyear", -4.605170185988091),
-                                    ("yearhour", -2.995732273553991),
-                                    ("year (latent)intersect by `da` or `de`", -3.3524072174927233),
-                                    ("time-of-day (latent)year (latent)", -3.3524072174927233),
-                                    ("houryear", -3.3524072174927233),
-                                    ("year<ordinal> <cycle> de <time>", -2.4079456086518722),
-                                    ("year (latent)<day-of-month> de <named-month>",
-                                     -3.912023005428146),
-                                    ("time-of-day (latent)<day-of-month> de <named-month>",
-                                     -3.912023005428146),
-                                    ("monthhour", -4.199705077879927),
-                                    ("yearyear", -3.3524072174927233),
-                                    ("hourmonth", -3.912023005428146),
+                                   [("hourday", -3.420065865966538),
+                                    ("monthday", -4.672828834461907),
+                                    ("monthyear", -4.672828834461907),
+                                    ("yearhour", -3.0633909220278057),
+                                    ("year (latent)<day-of-month> (ordinal or number) <named-month>",
+                                     -3.979681653901961),
+                                    ("year (latent)intersect by `da` or `de`", -3.420065865966538),
+                                    ("time-of-day (latent)year (latent)", -3.420065865966538),
+                                    ("houryear", -3.420065865966538),
+                                    ("year<ordinal> <cycle> de <time>", -2.4756042571256867),
+                                    ("Dezembro<day-of-month> (ordinal or number) de <named-month>",
+                                     -4.672828834461907),
+                                    ("monthhour", -4.267363726353742),
+                                    ("yearyear", -3.420065865966538),
+                                    ("hourmonth", -3.979681653901961),
                                     ("time-of-day (latent)intersect by `da` or `de`",
-                                     -3.3524072174927233),
+                                     -3.420065865966538),
                                     ("time-of-day (latent)time-of-day (latent)",
-                                     -3.3524072174927233),
-                                    ("year (latent)year (latent)", -3.3524072174927233),
-                                    ("monthmonth", -4.605170185988091),
-                                    ("hourhour", -2.995732273553991),
-                                    ("Dezembrotime-of-day (latent)", -4.605170185988091),
-                                    ("Dezembro<day-of-month> de <named-month>", -4.605170185988091),
-                                    ("Dezembroyear (latent)", -4.605170185988091),
-                                    ("year (latent)time-of-day (latent)", -3.3524072174927233),
-                                    ("yearmonth", -1.6607312068216509),
-                                    ("year<ordinal> <cycle> <time>", -2.4079456086518722),
-                                    ("yearday", -3.912023005428146),
-                                    ("Dezembrointersect by `da` or `de`", -4.199705077879927)],
-                               n = 81}}),
+                                     -3.420065865966538),
+                                    ("year (latent)year (latent)", -3.420065865966538),
+                                    ("monthmonth", -4.672828834461907),
+                                    ("hourhour", -3.0633909220278057),
+                                    ("Dezembrotime-of-day (latent)", -4.672828834461907),
+                                    ("year (latent)<day-of-month> (ordinal or number) de <named-month>",
+                                     -3.979681653901961),
+                                    ("Dezembroyear (latent)", -4.672828834461907),
+                                    ("year (latent)time-of-day (latent)", -3.420065865966538),
+                                    ("yearmonth", -1.7283898552954657),
+                                    ("time-of-day (latent)<day-of-month> (ordinal or number) <named-month>",
+                                     -3.979681653901961),
+                                    ("year<ordinal> <cycle> <time>", -2.4756042571256867),
+                                    ("yearday", -3.420065865966538),
+                                    ("Dezembrointersect by `da` or `de`", -4.267363726353742),
+                                    ("time-of-day (latent)<day-of-month> (ordinal or number) de <named-month>",
+                                     -3.979681653901961)],
+                               n = 87}}),
        ("segundo (grain)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -1750,6 +1798,20 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("<named-month> <day-of-month>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("Maiointeger (0..19)", -1.8718021769015913),
+                                    ("Julhointeger (numeric)", -1.8718021769015913),
+                                    ("Julhointeger (0..19)", -1.8718021769015913),
+                                    ("month", -0.9555114450274363),
+                                    ("Maiointeger (numeric)", -1.8718021769015913)],
+                               n = 4},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("Mar\231o",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.1972245773362196,
diff --git a/Duckling/Time/PT/Corpus.hs b/Duckling/Time/PT/Corpus.hs
index 10ba225e..7a96d199 100644
--- a/Duckling/Time/PT/Corpus.hs
+++ b/Duckling/Time/PT/Corpus.hs
@@ -123,17 +123,30 @@ allExamples = concat
              ]
   , examples (datetime (2013, 5, 5, 0, 0, 0) Day)
              [ "5 de maio"
+             , "5 maio"
+             , "05 maio"
              , "cinco de maio"
+             , "cinco maio"
+             , "maio 5"
+             , "maio cinco"
              ]
   , examples (datetime (2013, 5, 5, 0, 0, 0) Day)
              [ "cinco de maio de 2013"
              , "5 de maio de 2013"
+             , "5 maio de 2013"
+             , "5 de maio 2013"
+             , "5 maio 2013"
              , "5/5"
              , "5/5/2013"
              ]
   , examples (datetime (2013, 7, 4, 0, 0, 0) Day)
              [ "4 de julho"
+             , "04 de julho"
+             , "04 julho"
              , "quatro de julho"
+             , "quatro julho"
+             , "julho 4"
+             , "julho quatro"
              , "4/7"
              , "4/7/2013"
              ]
diff --git a/Duckling/Time/PT/Rules.hs b/Duckling/Time/PT/Rules.hs
index e74a9472..fb113bb7 100644
--- a/Duckling/Time/PT/Rules.hs
+++ b/Duckling/Time/PT/Rules.hs
@@ -6,6 +6,7 @@
 
 
 {-# LANGUAGE GADTs #-}
+{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NoRebindableSyntax #-}
 {-# LANGUAGE OverloadedStrings #-}
 
@@ -20,12 +21,10 @@ import qualified Data.Text as Text
 import Duckling.Dimensions.Types
 import Duckling.Duration.Helpers (isGrain)
 import Duckling.Numeral.Helpers (parseInt)
-import Duckling.Ordinal.Types (OrdinalData(..))
 import Duckling.Regex.Types
 import Duckling.Time.Helpers
 import Duckling.Time.Types (TimeData(..))
 import Duckling.Types
-import qualified Duckling.Ordinal.Types as TOrdinal
 import qualified Duckling.Time.Types as TTime
 import qualified Duckling.TimeGrain.Types as TG
 
@@ -383,6 +382,7 @@ ruleHourofdayAndRelativeMinutes = Rule
         tt $ hourMinute is12H hours n
       _ -> Nothing
   }
+
 ruleIntegerParaAsHourofdayAsRelativeMinutes :: Rule
 ruleIntegerParaAsHourofdayAsRelativeMinutes = Rule
   { name = "<integer> para as <hour-of-day> (as relative minutes)"
@@ -414,6 +414,7 @@ ruleHourofdayIntegerAsRelativeMinutes2 = Rule
         tt $ hourMinute is12H hours n
       _ -> Nothing
   }
+
 ruleHourofdayAndRelativeMinutes2 :: Rule
 ruleHourofdayAndRelativeMinutes2 = Rule
   { name = "<hour-of-day> and <relative minutes> minutos"
@@ -432,6 +433,7 @@ ruleHourofdayAndRelativeMinutes2 = Rule
         tt $ hourMinute is12H hours n
       _ -> Nothing
   }
+
 ruleIntegerParaAsHourofdayAsRelativeMinutes2 :: Rule
 ruleIntegerParaAsHourofdayAsRelativeMinutes2 = Rule
   { name = "<integer> minutos para as <hour-of-day> (as relative minutes)"
@@ -460,6 +462,7 @@ ruleHourofdayQuarter = Rule
        _) -> tt $ hourMinute is12H hours 15
       _ -> Nothing
   }
+
 ruleHourofdayAndQuarter :: Rule
 ruleHourofdayAndQuarter = Rule
   { name = "<hour-of-day> and quinze"
@@ -472,6 +475,7 @@ ruleHourofdayAndQuarter = Rule
        _) -> tt $ hourMinute is12H hours 15
       _ -> Nothing
   }
+
 ruleQuarterParaAsHourofdayAsRelativeMinutes :: Rule
 ruleQuarterParaAsHourofdayAsRelativeMinutes = Rule
   { name = "quinze para as <hour-of-day> (as relative minutes)"
@@ -496,6 +500,7 @@ ruleHourofdayHalf = Rule
        _) -> tt $ hourMinute is12H hours 30
       _ -> Nothing
   }
+
 ruleHourofdayAndHalf :: Rule
 ruleHourofdayAndHalf = Rule
   { name = "<hour-of-day> and half"
@@ -508,6 +513,7 @@ ruleHourofdayAndHalf = Rule
        _) -> tt $ hourMinute is12H hours 30
       _ -> Nothing
   }
+
 ruleHalfParaAsHourofdayAsRelativeMinutes :: Rule
 ruleHalfParaAsHourofdayAsRelativeMinutes = Rule
   { name = "half para as <hour-of-day> (as relative minutes)"
@@ -532,6 +538,7 @@ ruleHourofdayThreeQuarter = Rule
        _) -> tt $ hourMinute is12H hours 45
       _ -> Nothing
   }
+
 ruleHourofdayAndThreeQuarter :: Rule
 ruleHourofdayAndThreeQuarter = Rule
   { name = "<hour-of-day> and 3/4"
@@ -544,6 +551,7 @@ ruleHourofdayAndThreeQuarter = Rule
        _) -> tt $ hourMinute is12H hours 45
       _ -> Nothing
   }
+
 ruleThreeQuarterParaAsHourofdayAsRelativeMinutes :: Rule
 ruleThreeQuarterParaAsHourofdayAsRelativeMinutes = Rule
   { name = "3/4 para as <hour-of-day> (as relative minutes)"
@@ -1202,19 +1210,43 @@ ruleTimeofdayAmpm = Rule
       _ -> Nothing
   }
 
-ruleDayofmonthDeNamedmonth :: Rule
-ruleDayofmonthDeNamedmonth = Rule
-  { name = "<day-of-month> de <named-month>"
+ruleDOMOfMonth :: Rule
+ruleDOMOfMonth = Rule
+  { name = "<day-of-month> (ordinal or number) de <named-month>"
   , pattern =
-    [ Predicate isDOMInteger
+    [ Predicate isDOMValue
     , regex "de|\\/"
     , Predicate isAMonth
     ]
-  , prod = \tokens -> case tokens of
+  , prod = \case
       (token:_:Token Time td:_) -> Token Time <$> intersectDOM td token
       _ -> Nothing
   }
 
+ruleDOMMonth :: Rule
+ruleDOMMonth = Rule
+  { name = "<day-of-month> (ordinal or number) <named-month>"
+  , pattern =
+    [ Predicate isDOMValue
+    , Predicate isAMonth
+    ]
+  , prod = \case
+      (token:Token Time td:_) -> Token Time <$> intersectDOM td token
+      _ -> Nothing
+  }
+
+ruleMonthDOM :: Rule
+ruleMonthDOM = Rule
+  { name = "<named-month> <day-of-month>"
+  , pattern =
+    [ Predicate isAMonth
+    , Predicate isDOMInteger
+    ]
+  , prod = \case
+      (Token Time td:token:_) -> Token Time <$> intersectDOM td token
+      _ -> Nothing
+  }
+
 ruleEntreDatetimeEDatetimeInterval :: Rule
 ruleEntreDatetimeEDatetimeInterval = Rule
   { name = "entre <datetime> e <datetime> (interval)"
@@ -1705,7 +1737,6 @@ rules =
   , ruleAntesDasTimeofday
   , ruleDatetimeDatetimeInterval
   , ruleDayOfMonthSt
-  , ruleDayofmonthDeNamedmonth
   , ruleDayofweekSHourmin
   , ruleDdddMonthinterval
   , ruleDdmm
@@ -1720,6 +1751,8 @@ rules =
   , ruleDimTimeDaMadrugada
   , ruleDimTimeDaManha
   , ruleDimTimeDaTarde
+  , ruleDOMOfMonth
+  , ruleDOMMonth
   , ruleEmDuration
   , ruleEntreDatetimeEDatetimeInterval
   , ruleEntreDdEtDdMonthinterval
@@ -1751,6 +1784,7 @@ rules =
   , ruleIntersectByDaOrDe
   , ruleLastTime
   , ruleMidnight
+  , ruleMonthDOM
   , ruleMorning
   , ruleNCycleAtras
   , ruleNCycleProximoqueVem