From 984769244ffa4d6bfb4260537a434f2d9804f0fe Mon Sep 17 00:00:00 2001
From: Ben Powell <theben27@fb.com>
Date: Wed, 1 Aug 2018 09:23:42 -0700
Subject: [PATCH] Time/EN: All week, Rest of the week

Summary:
Task also says to add "this week", but this is already covered
by the "this <time>" rule.

Reviewed By: chinmay87

Differential Revision: D9018849

fbshipit-source-id: 210daf87ad4221cf734f260932f7c95c8a3e417a
---
 Duckling/Ranking/Classifiers/EN_AU.hs |  7 +++++++
 Duckling/Ranking/Classifiers/EN_BZ.hs |  7 +++++++
 Duckling/Ranking/Classifiers/EN_CA.hs |  7 +++++++
 Duckling/Ranking/Classifiers/EN_GB.hs |  7 +++++++
 Duckling/Ranking/Classifiers/EN_IE.hs |  7 +++++++
 Duckling/Ranking/Classifiers/EN_IN.hs |  7 +++++++
 Duckling/Ranking/Classifiers/EN_JM.hs |  7 +++++++
 Duckling/Ranking/Classifiers/EN_NZ.hs |  7 +++++++
 Duckling/Ranking/Classifiers/EN_PH.hs |  7 +++++++
 Duckling/Ranking/Classifiers/EN_TT.hs |  7 +++++++
 Duckling/Ranking/Classifiers/EN_US.hs |  7 +++++++
 Duckling/Ranking/Classifiers/EN_XX.hs |  7 +++++++
 Duckling/Ranking/Classifiers/EN_ZA.hs |  7 +++++++
 Duckling/Time/EN/Corpus.hs            |  6 ++++++
 Duckling/Time/EN/Rules.hs             | 18 +++++++++++++++++-
 15 files changed, 114 insertions(+), 1 deletion(-)

diff --git a/Duckling/Ranking/Classifiers/EN_AU.hs b/Duckling/Ranking/Classifiers/EN_AU.hs
index ea7a6c58..a1e69c60 100644
--- a/Duckling/Ranking/Classifiers/EN_AU.hs
+++ b/Duckling/Ranking/Classifiers/EN_AU.hs
@@ -45,6 +45,13 @@ classifiers
                                    [("hour", -0.7537718023763802),
                                     ("integer (numeric)time-of-day (latent)", -0.7537718023763802)],
                                n = 7}}),
+       ("week",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> timezone",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.6888794541139363,
diff --git a/Duckling/Ranking/Classifiers/EN_BZ.hs b/Duckling/Ranking/Classifiers/EN_BZ.hs
index 7a2eefad..674be3e3 100644
--- a/Duckling/Ranking/Classifiers/EN_BZ.hs
+++ b/Duckling/Ranking/Classifiers/EN_BZ.hs
@@ -45,6 +45,13 @@ classifiers
                                    [("hour", -0.7537718023763802),
                                     ("integer (numeric)time-of-day (latent)", -0.7537718023763802)],
                                n = 7}}),
+       ("week",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> timezone",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.6888794541139363,
diff --git a/Duckling/Ranking/Classifiers/EN_CA.hs b/Duckling/Ranking/Classifiers/EN_CA.hs
index baf81aed..44d05f3b 100644
--- a/Duckling/Ranking/Classifiers/EN_CA.hs
+++ b/Duckling/Ranking/Classifiers/EN_CA.hs
@@ -45,6 +45,13 @@ classifiers
                                    [("hour", -0.7537718023763802),
                                     ("integer (numeric)time-of-day (latent)", -0.7537718023763802)],
                                n = 7}}),
+       ("week",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> timezone",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.6888794541139363,
diff --git a/Duckling/Ranking/Classifiers/EN_GB.hs b/Duckling/Ranking/Classifiers/EN_GB.hs
index 7b547e49..c401298a 100644
--- a/Duckling/Ranking/Classifiers/EN_GB.hs
+++ b/Duckling/Ranking/Classifiers/EN_GB.hs
@@ -45,6 +45,13 @@ classifiers
                                    [("hour", -0.7537718023763802),
                                     ("integer (numeric)time-of-day (latent)", -0.7537718023763802)],
                                n = 7}}),
