From e472572150c467b862fd0a0630297a5a879c354a Mon Sep 17 00:00:00 2001
From: Ninglin Du <du00cs@outlook.com>
Date: Mon, 4 Mar 2024 15:06:19 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E7=89=B9=E6=AE=8A=E8=AF=B4=E6=B3=95?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81"=E6=98=8E=E5=90=8E=E5=A4=A7=E5=90=8E"=20(#21?=
 =?UTF-8?q?6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 支持"工作日的上午"
---
 .../duckling/dimension/time/date/Rules.scala  |  8 ++++
 .../dimension/time/repeat/Rules.scala         | 44 ++++++++++++-------
 .../time/repeat/RepeatValueTest.scala         |  1 +
 .../dimension/time/date/Examples.scala        |  3 +-
 4 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/date/Rules.scala b/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/date/Rules.scala
index 89bf0e2d..dec0e0aa 100644
--- a/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/date/Rules.scala
+++ b/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/date/Rules.scala
@@ -299,6 +299,14 @@ trait Rules extends DimRules {
         for (td <- interval(Open, from, to, options.timeOptions.beforeEndOfInterval)) yield Token(Date, td)
   })
 
+  val ruleSpecial5 = Rule(name = "date - special days: 明天后天大后天", pattern = List("(明后大后|明天后天大后天)(三天)?".regex),
+    prod = {
+      case (options, _) =>
+        val from = cycleNth(Day, 1, Day)
+        val to = cycleNth(Day, 3, Day)
+        for (td <- interval(Open, from, to, options.timeOptions.beforeEndOfInterval)) yield Token(Date, td)
+    })
+
   val ruleEndOfMonth = Rule(name = "date - 月底", pattern = List("月(底|末)".regex), prod = tokens {
     case _ =>
       val td1 = TimeData(EndOfGrainPredicate, timeGrain = Day)
diff --git a/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/repeat/Rules.scala b/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/repeat/Rules.scala
index de6a63d1..12ce29be 100644
--- a/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/repeat/Rules.scala
+++ b/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/repeat/Rules.scala
@@ -122,25 +122,37 @@ trait Rules extends DimRules with LazyLogging {
     }
   )
 
-  val ruleWorkDaysTime = Rule(
+  def workdaysTime(rd: RepeatData, td: TimeData) = {
+    // 工作日八点应该就是上午八点，不是晚上八点
+    val _form = td.form match {
+      case Some(form.TimeOfDay(h, true)) => Some(form.TimeOfDay(h, false))
+      case _ => td.form
+    }
+    val timePred = td.timePred match {
+      case tdp: TimeDatePredicate =>
+        val _hour = tdp.hour match {
+          case Some((true, h)) => Some((false, h))
+          case _ => tdp.hour
+        }
+        tdp.copy(hour = _hour)
+      case _ => td.timePred
+    }
+    Token(Repeat, RepeatData(workdayType = rd.workdayType, start = td.copy(timePred = timePred, form = _form)))
+  }
+
+  val ruleWorkDaysTime1 = Rule(
     name = "<work/non-workday> <time>",
     pattern = List(isOnlyWorkdaysType.predicate, isHourTimes.predicate),
     prod = tokens { case Token(Repeat, rd: RepeatData) :: Token(Time, td: TimeData) :: _ =>
-      // 工作日八点应该就是上午八点，不是晚上八点
-      val _form = td.form match {
-        case Some(form.TimeOfDay(h, true)) => Some(form.TimeOfDay(h, false))
-        case _ => td.form
-      }
-      val timePred = td.timePred match {
-        case tdp: TimeDatePredicate =>
-          val _hour = tdp.hour match {
-            case Some((true, h)) => Some((false, h))
-            case _ => tdp.hour
-          }
-          tdp.copy(hour = _hour)
-        case _ => td.timePred
-      }
-      Token(Repeat, RepeatData(workdayType = rd.workdayType, start = td.copy(timePred = timePred, form = _form)))
+      workdaysTime(rd, td)
+    }
+  )
+
+  val ruleWorkDaysTime2 = Rule(
+    name = "<work/non-workday> 的 <time>",
+    pattern = List(isOnlyWorkdaysType.predicate, "的".regex, isHourTimes.predicate),
+    prod = tokens { case Token(Repeat, rd: RepeatData) :: _ :: Token(Time, td: TimeData) :: _ =>
+      workdaysTime(rd, td)
     }
   )
 }
diff --git a/duckling-fork-chinese/core/src/test/scala/com/xiaomi/duckling/dimension/time/repeat/RepeatValueTest.scala b/duckling-fork-chinese/core/src/test/scala/com/xiaomi/duckling/dimension/time/repeat/RepeatValueTest.scala
index 2d74231c..87a812c4 100644
--- a/duckling-fork-chinese/core/src/test/scala/com/xiaomi/duckling/dimension/time/repeat/RepeatValueTest.scala
+++ b/duckling-fork-chinese/core/src/test/scala/com/xiaomi/duckling/dimension/time/repeat/RepeatValueTest.scala
@@ -17,6 +17,7 @@ class RepeatValueTest extends UnitSpec {
 
     val cases = Table(("query", "schema")
       , ("每个工作日上午", "Repeat_Hour_08:00/12:00_Workday")
+      , ("每个工作日的上午", "Repeat_Hour_08:00/12:00_Workday")
       , ("每个非工作日上午八点", "Repeat_Hour_08:00_NonWorkday")
       , ("每月2号下午2点", "Repeat_Hour_2013-03-02T14:00_P1M")
     )
diff --git a/duckling-fork-chinese/learning/src/main/scala/com/xiaomi/duckling/dimension/time/date/Examples.scala b/duckling-fork-chinese/learning/src/main/scala/com/xiaomi/duckling/dimension/time/date/Examples.scala
index 37e8899c..1b7487c9 100644
--- a/duckling-fork-chinese/learning/src/main/scala/com/xiaomi/duckling/dimension/time/date/Examples.scala
+++ b/duckling-fork-chinese/learning/src/main/scala/com/xiaomi/duckling/dimension/time/date/Examples.scala
@@ -61,7 +61,8 @@ object Examples extends DimExamples {
     (ymd(2013, 12, 10, calendar = Lunar(false)), List("农历十二月初十", "腊月初十")),
     (ymd(2013, 12, 13, calendar = Lunar(false)), List("农历十二月十三", "腊月十三")),
     (ymd(2013, 8, 8, calendar = Lunar(false)), List("农历八月初八", "农历2013年八月八日", "八月初八")),
-    (localDateTimeInterval(LocalDateTime.of(2013, 2, 12, 0, 0), LocalDateTime.of(2013, 2, 15, 0, 0), Grain.Day), List("今明后三天", "今天明天后天三天"))
+    (localDateTimeInterval(LocalDateTime.of(2013, 2, 12, 0, 0), LocalDateTime.of(2013, 2, 15, 0, 0), Grain.Day), List("今明后三天", "今天明天后天三天")),
+    (localDateTimeInterval(LocalDateTime.of(2013, 2, 13, 0, 0), LocalDateTime.of(2013, 2, 16, 0, 0), Grain.Day), List("明后大后三天", "明天后天大后天三天"))
   )
 
   override val dimension: Dimension = Date