IMP修改【duration+内】interval范围等同【未来+duration】 (#208)

Co-authored-by: zhangsonglei <[email protected]>
XiaoMi · Oct 20, 2023 · 8e91e92 · 8e91e92
1 parent 61f8e43
commit 8e91e92
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/Rules.scala b/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/Rules.scala
@@ -458,10 +458,15 @@ trait Rules extends DimRules {
     */
   val ruleInAInterval = Rule(
     name = "in a <duration>",
-    pattern = List(isNotLatentDuration.predicate, "内".regex),
+    pattern = List(isNotLatentDuration.predicate, "[之以]?内".regex),
     prod = tokens {
       case Token(Duration, DurationData(value, grain, _, _, _)) :: _ =>
-        tt(cycleN(notImmediate = false, grain, value, NoGrain))
+        val (g, v) = grain match {
+          case Month => (Day, value * 30)
+          case Week => (Day, value * 7)
+          case _ => (grain, value)
+        }
+        tt(cycleN(notImmediate = false, g, v))
     }
   )
 

diff --git a/...ng-fork-chinese/learning/src/main/scala/com/xiaomi/duckling/dimension/time/Examples.scala b/...ng-fork-chinese/learning/src/main/scala/com/xiaomi/duckling/dimension/time/Examples.scala
@@ -106,7 +106,7 @@ object Examples extends DimExamples {
         LocalDateTime.of(2016, 1, 1, 0, 0, 0),
         Year
       ),
-      List("下三年", "未来三年")
+      List("下三年", "未来三年", "三年内")
     ),
     (
       localDateTimeInterval(
@@ -216,7 +216,7 @@ object Examples extends DimExamples {
         LocalDateTime.of(2013, 2, 12, 4, 45, 0),
         Minute
       ),
-      List("未来一刻钟", "之后一刻钟", "向后一刻钟", "往后一刻钟")
+      List("未来一刻钟", "之后一刻钟", "向后一刻钟", "往后一刻钟", "一刻钟以内")
     )
   )
 
@@ -271,15 +271,15 @@ object Examples extends DimExamples {
         LocalDateTime.of(2013, 3, 5, 0, 0, 0),
         Day
       ),
-      List("接下来三周")
+      List("接下来三周", "三周内")
     ),
     (
       localDateTimeInterval(
         LocalDateTime.of(2013, 2, 12, 0, 0, 0),
         LocalDateTime.of(2013, 2, 19, 0, 0, 0),
         Day
       ),
-      List("未来一周")
+      List("未来一周", "一周内")
     ),
     (
       datetime(LocalDateTime.of(2013, 3, 5, 4, 30, 0), Second),