+       ("week",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> timezone",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.6888794541139363,
diff --git a/Duckling/Ranking/Classifiers/EN_IE.hs b/Duckling/Ranking/Classifiers/EN_IE.hs
index 13416d45..9ef6522b 100644
--- a/Duckling/Ranking/Classifiers/EN_IE.hs
+++ b/Duckling/Ranking/Classifiers/EN_IE.hs
@@ -45,6 +45,13 @@ classifiers
                                    [("hour", -0.7537718023763802),
                                     ("integer (numeric)time-of-day (latent)", -0.7537718023763802)],
                                n = 7}}),
+       ("week",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> timezone",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.6888794541139363,
diff --git a/Duckling/Ranking/Classifiers/EN_IN.hs b/Duckling/Ranking/Classifiers/EN_IN.hs
index c906f743..cd0fa1d7 100644
--- a/Duckling/Ranking/Classifiers/EN_IN.hs
+++ b/Duckling/Ranking/Classifiers/EN_IN.hs
@@ -45,6 +45,13 @@ classifiers
                                    [("hour", -0.7537718023763802),
                                     ("integer (numeric)time-of-day (latent)", -0.7537718023763802)],
                                n = 7}}),
+       ("week",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> timezone",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.6888794541139363,
diff --git a/Duckling/Ranking/Classifiers/EN_JM.hs b/Duckling/Ranking/Classifiers/EN_JM.hs
index c2be9db0..83437fea 100644
--- a/Duckling/Ranking/Classifiers/EN_JM.hs
+++ b/Duckling/Ranking/Classifiers/EN_JM.hs
@@ -45,6 +45,13 @@ classifiers
                                    [("hour", -0.7537718023763802),
                                     ("integer (numeric)time-of-day (latent)", -0.7537718023763802)],
                                n = 7}}),
+       ("week",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> timezone",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.6888794541139363,
diff --git a/Duckling/Ranking/Classifiers/EN_NZ.hs b/Duckling/Ranking/Classifiers/EN_NZ.hs
index ea601635..c919e4bc 100644
--- a/Duckling/Ranking/Classifiers/EN_NZ.hs
+++ b/Duckling/Ranking/Classifiers/EN_NZ.hs
@@ -45,6 +45,13 @@ classifiers
                                    [("hour", -0.7537718023763802),
                                     ("integer (numeric)time-of-day (latent)", -0.7537718023763802)],
                                n = 7}}),
+       ("week",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> timezone",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.6888794541139363,
diff --git a/Duckling/Ranking/Classifiers/EN_PH.hs b/Duckling/Ranking/Classifiers/EN_PH.hs
index 8a43d937..9078d7cb 100644
--- a/Duckling/Ranking/Classifiers/EN_PH.hs
+++ b/Duckling/Ranking/Classifiers/EN_PH.hs
@@ -45,6 +45,13 @@ classifiers
                                    [("hour", -0.7537718023763802),
                                     ("integer (numeric)time-of-day (latent)", -0.7537718023763802)],
                                n = 7}}),
+       ("week",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> timezone",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.6888794541139363,
diff --git a/Duckling/Ranking/Classifiers/EN_TT.hs b/Duckling/Ranking/Classifiers/EN_TT.hs
index 0ed8c655..ce713b0a 100644
--- a/Duckling/Ranking/Classifiers/EN_TT.hs
+++ b/Duckling/Ranking/Classifiers/EN_TT.hs
@@ -45,6 +45,13 @@ classifiers
                                    [("hour", -0.7537718023763802),
                                     ("integer (numeric)time-of-day (latent)", -0.7537718023763802)],
                                n = 7}}),
+       ("week",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> timezone",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.6888794541139363,
diff --git a/Duckling/Ranking/Classifiers/EN_US.hs b/Duckling/Ranking/Classifiers/EN_US.hs
index 65ddea96..529a5737 100644
--- a/Duckling/Ranking/Classifiers/EN_US.hs
+++ b/Duckling/Ranking/Classifiers/EN_US.hs
@@ -52,6 +52,13 @@ classifiers
                                    [("hour", -0.7537718023763802),
                                     ("integer (numeric)time-of-day (latent)", -0.7537718023763802)],
                                n = 7}}),
