为上午/下午... 默认开启beforeEndOfInterval

XiaoMi · Jul 5, 2023 · 74b0020 · 74b0020
1 parent f5c4e7f
commit 74b0020
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/...inese/core/src/main/scala/com/xiaomi/duckling/dimension/time/rule/FuzzyDayIntervals.scala b/...inese/core/src/main/scala/com/xiaomi/duckling/dimension/time/rule/FuzzyDayIntervals.scala
@@ -51,11 +51,11 @@ object FuzzyDayIntervals {
     }
   }
 
-  def ofInterval(s: String, larger: Boolean = false, beforeEndOfInterval: Boolean): Option[(String, TimeData)] = {
+  def ofInterval(s: String, larger: Boolean = false): Option[(String, TimeData)] = {
     val (name, (from, to), (_from, _to)) = between(s)
     val td =
-      if (larger) interval(Open, hour(is12H = false, _from), hour(is12H = false, _to), beforeEndOfInterval)
-      else interval(Open, hour(is12H = false, from), hour(is12H = false, to), beforeEndOfInterval)
+      if (larger) interval(Open, hour(is12H = false, _from), hour(is12H = false, _to), beforeEndOfInterval = true)
+      else interval(Open, hour(is12H = false, from), hour(is12H = false, to), beforeEndOfInterval = true)
     td.map((name, _))
   }
 
@@ -67,7 +67,7 @@ object FuzzyDayIntervals {
   def enlarge(td: TimeData, beforeEndOfInterval: Boolean): TimeData = {
     (td.form, td.timePred) match {
       case (Some(PartOfDay(part)), _: TimeIntervalsPredicate) =>
-        val _td = ofInterval(part, larger = true, beforeEndOfInterval).map(_._2).get
+        val _td = ofInterval(part, larger = true).map(_._2).get
         _td.copy(latent = td.latent)
       case _ => td
     }
@@ -79,7 +79,7 @@ object FuzzyDayIntervals {
         case (options, tokens: List[Token]) =>
           tokens.headOption.flatMap {
             case Token(RegexMatch, GroupMatch(s :: _)) =>
-              for ((name, td) <- ofInterval(s, beforeEndOfInterval = options.timeOptions.beforeEndOfInterval)) yield {
+              for ((name, td) <- ofInterval(s)) yield {
                 tt(partOfDay(name, td).copy(latent = s.length == 1))
               }
             case _ => None
@@ -103,7 +103,7 @@ object FuzzyDayIntervals {
               case '中' => "中午"
               case '晚' => "晚上"
             }
-            val tdInterval = ofInterval(part, beforeEndOfInterval = options.timeOptions.beforeEndOfInterval)
+            val tdInterval = ofInterval(part)
             for {
               (_, td) <- tdInterval
               td1 <- intersect(cycleNth(Day, offset), td)

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
@@ -392,6 +392,15 @@ object Examples extends DimExamples {
       ),
       List("9点到9点")
     ),
+    (
+      localDateTimeInterval(
+        LocalDateTime.of(2013, 2, 12, 0, 0, 0),
+        LocalDateTime.of(2013, 2, 12, 6, 0, 0),
+        Hour,
+        partOfDay = "凌晨"
+      ),
+      List("凌晨")
+    ),
     (
       localDateTimeInterval(
         LocalDateTime.of(2013, 2, 13, 15, 0, 0),

diff --git a/duckling-fork-chinese/learning/src/main/scala/com/xiaomi/duckling/task/NaiveBayesDebug.scala b/duckling-fork-chinese/learning/src/main/scala/com/xiaomi/duckling/task/NaiveBayesDebug.scala
@@ -55,7 +55,7 @@ object NaiveBayesDebug {
     options.timeOptions.setResetTimeOfDay(false)
     options.timeOptions.setRecentInFuture(true)
     options.timeOptions.setAlwaysInFuture(true)
-    options.timeOptions.setBeforeEndOfInterval(true)
+    options.timeOptions.setBeforeEndOfInterval(false)
     options.numeralOptions.setAllowZeroLeadingDigits(false)
     options.numeralOptions.setCnSequenceAsNumber(false)