+       ("week",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> timezone",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.6888794541139363,
diff --git a/Duckling/Ranking/Classifiers/EN_XX.hs b/Duckling/Ranking/Classifiers/EN_XX.hs
index 57734fa3..e8142d29 100644
--- a/Duckling/Ranking/Classifiers/EN_XX.hs
+++ b/Duckling/Ranking/Classifiers/EN_XX.hs
@@ -45,6 +45,13 @@ classifiers
                                    [("hour", -0.7537718023763802),
                                     ("integer (numeric)time-of-day (latent)", -0.7537718023763802)],
                                n = 7}}),
+       ("week",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> timezone",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.6888794541139363,
diff --git a/Duckling/Ranking/Classifiers/EN_ZA.hs b/Duckling/Ranking/Classifiers/EN_ZA.hs
index 740f799c..7350cbfc 100644
--- a/Duckling/Ranking/Classifiers/EN_ZA.hs
+++ b/Duckling/Ranking/Classifiers/EN_ZA.hs
@@ -45,6 +45,13 @@ classifiers
                                    [("hour", -0.7537718023763802),
                                     ("integer (numeric)time-of-day (latent)", -0.7537718023763802)],
                                n = 7}}),
+       ("week",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> timezone",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.6888794541139363,
diff --git a/Duckling/Time/EN/Corpus.hs b/Duckling/Time/EN/Corpus.hs
index 7fe64eac..6b6898f1 100644
--- a/Duckling/Time/EN/Corpus.hs
+++ b/Duckling/Time/EN/Corpus.hs
@@ -1170,6 +1170,12 @@ allExamples = concat
              , "last week-end in October"
              , "last week end of October"
              ]
+  , examples (datetimeInterval ((2013, 2, 11, 0, 0, 0), (2013, 2, 17, 0, 0, 0)) Day)
+             [ "all week"
+             ]
+  , examples (datetimeInterval ((2013, 2, 12, 0, 0, 0), (2013, 2, 17, 0, 0, 0)) Day)
+             [ "rest of the week"
+             ]
   , examples (datetimeInterval ((2013, 7, 26, 18, 0, 0), (2013, 7, 29, 0, 0, 0)) Hour)
              [ "last wkend of July"
              ]
diff --git a/Duckling/Time/EN/Rules.hs b/Duckling/Time/EN/Rules.hs
index ea284767..65094b61 100644
--- a/Duckling/Time/EN/Rules.hs
+++ b/Duckling/Time/EN/Rules.hs
@@ -30,7 +30,7 @@ import Duckling.Ordinal.Types (OrdinalData (..))
 import Duckling.Regex.Types
 import Duckling.Time.Computed
 import Duckling.Time.Helpers
-import Duckling.Time.Types (TimeData (..))
+import Duckling.Time.Types (TimeData (..), TimeIntervalType (..))
 import Duckling.Types
 import qualified Duckling.Duration.Types as TDuration
 import qualified Duckling.Numeral.Types as TNumeral
@@ -967,6 +967,21 @@ ruleWeekend = Rule
   , prod = \_ -> tt $ mkOkForThisNext weekend
   }
 
+ruleWeek :: Rule
+ruleWeek = Rule
+ { name = "week"
+ , pattern = [regex "(all|rest of the) week"]
+ , prod = \case
+     (Token RegexMatch (GroupMatch (match:_)):_) ->
+       let end = cycleNthAfter True TG.Day (-2) (cycleNth TG.Week 1)
+           period = case Text.toLower match of
+                      "all" -> interval Closed (cycleNth TG.Week 0) end
+                      "rest of the" -> interval Open (cycleNth TG.Day 0) end
+                      _ -> Nothing
+       in Token Time <$> period
+     _ -> Nothing
+ }
+
 ruleSeason :: Rule
 ruleSeason = Rule
   { name = "last|this|next <season>"
@@ -2328,6 +2343,7 @@ rules =
   , ruleTimePOD
   , rulePODofTime
   , ruleWeekend
+  , ruleWeek
   , ruleTODPrecision
   , rulePrecisionTOD
   , ruleIntervalFromMonthDDDD