Merge branch 'main' into EN-time-improvements

Duckling/AmountOfMoney/ZH/Rules.hs

@@ -226,7 +226,7 @@ ruleOneDollarAnd = Rule
   { name = "one dollar and x dimes (short form)"
   , pattern =
     [ regex "個"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \case
       (_:Token Numeral NumeralData{TNumeral.value = v}:_) ->

Duckling/Duration/DE/Rules.hs

@@ -19,7 +19,7 @@ import Duckling.Regex.Types
 import Control.Monad (join)
 import qualified Data.Text as Text
 import Prelude
-import Duckling.Numeral.Helpers (parseInteger)
+import Duckling.Numeral.Helpers (numberBetween, parseInteger)
 import Duckling.Duration.Types (DurationData(..))
 import qualified Duckling.Duration.Types as TDuration
 import Data.String
@@ -216,7 +216,7 @@ ruleHoursAndMinutes = Rule
   , pattern =
     [ Predicate isNatural
     , regex "(ein(en?) )?stunden?( und)?"
-    , Predicate isNatural
+    , Predicate $ and . sequence [isNatural, numberBetween 1 60]
     , Predicate $ isGrain TG.Minute
     ]
   , prod = \case

Duckling/Duration/EN/Rules.hs

@@ -20,7 +20,7 @@ import qualified Data.Text as Text
 import Duckling.Dimensions.Types
 import Duckling.Duration.Helpers
 import Duckling.Duration.Types (DurationData(..))
-import Duckling.Numeral.Helpers (parseInteger)
+import Duckling.Numeral.Helpers (numberBetween, parseInteger)
 import Duckling.Numeral.Types (NumeralData(..))
 import Duckling.Regex.Types
 import Duckling.Types
@@ -180,7 +180,7 @@ ruleDurationHoursAndMinutes = Rule
   , pattern =
     [ Predicate isNatural
     , regex "hours?( and)?"
-    , Predicate isNatural
+    , Predicate $ and . sequence [isNatural, numberBetween 1 60]
     ]
   , prod = \case
       (Token Numeral h:

Duckling/Numeral/AF/Rules.hs

@@ -124,7 +124,7 @@ ruleCompositeTens :: Rule
 ruleCompositeTens = Rule
   { name = "integer ([3-9][1-9])"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , regex "en"
     , oneOf [20, 30..90]
     ]

Duckling/Numeral/AR/Rules.hs

@@ -42,7 +42,7 @@ ruleInteger23 = Rule
   , pattern =
     [ oneOf [100, 200 .. 900]
     , regex "و"
-    , numberBetween 1 100
+    , Predicate $ numberBetween 1 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -86,7 +86,7 @@ ruleInteger22 :: Rule
 ruleInteger22 = Rule
   { name = "integer 21..99"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , regex "و"
     , oneOf [20, 30 .. 90]
     ]
@@ -102,7 +102,7 @@ ruleInteger21 :: Rule
 ruleInteger21 = Rule
   { name = "integer (13..19)"
   , pattern =
-    [ numberBetween 3 10
+    [ Predicate $ numberBetween 3 10
     , numberWith TNumeral.value (== 10)
     ]
   , prod = \tokens -> case tokens of

Duckling/Numeral/BG/Rules.hs

@@ -111,7 +111,7 @@ ruleCompositeTens = Rule
   , pattern =
     [ oneOf [20, 30..90]
     , regex "и"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = tens}:
@@ -147,7 +147,7 @@ ruleCompositeHundreds = Rule
   { name = "integer 101..999"
   , pattern =
     [ oneOf [200, 300..900]
-    , numberBetween 1 100
+    , Predicate $ numberBetween 1 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = hundreds}:

Duckling/Numeral/CA/Rules.hs

@@ -140,7 +140,10 @@ ruleHigherTensWithOnes :: Rule
 ruleHigherTensWithOnes = Rule
   { name = "number (31..39 41..49 51..59 61..69 71..79 81..89 91..99)"
   , pattern =
-      [oneOf [30, 40, 50, 60, 70, 80, 90], regex "-", numberBetween 1 9]
+      [ oneOf [30, 40, 50, 60, 70, 80, 90]
+      , regex "-"
+      , Predicate $ numberBetween 1 9
+      ]
   , prod = \case
       (Token Numeral NumeralData{TNumeral.value = v1}:
        _:
@@ -185,7 +188,10 @@ ruleTwenties :: Rule
 ruleTwenties = Rule
   { name = "number (21..29)"
   , pattern =
-      [oneOf [20], regex "(-i-| i )", numberBetween 1 10]
+      [ oneOf [20]
+      , regex "(-i-| i )"
+      , Predicate $ numberBetween 1 10
+      ]
   , prod = \case
       (Token Numeral NumeralData{TNumeral.value = v1}:
        _:
@@ -212,10 +218,10 @@ ruleNumerals :: Rule
 ruleNumerals = Rule
   { name = "numbers 200..999"
   , pattern =
-      [ numberBetween 2 10
+      [ Predicate $ numberBetween 2 10
       , regex "-"
       , numberWith TNumeral.value (== 100)
-      , numberBetween 0 100
+      , Predicate $ numberBetween 0 100
       ]
   , prod = \case
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -242,7 +248,7 @@ ruleBelowTenWithTwoDigits = Rule
   { name = "integer (0-9) with two digits"
   , pattern =
       [ regex "zero|0"
-      , numberBetween 1 10
+      , Predicate $ numberBetween 1 10
       ]
   , prod = \case
       (_:Token Numeral NumeralData{TNumeral.value = v}:_) -> double v

Duckling/Numeral/DA/Rules.hs

@@ -87,7 +87,7 @@ ruleInteger3 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [20, 30 .. 90]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -170,7 +170,7 @@ ruleNumeralsOg :: Rule
 ruleNumeralsOg = Rule
   { name = "numbers og"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , regex "og"
     , oneOf [70, 20, 60, 50, 40, 90, 30, 80]
     ]

Duckling/Numeral/DE/Rules.hs

@@ -123,7 +123,7 @@ ruleNumeralsUnd :: Rule
 ruleNumeralsUnd = Rule
   { name = "numbers und"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , regex "und"
     , oneOf [20, 30 .. 90]
     ]

Duckling/Numeral/EL/Rules.hs

@@ -123,7 +123,7 @@ ruleCompositeTens = Rule
   { name = "integer 21..99"
   , pattern =
       [ oneOf [20,30..90]
-      , numberBetween 1 10
+      , Predicate $ numberBetween 1 10
       ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = tens} :

Duckling/Numeral/EN/Rules.hs

@@ -161,7 +161,7 @@ ruleCompositeTens = Rule
   , pattern =
     [ oneOf [20,30..90]
     , regex "[\\s\\-]+"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = tens}:

Duckling/Numeral/ES/Rules.hs

@@ -69,9 +69,8 @@ ruleBelowTenWithTwoDigits = Rule
   {
     name = "integer (0-9) with two digits"
   , pattern =
-      [
-        regex "((c|z)ero)|0"
-      , numberBetween 1 10
+      [ regex "((c|z)ero)|0"
+      , Predicate $ numberBetween 1 10
       ]
   , prod = \case
       (
@@ -124,12 +123,17 @@ ruleNumeralSixteenToTwentyNine = Rule
 ruleNumeralSixteenToNineteenWithDiez :: Rule
 ruleNumeralSixteenToNineteenWithDiez = Rule
   { name = "number (16..19, two words)"
-  , pattern = [numberWith TNumeral.value (== 10), regex "y", numberBetween 6 10]
+  , pattern =
+      [ numberWith TNumeral.value (== 10)
+      , regex "y"
+      , Predicate $ numberBetween 6 10
+      ]
   , prod = \case
       (_ : _ : Token Numeral NumeralData { TNumeral.value = v } : _) ->
         double $ 10 + v
       _ -> Nothing
   }
+
 byTensMap :: HashMap.HashMap Text.Text Integer
 byTensMap =
   HashMap.fromList
@@ -161,7 +165,10 @@ ruleNumeralTwentyOneToNinetyNine :: Rule
 ruleNumeralTwentyOneToNinetyNine = Rule
   { name = "number (21..29 31..39 41..49 51..59 61..69 71..79 81..89 91..99)"
   , pattern =
-      [oneOf [20, 30 .. 90], regex "y", numberBetween 1 10]
+      [ oneOf [20, 30 .. 90]
+      , regex "y"
+      , Predicate $ numberBetween 1 10
+      ]
   , prod = \case
       (Token Numeral NumeralData { TNumeral.value = v1 } : _ : Token Numeral NumeralData { TNumeral.value = v2 } : _) ->
         double $ v1 + v2
@@ -221,7 +228,7 @@ ruleTwoPartHundreds :: Rule
 ruleTwoPartHundreds = Rule
  { name = "2..9 cientos"
  , pattern =
-     [ numberBetween 2 10
+     [ Predicate $ numberBetween 2 10
      , regex "cientos"
      ]
   , prod = \case
@@ -235,7 +242,7 @@ ruleNumeralHundredsAndSmaller = Rule
   { name = "<hundreds> 0..99"
   , pattern =
       [ numberWith TNumeral.value (TNumeral.isMultiple 100)
-      , numberBetween 0 100
+      , Predicate $ numberBetween 0 100
       ]
   , prod = \case
       (Token Numeral NumeralData { TNumeral.value = v1 } : Token Numeral NumeralData { TNumeral.value = v2 } : _)
@@ -247,7 +254,7 @@ ruleNumeralMultiply :: Rule
 ruleNumeralMultiply = Rule
   { name = "2..999 <multipliable>"
   , pattern =
-      [ numberBetween 2 1000
+      [ Predicate $ numberBetween 2 1000
       , Predicate isMultipliable
       ]
   , prod = \case
@@ -261,7 +268,7 @@ ruleNumeralThousandsAnd = Rule
   { name = "<thousands> 0..999"
   , pattern =
       [ numberWith TNumeral.value (TNumeral.isMultiple 1000)
-      , numberBetween 0 999
+      , Predicate $ numberBetween 0 999
       ]
   , prod = \case
       (Token Numeral NumeralData { TNumeral.value = v1 } : Token Numeral NumeralData { TNumeral.value = v2 } : _)
@@ -274,7 +281,7 @@ ruleNumeralMillionsAnd = Rule
   { name = "<millions> 0..999999"
   , pattern =
       [ numberWith TNumeral.value (TNumeral.isMultiple 1000000)
-      , numberBetween 0 999999
+      , Predicate $ numberBetween 0 999999
       ]
   , prod = \case
       (Token Numeral NumeralData { TNumeral.value = v1 } : Token Numeral NumeralData { TNumeral.value = v2 } : _)

Duckling/Numeral/ET/Rules.hs

@@ -87,7 +87,7 @@ ruleInteger3 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 80]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:

Duckling/Numeral/FA/Rules.hs

@@ -135,7 +135,7 @@ ruleCompositeTens = Rule
   , pattern =
     [ oneOf [20,30..90]
     , regex "و"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = tens}:
@@ -151,7 +151,7 @@ ruleCompositeHundred = Rule
   , pattern =
     [ oneOf [100,200..900]
     , regex "و"
-    , numberBetween 1 100
+    , Predicate $ numberBetween 1 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = tens}:

Duckling/Numeral/FR/Rules.hs

@@ -57,7 +57,7 @@ ruleNumerals2 = Rule
   , pattern =
     [ oneOf [20, 50, 40, 30]
     , regex "[\\s\\-]+"
-    , numberBetween 2 10
+    , Predicate $ numberBetween 2 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -119,7 +119,7 @@ ruleNumerals5 = Rule
   , pattern =
     [ oneOf [60, 80]
     , regex "[\\s\\-]+"
-    , numberBetween 2 20
+    , Predicate $ numberBetween 2 20
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -170,7 +170,7 @@ ruleNumeral3 = Rule
   , pattern =
     [ numberWith TNumeral.value (== 10)
     , regex "[\\s\\-]+"
-    , numberBetween 7 10
+    , Predicate $ numberBetween 7 10
     ]
   , prod = \tokens -> case tokens of
       (_:

Duckling/Numeral/HE/Rules.hs

@@ -68,7 +68,7 @@ ruleCompositeTens = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [ 20, 30..90 ]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = tens}:
@@ -83,7 +83,7 @@ ruleCompositeTensWithAnd = Rule
   , pattern =
     [ oneOf [ 20, 30..90 ]
     , regex "ו"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = tens}:
@@ -230,7 +230,7 @@ ruleInteger14 :: Rule
 ruleInteger14 = Rule
   { name = "integer 11..19"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , numberWith TNumeral.value (== 10)
     ]
   , prod = \tokens -> case tokens of
@@ -263,7 +263,7 @@ ruleInteger16 = Rule
   { name = "integer 101..999"
   , pattern =
     [ oneOf [300, 600, 500, 100, 800, 200, 900, 700, 400]
-    , numberBetween 1 100
+    , Predicate $ numberBetween 1 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:

Duckling/Numeral/HI/Rules.hs

@@ -222,7 +222,7 @@ ruleCompositeHundreds = Rule
   , pattern =
     [ oneOf [100,200..5000]
     , regex "[\\s\\-]+"
-    , numberBetween 1 99
+    , Predicate $ numberBetween 1 99
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = hundreds}:
@@ -239,7 +239,7 @@ ruleCompositeThousands = Rule
   , pattern =
     [ oneOf [1000,2000..50000]
     , regex "[\\s\\-]+"
-    , numberBetween 1 999
+    , Predicate $ numberBetween 1 999
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = thousands}:

Duckling/Numeral/HR/Rules.hs

@@ -143,7 +143,7 @@ ruleNumbersI = Rule
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 80]
     , regex "i"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -255,7 +255,7 @@ ruleInteger4 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 80]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -290,9 +290,9 @@ ruleNumbers :: Rule
 ruleNumbers = Rule
   { name = "numbers 100..999"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , numberWith TNumeral.value (== 100)
-    , numberBetween 0 100
+    , Predicate $ numberBetween 0 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:

Duckling/Numeral/Helpers.hs

@@ -101,12 +101,10 @@ numberWith f pred = Predicate $ \x ->
     (Token Numeral x@NumeralData{}) -> pred (f x)
     _ -> False
 
-numberBetween :: Double -> Double -> PatternItem
-numberBetween low up = Predicate $ \x ->
-  case x of
-    (Token Numeral NumeralData {value = v, multipliable = False}) ->
-      low <= v && v < up
-    _ -> False
+numberBetween :: Double -> Double -> Predicate
+numberBetween low up (Token Numeral NumeralData {value = v, multipliable = False}) =
+  low <= v && v < up
+numberBetween _ _ _ = False
 
 isNatural :: Predicate
 isNatural (Token Numeral NumeralData {value = v}) =

Duckling/Numeral/ID/Rules.hs

@@ -47,7 +47,7 @@ ruleTeen :: Rule
 ruleTeen = Rule
   { name = "teen"
   , pattern =
-    [ numberBetween 2 10
+    [ Predicate $ numberBetween 2 10
     , regex "belas"
     ]
   , prod = \tokens -> case tokens of
@@ -132,7 +132,7 @@ ruleInteger3 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 80]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -222,7 +222,7 @@ ruleInteger2 :: Rule
 ruleInteger2 = Rule
   { name = "integer 20..90"
   , pattern =
-    [ numberBetween 2 10
+    [ Predicate $ numberBetween 2 10
     , numberWith TNumeral.value (== 10)
     ]
   , prod = \tokens -> case tokens of

Duckling/Numeral/IT/Rules.hs

@@ -159,7 +159,7 @@ ruleNumeral3 = Rule
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 80]
     , regex "e"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -287,9 +287,9 @@ ruleNumerals :: Rule
 ruleNumerals = Rule
   { name = "numbers 200..999"
   , pattern =
-    [ numberBetween 2 10
+    [ Predicate $ numberBetween 2 10
     , numberWith TNumeral.value (== 100)
-    , numberBetween 0 100
+    , Predicate $ numberBetween 0 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:

Duckling/Numeral/JA/Rules.hs

@@ -52,7 +52,7 @@ ruleInteger10 = Rule
   { name = "integer (1000..1999)"
   , pattern =
     [ regex "千"
-    , numberBetween 1 1000
+    , Predicate $ numberBetween 1 1000
     ]
   , prod = \tokens -> case tokens of
       (_:Token Numeral NumeralData{TNumeral.value = v}:_) ->
@@ -76,7 +76,7 @@ ruleInteger15 :: Rule
 ruleInteger15 = Rule
   { name = "integer (20000..90000)"
   , pattern =
-    [ numberBetween 2 10
+    [ Predicate $ numberBetween 2 10
     , regex "万"
     ]
   , prod = \tokens -> case tokens of
@@ -111,7 +111,7 @@ ruleInteger3 :: Rule
 ruleInteger3 = Rule
   { name = "integer (20..90)"
   , pattern =
-    [ numberBetween 2 10
+    [ Predicate $ numberBetween 2 10
     , regex "十"
     ]
   , prod = \tokens -> case tokens of
@@ -133,7 +133,7 @@ ruleInteger6 = Rule
   { name = "integer (100..199)"
   , pattern =
     [ regex "百"
-    , numberBetween 1 100
+    , Predicate $ numberBetween 1 100
     ]
   , prod = \tokens -> case tokens of
       (_:Token Numeral NumeralData{TNumeral.value = v}:_) -> double $ v + 100
@@ -145,7 +145,7 @@ ruleInteger12 = Rule
   { name = "integer 2001..9999"
   , pattern =
     [ oneOf [3000, 9000, 7000, 8000, 2000, 4000, 6000, 5000]
-    , numberBetween 1 1000
+    , Predicate $ numberBetween 1 1000
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -178,7 +178,7 @@ ruleInteger7 :: Rule
 ruleInteger7 = Rule
   { name = "integer (200..900)"
   , pattern =
-    [ numberBetween 2 10
+    [ Predicate $ numberBetween 2 10
     , regex "百"
     ]
   , prod = \tokens -> case tokens of
@@ -191,7 +191,7 @@ ruleInteger14 = Rule
   { name = "integer (10000..19999)"
   , pattern =
     [ regex "万"
-    , numberBetween 1 10000
+    , Predicate $ numberBetween 1 10000
     ]
   , prod = \tokens -> case tokens of
       (_:Token Numeral NumeralData{TNumeral.value = v}:_) ->
@@ -204,7 +204,7 @@ ruleInteger8 = Rule
   { name = "integer 201..999"
   , pattern =
     [ oneOf [300, 600, 500, 800, 200, 900, 700, 400]
-    , numberBetween 1 100
+    , Predicate $ numberBetween 1 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -218,7 +218,7 @@ ruleInteger16 = Rule
   { name = "integer 20001..99999"
   , pattern =
     [ oneOf [20000, 40000, 80000, 60000, 30000, 70000, 90000, 50000]
-    , numberBetween 1 10000
+    , Predicate $ numberBetween 1 10000
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -269,7 +269,7 @@ ruleInteger4 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 80]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -283,7 +283,7 @@ ruleInteger2 = Rule
   { name = "integer (11..19)"
   , pattern =
     [ regex "十"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (_:Token Numeral NumeralData{TNumeral.value = v}:_) -> double $ v + 10
@@ -294,7 +294,7 @@ ruleInteger11 :: Rule
 ruleInteger11 = Rule
   { name = "integer (2000..9000)"
   , pattern =
-    [ numberBetween 2 10
+    [ Predicate $ numberBetween 2 10
     , regex "千"
     ]
   , prod = \tokens -> case tokens of

Duckling/Numeral/KA/Rules.hs

@@ -209,7 +209,7 @@ ruleCompositeTens = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [20,40..90]
-    , numberBetween 1 20
+    , Predicate $ numberBetween 1 20
     ]
   , prod = \case
       (Token Numeral NumeralData{TNumeral.value = tens}:
@@ -224,7 +224,7 @@ ruleCompositeHundreds = Rule
   , pattern =
     [ oneOf [100,200..900]
     , oneOf [20,40..90]
-    , numberBetween 1 20
+    , Predicate $ numberBetween 1 20
     ]
   , prod = \case
       (Token Numeral NumeralData{TNumeral.value = hundreds}:
@@ -239,7 +239,7 @@ ruleCompositeHundredsAndUnits = Rule
   { name = "integer 100..999"
   , pattern =
     [ oneOf [100,200..900]
-    , numberBetween 1 20
+    , Predicate $ numberBetween 1 20
     ]
   , prod = \case
       (Token Numeral NumeralData{TNumeral.value = hundreds}:

Duckling/Numeral/MN/Rules.hs

@@ -112,7 +112,7 @@ ruleNumeralsUnd = Rule
   { name = "numbers und"
   , pattern =
     [ oneOf [20, 30 .. 90]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:

Duckling/Numeral/MY/Rules.hs

@@ -29,9 +29,9 @@ ruleInteger5 :: Rule
 ruleInteger5 = Rule
   { name = "integer (11..99) "
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , regex "ဆယ့်"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -72,7 +72,7 @@ ruleInteger3 = Rule
   { name = "integer (11..19) "
   , pattern =
     [ regex "ဆယ့်"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (_:Token Numeral NumeralData{TNumeral.value = v}:_) -> double $ v + 10
@@ -102,7 +102,7 @@ ruleInteger6 :: Rule
 ruleInteger6 = Rule
   { name = "integer (100..900)"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , regex "ရာ"
     ]
   , prod = \tokens -> case tokens of
@@ -114,7 +114,7 @@ ruleInteger7 :: Rule
 ruleInteger7 = Rule
   { name = "integer (1000..9000)"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , regex "ထောင်"
     ]
   , prod = \tokens -> case tokens of
@@ -126,7 +126,7 @@ ruleInteger8 :: Rule
 ruleInteger8 = Rule
   { name = "integer (10000..90000)"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , regex "သောင်း"
     ]
   , prod = \tokens -> case tokens of
@@ -147,7 +147,7 @@ ruleInteger4 :: Rule
 ruleInteger4 = Rule
   { name = "integer (10..90)"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , regex "ဆယ်"
     ]
   , prod = \tokens -> case tokens of

Duckling/Numeral/NB/Rules.hs

@@ -107,7 +107,7 @@ ruleInteger3 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 80]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \case
       (Token Numeral NumeralData{TNumeral.value = v1}:

Duckling/Numeral/NL/Rules.hs

@@ -146,7 +146,7 @@ ruleNumeralsEn :: Rule
 ruleNumeralsEn = Rule
   { name = "numbers en"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , regex "-?en-?"
     , oneOf [20, 30 .. 90]
     ]

Duckling/Numeral/PL/Rules.hs

@@ -137,8 +137,8 @@ ruleSpecialCompositionForMissingHundredsLikeInOneTwentyTwo :: Rule
 ruleSpecialCompositionForMissingHundredsLikeInOneTwentyTwo = Rule
   { name = "special composition for missing hundreds like in one twenty two"
   , pattern =
-    [ numberBetween 1 10
-    , numberBetween 10 100
+    [ Predicate $ numberBetween 1 10
+    , Predicate $ numberBetween 10 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -516,7 +516,7 @@ ruleInteger2 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [20, 30 .. 90]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:

Duckling/Numeral/PT/Rules.hs

@@ -173,7 +173,7 @@ ruleCompositeTens = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [20,30..90]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = tens}:
@@ -188,7 +188,7 @@ ruleDecsAnd = Rule
   , pattern =
     [ oneOf [20, 30..90]
     , regex "e"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -203,7 +203,7 @@ ruleCompositeCents = Rule
   { name = "integer 101..999"
   , pattern =
     [ oneOf [100, 200..900]
-    , numberBetween 1 100
+    , Predicate $ numberBetween 1 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = hundreds}:
@@ -218,7 +218,7 @@ ruleCentsAnd = Rule
   , pattern =
     [ oneOf [100, 200..900]
     , regex "e"
-    , numberBetween 1 100
+    , Predicate $ numberBetween 1 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -232,8 +232,8 @@ ruleSkipHundreds :: Rule
 ruleSkipHundreds = Rule
   { name = "one twenty two"
   , pattern =
-    [ numberBetween 1 10
-    , numberBetween 10 100
+    [ Predicate $ numberBetween 1 10
+    , Predicate $ numberBetween 10 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = hundreds}:

Duckling/Numeral/RO/Rules.hs

@@ -69,7 +69,7 @@ ruleInteger3 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [20, 30 .. 90]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \case
       (Token Numeral NumeralData{TNumeral.value = v1}:

Duckling/Numeral/RU/Rules.hs

@@ -179,7 +179,7 @@ ruleInteger7 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 80]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -193,7 +193,7 @@ ruleInteger8 = Rule
   { name = "integer 101..999"
   , pattern =
     [ oneOf [300, 600, 500, 100, 800, 200, 900, 700, 400]
-    , numberBetween 1 100
+    , Predicate $ numberBetween 1 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:

Duckling/Numeral/SK/Rules.hs

@@ -98,7 +98,7 @@ ruleIntegerCompositeTens = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [20, 30..90]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \case
       (Token Numeral NumeralData{TNumeral.value = tens}:

Duckling/Numeral/SV/Rules.hs

@@ -96,7 +96,7 @@ ruleInteger3 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 80]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:

Duckling/Numeral/SW/Rules.hs

@@ -87,7 +87,7 @@ ruleCompositeTens = Rule
   { name = "integer 11..19 21..29 .. 91..99"
   , pattern = [oneOf [20,30..90]
   , regex "-?na-?"
-  , numberBetween 1 10]
+  , Predicate $ numberBetween 1 10]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
        Token Numeral NumeralData{TNumeral.value = v2}:

Duckling/Numeral/TH/Rules.hs

@@ -246,7 +246,7 @@ ruleCompositeTens = Rule
   , pattern =
     [ oneOf [20,30..90]
     , regex "[\\s\\-]+"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \case
       (Token Numeral NumeralData{TNumeral.value = tens}:

Duckling/Numeral/TR/Rules.hs

@@ -607,7 +607,7 @@ ruleInteger4 = Rule
   { name = "integer 11..99"
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 10, 80]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:

Duckling/Numeral/UK/Rules.hs

@@ -145,7 +145,7 @@ ruleInteger7 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 80]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -159,7 +159,7 @@ ruleInteger8 = Rule
   { name = "integer 101..999"
   , pattern =
     [ oneOf [300, 600, 500, 100, 800, 200, 900, 700, 400]
-    , numberBetween 1 100
+    , Predicate $ numberBetween 1 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:

Duckling/Numeral/VI/Rules.hs

@@ -101,7 +101,7 @@ ruleInteger3 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [20, 30 .. 90]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:

Duckling/Numeral/ZH/Rules.hs

@@ -92,7 +92,7 @@ ruleCompositeTens = Rule
   , pattern =
     [ oneOf [20,30,40]
     , regex "[\\s\\-]+"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = tens}:
@@ -324,7 +324,7 @@ ruleHundredPrefix = Rule
   { name = "one hundred and <integer> (short form)"
   , pattern =
     [ regex "百|佰"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \case
     (_:Token Numeral NumeralData{TNumeral.value = v}:_) ->
@@ -337,7 +337,7 @@ ruleThousandPrefix = Rule
   { name = "one thousand and <integer> (short form)"
   , pattern =
     [ regex "千|仟"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \case
     (_:Token Numeral NumeralData{TNumeral.value = v}:_) ->
@@ -350,7 +350,7 @@ ruleTenThousandPrefix = Rule
   { name = "ten thousand and <integer> (short form)"
   , pattern =
     [ regex "万|萬"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \case
     (_:Token Numeral NumeralData{TNumeral.value = v}:_) ->

Duckling/Ordinal/RU/Corpus.hs

@@ -30,6 +30,7 @@ allExamples = concat
              , "первое"
              , "первой"
              , "первого"
+             , "первые"
              , "1ая"
              , "1-ая"
              , "1ый"
@@ -40,6 +41,11 @@ allExamples = concat
              , "1-й"
              , "1го"
              , "1-го"
+             , "1-ого"
+             , "первой"
+             , "первым"
+             , "первому"
+             , "первым"
              ]
   , examples (OrdinalData 3)
              [ "третий"
@@ -47,6 +53,7 @@ allExamples = concat
              , "третье"
              , "третьей"
              , "третьего"
+             , "третьи"
              , "3й"
              , "3ий"
              , "3я"
@@ -61,6 +68,11 @@ allExamples = concat
              , "3-е"
              , "3-ье"
              , "3-го"
+             , "3-его"
+             , "третьей"
+             , "третьим"
+             , "третьему"
+             , "третьим"
              ]
   , examples (OrdinalData 4)
              [ "четвертый"
@@ -68,6 +80,8 @@ allExamples = concat
              , "четвертое"
              , "четвертой"
              , "четвертого"
+             , "четвёртый"
+             , "четвертые"
              , "4й"
              , "4ый"
              , "4ая"
@@ -80,39 +94,102 @@ allExamples = concat
              , "4-ое"
              , "4-ой"
              , "4-го"
+             , "4-ого"
+             , "четвертой"
+             , "четвертым"
+             , "четвёртому"
+             , "четвёртым"
              ]
   , examples (OrdinalData 15)
              [ "пятнадцатый"
              , "15й"
              , "15-й"
+             , "15-ый"
+             , "пятнадцатая"
+             , "15я"
+             , "15-я"
+             , "15-ая"
+             , "пятнадцатое"
+             , "15е"
+             , "15-е"
+             , "15-ое"
+             , "пятнадцатому"
+             , "пятнадцатые"
+             , "пятнадцатой"
+             , "пятнадцатым"
+             , "пятнадцатому"
+             , "пятнадцатым"
+             ]
+  , examples (OrdinalData 10)
+             [ "десятый"
+             , "10й"
+             , "10-й"
+             , "10-ый"
+             , "десятая"
+             , "десятой"
              ]
   , examples (OrdinalData 21)
              [ "21й"
              , "21-й"
              , "21-го"
+             , "21-ого"
              , "Двадцать первый"
              , "двадцать первый"
              , "двадцать первого"
+             , "двадцать первой"
              ]
   , examples (OrdinalData 23)
              [ "23й"
              , "23-й"
              , "двадцать третий"
              , "двадцать третьего"
+             , "двадцать третьей"
+             , "23-го"
+             , "23-его"
              ]
   , examples (OrdinalData 31)
              [ "31ый"
              , "31-ый"
              , "тридцать первый"
              ]
+  , examples (OrdinalData 30)
+             [ "30ый"
+             , "30-ый"
+             , "тридцатый"
+             ]
   , examples (OrdinalData 48)
              [ "48ое"
              , "48-ое"
              , "сорок восьмое"
              ]
+  , examples (OrdinalData 40)
+             [ "40ое"
+             , "40-ое"
+             , "сороковой"
+             , "сороковое"
+             , "сороковая"
+             ]
   , examples (OrdinalData 99)
              [ "99ый"
              , "99-й"
+             , "99-ый"
              , "девяносто девятый"
+             , "девяносто девятая"
+             ]
+  , examples (OrdinalData 90)
+             [ "90ый"
+             , "90-й"
+             , "90-ый"
+             , "девяностый"
+             , "девяностая"
+             ]
+  , examples (OrdinalData 100)
+             [ "сотое"
+             , "сотая"
+             , "сотый"
+             , "100-ая"
+             , "100-я"
+             , "100-й"
+             , "100-е"
              ]
   ]

Duckling/Ordinal/RU/Rules.hs

@@ -31,6 +31,7 @@ ordinalsFirstthMap = HashMap.fromList
   , ( "втор", 2 )
   , ( "трет", 3 )
   , ( "четверт", 4 )
+  , ( "четвёрт", 4 )
   , ( "пят", 5 )
   , ( "шест", 6 )
   , ( "седьм", 7 )
@@ -47,6 +48,14 @@ ordinalsFirstthMap = HashMap.fromList
   , ( "восемнадцат", 18 )
   , ( "девятнадцат", 19 )
   , ( "двадцат", 20 )
+  , ( "тридцат", 30 )
+  , ( "сороков", 40 )
+  , ( "пятидесят", 50 )
+  , ( "шестидесят", 60 )
+  , ( "семидесят", 70 )
+  , ( "восьмидесят", 80 )
+  , ( "девяност", 90 )
+  , ( "сот", 100 )
   ]
 
 cardinalsMap :: HashMap Text.Text Int
@@ -59,13 +68,14 @@ cardinalsMap = HashMap.fromList
   , ( "семьдесят", 70 )
   , ( "восемьдесят", 80 )
   , ( "девяносто", 90 )
+  , ( "сто", 100 )
   ]
 
 ruleOrdinalsFirstth :: Rule
 ruleOrdinalsFirstth = Rule
-  { name = "ordinals (first..19th)"
+  { name = "ordinals (first..20th, then 30th, 40th, ..., 100th)"
   , pattern =
-    [ regex "(перв|втор|трет|четверт|пят|шест|седьм|восьм|девят|десят|одиннадцат|двенадцат|тринадцат|четырнадцат|пятнадцат|шестнадцат|семнадцат|восемнадцат|девятнадцат|двадцат)(ье(го|й)?|ого|ый|ой|ий|ая|ое|ья)"
+    [ regex "(перв|втор|трет|четв[её]рт|пят|шест|седьм|восьм|девят|десят|одиннадцат|двенадцат|тринадцат|четырнадцат|пятнадцат|шестнадцат|семнадцат|восемнадцат|девятнадцат|двадцат|тридцат|сороков|пятидесят|шестидесят|семидесят|восьмидесят|девяност|сот)(ь(его|ему|ей|ем|им|их|и|е)|ого|ому|ый|ой|ий|ая|ое|ья|ом|ые|ым|ых)"
     ]
   , prod = \tokens -> case tokens of
       (Token RegexMatch (GroupMatch (match:_)):_) ->
@@ -78,7 +88,7 @@ ruleOrdinal = Rule
   { name = "ordinal 21..99"
   , pattern =
     [ regex "(двадцать|тридцать|сорок|пятьдесят|шестьдесят|семьдесят|восемьдесят|девяносто)"
-    , regex "(перв|втор|трет|четверт|пят|шест|седьм|восьм|девят)(ье(го|й)?|ого|ый|ой|ий|ая|ое|ья)"
+    , regex "(перв|втор|трет|четв[её]рт|пят|шест|седьм|восьм|девят)(ье(го|й)?|ого|ому|ый|ой|ий|ая|ое|ья|ые|ым|ых)"
     ]
   , prod = \tokens -> case tokens of
       (Token RegexMatch (GroupMatch (m1:_)):
@@ -94,7 +104,7 @@ ruleOrdinalDigits :: Rule
 ruleOrdinalDigits = Rule
   { name = "ordinal (digits)"
   , pattern =
-    [ regex "0*(\\d+)-?((ы|о|и|а|e|ь)?(ее|й|я|е|го))"
+    [ regex "0*(\\d+)-?((ы|о|и|а|е|ь)?(ее|й|я|е|го|му?))"
     ]
   , prod = \tokens -> case tokens of
       (Token RegexMatch (GroupMatch (match:_)):_) -> ordinal <$> parseInt match

Duckling/Quantity/ZH/Rules.hs

@@ -72,7 +72,7 @@ ruleCattyTael = Rule
   , pattern =
     [ Predicate isPositive
     , regex "斤"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     , regex "两|兩"
     ]
   , prod = \case

Duckling/Ranking/Classifiers/DA_XX.hs

@@ -64,23 +64,18 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.6931471805599453, unseen = -2.772588722239781,
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -1.0986122886681098),
-                                    ("tomorrowevening", -2.0149030205422647),
-                                    ("tomorrowlunch", -2.0149030205422647),
-                                    ("yesterdayevening", -2.0149030205422647),
-                                    ("Mondaymorning", -2.0149030205422647)],
+                                   [("dayhour", -0.9555114450274363),
+                                    ("tomorrowevening", -1.8718021769015913),
+                                    ("tomorrowlunch", -1.8718021769015913),
+                                    ("yesterdayevening", -1.8718021769015913),
+                                    ("Mondaymorning", -1.8718021769015913)],
                                n = 4},
                    koData =
-                     ClassData{prior = -0.6931471805599453, unseen = -2.772588722239781,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("yearhour", -1.0986122886681098),
-                                    ("year (latent)in|during the <part-of-day>",
-                                     -1.0986122886681098)],
-                               n = 4}}),
+                     ClassData{prior = -infinity, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("dd/mm",
         Classifier{okData =
                      ClassData{prior = -0.40546510810816444,
@@ -535,12 +530,12 @@ classifiers
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -3.295836866004329,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.42488319396526597),
-                                    ("integer (0..19)", -1.0608719606852628)],
-                               n = 24}}),
+                                   [("integer (numeric)", -0.5260930958967791),
+                                    ("integer (0..19)", -0.8938178760220964)],
+                               n = 20}}),
        ("Monday",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.4849066497880004,

Duckling/Ranking/Classifiers/EL_XX.hs

@@ -559,347 +559,345 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4037091814058995, unseen = -6.860663671448286,
+                     ClassData{prior = -0.4019501660007199, unseen = -6.859614903654202,
                                likelihoods =
                                  HashMap.fromList
-                                   [("tuesdaySeptember", -5.250176991220102),
+                                   [("tuesdaySeptember", -5.249127122357264),
                                     ("Father's Dayabsorption of article before time",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("last <cycle> <time>'s'absorption of article before time",
-                                     -5.473320542534312),
-                                    ("hourday", -4.2946655461926655),
-                                    ("dayhour", -2.359805233323937),
-                                    ("daymonth", -3.815092465930779),
-                                    ("monthyear", -3.768572450295886),
+                                     -5.472270673671475),
+                                    ("hourday", -4.293615677329829),
+                                    ("dayhour", -2.3587553644611003),
+                                    ("daymonth", -3.8140425970679424),
+                                    ("monthyear", -3.7675225814330493),
                                     ("<time-of-day> am|pmabsorption of article before time",
-                                     -4.0264015595979865),
-                                    ("tuesdaythis <cycle>", -6.166467723094256),
+                                     -4.02535169073515),
+                                    ("tuesdaythis <cycle>", -6.16541785423142),
                                     ("last <day-of-week> of <time>absorption of article before time",
-                                     -6.166467723094256),
-                                    ("wednesdayintersect", -5.067855434426147),
+                                     -6.16541785423142),
+                                    ("wednesdayintersect", -5.06680556556331),
                                     ("absorption of article before timeabsorption of , after named day",
-                                     -6.166467723094256),
-                                    ("houryear", -6.166467723094256),
+                                     -6.16541785423142),
+                                    ("houryear", -6.16541785423142),
                                     ("absorption of article before timeat <time-of-day>",
-                                     -5.473320542534312),
+                                     -5.472270673671475),
                                     ("absorption of article before time<day-of-month> (ordinal or number) <named-month>",
-                                     -5.250176991220102),
+                                     -5.249127122357264),
                                     ("absorption of article before time<time> <part-of-day>",
-                                     -5.473320542534312),
+                                     -5.472270673671475),
                                     ("Octoberabsorption of article before time",
-                                     -5.473320542534312),
+                                     -5.472270673671475),
                                     ("intersect<day-of-month> (ordinal or number) <named-month>",
-                                     -4.2946655461926655),
-                                    ("intersect by 'of', 'from', 'syear", -6.166467723094256),
-                                    ("<time-of-day> am|pmintersect", -4.662390326317983),
-                                    ("intersectat <time-of-day>", -5.761002614986093),
+                                     -4.293615677329829),
+                                    ("intersect by 'of', 'from', 'syear", -6.16541785423142),
+                                    ("<time-of-day> am|pmintersect", -4.661340457455146),
+                                    ("intersectat <time-of-day>", -5.759952746123256),
                                     ("thursday<day-of-month> ( ordinal) <named-month> year",
-                                     -6.166467723094256),
-                                    ("saturday<time-of-day> am|pm", -5.761002614986093),
-                                    ("saturdayat <time-of-day>", -5.761002614986093),
-                                    ("after tomorrowat <time-of-day>", -6.166467723094256),
-                                    ("intersect<time-of-day> am|pm", -6.166467723094256),
-                                    ("<part-of-day> of <time>February", -6.166467723094256),
+                                     -6.16541785423142),
+                                    ("saturday<time-of-day> am|pm", -5.759952746123256),
+                                    ("saturdayat <time-of-day>", -5.759952746123256),
+                                    ("after tomorrowat <time-of-day>", -6.16541785423142),
+                                    ("intersect<time-of-day> am|pm", -6.16541785423142),
+                                    ("<part-of-day> of <time>February", -6.16541785423142),
                                     ("absorption of article before timeOctober",
-                                     -5.761002614986093),
+                                     -5.759952746123256),
                                     ("<time-of-day>  o'clockabsorption of article before time",
-                                     -6.166467723094256),
-                                    ("after tomorrow<time-of-day> am|pm", -5.761002614986093),
+                                     -6.16541785423142),
+                                    ("after tomorrow<time-of-day> am|pm", -5.759952746123256),
                                     ("wednesdayabsorption of article before time",
-                                     -4.662390326317983),
-                                    ("Marchabsorption of article before time", -6.166467723094256),
-                                    ("wednesdayat <time-of-day>", -5.761002614986093),
-                                    ("intersect by ','<time-of-day> am|pm", -5.250176991220102),
-                                    ("thursdayhh(:mm) - <time-of-day> am|pm", -6.166467723094256),
-                                    ("<time-of-day> am|pmintersect by ','", -5.250176991220102),
+                                     -4.661340457455146),
+                                    ("Marchabsorption of article before time", -6.16541785423142),
+                                    ("wednesdayat <time-of-day>", -5.759952746123256),
+                                    ("intersect by ','<time-of-day> am|pm", -5.249127122357264),
+                                    ("thursdayhh(:mm) - <time-of-day> am|pm", -6.16541785423142),
+                                    ("<time-of-day> am|pmintersect by ','", -5.249127122357264),
                                     ("absorption of article before timeLast year",
-                                     -5.761002614986093),
+                                     -5.759952746123256),
                                     ("absorption of article before timeintersect",
-                                     -5.250176991220102),
-                                    ("wednesday<time> <part-of-day>", -5.250176991220102),
-                                    ("hourmonth", -6.166467723094256),
-                                    ("todayat <time-of-day>", -6.166467723094256),
+                                     -5.249127122357264),
+                                    ("wednesday<time> <part-of-day>", -5.249127122357264),
+                                    ("hourmonth", -6.16541785423142),
+                                    ("todayat <time-of-day>", -6.16541785423142),
                                     ("absorption of article before timeabsorption of article before time",
-                                     -3.563778037649873),
-                                    ("thursday<time> timezone", -4.913704754598889),
+                                     -3.5627281687870362),
+                                    ("thursday<time> timezone", -4.912654885736052),
                                     ("yesterdayabsorption of article before time",
-                                     -6.166467723094256),
-                                    ("dayday", -3.60151836563272),
-                                    ("<time> <part-of-day>at <time-of-day>", -5.761002614986093),
-                                    ("tonightat <time-of-day>", -5.761002614986093),
+                                     -6.16541785423142),
+                                    ("dayday", -3.6004684967698832),
+                                    ("<time> <part-of-day>at <time-of-day>", -5.759952746123256),
+                                    ("tonightat <time-of-day>", -5.759952746123256),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.250176991220102),
-                                    ("today<time-of-day> am|pm", -5.761002614986093),
-                                    ("at <time-of-day><time> <part-of-day>", -5.473320542534312),
+                                     -5.249127122357264),
+                                    ("today<time-of-day> am|pm", -5.759952746123256),
+                                    ("at <time-of-day><time> <part-of-day>", -5.472270673671475),
                                     ("absorption of , after named day<day-of-month> (ordinal or number) <named-month>",
-                                     -4.220557574038944),
-                                    ("hourhour", -2.852281718421731),
+                                     -4.219507705176107),
+                                    ("hourhour", -2.851231849558894),
                                     ("<time-of-day> - <time-of-day> (interval)absorption of article before time",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("halloween dayabsorption of article before time",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("<datetime> - <datetime> (interval)absorption of article before time",
-                                     -5.761002614986093),
-                                    ("dayyear", -2.9475918982260563),
+                                     -5.759952746123256),
+                                    ("dayyear", -2.9465420293632194),
                                     ("thursday<day-of-month> (ordinal or number) <named-month>",
-                                     -6.166467723094256),
-                                    ("last weekend of <named-month>year", -6.166467723094256),
+                                     -6.16541785423142),
+                                    ("last weekend of <named-month>year", -6.16541785423142),
                                     ("<time-of-day>  o'clockin|during the <part-of-day>",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("thursdaybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.761002614986093),
+                                     -5.759952746123256),
                                     ("tuesdayabsorption of article before time",
-                                     -4.662390326317983),
+                                     -4.661340457455146),
                                     ("thursdaybetween <datetime> and <datetime> (interval)",
-                                     -6.166467723094256),
-                                    ("wednesday<time-of-day> am|pm (verbose)", -5.761002614986093),
-                                    ("before yesterday<time-of-day> am|pm", -5.761002614986093),
-                                    ("wednesdaythis <cycle>", -6.166467723094256),
-                                    ("todayin|during the <part-of-day>", -6.166467723094256),
-                                    ("<time-of-day> am|pmtomorrow", -5.250176991220102),
-                                    ("thursdayhh:mm", -6.166467723094256),
-                                    ("minutehour", -4.461719630855832),
-                                    ("before yesterdayat <time-of-day>", -5.761002614986093),
-                                    ("tonightin|during the <part-of-day>", -6.166467723094256),
+                                     -6.16541785423142),
+                                    ("wednesday<time-of-day> am|pm (verbose)", -5.759952746123256),
+                                    ("before yesterday<time-of-day> am|pm", -5.759952746123256),
+                                    ("wednesdaythis <cycle>", -6.16541785423142),
+                                    ("todayin|during the <part-of-day>", -6.16541785423142),
+                                    ("<time-of-day> am|pmtomorrow", -5.249127122357264),
+                                    ("thursdayhh:mm", -6.16541785423142),
+                                    ("minutehour", -4.460669761992995),
+                                    ("before yesterdayat <time-of-day>", -5.759952746123256),
+                                    ("tonightin|during the <part-of-day>", -6.16541785423142),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.250176991220102),
-                                    ("thursdayintersect", -6.166467723094256),
+                                     -5.249127122357264),
+                                    ("thursdayintersect", -6.16541785423142),
                                     ("thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.250176991220102),
-                                    ("Aprilyear", -5.761002614986093),
+                                     -5.249127122357264),
+                                    ("Aprilyear", -5.759952746123256),
                                     ("absorption of article before timetomorrow",
-                                     -5.473320542534312),
+                                     -5.472270673671475),
                                     ("absorption of article before timehh(:mm) - <time-of-day> am|pm",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("absorption of article before timein|during the <part-of-day>",
-                                     -5.250176991220102),
-                                    ("yesterdayin|during the <part-of-day>", -6.166467723094256),
+                                     -5.249127122357264),
+                                    ("yesterdayin|during the <part-of-day>", -6.16541785423142),
                                     ("before yesterdayabsorption of article before time",
-                                     -5.761002614986093),
+                                     -5.759952746123256),
                                     ("this <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.166467723094256),
-                                    ("tuesday<time> <part-of-day>", -5.250176991220102),
+                                     -6.16541785423142),
+                                    ("tuesday<time> <part-of-day>", -5.249127122357264),
                                     ("absorption of article before timeFebruary",
-                                     -5.761002614986093),
-                                    ("weekmonth", -5.250176991220102),
-                                    ("tuesdayat <time-of-day>", -5.761002614986093),
-                                    ("mondaythis <cycle>", -6.166467723094256),
-                                    ("tomorrowintersect", -5.250176991220102),
-                                    ("intersectin|during the <part-of-day>", -4.913704754598889),
+                                     -5.759952746123256),
+                                    ("weekmonth", -5.249127122357264),
+                                    ("tuesdayat <time-of-day>", -5.759952746123256),
+                                    ("mondaythis <cycle>", -6.16541785423142),
+                                    ("tomorrowintersect", -5.249127122357264),
+                                    ("intersectin|during the <part-of-day>", -4.912654885736052),
                                     ("<time> <part-of-day>absorption of article before time",
-                                     -5.761002614986093),
-                                    ("the <cycle> of <time>October", -5.761002614986093),
+                                     -5.759952746123256),
+                                    ("the <cycle> of <time>October", -5.759952746123256),
                                     ("revolution dayabsorption of article before time",
-                                     -5.761002614986093),
+                                     -5.759952746123256),
                                     ("thursday<datetime> - <datetime> (interval)",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("Septemberabsorption of article before time",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("absorption of article before time<time-of-day> am|pm",
-                                     -5.761002614986093),
+                                     -5.759952746123256),
                                     ("tonightabsorption of article before time",
-                                     -5.473320542534312),
-                                    ("todayabsorption of article before time", -5.761002614986093),
+                                     -5.472270673671475),
+                                    ("todayabsorption of article before time", -5.759952746123256),
                                     ("at <time-of-day>absorption of article before time",
-                                     -4.662390326317983),
+                                     -4.661340457455146),
                                     ("thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.761002614986093),
-                                    ("absorption of article before timeyear", -6.166467723094256),
-                                    ("tuesday<time-of-day> am|pm (verbose)", -5.761002614986093),
-                                    ("revolution dayLast year", -5.761002614986093),
-                                    ("at <time-of-day>intersect", -5.250176991220102),
+                                     -5.759952746123256),
+                                    ("absorption of article before timeyear", -6.16541785423142),
+                                    ("tuesday<time-of-day> am|pm (verbose)", -5.759952746123256),
+                                    ("revolution dayLast year", -5.759952746123256),
+                                    ("at <time-of-day>intersect", -5.249127122357264),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("absorption of article before timeintersect by ','",
-                                     -6.166467723094256),
-                                    ("dayminute", -3.815092465930779),
-                                    ("intersectyear", -5.067855434426147),
-                                    ("hh:mmabsorption of article before time", -5.473320542534312),
+                                     -6.16541785423142),
+                                    ("dayminute", -3.8140425970679424),
+                                    ("intersectyear", -5.06680556556331),
+                                    ("hh:mmabsorption of article before time", -5.472270673671475),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.166467723094256),
-                                    ("minuteday", -2.685227633758565),
-                                    ("absorption of , after named dayintersect",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
+                                    ("minuteday", -2.684177764895728),
+                                    ("absorption of , after named dayintersect", -6.16541785423142),
                                     ("the <cycle> of <time>absorption of article before time",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("<ordinal> <cycle> of <time>absorption of article before time",
-                                     -6.166467723094256),
-                                    ("at <time-of-day>intersect by ','", -6.166467723094256),
-                                    ("Octoberyear", -4.913704754598889),
+                                     -6.16541785423142),
+                                    ("at <time-of-day>intersect by ','", -6.16541785423142),
+                                    ("Octoberyear", -4.912654885736052),
                                     ("absorption of , after named dayintersect by ','",
-                                     -5.761002614986093),
+                                     -5.759952746123256),
                                     ("this <cycle>hh(:mm) - <time-of-day> am|pm",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("intersectabsorption of article before time",
-                                     -4.557029810660157),
+                                     -4.55597994179732),
                                     ("after tomorrowabsorption of article before time",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("saturdayabsorption of article before time",
-                                     -5.761002614986093),
-                                    ("tuesdaythe <day-of-month> (non ordinal)", -6.166467723094256),
+                                     -5.759952746123256),
+                                    ("tuesdaythe <day-of-month> (non ordinal)", -6.16541785423142),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.166467723094256),
-                                    ("tomorrowin|during the <part-of-day>", -5.067855434426147),
+                                     -6.16541785423142),
+                                    ("tomorrowin|during the <part-of-day>", -5.06680556556331),
                                     ("<day-of-month> (ordinal or number) <named-month>year",
-                                     -3.9151759244877615),
-                                    ("year<time-of-day> am|pm", -6.166467723094256),
-                                    ("Septemberyear", -5.250176991220102),
+                                     -3.914126055624925),
+                                    ("year<time-of-day> am|pm", -6.16541785423142),
+                                    ("Septemberyear", -5.249127122357264),
                                     ("christmasabsorption of article before time",
-                                     -6.166467723094256),
-                                    ("dayweek", -5.067855434426147),
-                                    ("weekyear", -5.250176991220102),
-                                    ("hh:mmin|during the <part-of-day>", -5.473320542534312),
+                                     -6.16541785423142),
+                                    ("dayweek", -5.06680556556331),
+                                    ("weekyear", -5.249127122357264),
+                                    ("hh:mmin|during the <part-of-day>", -5.472270673671475),
                                     ("the <day-of-month> (non ordinal)absorption of article before time",
-                                     -5.761002614986093),
-                                    ("tomorrowat <time-of-day>", -6.166467723094256),
-                                    ("tuesdayintersect", -4.557029810660157),
+                                     -5.759952746123256),
+                                    ("tomorrowat <time-of-day>", -6.16541785423142),
+                                    ("tuesdayintersect", -4.55597994179732),
                                     ("tomorrowbetween <time-of-day> and <time-of-day> (interval)",
-                                     -6.166467723094256),
-                                    ("at <time-of-day>tomorrow", -5.473320542534312),
-                                    ("tomorrow<time-of-day> am|pm", -5.761002614986093),
+                                     -6.16541785423142),
+                                    ("at <time-of-day>tomorrow", -5.472270673671475),
+                                    ("tomorrow<time-of-day> am|pm", -5.759952746123256),
                                     ("last <cycle> of <time>absorption of article before time",
-                                     -5.761002614986093),
+                                     -5.759952746123256),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("in|during the <part-of-day>absorption of article before time",
-                                     -6.166467723094256),
-                                    ("intersectFebruary", -6.166467723094256),
-                                    ("<datetime> - <datetime> (interval)July", -6.166467723094256),
+                                     -6.16541785423142),
+                                    ("intersectFebruary", -6.16541785423142),
+                                    ("<datetime> - <datetime> (interval)July", -6.16541785423142),
                                     ("tomorrowabsorption of article before time",
-                                     -4.913704754598889),
-                                    ("yearminute", -6.166467723094256),
+                                     -4.912654885736052),
+                                    ("yearminute", -6.16541785423142),
                                     ("Mother's Dayabsorption of article before time",
-                                     -6.166467723094256)],
+                                     -6.16541785423142)],
                                n = 380},
                    koData =
-                     ClassData{prior = -1.1021334190666885, unseen = -6.349138991379798,
+                     ClassData{prior = -1.1056794558912022, unseen = -6.343880434126331,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -5.654242029096065),
+                                   [("hourday", -5.648974238161206),
                                     ("thursdayabsorption of article before time",
-                                     -5.2487769209879005),
-                                    ("dayhour", -3.574800487416229),
-                                    ("daymonth", -2.563199575737749),
-                                    ("hourquarter", -5.654242029096065),
-                                    ("absorption of article before timedd/mm", -5.654242029096065),
-                                    ("monthyear", -3.302866771932587),
+                                     -5.243509130053042),
+                                    ("dayhour", -3.56953269648137), ("daymonth", -2.55793178480289),
+                                    ("hourquarter", -5.648974238161206),
+                                    ("absorption of article before timedd/mm", -5.648974238161206),
+                                    ("monthyear", -3.297598980997728),
                                     ("absorption of article before timeDecember",
-                                     -5.654242029096065),
-                                    ("tuesdayFebruary", -5.654242029096065),
-                                    ("wednesdayintersect", -5.654242029096065),
-                                    ("intersecthh:mm", -5.654242029096065),
-                                    ("hh:mmuntil <time>", -4.96109484853612),
-                                    ("houryear", -5.2487769209879005),
-                                    ("hournograin", -4.401479060600697),
-                                    ("intersect by 'of', 'from', 'syear", -4.73795129722191),
-                                    ("absorption of article before timeJuly", -5.2487769209879005),
-                                    ("thursdayafter <time-of-day>", -4.555629740427955),
-                                    ("Marchyear", -4.1501646323197905),
-                                    ("after tomorrowat <time-of-day>", -5.654242029096065),
+                                     -5.648974238161206),
+                                    ("tuesdayFebruary", -5.648974238161206),
+                                    ("wednesdayintersect", -5.648974238161206),
+                                    ("intersecthh:mm", -5.648974238161206),
+                                    ("hh:mmuntil <time>", -4.955827057601261),
+                                    ("houryear", -5.243509130053042),
+                                    ("hournograin", -4.396211269665838),
+                                    ("intersect by 'of', 'from', 'syear", -4.732683506287051),
+                                    ("absorption of article before timeJuly", -5.243509130053042),
+                                    ("thursdayafter <time-of-day>", -4.550361949493096),
+                                    ("Marchyear", -4.144896841384932),
+                                    ("after tomorrowat <time-of-day>", -5.648974238161206),
                                     ("absorption of article before timeOctober",
-                                     -5.2487769209879005),
-                                    ("<time-of-day> am|pmuntil <time>", -5.2487769209879005),
+                                     -5.243509130053042),
+                                    ("<time-of-day> am|pmuntil <time>", -5.243509130053042),
                                     ("wednesdayabsorption of article before time",
-                                     -5.2487769209879005),
-                                    ("intersect by ','<time-of-day> am|pm", -5.654242029096065),
+                                     -5.243509130053042),
+                                    ("intersect by ','<time-of-day> am|pm", -5.648974238161206),
                                     ("absorption of article before timethe <cycle> of <time>",
-                                     -5.654242029096065),
+                                     -5.648974238161206),
                                     ("intersect by 'of', 'from', 'sabsorption of article before time",
-                                     -5.654242029096065),
-                                    ("intersect by ','hh:mm", -4.555629740427955),
-                                    ("mondayabsorption of article before time", -5.654242029096065),
-                                    ("hourmonth", -3.2563467562976944),
-                                    ("todayat <time-of-day>", -5.654242029096065),
+                                     -5.648974238161206),
+                                    ("intersect by ','hh:mm", -4.550361949493096),
+                                    ("mondayabsorption of article before time", -5.648974238161206),
+                                    ("hourmonth", -3.2510789653628356),
+                                    ("todayat <time-of-day>", -5.648974238161206),
                                     ("absorption of article before timeabsorption of article before time",
-                                     -3.6393390085538),
-                                    ("dayday", -3.351656936102019),
-                                    ("dayquarter", -5.654242029096065),
+                                     -3.703064089105893),
+                                    ("dayday", -3.3463891451671604),
+                                    ("dayquarter", -5.648974238161206),
                                     ("<time-of-day> - <time-of-day> (interval)absorption of article before time",
-                                     -5.654242029096065),
-                                    ("thursdayat <time-of-day>", -5.2487769209879005),
-                                    ("week-endintersect", -5.654242029096065),
+                                     -5.648974238161206),
+                                    ("thursdayat <time-of-day>", -5.243509130053042),
+                                    ("week-endintersect", -5.648974238161206),
                                     ("<datetime> - <datetime> (interval)absorption of article before time",
-                                     -5.2487769209879005),
-                                    ("dayyear", -3.1285133847878095),
-                                    ("thursdaydd/mm", -5.654242029096065),
-                                    ("tuesdayabsorption of article before time", -4.96109484853612),
-                                    ("tuesdayintersect by 'of', 'from', 's", -5.2487769209879005),
-                                    ("monthminute", -5.2487769209879005),
-                                    ("<time-of-day> am|pmtomorrow", -5.654242029096065),
-                                    ("tuesdayMarch", -4.73795129722191),
-                                    ("thursdayhh:mm", -5.2487769209879005),
-                                    ("after <time-of-day>December", -5.654242029096065),
-                                    ("for <duration> from <time>December", -5.654242029096065),
-                                    ("thursdayintersect", -5.2487769209879005),
-                                    ("Aprilyear", -4.555629740427955),
-                                    ("sundayintersect by 'of', 'from', 's", -5.654242029096065),
-                                    ("tuesdayJanuary", -5.654242029096065),
+                                     -5.243509130053042),
+                                    ("dayyear", -3.1232455938529506),
+                                    ("thursdaydd/mm", -5.648974238161206),
+                                    ("tuesdayabsorption of article before time",
+                                     -4.955827057601261),
+                                    ("tuesdayintersect by 'of', 'from', 's", -5.243509130053042),
+                                    ("monthminute", -5.243509130053042),
+                                    ("<time-of-day> am|pmtomorrow", -5.648974238161206),
+                                    ("tuesdayMarch", -4.732683506287051),
+                                    ("thursdayhh:mm", -5.243509130053042),
+                                    ("after <time-of-day>December", -5.648974238161206),
+                                    ("for <duration> from <time>December", -5.648974238161206),
+                                    ("thursdayintersect", -5.243509130053042),
+                                    ("Aprilyear", -4.550361949493096),
+                                    ("sundayintersect by 'of', 'from', 's", -5.648974238161206),
+                                    ("tuesdayJanuary", -5.648974238161206),
                                     ("absorption of article before timehh(:mm) - <time-of-day> am|pm",
-                                     -5.654242029096065),
-                                    ("tuesdayOctober", -5.2487769209879005),
+                                     -5.648974238161206),
+                                    ("tuesdayOctober", -5.243509130053042),
                                     ("<day-of-month> (ordinal or number) of <named-month>year",
-                                     -4.96109484853612),
+                                     -4.955827057601261),
                                     ("absorption of article before timeFebruary",
-                                     -5.2487769209879005),
+                                     -5.243509130053042),
                                     ("tuesday<day-of-month> (ordinal or number) <named-month>",
-                                     -5.654242029096065),
-                                    ("weekmonth", -4.73795129722191),
-                                    ("minutenograin", -4.96109484853612),
-                                    ("sundayabsorption of article before time", -4.96109484853612),
-                                    ("todayabsorption of article before time", -5.654242029096065),
-                                    ("yearmonth", -5.654242029096065),
-                                    ("absorption of article before timeyear", -4.555629740427955),
-                                    ("dayminute", -4.044804116661965),
-                                    ("intersectyear", -3.8624825598680097),
-                                    ("hh:mmabsorption of article before time", -5.2487769209879005),
-                                    ("thursdayApril", -5.654242029096065),
-                                    ("minuteday", -4.73795129722191),
+                                     -5.648974238161206),
+                                    ("weekmonth", -4.732683506287051),
+                                    ("minutenograin", -4.955827057601261),
+                                    ("sundayabsorption of article before time", -4.955827057601261),
+                                    ("todayabsorption of article before time", -5.648974238161206),
+                                    ("absorption of article before timeyear", -4.550361949493096),
+                                    ("dayminute", -4.039536325727106),
+                                    ("intersectyear", -3.857214768933151),
+                                    ("hh:mmabsorption of article before time", -5.243509130053042),
+                                    ("thursdayApril", -5.648974238161206),
+                                    ("minuteday", -4.732683506287051),
                                     ("absorption of , after named dayintersect",
-                                     -5.654242029096065),
+                                     -5.648974238161206),
                                     ("the <cycle> of <time>absorption of article before time",
-                                     -4.96109484853612),
-                                    ("tuesdayApril", -5.2487769209879005),
-                                    ("Octoberyear", -5.654242029096065),
+                                     -4.955827057601261),
+                                    ("tuesdayApril", -5.243509130053042),
+                                    ("Octoberyear", -5.648974238161206),
                                     ("absorption of , after named dayintersect by ','",
-                                     -5.654242029096065),
-                                    ("yearhh:mm", -5.654242029096065),
+                                     -5.648974238161206),
+                                    ("yearhh:mm", -5.648974238161206),
                                     ("this <cycle>hh(:mm) - <time-of-day> am|pm",
-                                     -5.654242029096065),
+                                     -5.648974238161206),
                                     ("intersectabsorption of article before time",
-                                     -4.555629740427955),
+                                     -4.550361949493096),
                                     ("tuesday<day-of-month> (ordinal or number) of <named-month>",
-                                     -5.654242029096065),
+                                     -5.648974238161206),
                                     ("after tomorrowabsorption of article before time",
-                                     -5.654242029096065),
+                                     -5.648974238161206),
                                     ("absorption of article before timeuntil <time>",
-                                     -4.267947667976174),
+                                     -4.2626798770413155),
                                     ("<day-of-month> (ordinal or number) <named-month>year",
-                                     -4.96109484853612),
-                                    ("<duration> after <time>December", -5.654242029096065),
-                                    ("intersectintersect", -5.654242029096065),
-                                    ("tuesdaytuesday", -5.654242029096065),
+                                     -4.955827057601261),
+                                    ("<duration> after <time>December", -5.648974238161206),
+                                    ("intersectintersect", -5.648974238161206),
+                                    ("tuesdaytuesday", -5.648974238161206),
                                     ("the <day-of-month> (non ordinal)absorption of article before time",
-                                     -3.94949393685764),
-                                    ("at <time-of-day>February", -5.654242029096065),
+                                     -3.944226145922781),
+                                    ("at <time-of-day>February", -5.648974238161206),
                                     ("week-endabsorption of article before time",
-                                     -4.73795129722191),
-                                    ("thursdayOctober", -5.2487769209879005),
-                                    ("tomorrowat <time-of-day>", -5.654242029096065),
-                                    ("tuesdayintersect", -3.8624825598680097),
-                                    ("daynograin", -3.7824398521944733),
+                                     -4.732683506287051),
+                                    ("thursdayOctober", -5.243509130053042),
+                                    ("tomorrowat <time-of-day>", -5.648974238161206),
+                                    ("tuesdayintersect", -3.857214768933151),
+                                    ("daynograin", -3.7771720612596145),
                                     ("tomorrowbetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.654242029096065),
-                                    ("tuesdayMay", -5.654242029096065),
+                                     -5.648974238161206),
+                                    ("tuesdayMay", -5.648974238161206),
                                     ("after <time-of-day>absorption of article before time",
-                                     -5.654242029096065),
+                                     -5.648974238161206),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.2487769209879005),
-                                    ("sundayintersect", -5.654242029096065),
-                                    ("thursdayintersect by 'of', 'from', 's", -5.654242029096065),
+                                     -5.243509130053042),
+                                    ("sundayintersect", -5.648974238161206),
+                                    ("thursdayintersect by 'of', 'from', 's", -5.648974238161206),
                                     ("tomorrowabsorption of article before time",
-                                     -5.654242029096065),
-                                    ("yearminute", -5.654242029096065)],
-                               n = 189}}),
+                                     -5.648974238161206),
+                                    ("yearminute", -5.648974238161206)],
+                               n = 188}}),
        ("quarter to|past <integer> (hour-of-day)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.1972245773362196,
@@ -1082,117 +1080,113 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("integer (numeric)", -0.6931471805599453),
-                                    ("negative numbers", -0.6931471805599453)],
-                               n = 2}}),
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
+                               n = 1}}),
        ("absorption of article before time",
         Classifier{okData =
-                     ClassData{prior = -0.2325627732307014, unseen = -6.551080335043404,
+                     ClassData{prior = -0.23005964301258283, unseen = -6.54965074223381,
                                likelihoods =
                                  HashMap.fromList
-                                   [("midnight", -5.856503561673865),
-                                    ("last <cycle> <time>'s'", -3.9105934126185518),
-                                    ("week", -3.6592789843376456),
-                                    ("Father's Day", -5.4510384535657),
-                                    ("thursday", -5.4510384535657), ("fall", -5.4510384535657),
+                                   [("midnight", -5.855071922202427),
+                                    ("last <cycle> <time>'s'", -3.909161773147114),
+                                    ("week", -3.657847344866208),
+                                    ("Father's Day", -5.449606814094262),
+                                    ("thursday", -5.449606814094262), ("fall", -5.449606814094262),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.470209200553974),
-                                    ("<time> <part-of-day>", -4.247065649239764),
-                                    ("absorption of , after named day", -5.4510384535657),
-                                    ("revolution day", -4.757891273005756),
-                                    ("October", -4.1517554694354395),
-                                    ("wednesday", -5.856503561673865), ("July", -5.4510384535657),
-                                    ("<ordinal> quarter", -5.856503561673865),
-                                    ("saturday", -5.163356381113919),
-                                    ("Last year", -5.163356381113919),
-                                    ("intersect", -2.8119811239504418),
-                                    ("half after|past <integer> (hour-of-day)", -5.856503561673865),
-                                    ("<ordinal> <cycle> of <time>", -5.856503561673865),
-                                    ("next <cycle>", -4.470209200553974),
-                                    ("the <cycle> of <time>", -4.603740593178497),
-                                    ("<ordinal> quarter <year>", -5.856503561673865),
-                                    ("second", -4.94021282979971), ("monday", -5.4510384535657),
-                                    ("valentine's day", -5.4510384535657),
+                                     -4.468777561082536),
+                                    ("<time> <part-of-day>", -4.2456340097683265),
+                                    ("absorption of , after named day", -5.449606814094262),
+                                    ("revolution day", -4.756459633534318),
+                                    ("October", -4.150323829964002),
+                                    ("wednesday", -5.855071922202427), ("July", -5.449606814094262),
+                                    ("<ordinal> quarter", -5.855071922202427),
+                                    ("saturday", -5.161924741642482),
+                                    ("Last year", -5.161924741642482),
+                                    ("intersect", -2.810549484479004),
+                                    ("half after|past <integer> (hour-of-day)", -5.855071922202427),
+                                    ("<ordinal> <cycle> of <time>", -5.855071922202427),
+                                    ("next <cycle>", -4.468777561082536),
+                                    ("the <cycle> of <time>", -4.602308953707059),
+                                    ("<ordinal> quarter <year>", -5.855071922202427),
+                                    ("second", -4.938781190328272), ("monday", -5.449606814094262),
+                                    ("valentine's day", -5.449606814094262),
                                     ("<day-of-month> (ordinal or number) of <named-month>",
-                                     -5.856503561673865),
-                                    ("this|last|next <cycle>", -4.247065649239764),
-                                    ("Mother's Day", -5.4510384535657),
-                                    ("friday", -5.4510384535657),
-                                    ("<time-of-day> am|pm (verbose)", -5.163356381113919),
-                                    ("<time> after next", -5.856503561673865),
-                                    ("day", -1.8862116481217432),
-                                    ("next <day-of-week>", -4.94021282979971),
-                                    ("afternoon", -4.1517554694354395),
-                                    ("February", -4.94021282979971),
-                                    ("quarter", -4.757891273005756),
-                                    ("this <cycle>", -5.856503561673865),
-                                    ("sunday", -5.856503561673865),
-                                    ("time-of-day (latent)", -2.9661318037777002),
-                                    ("year", -3.5539184686798193),
-                                    ("<time-of-day> am|pm", -3.4586082888754945),
-                                    ("<duration> after <time>", -5.163356381113919),
-                                    ("hh:mm", -4.757891273005756),
-                                    ("intersect by ','", -5.163356381113919),
-                                    ("intersect by 'of', 'from', 's", -3.9105934126185518),
-                                    ("last <time>", -4.470209200553974),
-                                    ("EOM|End of month", -5.856503561673865),
-                                    ("March", -4.603740593178497),
-                                    ("<day-of-month> (ordinal)", -4.470209200553974),
-                                    ("noon", -5.4510384535657), ("hour", -1.9444805562457188),
-                                    ("evening", -4.470209200553974), ("month", -2.938732829589586),
-                                    ("EOD|End of day", -5.856503561673865),
-                                    ("next <time>", -4.757891273005756),
-                                    ("christmas", -5.4510384535657),
-                                    ("next n <cycle>", -4.603740593178497),
-                                    ("tuesday", -5.163356381113919),
-                                    ("halloween day", -5.856503561673865),
-                                    ("winter", -5.856503561673865),
-                                    ("last n <cycle>", -4.757891273005756),
-                                    ("last <cycle> of <time>", -4.603740593178497),
-                                    ("minute", -3.05314318076733), ("week-end", -5.4510384535657),
-                                    ("summer", -5.856503561673865), ("August", -5.856503561673865)],
+                                     -5.855071922202427),
+                                    ("this|last|next <cycle>", -4.2456340097683265),
+                                    ("Mother's Day", -5.449606814094262),
+                                    ("friday", -5.449606814094262),
+                                    ("<time-of-day> am|pm (verbose)", -5.161924741642482),
+                                    ("<time> after next", -5.855071922202427),
+                                    ("day", -1.8847800086503053),
+                                    ("next <day-of-week>", -4.938781190328272),
+                                    ("afternoon", -4.150323829964002),
+                                    ("February", -4.938781190328272),
+                                    ("quarter", -4.756459633534318),
+                                    ("this <cycle>", -5.855071922202427),
+                                    ("sunday", -5.855071922202427),
+                                    ("time-of-day (latent)", -2.9647001643062625),
+                                    ("year", -3.5524868292083815),
+                                    ("<time-of-day> am|pm", -3.457176649404057),
+                                    ("<duration> after <time>", -5.161924741642482),
+                                    ("hh:mm", -4.756459633534318),
+                                    ("intersect by ','", -5.161924741642482),
+                                    ("intersect by 'of', 'from', 's", -3.909161773147114),
+                                    ("last <time>", -4.468777561082536),
+                                    ("EOM|End of month", -5.855071922202427),
+                                    ("March", -4.602308953707059),
+                                    ("<day-of-month> (ordinal)", -4.468777561082536),
+                                    ("noon", -5.449606814094262), ("hour", -1.9430489167742813),
+                                    ("evening", -4.468777561082536), ("month", -2.937301190118148),
+                                    ("EOD|End of day", -5.855071922202427),
+                                    ("next <time>", -4.756459633534318),
+                                    ("christmas", -5.449606814094262),
+                                    ("next n <cycle>", -4.602308953707059),
+                                    ("tuesday", -5.161924741642482),
+                                    ("halloween day", -5.855071922202427),
+                                    ("winter", -5.855071922202427),
+                                    ("last n <cycle>", -4.756459633534318),
+                                    ("last <cycle> of <time>", -4.602308953707059),
+                                    ("minute", -3.051711541295892),
+                                    ("week-end", -5.449606814094262),
+                                    ("summer", -5.855071922202427), ("August", -5.855071922202427)],
                                n = 317},
                    koData =
-                     ClassData{prior = -1.5726239393113841, unseen = -5.493061443340548,
+                     ClassData{prior = -1.5822421696256104, unseen = -5.480638923341991,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -3.6971782569286313),
-                                    ("<duration> hence|ago", -4.795790545596741),
+                                   [("week", -3.6847040827034556),
+                                    ("<duration> hence|ago", -4.783316371371566),
                                     ("<named-month> <day-of-month> (ordinal or number)",
-                                     -4.795790545596741),
+                                     -4.783316371371566),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -3.186352633162641),
-                                    ("September", -4.795790545596741),
-                                    ("October", -4.390325437488577),
-                                    ("<ordinal> quarter", -4.795790545596741),
-                                    ("intersect", -3.186352633162641),
-                                    ("the <cycle> of <time>", -3.879499813722586),
-                                    ("year (latent)", -4.795790545596741),
-                                    ("April", -4.795790545596741),
-                                    ("this|last|next <cycle>", -4.795790545596741),
-                                    ("day", -2.230841188135204), ("afternoon", -4.795790545596741),
-                                    ("quarter", -4.102643365036796),
-                                    ("time-of-day (latent)", -2.4444152884332633),
-                                    ("year", -4.795790545596741), ("hh:mm", -4.795790545596741),
-                                    ("nograin", -3.291713148820467),
-                                    ("until <time>", -3.291713148820467),
-                                    ("intersect by 'of', 'from', 's", -4.795790545596741),
-                                    ("March", -4.390325437488577),
-                                    ("<day-of-month> (ordinal)", -3.004031076368686),
-                                    ("hour", -2.3978952727983707), ("month", -2.716349003916905),
-                                    ("last <cycle>", -4.102643365036796),
-                                    ("<datetime> - <datetime> (interval)", -4.795790545596741),
+                                     -3.173878458937465),
+                                    ("September", -4.783316371371566),
+                                    ("October", -4.377851263263401),
+                                    ("<ordinal> quarter", -4.783316371371566),
+                                    ("intersect", -3.173878458937465),
+                                    ("the <cycle> of <time>", -3.8670256394974105),
+                                    ("April", -4.783316371371566),
+                                    ("this|last|next <cycle>", -4.783316371371566),
+                                    ("day", -2.2183670139100284), ("afternoon", -4.783316371371566),
+                                    ("quarter", -4.09016919081162),
+                                    ("time-of-day (latent)", -2.4319411142080876),
+                                    ("hh:mm", -4.783316371371566), ("nograin", -3.2792389745952915),
+                                    ("until <time>", -3.2792389745952915),
+                                    ("intersect by 'of', 'from', 's", -4.783316371371566),
+                                    ("March", -4.377851263263401),
+                                    ("<day-of-month> (ordinal)", -2.99155690214351),
+                                    ("hour", -2.385421098573195), ("month", -2.7038748296917294),
+                                    ("last <cycle>", -4.09016919081162),
+                                    ("<datetime> - <datetime> (interval)", -4.783316371371566),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -4.390325437488577),
-                                    ("minute", -3.6971782569286313),
-                                    ("August", -4.390325437488577)],
-                               n = 83}}),
+                                     -4.377851263263401),
+                                    ("minute", -3.6847040827034556),
+                                    ("August", -4.377851263263401)],
+                               n = 82}}),
        ("dd/mm/yyyy",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,

Duckling/Ranking/Classifiers/EN_AU.hs

@@ -276,7 +276,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -297,44 +297,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -992,467 +992,455 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.49314027536445065,
-                               unseen = -7.176254532017144,
+                     ClassData{prior = -0.4572231019431188, unseen = -7.172424577124845,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.482342533064276),
-                                    ("Karva Chauthyear (latent)", -6.482342533064276),
+                                   [("Navaratriyear (latent)", -6.478509642208569),
+                                    ("Karva Chauthyear (latent)", -6.478509642208569),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Maha Shivaratriyear (latent)", -6.482342533064276),
-                                    ("Ramadanyear (latent)", -5.229579564568908),
+                                     -6.478509642208569),
+                                    ("Maha Shivaratriyear (latent)", -6.478509642208569),
+                                    ("Ramadanyear (latent)", -5.225746673713201),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.096048171944386),
-                                    ("Bhai Doojyear (latent)", -6.482342533064276),
-                                    ("hourday", -4.467439512522012),
-                                    ("dayhour", -3.4378200953408538),
+                                     -5.092215281088679),
+                                    ("Bhai Doojyear (latent)", -6.478509642208569),
+                                    ("hourday", -4.463606621666305),
+                                    ("dayhour", -3.4339872044851463),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.096048171944386),
-                                    ("Martin Luther King's Dayyear (latent)", -6.076877424956113),
-                                    ("Shemini Atzeretyear (latent)", -6.482342533064276),
-                                    ("daymonth", -4.467439512522012),
-                                    ("monthday", -6.076877424956113),
-                                    ("monthyear", -4.690583063836222),
-                                    ("Yom Ha'atzmautyear (latent)", -6.482342533064276),
-                                    ("Orthodox Good Fridayyear (latent)", -6.076877424956113),
-                                    ("Vijayadashamiyear (latent)", -6.482342533064276),
-                                    ("Thai Pongalyear (latent)", -5.789195352504331),
-                                    ("Thiru Onamyear (latent)", -5.789195352504331),
-                                    ("hhhmmabsorption of , after named day", -6.482342533064276),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.482342533064276),
+                                     -5.092215281088679),
+                                    ("Martin Luther King's Dayyear (latent)", -6.073044534100405),
+                                    ("Shemini Atzeretyear (latent)", -6.478509642208569),
+                                    ("daymonth", -4.463606621666305),
+                                    ("monthday", -6.073044534100405),
+                                    ("monthyear", -4.686750172980514),
+                                    ("Yom Ha'atzmautyear (latent)", -6.478509642208569),
+                                    ("Orthodox Good Fridayyear (latent)", -6.073044534100405),
+                                    ("Vijayadashamiyear (latent)", -6.478509642208569),
+                                    ("Thai Pongalyear (latent)", -5.785362461648624),
+                                    ("Thiru Onamyear (latent)", -5.785362461648624),
+                                    ("hhhmmabsorption of , after named day", -6.478509642208569),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.478509642208569),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.566051801190121),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.482342533064276),
-                                    ("Krishna Janmashtamiyear (latent)", -6.076877424956113),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.482342533064276),
-                                    ("houryear", -5.566051801190121),
+                                     -5.562218910334414),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.478509642208569),
+                                    ("Krishna Janmashtamiyear (latent)", -6.073044534100405),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.478509642208569),
+                                    ("houryear", -5.562218910334414),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("Christmas<time-of-day> am|pm", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Christmas<time-of-day> am|pm", -6.478509642208569),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.789195352504331),
-                                    ("intersectin|during <named-month>|year", -6.482342533064276),
-                                    ("<time-of-day> am|pmintersect", -5.229579564568908),
-                                    ("Earth Houryear (latent)", -6.482342533064276),
-                                    ("Ganesh Chaturthiyear (latent)", -6.482342533064276),
-                                    ("Octoberyear (latent)", -4.978265136288003),
-                                    ("intersect<time-of-day> am|pm", -6.482342533064276),
-                                    ("Mattu Pongalyear (latent)", -6.482342533064276),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.482342533064276),
-                                    ("Shavuotyear (latent)", -6.482342533064276),
-                                    ("Parsi New Yearyear (latent)", -5.566051801190121),
+                                     -5.785362461648624),
+                                    ("intersectin|during <named-month>|year", -6.478509642208569),
+                                    ("<time-of-day> am|pmintersect", -5.225746673713201),
+                                    ("Earth Houryear (latent)", -6.478509642208569),
+                                    ("Ganesh Chaturthiyear (latent)", -6.478509642208569),
+                                    ("Octoberyear (latent)", -4.974432245432295),
+                                    ("intersect<time-of-day> am|pm", -6.478509642208569),
+                                    ("Mattu Pongalyear (latent)", -6.478509642208569),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.478509642208569),
+                                    ("Shavuotyear (latent)", -6.478509642208569),
+                                    ("Parsi New Yearyear (latent)", -5.562218910334414),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.482342533064276),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.482342533064276),
-                                    ("todayin|within|after <duration>", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.478509642208569),
+                                    ("todayin|within|after <duration>", -6.478509642208569),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.076877424956113),
-                                    ("Marchyear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("Marchyear (latent)", -6.478509642208569),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.076877424956113),
-                                    ("Sukkotyear (latent)", -6.076877424956113),
-                                    ("hhhmmintersect", -6.076877424956113),
+                                     -6.073044534100405),
+                                    ("Sukkotyear (latent)", -6.073044534100405),
+                                    ("hhhmmintersect", -6.073044534100405),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.076877424956113),
-                                    ("Clean Mondayyear (latent)", -6.076877424956113),
-                                    ("monthhour", -6.076877424956113),
+                                     -6.073044534100405),
+                                    ("Clean Mondayyear (latent)", -6.073044534100405),
+                                    ("monthhour", -6.073044534100405),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.566051801190121),
-                                    ("todayat <time-of-day>", -6.482342533064276),
-                                    ("Thursday<time> timezone", -4.0844472602659065),
-                                    ("tonight<time-of-day> am|pm", -6.482342533064276),
-                                    ("time-of-day (latent)tonight", -6.076877424956113),
-                                    ("from|since|after <time>December", -6.482342533064276),
-                                    ("<time-of-day> am|pmon <day>", -4.467439512522012),
+                                     -5.562218910334414),
+                                    ("todayat <time-of-day>", -6.478509642208569),
+                                    ("Thursday<time> timezone", -4.080614369410199),
+                                    ("tonight<time-of-day> am|pm", -6.478509642208569),
+                                    ("time-of-day (latent)tonight", -6.073044534100405),
+                                    ("from|since|after <time>December", -6.478509642208569),
+                                    ("<time-of-day> am|pmon <day>", -4.463606621666305),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.076877424956113),
-                                    ("dayday", -3.7097538108244956),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.076877424956113),
-                                    ("tonightat <time-of-day>", -5.383730244396167),
+                                     -6.478509642208569),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.073044534100405),
+                                    ("dayday", -3.705920919968788),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.073044534100405),
+                                    ("tonightat <time-of-day>", -5.37989735354046),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.789195352504331),
+                                     -5.785362461648624),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.482342533064276),
-                                    ("today<time-of-day> am|pm", -6.482342533064276),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.076877424956113),
-                                    ("at <time-of-day><time> <part-of-day>", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)intersect", -6.076877424956113),
-                                    ("hourhour", -3.5119280674945754),
-                                    ("Mahavir Jayantiyear (latent)", -6.076877424956113),
-                                    ("Navaratriin|during <named-month>|year", -6.482342533064276),
-                                    ("Wednesdaythis|last|next <cycle>", -6.482342533064276),
-                                    ("Lentyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("today<time-of-day> am|pm", -6.478509642208569),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.073044534100405),
+                                    ("at <time-of-day><time> <part-of-day>", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)intersect", -6.073044534100405),
+                                    ("hourhour", -3.5080951766388684),
+                                    ("Mahavir Jayantiyear (latent)", -6.073044534100405),
+                                    ("Navaratriin|during <named-month>|year", -6.478509642208569),
+                                    ("Wednesdaythis|last|next <cycle>", -6.478509642208569),
+                                    ("Lentyear (latent)", -6.478509642208569),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.610540356162685),
-                                    ("Boghiyear (latent)", -6.482342533064276),
-                                    ("dayyear", -1.923216285577592),
+                                     -4.606707465306978),
+                                    ("Boghiyear (latent)", -6.478509642208569),
+                                    ("dayyear", -1.9193833947218846),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.482342533064276),
-                                    ("Thursdayfrom|since|after <time>", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Thursdayfrom|since|after <time>", -6.073044534100405),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Thursdayat <time-of-day>", -5.789195352504331),
-                                    ("Islamic New Yearyear (latent)", -6.076877424956113),
-                                    ("Laylat al-Qadryear (latent)", -5.566051801190121),
-                                    ("part of days<time-of-day> am|pm", -6.482342533064276),
-                                    ("Shrove Tuesdayyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Thursdayat <time-of-day>", -5.785362461648624),
+                                    ("Islamic New Yearyear (latent)", -6.073044534100405),
+                                    ("Laylat al-Qadryear (latent)", -5.562218910334414),
+                                    ("part of days<time-of-day> am|pm", -6.478509642208569),
+                                    ("Shrove Tuesdayyear (latent)", -6.478509642208569),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.789195352504331),
-                                    ("hourminute", -6.076877424956113),
-                                    ("<time-of-day> am|pmtomorrow", -5.566051801190121),
-                                    ("Yom Kippuryear (latent)", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.789195352504331),
-                                    ("<part-of-day> of <time>year (latent)", -6.482342533064276),
-                                    ("minutehour", -5.229579564568908),
-                                    ("Kaanum Pongalyear (latent)", -6.076877424956113),
-                                    ("Maha Saptamiyear (latent)", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("hourminute", -6.073044534100405),
+                                    ("<time-of-day> am|pmtomorrow", -5.562218910334414),
+                                    ("Yom Kippuryear (latent)", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.785362461648624),
+                                    ("<part-of-day> of <time>year (latent)", -6.478509642208569),
+                                    ("minutehour", -5.225746673713201),
+                                    ("Kaanum Pongalyear (latent)", -6.073044534100405),
+                                    ("Maha Saptamiyear (latent)", -6.478509642208569),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.789195352504331),
-                                    ("time-of-day (latent)tomorrow", -5.566051801190121),
-                                    ("part of daysat <time-of-day>", -4.872904620630176),
+                                     -5.785362461648624),
+                                    ("time-of-day (latent)tomorrow", -5.562218910334414),
+                                    ("part of daysat <time-of-day>", -4.869071729774469),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.467439512522012),
-                                    ("for <duration> from <time>December", -6.482342533064276),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.482342533064276),
+                                     -4.463606621666305),
+                                    ("for <duration> from <time>December", -6.478509642208569),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.478509642208569),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.229579564568908),
+                                     -5.225746673713201),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.229579564568908),
-                                    ("time-of-day (latent)this <part-of-day>", -6.482342533064276),
-                                    ("Pentecostyear (latent)", -6.482342533064276),
+                                     -5.225746673713201),
+                                    ("time-of-day (latent)this <part-of-day>", -6.478509642208569),
+                                    ("Pentecostyear (latent)", -6.478509642208569),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.229579564568908),
-                                    ("<day-of-month> (ordinal)February", -6.482342533064276),
-                                    ("Eid al-Fitryear (latent)", -5.096048171944386),
+                                     -5.225746673713201),
+                                    ("<day-of-month> (ordinal)February", -6.478509642208569),
+                                    ("Eid al-Fitryear (latent)", -5.092215281088679),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.482342533064276),
-                                    ("Mondayin|during the <part-of-day>", -6.482342533064276),
-                                    ("Chhathin|during <named-month>|year", -6.482342533064276),
-                                    ("Diwaliin|during <named-month>|year", -6.482342533064276),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.482342533064276),
-                                    ("Vaisakhiin|during <named-month>|year", -6.482342533064276),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.229579564568908),
-                                    ("Raksha Bandhanyear (latent)", -6.482342533064276),
-                                    ("daysecond", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Mondayin|during the <part-of-day>", -6.478509642208569),
+                                    ("Chhathin|during <named-month>|year", -6.478509642208569),
+                                    ("Diwaliin|during <named-month>|year", -6.478509642208569),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.478509642208569),
+                                    ("Vaisakhiin|during <named-month>|year", -6.478509642208569),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.225746673713201),
+                                    ("Raksha Bandhanyear (latent)", -6.478509642208569),
+                                    ("daysecond", -6.073044534100405),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.076877424956113),
-                                    ("Ratha-Yatrayear (latent)", -6.482342533064276),
-                                    ("Ashurayear (latent)", -6.482342533064276),
-                                    ("Tuesdayin|during <named-month>|year", -6.482342533064276),
-                                    ("Chinese New Yearyear (latent)", -6.482342533064276),
-                                    ("tomorrowintersect", -6.482342533064276),
-                                    ("Lag BaOmeryear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("Ratha-Yatrayear (latent)", -6.478509642208569),
+                                    ("Ashurayear (latent)", -6.478509642208569),
+                                    ("Tuesdayin|during <named-month>|year", -6.478509642208569),
+                                    ("Chinese New Yearyear (latent)", -6.478509642208569),
+                                    ("tomorrowintersect", -6.478509642208569),
+                                    ("Lag BaOmeryear (latent)", -6.478509642208569),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.482342533064276),
-                                    ("Eid al-Adhayear (latent)", -4.342276369568006),
-                                    ("intersectin|during the <part-of-day>", -6.482342533064276),
-                                    ("Palm Sundayyear (latent)", -6.482342533064276),
-                                    ("Christmasat <time-of-day>", -6.482342533064276),
-                                    ("Passoveryear (latent)", -6.482342533064276),
-                                    ("Lazarus Saturdayyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Eid al-Adhayear (latent)", -4.338443478712298),
+                                    ("intersectin|during the <part-of-day>", -6.478509642208569),
+                                    ("Palm Sundayyear (latent)", -6.478509642208569),
+                                    ("Christmasat <time-of-day>", -6.478509642208569),
+                                    ("Passoveryear (latent)", -6.478509642208569),
+                                    ("Lazarus Saturdayyear (latent)", -6.478509642208569),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.482342533064276),
-                                    ("hhhmmon <day>", -5.566051801190121),
-                                    ("Yom HaShoahyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("hhhmmon <day>", -5.562218910334414),
+                                    ("Yom HaShoahyear (latent)", -6.073044534100405),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Septemberyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Septemberyear (latent)", -6.073044534100405),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.978265136288003),
-                                    ("Halloweenyear (latent)", -6.482342533064276),
+                                     -4.974432245432295),
+                                    ("Halloweenyear (latent)", -6.478509642208569),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.789195352504331),
+                                     -5.785362461648624),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("at <time-of-day>intersect", -5.566051801190121),
-                                    ("Rosh Hashanahyear (latent)", -5.789195352504331),
-                                    ("Dhanterasyear (latent)", -6.482342533064276),
-                                    ("Tu BiShvatyear (latent)", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)December", -5.789195352504331),
-                                    ("Holiyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("at <time-of-day>intersect", -5.562218910334414),
+                                    ("Rosh Hashanahyear (latent)", -5.785362461648624),
+                                    ("Dhanterasyear (latent)", -6.478509642208569),
+                                    ("Tu BiShvatyear (latent)", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)December", -5.785362461648624),
+                                    ("Holiyear (latent)", -5.785362461648624),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.482342533064276),
-                                    ("Holika Dahanyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("Holika Dahanyear (latent)", -5.785362461648624),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.076877424956113),
-                                    ("dayminute", -3.168156528391751),
-                                    ("Mawlidyear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("dayminute", -3.1643236375360435),
+                                    ("Mawlidyear (latent)", -6.478509642208569),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.482342533064276),
-                                    ("Jumu'atul-Widayear (latent)", -5.566051801190121),
-                                    ("minuteday", -2.7328384571339055),
+                                     -6.478509642208569),
+                                    ("Jumu'atul-Widayear (latent)", -5.562218910334414),
+                                    ("minuteday", -2.729005566278198),
                                     ("absorption of , after named dayintersect",
-                                     -5.789195352504331),
-                                    ("intersectyear (latent)", -6.482342533064276),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("intersectyear (latent)", -6.478509642208569),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.478509642208569),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.482342533064276),
-                                    ("intersecthhhmm", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("intersecthhhmm", -6.073044534100405),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Boss's Dayyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Boss's Dayyear (latent)", -6.073044534100405),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.482342533064276),
-                                    ("Global Youth Service Dayyear (latent)", -6.482342533064276),
-                                    ("Dhanterasin|during <named-month>|year", -6.482342533064276),
-                                    ("tonight<time-of-day> o'clock", -6.482342533064276),
-                                    ("Tisha B'Avyear (latent)", -6.482342533064276),
-                                    ("Isra and Mi'rajyear (latent)", -5.566051801190121),
-                                    ("at <time-of-day>on <day>", -4.872904620630176),
+                                     -6.478509642208569),
+                                    ("Global Youth Service Dayyear (latent)", -6.478509642208569),
+                                    ("Dhanterasin|during <named-month>|year", -6.478509642208569),
+                                    ("tonight<time-of-day> o'clock", -6.478509642208569),
+                                    ("Tisha B'Avyear (latent)", -6.478509642208569),
+                                    ("Isra and Mi'rajyear (latent)", -5.562218910334414),
+                                    ("at <time-of-day>on <day>", -4.869071729774469),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.789195352504331),
-                                    ("Christmasyear (latent)", -6.076877424956113),
-                                    ("Saturdayintersect", -6.482342533064276),
-                                    ("Naraka Chaturdashiyear (latent)", -6.076877424956113),
-                                    ("Thai Pongalin|during <named-month>|year", -6.482342533064276),
-                                    ("dayweek", -6.482342533064276),
-                                    ("Easter Sundayyear (latent)", -5.789195352504331),
+                                     -5.785362461648624),
+                                    ("Christmasyear (latent)", -6.073044534100405),
+                                    ("Saturdayintersect", -6.478509642208569),
+                                    ("Naraka Chaturdashiyear (latent)", -6.073044534100405),
+                                    ("Thai Pongalin|during <named-month>|year", -6.478509642208569),
+                                    ("dayweek", -6.478509642208569),
+                                    ("Easter Sundayyear (latent)", -5.785362461648624),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.076877424956113),
-                                    ("weekyear", -5.383730244396167),
-                                    ("King's Dayyear (latent)", -4.978265136288003),
-                                    ("hh:mmin|during the <part-of-day>", -5.566051801190121),
+                                     -6.073044534100405),
+                                    ("weekyear", -5.37989735354046),
+                                    ("King's Dayyear (latent)", -4.974432245432295),
+                                    ("hh:mmin|during the <part-of-day>", -5.562218910334414),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.789195352504331),
-                                    ("Hanukkahyear (latent)", -5.789195352504331),
-                                    ("Rama Navamiyear (latent)", -6.482342533064276),
-                                    ("February<time> <part-of-day>", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("Hanukkahyear (latent)", -5.785362461648624),
+                                    ("Rama Navamiyear (latent)", -6.478509642208569),
+                                    ("February<time> <part-of-day>", -6.478509642208569),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.789195352504331),
-                                    ("Great Lentyear (latent)", -6.482342533064276),
-                                    ("tomorrowat <time-of-day>", -5.789195352504331),
+                                     -5.785362461648624),
+                                    ("Great Lentyear (latent)", -6.478509642208569),
+                                    ("tomorrowat <time-of-day>", -5.785362461648624),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.076877424956113),
-                                    ("Ugadiyear (latent)", -5.096048171944386),
-                                    ("Vaisakhiyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.073044534100405),
+                                    ("Ugadiyear (latent)", -5.092215281088679),
+                                    ("Vaisakhiyear (latent)", -5.785362461648624),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.789195352504331),
-                                    ("last <cycle> of <time>year (latent)", -5.789195352504331),
-                                    ("at <time-of-day>tomorrow", -6.076877424956113),
-                                    ("tomorrow<time-of-day> am|pm", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("last <cycle> of <time>year (latent)", -5.785362461648624),
+                                    ("at <time-of-day>tomorrow", -6.073044534100405),
+                                    ("tomorrow<time-of-day> am|pm", -6.478509642208569),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.482342533064276),
-                                    ("Diwaliyear (latent)", -6.482342533064276),
-                                    ("between <time> and <time>on <day>", -6.076877424956113),
-                                    ("Black Fridayyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Diwaliyear (latent)", -6.478509642208569),
+                                    ("between <time> and <time>on <day>", -6.073044534100405),
+                                    ("Black Fridayyear (latent)", -6.073044534100405),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.482342533064276),
-                                    ("Chhathyear (latent)", -6.076877424956113),
-                                    ("Vasant Panchamiyear (latent)", -6.482342533064276),
-                                    ("Rabindra Jayantiyear (latent)", -5.229579564568908),
-                                    ("this <part-of-day>at <time-of-day>", -5.229579564568908),
-                                    ("St Patrick's Dayyear (latent)", -6.482342533064276),
-                                    ("Thursday<time> (timezone)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Chhathyear (latent)", -6.073044534100405),
+                                    ("Vasant Panchamiyear (latent)", -6.478509642208569),
+                                    ("Rabindra Jayantiyear (latent)", -5.225746673713201),
+                                    ("this <part-of-day>at <time-of-day>", -5.225746673713201),
+                                    ("St Patrick's Dayyear (latent)", -6.478509642208569),
+                                    ("Thursday<time> (timezone)", -6.478509642208569),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Pargat Diwasyear (latent)", -5.229579564568908),
-                                    ("<datetime> - <datetime> (interval)July", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Pargat Diwasyear (latent)", -5.225746673713201),
+                                    ("<datetime> - <datetime> (interval)July", -6.073044534100405),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.789195352504331),
-                                    ("Februaryintersect", -6.482342533064276),
-                                    ("Simchat Torahyear (latent)", -6.482342533064276),
-                                    ("minuteyear", -6.482342533064276)],
+                                     -5.785362461648624),
+                                    ("Februaryintersect", -6.478509642208569),
+                                    ("Simchat Torahyear (latent)", -6.478509642208569),
+                                    ("minuteyear", -6.478509642208569)],
                                n = 502},
                    koData =
-                     ClassData{prior = -0.9434193992624076, unseen = -6.8501261661455,
+                     ClassData{prior = -1.0024999544633555, unseen = -6.78105762593618,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.651841705297238),
-                                    ("hourday", -3.5532294166291285),
+                                   [("Thursdayhhhmm", -4.582697330136033),
+                                    ("hourday", -3.484085041467923),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)August", -6.155919102073512),
-                                    ("dayhour", -3.5909697446119755),
-                                    ("<time> timezoneyear (latent)", -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)August", -6.0867747269123065),
+                                    ("dayhour", -3.52182536945077),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.239628370199357),
-                                    ("Tuesdayfrom|since|after <time>", -5.462771921513567),
-                                    ("daymonth", -3.447868900971302),
-                                    ("hourquarter", -5.239628370199357),
-                                    ("monthday", -5.750453993965348),
-                                    ("monthyear", -4.903156133578144),
-                                    ("<time-of-day> am|pmyear (latent)", -5.462771921513567),
-                                    ("Thai Pongalyear (latent)", -5.462771921513567),
-                                    ("intersecthh:mm", -6.155919102073512),
+                                     -5.170483995038151),
+                                    ("Tuesdayfrom|since|after <time>", -5.393627546352362),
+                                    ("daymonth", -3.378724525810097),
+                                    ("hourquarter", -5.170483995038151),
+                                    ("monthday", -5.681309618804143),
+                                    ("monthyear", -4.834011758416939),
+                                    ("Thai Pongalyear (latent)", -5.393627546352362),
+                                    ("intersecthh:mm", -6.0867747269123065),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.750453993965348),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.155919102073512),
-                                    ("houryear", -4.364159632845457),
+                                     -5.681309618804143),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.0867747269123065),
+                                    ("houryear", -4.700480365792417),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)October", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)October", -6.0867747269123065),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.462771921513567),
-                                    ("hournograin", -4.903156133578144),
-                                    ("<time-of-day> am|pmintersect", -4.903156133578144),
-                                    ("Octoberyear (latent)", -6.155919102073512),
-                                    ("Good Fridayyear (latent)", -5.750453993965348),
+                                     -5.393627546352362),
+                                    ("hournograin", -4.834011758416939),
+                                    ("<time-of-day> am|pmintersect", -4.834011758416939),
+                                    ("Octoberyear (latent)", -6.0867747269123065),
+                                    ("Good Fridayyear (latent)", -5.681309618804143),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("early morningat <time-of-day>", -6.155919102073512),
-                                    ("until <time>on <day>", -5.462771921513567),
+                                     -5.681309618804143),
+                                    ("early morningat <time-of-day>", -6.0867747269123065),
+                                    ("until <time>on <day>", -5.393627546352362),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
-                                    ("time-of-day (latent)intersect", -5.462771921513567),
-                                    ("todayin <number> (implicit minutes)", -6.155919102073512),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("time-of-day (latent)intersect", -5.393627546352362),
+                                    ("todayin <number> (implicit minutes)", -6.0867747269123065),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.155919102073512),
-                                    ("hh:mmon <day>", -4.903156133578144),
-                                    ("hhhmmintersect", -5.750453993965348),
-                                    ("absorption of , after named dayJuly", -5.239628370199357),
-                                    ("from|since|after <time>July", -5.750453993965348),
+                                     -6.0867747269123065),
+                                    ("hh:mmon <day>", -4.834011758416939),
+                                    ("hhhmmintersect", -5.681309618804143),
+                                    ("absorption of , after named dayJuly", -5.170483995038151),
+                                    ("from|since|after <time>July", -5.681309618804143),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.239628370199357),
-                                    ("Clean Mondayyear (latent)", -6.155919102073512),
-                                    ("monthhour", -6.155919102073512),
+                                     -5.170483995038151),
+                                    ("Clean Mondayyear (latent)", -6.0867747269123065),
+                                    ("monthhour", -6.0867747269123065),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("hourmonth", -4.0158529385772415),
-                                    ("todayat <time-of-day>", -6.155919102073512),
-                                    ("hhhmmyear (latent)", -4.903156133578144),
-                                    ("from|since|after <time>December", -6.155919102073512),
+                                     -5.681309618804143),
+                                    ("hourmonth", -3.946708563416036),
+                                    ("todayat <time-of-day>", -6.0867747269123065),
+                                    ("from|since|after <time>December", -6.0867747269123065),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.155919102073512),
-                                    ("<time-of-day> am|pmon <day>", -4.903156133578144),
-                                    ("Mondayyear (latent)", -5.462771921513567),
-                                    ("dayday", -4.0158529385772415),
-                                    ("on <day>September", -5.462771921513567),
-                                    ("time-of-day (latent)September", -5.750453993965348),
-                                    ("hourhour", -4.076477560393676),
-                                    ("time-of-day (latent)on <day>", -4.651841705297238),
-                                    ("Thursdaydd/mm", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<time-of-day> am|pmon <day>", -4.834011758416939),
+                                    ("Mondayyear (latent)", -5.393627546352362),
+                                    ("dayday", -3.946708563416036),
+                                    ("on <day>September", -5.393627546352362),
+                                    ("time-of-day (latent)September", -5.681309618804143),
+                                    ("hourhour", -4.007333185232471),
+                                    ("time-of-day (latent)on <day>", -4.582697330136033),
+                                    ("Thursdaydd/mm", -6.0867747269123065),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.750453993965348),
-                                    ("dayyear", -3.1354942159291497),
-                                    ("New Year's Dayyear (latent)", -5.239628370199357),
-                                    ("time-of-day (latent)Sunday", -5.750453993965348),
-                                    ("Thursdayfrom|since|after <time>", -4.451171009835087),
-                                    ("Thursdayat <time-of-day>", -4.546481189639412),
+                                     -5.681309618804143),
+                                    ("dayyear", -3.283414346005772),
+                                    ("New Year's Dayyear (latent)", -5.170483995038151),
+                                    ("time-of-day (latent)Sunday", -5.681309618804143),
+                                    ("Thursdayfrom|since|after <time>", -4.382026634673881),
+                                    ("Thursdayat <time-of-day>", -4.477336814478207),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.155919102073512),
-                                    ("Aprilyear (latent)", -6.155919102073512),
-                                    ("the <day-of-month> (ordinal)July", -6.155919102073512),
-                                    ("the <day-of-month> (number)July", -6.155919102073512),
-                                    ("monthminute", -6.155919102073512),
-                                    ("<time-of-day> am|pmtomorrow", -5.750453993965348),
-                                    ("Thursdayhh:mm", -5.239628370199357),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.750453993965348),
-                                    ("minutemonth", -4.0158529385772415),
-                                    ("time-of-day (latent)Friday", -5.750453993965348),
-                                    ("minutehour", -6.155919102073512),
-                                    ("part of daysat <time-of-day>", -5.057306813405402),
+                                     -6.0867747269123065),
+                                    ("Aprilyear (latent)", -6.0867747269123065),
+                                    ("the <day-of-month> (ordinal)July", -6.0867747269123065),
+                                    ("the <day-of-month> (number)July", -6.0867747269123065),
+                                    ("monthminute", -6.0867747269123065),
+                                    ("<time-of-day> am|pmtomorrow", -5.681309618804143),
+                                    ("Thursdayhh:mm", -5.170483995038151),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.681309618804143),
+                                    ("minutemonth", -3.946708563416036),
+                                    ("time-of-day (latent)Friday", -5.681309618804143),
+                                    ("minutehour", -6.0867747269123065),
+                                    ("part of daysat <time-of-day>", -4.988162438244197),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.8045438449100346),
-                                    ("Augustyear (latent)", -5.750453993965348),
-                                    ("week-endin|during <named-month>|year", -6.155919102073512),
-                                    ("time-of-day (latent)Tuesday", -5.750453993965348),
+                                     -3.7353994697488293),
+                                    ("Augustyear (latent)", -5.681309618804143),
+                                    ("week-endin|during <named-month>|year", -6.0867747269123065),
+                                    ("time-of-day (latent)Tuesday", -5.681309618804143),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("July<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.155919102073512),
-                                    ("Sundayyear (latent)", -5.239628370199357),
-                                    ("hourweek", -5.239628370199357),
-                                    ("the <day-of-month> (ordinal)Monday", -5.462771921513567),
-                                    ("Christmasat <time-of-day>", -6.155919102073512),
-                                    ("from|since|after <time>year (latent)", -5.057306813405402),
-                                    ("hhhmmon <day>", -5.239628370199357),
-                                    ("yesterday<time-of-day> am|pm", -6.155919102073512),
-                                    ("<day-of-month> (ordinal)July", -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("Sundayyear (latent)", -5.170483995038151),
+                                    ("hourweek", -5.170483995038151),
+                                    ("the <day-of-month> (ordinal)Monday", -5.393627546352362),
+                                    ("Christmasat <time-of-day>", -6.0867747269123065),
+                                    ("from|since|after <time>year (latent)", -5.681309618804143),
+                                    ("hhhmmon <day>", -5.170483995038151),
+                                    ("yesterday<time-of-day> am|pm", -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)July", -5.393627546352362),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("August<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.155919102073512),
-                                    ("at <time-of-day>intersect", -5.239628370199357),
-                                    ("hh:mmyear (latent)", -4.769624740953621),
-                                    ("Holiyear (latent)", -6.155919102073512),
-                                    ("until <time><time-of-day> am|pm", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("at <time-of-day>intersect", -5.170483995038151),
+                                    ("Holiyear (latent)", -6.0867747269123065),
+                                    ("until <time><time-of-day> am|pm", -6.0867747269123065),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("dayminute", -3.322705758017296),
-                                    ("yyyy-mm-ddhh:mm", -5.750453993965348),
-                                    ("intersectfrom|since|after <time>", -5.750453993965348),
-                                    ("intersectSeptember", -4.28411692517192),
-                                    ("minuteday", -2.9989186809233987),
+                                     -5.681309618804143),
+                                    ("dayminute", -3.2535613828560908),
+                                    ("yyyy-mm-ddhh:mm", -5.681309618804143),
+                                    ("intersectfrom|since|after <time>", -5.681309618804143),
+                                    ("intersectSeptember", -4.214972550010716),
+                                    ("minuteday", -2.9297743057621934),
                                     ("absorption of , after named dayintersect",
-                                     -6.155919102073512),
-                                    ("intersectyear (latent)", -6.155919102073512),
-                                    ("Februaryin|during the <part-of-day>", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("intersectyear (latent)", -6.0867747269123065),
+                                    ("Februaryin|during the <part-of-day>", -6.0867747269123065),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.155919102073512),
-                                    ("time-of-day (latent)July", -5.462771921513567),
-                                    ("Saturdayyear (latent)", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("time-of-day (latent)July", -5.393627546352362),
+                                    ("Saturdayyear (latent)", -6.0867747269123065),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)Monday", -4.903156133578144),
-                                    ("at <time-of-day>on <day>", -5.239628370199357),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)Monday", -4.834011758416939),
+                                    ("at <time-of-day>on <day>", -5.170483995038151),
                                     ("absorption of , after named daySeptember",
-                                     -4.903156133578144),
-                                    ("Naraka Chaturdashiyear (latent)", -6.155919102073512),
-                                    ("from|since|after <time>on <day>", -5.239628370199357),
-                                    ("dayweek", -6.155919102073512),
-                                    ("Easter Sundayyear (latent)", -5.750453993965348),
-                                    ("Thursday<time-of-day> am|pm", -4.903156133578144),
-                                    ("weekyear", -5.750453993965348),
-                                    ("time-of-day (latent)Thursday", -5.750453993965348),
+                                     -4.834011758416939),
+                                    ("Naraka Chaturdashiyear (latent)", -6.0867747269123065),
+                                    ("from|since|after <time>on <day>", -5.170483995038151),
+                                    ("dayweek", -6.0867747269123065),
+                                    ("Easter Sundayyear (latent)", -5.681309618804143),
+                                    ("Thursday<time-of-day> am|pm", -4.834011758416939),
+                                    ("weekyear", -5.681309618804143),
+                                    ("time-of-day (latent)Thursday", -5.681309618804143),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)April", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)April", -6.0867747269123065),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.750453993965348),
+                                     -5.681309618804143),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.462771921513567),
-                                    ("Sundayfrom|since|after <time>", -6.155919102073512),
-                                    ("absorption of , after named dayFebruary", -5.239628370199357),
+                                     -5.393627546352362),
+                                    ("Sundayfrom|since|after <time>", -6.0867747269123065),
+                                    ("absorption of , after named dayFebruary", -5.170483995038151),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.750453993965348),
+                                     -5.681309618804143),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.155919102073512),
-                                    ("tomorrowat <time-of-day>", -6.155919102073512),
-                                    ("daynograin", -5.750453993965348),
-                                    ("Fridayin|during <named-month>|year", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("tomorrowat <time-of-day>", -6.0867747269123065),
+                                    ("daynograin", -5.681309618804143),
+                                    ("Fridayin|during <named-month>|year", -6.0867747269123065),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.750453993965348),
-                                    ("last <cycle> of <time>year (latent)", -5.750453993965348),
-                                    ("tomorrow<time-of-day> am|pm", -6.155919102073512),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.462771921513567),
-                                    ("Diwaliyear (latent)", -5.750453993965348),
+                                     -5.681309618804143),
+                                    ("last <cycle> of <time>year (latent)", -5.681309618804143),
+                                    ("tomorrow<time-of-day> am|pm", -6.0867747269123065),
+                                    ("Diwaliyear (latent)", -5.681309618804143),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.155919102073512),
-                                    ("this <part-of-day>at <time-of-day>", -5.239628370199357),
-                                    ("Fridayyear (latent)", -5.239628370199357),
-                                    ("time-of-day (latent)April", -6.155919102073512),
-                                    ("minuteyear", -3.9586945247372927)],
-                               n = 320}}),
+                                     -6.0867747269123065),
+                                    ("this <part-of-day>at <time-of-day>", -5.170483995038151),
+                                    ("Fridayyear (latent)", -5.170483995038151),
+                                    ("time-of-day (latent)April", -6.0867747269123065)],
+                               n = 291}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1742,22 +1730,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.14681486833704485,
-                               unseen = -5.393627546352362,
+                     ClassData{prior = -4.546237407675729e-2,
+                               unseen = -5.389071729816501,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.7779564107075706e-2),
-                                    ("intersect 2 numbers", -4.00277736869661)],
+                                   [("integer (numeric)", -2.320289707966387e-2),
+                                    ("intersect 2 numbers", -3.9982007016691985)],
                                n = 215},
                    koData =
-                     ClassData{prior = -1.9910923718485463,
-                               unseen = -3.6635616461296463,
+                     ClassData{prior = -3.1135153092103742, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.55814461804655),
-                                    ("negative numbers", -0.41871033485818493),
-                                    ("compose by multiplication", -2.2512917986064953)],
-                               n = 34}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.15415067982725836,

Duckling/Ranking/Classifiers/EN_BZ.hs

@@ -276,7 +276,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -297,44 +297,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -992,467 +992,455 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.49314027536445065,
-                               unseen = -7.176254532017144,
+                     ClassData{prior = -0.4572231019431188, unseen = -7.172424577124845,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.482342533064276),
-                                    ("Karva Chauthyear (latent)", -6.482342533064276),
+                                   [("Navaratriyear (latent)", -6.478509642208569),
+                                    ("Karva Chauthyear (latent)", -6.478509642208569),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Maha Shivaratriyear (latent)", -6.482342533064276),
-                                    ("Ramadanyear (latent)", -5.229579564568908),
+                                     -6.478509642208569),
+                                    ("Maha Shivaratriyear (latent)", -6.478509642208569),
+                                    ("Ramadanyear (latent)", -5.225746673713201),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.096048171944386),
-                                    ("Bhai Doojyear (latent)", -6.482342533064276),
-                                    ("hourday", -4.467439512522012),
-                                    ("dayhour", -3.4378200953408538),
+                                     -5.092215281088679),
+                                    ("Bhai Doojyear (latent)", -6.478509642208569),
+                                    ("hourday", -4.463606621666305),
+                                    ("dayhour", -3.4339872044851463),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.096048171944386),
-                                    ("Martin Luther King's Dayyear (latent)", -6.076877424956113),
-                                    ("Shemini Atzeretyear (latent)", -6.482342533064276),
-                                    ("daymonth", -4.467439512522012),
-                                    ("monthday", -6.076877424956113),
-                                    ("monthyear", -4.690583063836222),
-                                    ("Yom Ha'atzmautyear (latent)", -6.482342533064276),
-                                    ("Orthodox Good Fridayyear (latent)", -6.076877424956113),
-                                    ("Vijayadashamiyear (latent)", -6.482342533064276),
-                                    ("Thai Pongalyear (latent)", -5.789195352504331),
-                                    ("Thiru Onamyear (latent)", -5.789195352504331),
-                                    ("hhhmmabsorption of , after named day", -6.482342533064276),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.482342533064276),
+                                     -5.092215281088679),
+                                    ("Martin Luther King's Dayyear (latent)", -6.073044534100405),
+                                    ("Shemini Atzeretyear (latent)", -6.478509642208569),
+                                    ("daymonth", -4.463606621666305),
+                                    ("monthday", -6.073044534100405),
+                                    ("monthyear", -4.686750172980514),
+                                    ("Yom Ha'atzmautyear (latent)", -6.478509642208569),
+                                    ("Orthodox Good Fridayyear (latent)", -6.073044534100405),
+                                    ("Vijayadashamiyear (latent)", -6.478509642208569),
+                                    ("Thai Pongalyear (latent)", -5.785362461648624),
+                                    ("Thiru Onamyear (latent)", -5.785362461648624),
+                                    ("hhhmmabsorption of , after named day", -6.478509642208569),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.478509642208569),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.566051801190121),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.482342533064276),
-                                    ("Krishna Janmashtamiyear (latent)", -6.076877424956113),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.482342533064276),
-                                    ("houryear", -5.566051801190121),
+                                     -5.562218910334414),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.478509642208569),
+                                    ("Krishna Janmashtamiyear (latent)", -6.073044534100405),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.478509642208569),
+                                    ("houryear", -5.562218910334414),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("Christmas<time-of-day> am|pm", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Christmas<time-of-day> am|pm", -6.478509642208569),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.789195352504331),
-                                    ("intersectin|during <named-month>|year", -6.482342533064276),
-                                    ("<time-of-day> am|pmintersect", -5.229579564568908),
-                                    ("Earth Houryear (latent)", -6.482342533064276),
-                                    ("Ganesh Chaturthiyear (latent)", -6.482342533064276),
-                                    ("Octoberyear (latent)", -4.978265136288003),
-                                    ("intersect<time-of-day> am|pm", -6.482342533064276),
-                                    ("Mattu Pongalyear (latent)", -6.482342533064276),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.482342533064276),
-                                    ("Shavuotyear (latent)", -6.482342533064276),
-                                    ("Parsi New Yearyear (latent)", -5.566051801190121),
+                                     -5.785362461648624),
+                                    ("intersectin|during <named-month>|year", -6.478509642208569),
+                                    ("<time-of-day> am|pmintersect", -5.225746673713201),
+                                    ("Earth Houryear (latent)", -6.478509642208569),
+                                    ("Ganesh Chaturthiyear (latent)", -6.478509642208569),
+                                    ("Octoberyear (latent)", -4.974432245432295),
+                                    ("intersect<time-of-day> am|pm", -6.478509642208569),
+                                    ("Mattu Pongalyear (latent)", -6.478509642208569),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.478509642208569),
+                                    ("Shavuotyear (latent)", -6.478509642208569),
+                                    ("Parsi New Yearyear (latent)", -5.562218910334414),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.482342533064276),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.482342533064276),
-                                    ("todayin|within|after <duration>", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.478509642208569),
+                                    ("todayin|within|after <duration>", -6.478509642208569),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.076877424956113),
-                                    ("Marchyear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("Marchyear (latent)", -6.478509642208569),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.076877424956113),
-                                    ("Sukkotyear (latent)", -6.076877424956113),
-                                    ("hhhmmintersect", -6.076877424956113),
+                                     -6.073044534100405),
+                                    ("Sukkotyear (latent)", -6.073044534100405),
+                                    ("hhhmmintersect", -6.073044534100405),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.076877424956113),
-                                    ("Clean Mondayyear (latent)", -6.076877424956113),
-                                    ("monthhour", -6.076877424956113),
+                                     -6.073044534100405),
+                                    ("Clean Mondayyear (latent)", -6.073044534100405),
+                                    ("monthhour", -6.073044534100405),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.566051801190121),
-                                    ("todayat <time-of-day>", -6.482342533064276),
-                                    ("Thursday<time> timezone", -4.0844472602659065),
-                                    ("tonight<time-of-day> am|pm", -6.482342533064276),
-                                    ("time-of-day (latent)tonight", -6.076877424956113),
-                                    ("from|since|after <time>December", -6.482342533064276),
-                                    ("<time-of-day> am|pmon <day>", -4.467439512522012),
+                                     -5.562218910334414),
+                                    ("todayat <time-of-day>", -6.478509642208569),
+                                    ("Thursday<time> timezone", -4.080614369410199),
+                                    ("tonight<time-of-day> am|pm", -6.478509642208569),
+                                    ("time-of-day (latent)tonight", -6.073044534100405),
+                                    ("from|since|after <time>December", -6.478509642208569),
+                                    ("<time-of-day> am|pmon <day>", -4.463606621666305),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.076877424956113),
-                                    ("dayday", -3.7097538108244956),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.076877424956113),
-                                    ("tonightat <time-of-day>", -5.383730244396167),
+                                     -6.478509642208569),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.073044534100405),
+                                    ("dayday", -3.705920919968788),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.073044534100405),
+                                    ("tonightat <time-of-day>", -5.37989735354046),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.789195352504331),
+                                     -5.785362461648624),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.482342533064276),
-                                    ("today<time-of-day> am|pm", -6.482342533064276),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.076877424956113),
-                                    ("at <time-of-day><time> <part-of-day>", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)intersect", -6.076877424956113),
-                                    ("hourhour", -3.5119280674945754),
-                                    ("Mahavir Jayantiyear (latent)", -6.076877424956113),
-                                    ("Navaratriin|during <named-month>|year", -6.482342533064276),
-                                    ("Wednesdaythis|last|next <cycle>", -6.482342533064276),
-                                    ("Lentyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("today<time-of-day> am|pm", -6.478509642208569),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.073044534100405),
+                                    ("at <time-of-day><time> <part-of-day>", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)intersect", -6.073044534100405),
+                                    ("hourhour", -3.5080951766388684),
+                                    ("Mahavir Jayantiyear (latent)", -6.073044534100405),
+                                    ("Navaratriin|during <named-month>|year", -6.478509642208569),
+                                    ("Wednesdaythis|last|next <cycle>", -6.478509642208569),
+                                    ("Lentyear (latent)", -6.478509642208569),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.610540356162685),
-                                    ("Boghiyear (latent)", -6.482342533064276),
-                                    ("dayyear", -1.923216285577592),
+                                     -4.606707465306978),
+                                    ("Boghiyear (latent)", -6.478509642208569),
+                                    ("dayyear", -1.9193833947218846),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.482342533064276),
-                                    ("Thursdayfrom|since|after <time>", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Thursdayfrom|since|after <time>", -6.073044534100405),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Thursdayat <time-of-day>", -5.789195352504331),
-                                    ("Islamic New Yearyear (latent)", -6.076877424956113),
-                                    ("Laylat al-Qadryear (latent)", -5.566051801190121),
-                                    ("part of days<time-of-day> am|pm", -6.482342533064276),
-                                    ("Shrove Tuesdayyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Thursdayat <time-of-day>", -5.785362461648624),
+                                    ("Islamic New Yearyear (latent)", -6.073044534100405),
+                                    ("Laylat al-Qadryear (latent)", -5.562218910334414),
+                                    ("part of days<time-of-day> am|pm", -6.478509642208569),
+                                    ("Shrove Tuesdayyear (latent)", -6.478509642208569),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.789195352504331),
-                                    ("hourminute", -6.076877424956113),
-                                    ("<time-of-day> am|pmtomorrow", -5.566051801190121),
-                                    ("Yom Kippuryear (latent)", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.789195352504331),
-                                    ("<part-of-day> of <time>year (latent)", -6.482342533064276),
-                                    ("minutehour", -5.229579564568908),
-                                    ("Kaanum Pongalyear (latent)", -6.076877424956113),
-                                    ("Maha Saptamiyear (latent)", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("hourminute", -6.073044534100405),
+                                    ("<time-of-day> am|pmtomorrow", -5.562218910334414),
+                                    ("Yom Kippuryear (latent)", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.785362461648624),
+                                    ("<part-of-day> of <time>year (latent)", -6.478509642208569),
+                                    ("minutehour", -5.225746673713201),
+                                    ("Kaanum Pongalyear (latent)", -6.073044534100405),
+                                    ("Maha Saptamiyear (latent)", -6.478509642208569),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.789195352504331),
-                                    ("time-of-day (latent)tomorrow", -5.566051801190121),
-                                    ("part of daysat <time-of-day>", -4.872904620630176),
+                                     -5.785362461648624),
+                                    ("time-of-day (latent)tomorrow", -5.562218910334414),
+                                    ("part of daysat <time-of-day>", -4.869071729774469),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.467439512522012),
-                                    ("for <duration> from <time>December", -6.482342533064276),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.482342533064276),
+                                     -4.463606621666305),
+                                    ("for <duration> from <time>December", -6.478509642208569),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.478509642208569),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.229579564568908),
+                                     -5.225746673713201),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.229579564568908),
-                                    ("time-of-day (latent)this <part-of-day>", -6.482342533064276),
-                                    ("Pentecostyear (latent)", -6.482342533064276),
+                                     -5.225746673713201),
+                                    ("time-of-day (latent)this <part-of-day>", -6.478509642208569),
+                                    ("Pentecostyear (latent)", -6.478509642208569),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.229579564568908),
-                                    ("<day-of-month> (ordinal)February", -6.482342533064276),
-                                    ("Eid al-Fitryear (latent)", -5.096048171944386),
+                                     -5.225746673713201),
+                                    ("<day-of-month> (ordinal)February", -6.478509642208569),
+                                    ("Eid al-Fitryear (latent)", -5.092215281088679),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.482342533064276),
-                                    ("Mondayin|during the <part-of-day>", -6.482342533064276),
-                                    ("Chhathin|during <named-month>|year", -6.482342533064276),
-                                    ("Diwaliin|during <named-month>|year", -6.482342533064276),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.482342533064276),
-                                    ("Vaisakhiin|during <named-month>|year", -6.482342533064276),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.229579564568908),
-                                    ("Raksha Bandhanyear (latent)", -6.482342533064276),
-                                    ("daysecond", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Mondayin|during the <part-of-day>", -6.478509642208569),
+                                    ("Chhathin|during <named-month>|year", -6.478509642208569),
+                                    ("Diwaliin|during <named-month>|year", -6.478509642208569),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.478509642208569),
+                                    ("Vaisakhiin|during <named-month>|year", -6.478509642208569),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.225746673713201),
+                                    ("Raksha Bandhanyear (latent)", -6.478509642208569),
+                                    ("daysecond", -6.073044534100405),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.076877424956113),
-                                    ("Ratha-Yatrayear (latent)", -6.482342533064276),
-                                    ("Ashurayear (latent)", -6.482342533064276),
-                                    ("Tuesdayin|during <named-month>|year", -6.482342533064276),
-                                    ("Chinese New Yearyear (latent)", -6.482342533064276),
-                                    ("tomorrowintersect", -6.482342533064276),
-                                    ("Lag BaOmeryear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("Ratha-Yatrayear (latent)", -6.478509642208569),
+                                    ("Ashurayear (latent)", -6.478509642208569),
+                                    ("Tuesdayin|during <named-month>|year", -6.478509642208569),
+                                    ("Chinese New Yearyear (latent)", -6.478509642208569),
+                                    ("tomorrowintersect", -6.478509642208569),
+                                    ("Lag BaOmeryear (latent)", -6.478509642208569),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.482342533064276),
-                                    ("Eid al-Adhayear (latent)", -4.342276369568006),
-                                    ("intersectin|during the <part-of-day>", -6.482342533064276),
-                                    ("Palm Sundayyear (latent)", -6.482342533064276),
-                                    ("Christmasat <time-of-day>", -6.482342533064276),
-                                    ("Passoveryear (latent)", -6.482342533064276),
-                                    ("Lazarus Saturdayyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Eid al-Adhayear (latent)", -4.338443478712298),
+                                    ("intersectin|during the <part-of-day>", -6.478509642208569),
+                                    ("Palm Sundayyear (latent)", -6.478509642208569),
+                                    ("Christmasat <time-of-day>", -6.478509642208569),
+                                    ("Passoveryear (latent)", -6.478509642208569),
+                                    ("Lazarus Saturdayyear (latent)", -6.478509642208569),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.482342533064276),
-                                    ("hhhmmon <day>", -5.566051801190121),
-                                    ("Yom HaShoahyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("hhhmmon <day>", -5.562218910334414),
+                                    ("Yom HaShoahyear (latent)", -6.073044534100405),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Septemberyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Septemberyear (latent)", -6.073044534100405),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.978265136288003),
-                                    ("Halloweenyear (latent)", -6.482342533064276),
+                                     -4.974432245432295),
+                                    ("Halloweenyear (latent)", -6.478509642208569),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.789195352504331),
+                                     -5.785362461648624),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("at <time-of-day>intersect", -5.566051801190121),
-                                    ("Rosh Hashanahyear (latent)", -5.789195352504331),
-                                    ("Dhanterasyear (latent)", -6.482342533064276),
-                                    ("Tu BiShvatyear (latent)", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)December", -5.789195352504331),
-                                    ("Holiyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("at <time-of-day>intersect", -5.562218910334414),
+                                    ("Rosh Hashanahyear (latent)", -5.785362461648624),
+                                    ("Dhanterasyear (latent)", -6.478509642208569),
+                                    ("Tu BiShvatyear (latent)", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)December", -5.785362461648624),
+                                    ("Holiyear (latent)", -5.785362461648624),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.482342533064276),
-                                    ("Holika Dahanyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("Holika Dahanyear (latent)", -5.785362461648624),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.076877424956113),
-                                    ("dayminute", -3.168156528391751),
-                                    ("Mawlidyear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("dayminute", -3.1643236375360435),
+                                    ("Mawlidyear (latent)", -6.478509642208569),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.482342533064276),
-                                    ("Jumu'atul-Widayear (latent)", -5.566051801190121),
-                                    ("minuteday", -2.7328384571339055),
+                                     -6.478509642208569),
+                                    ("Jumu'atul-Widayear (latent)", -5.562218910334414),
+                                    ("minuteday", -2.729005566278198),
                                     ("absorption of , after named dayintersect",
-                                     -5.789195352504331),
-                                    ("intersectyear (latent)", -6.482342533064276),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("intersectyear (latent)", -6.478509642208569),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.478509642208569),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.482342533064276),
-                                    ("intersecthhhmm", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("intersecthhhmm", -6.073044534100405),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Boss's Dayyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Boss's Dayyear (latent)", -6.073044534100405),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.482342533064276),
-                                    ("Global Youth Service Dayyear (latent)", -6.482342533064276),
-                                    ("Dhanterasin|during <named-month>|year", -6.482342533064276),
-                                    ("tonight<time-of-day> o'clock", -6.482342533064276),
-                                    ("Tisha B'Avyear (latent)", -6.482342533064276),
-                                    ("Isra and Mi'rajyear (latent)", -5.566051801190121),
-                                    ("at <time-of-day>on <day>", -4.872904620630176),
+                                     -6.478509642208569),
+                                    ("Global Youth Service Dayyear (latent)", -6.478509642208569),
+                                    ("Dhanterasin|during <named-month>|year", -6.478509642208569),
+                                    ("tonight<time-of-day> o'clock", -6.478509642208569),
+                                    ("Tisha B'Avyear (latent)", -6.478509642208569),
+                                    ("Isra and Mi'rajyear (latent)", -5.562218910334414),
+                                    ("at <time-of-day>on <day>", -4.869071729774469),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.789195352504331),
-                                    ("Christmasyear (latent)", -6.076877424956113),
-                                    ("Saturdayintersect", -6.482342533064276),
-                                    ("Naraka Chaturdashiyear (latent)", -6.076877424956113),
-                                    ("Thai Pongalin|during <named-month>|year", -6.482342533064276),
-                                    ("dayweek", -6.482342533064276),
-                                    ("Easter Sundayyear (latent)", -5.789195352504331),
+                                     -5.785362461648624),
+                                    ("Christmasyear (latent)", -6.073044534100405),
+                                    ("Saturdayintersect", -6.478509642208569),
+                                    ("Naraka Chaturdashiyear (latent)", -6.073044534100405),
+                                    ("Thai Pongalin|during <named-month>|year", -6.478509642208569),
+                                    ("dayweek", -6.478509642208569),
+                                    ("Easter Sundayyear (latent)", -5.785362461648624),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.076877424956113),
-                                    ("weekyear", -5.383730244396167),
-                                    ("King's Dayyear (latent)", -4.978265136288003),
-                                    ("hh:mmin|during the <part-of-day>", -5.566051801190121),
+                                     -6.073044534100405),
+                                    ("weekyear", -5.37989735354046),
+                                    ("King's Dayyear (latent)", -4.974432245432295),
+                                    ("hh:mmin|during the <part-of-day>", -5.562218910334414),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.789195352504331),
-                                    ("Hanukkahyear (latent)", -5.789195352504331),
-                                    ("Rama Navamiyear (latent)", -6.482342533064276),
-                                    ("February<time> <part-of-day>", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("Hanukkahyear (latent)", -5.785362461648624),
+                                    ("Rama Navamiyear (latent)", -6.478509642208569),
+                                    ("February<time> <part-of-day>", -6.478509642208569),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.789195352504331),
-                                    ("Great Lentyear (latent)", -6.482342533064276),
-                                    ("tomorrowat <time-of-day>", -5.789195352504331),
+                                     -5.785362461648624),
+                                    ("Great Lentyear (latent)", -6.478509642208569),
+                                    ("tomorrowat <time-of-day>", -5.785362461648624),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.076877424956113),
-                                    ("Ugadiyear (latent)", -5.096048171944386),
-                                    ("Vaisakhiyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.073044534100405),
+                                    ("Ugadiyear (latent)", -5.092215281088679),
+                                    ("Vaisakhiyear (latent)", -5.785362461648624),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.789195352504331),
-                                    ("last <cycle> of <time>year (latent)", -5.789195352504331),
-                                    ("at <time-of-day>tomorrow", -6.076877424956113),
-                                    ("tomorrow<time-of-day> am|pm", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("last <cycle> of <time>year (latent)", -5.785362461648624),
+                                    ("at <time-of-day>tomorrow", -6.073044534100405),
+                                    ("tomorrow<time-of-day> am|pm", -6.478509642208569),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.482342533064276),
-                                    ("Diwaliyear (latent)", -6.482342533064276),
-                                    ("between <time> and <time>on <day>", -6.076877424956113),
-                                    ("Black Fridayyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Diwaliyear (latent)", -6.478509642208569),
+                                    ("between <time> and <time>on <day>", -6.073044534100405),
+                                    ("Black Fridayyear (latent)", -6.073044534100405),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.482342533064276),
-                                    ("Chhathyear (latent)", -6.076877424956113),
-                                    ("Vasant Panchamiyear (latent)", -6.482342533064276),
-                                    ("Rabindra Jayantiyear (latent)", -5.229579564568908),
-                                    ("this <part-of-day>at <time-of-day>", -5.229579564568908),
-                                    ("St Patrick's Dayyear (latent)", -6.482342533064276),
-                                    ("Thursday<time> (timezone)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Chhathyear (latent)", -6.073044534100405),
+                                    ("Vasant Panchamiyear (latent)", -6.478509642208569),
+                                    ("Rabindra Jayantiyear (latent)", -5.225746673713201),
+                                    ("this <part-of-day>at <time-of-day>", -5.225746673713201),
+                                    ("St Patrick's Dayyear (latent)", -6.478509642208569),
+                                    ("Thursday<time> (timezone)", -6.478509642208569),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Pargat Diwasyear (latent)", -5.229579564568908),
-                                    ("<datetime> - <datetime> (interval)July", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Pargat Diwasyear (latent)", -5.225746673713201),
+                                    ("<datetime> - <datetime> (interval)July", -6.073044534100405),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.789195352504331),
-                                    ("Februaryintersect", -6.482342533064276),
-                                    ("Simchat Torahyear (latent)", -6.482342533064276),
-                                    ("minuteyear", -6.482342533064276)],
+                                     -5.785362461648624),
+                                    ("Februaryintersect", -6.478509642208569),
+                                    ("Simchat Torahyear (latent)", -6.478509642208569),
+                                    ("minuteyear", -6.478509642208569)],
                                n = 502},
                    koData =
-                     ClassData{prior = -0.9434193992624076, unseen = -6.8501261661455,
+                     ClassData{prior = -1.0024999544633555, unseen = -6.78105762593618,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.651841705297238),
-                                    ("hourday", -3.5532294166291285),
+                                   [("Thursdayhhhmm", -4.582697330136033),
+                                    ("hourday", -3.484085041467923),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)August", -6.155919102073512),
-                                    ("dayhour", -3.5909697446119755),
-                                    ("<time> timezoneyear (latent)", -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)August", -6.0867747269123065),
+                                    ("dayhour", -3.52182536945077),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.239628370199357),
-                                    ("Tuesdayfrom|since|after <time>", -5.462771921513567),
-                                    ("daymonth", -3.447868900971302),
-                                    ("hourquarter", -5.239628370199357),
-                                    ("monthday", -5.750453993965348),
-                                    ("monthyear", -4.903156133578144),
-                                    ("<time-of-day> am|pmyear (latent)", -5.462771921513567),
-                                    ("Thai Pongalyear (latent)", -5.462771921513567),
-                                    ("intersecthh:mm", -6.155919102073512),
+                                     -5.170483995038151),
+                                    ("Tuesdayfrom|since|after <time>", -5.393627546352362),
+                                    ("daymonth", -3.378724525810097),
+                                    ("hourquarter", -5.170483995038151),
+                                    ("monthday", -5.681309618804143),
+                                    ("monthyear", -4.834011758416939),
+                                    ("Thai Pongalyear (latent)", -5.393627546352362),
+                                    ("intersecthh:mm", -6.0867747269123065),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.750453993965348),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.155919102073512),
-                                    ("houryear", -4.364159632845457),
+                                     -5.681309618804143),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.0867747269123065),
+                                    ("houryear", -4.700480365792417),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)October", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)October", -6.0867747269123065),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.462771921513567),
-                                    ("hournograin", -4.903156133578144),
-                                    ("<time-of-day> am|pmintersect", -4.903156133578144),
-                                    ("Octoberyear (latent)", -6.155919102073512),
-                                    ("Good Fridayyear (latent)", -5.750453993965348),
+                                     -5.393627546352362),
+                                    ("hournograin", -4.834011758416939),
+                                    ("<time-of-day> am|pmintersect", -4.834011758416939),
+                                    ("Octoberyear (latent)", -6.0867747269123065),
+                                    ("Good Fridayyear (latent)", -5.681309618804143),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("early morningat <time-of-day>", -6.155919102073512),
-                                    ("until <time>on <day>", -5.462771921513567),
+                                     -5.681309618804143),
+                                    ("early morningat <time-of-day>", -6.0867747269123065),
+                                    ("until <time>on <day>", -5.393627546352362),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
-                                    ("time-of-day (latent)intersect", -5.462771921513567),
-                                    ("todayin <number> (implicit minutes)", -6.155919102073512),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("time-of-day (latent)intersect", -5.393627546352362),
+                                    ("todayin <number> (implicit minutes)", -6.0867747269123065),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.155919102073512),
-                                    ("hh:mmon <day>", -4.903156133578144),
-                                    ("hhhmmintersect", -5.750453993965348),
-                                    ("absorption of , after named dayJuly", -5.239628370199357),
-                                    ("from|since|after <time>July", -5.750453993965348),
+                                     -6.0867747269123065),
+                                    ("hh:mmon <day>", -4.834011758416939),
+                                    ("hhhmmintersect", -5.681309618804143),
+                                    ("absorption of , after named dayJuly", -5.170483995038151),
+                                    ("from|since|after <time>July", -5.681309618804143),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.239628370199357),
-                                    ("Clean Mondayyear (latent)", -6.155919102073512),
-                                    ("monthhour", -6.155919102073512),
+                                     -5.170483995038151),
+                                    ("Clean Mondayyear (latent)", -6.0867747269123065),
+                                    ("monthhour", -6.0867747269123065),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("hourmonth", -4.0158529385772415),
-                                    ("todayat <time-of-day>", -6.155919102073512),
-                                    ("hhhmmyear (latent)", -4.903156133578144),
-                                    ("from|since|after <time>December", -6.155919102073512),
+                                     -5.681309618804143),
+                                    ("hourmonth", -3.946708563416036),
+                                    ("todayat <time-of-day>", -6.0867747269123065),
+                                    ("from|since|after <time>December", -6.0867747269123065),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.155919102073512),
-                                    ("<time-of-day> am|pmon <day>", -4.903156133578144),
-                                    ("Mondayyear (latent)", -5.462771921513567),
-                                    ("dayday", -4.0158529385772415),
-                                    ("on <day>September", -5.462771921513567),
-                                    ("time-of-day (latent)September", -5.750453993965348),
-                                    ("hourhour", -4.076477560393676),
-                                    ("time-of-day (latent)on <day>", -4.651841705297238),
-                                    ("Thursdaydd/mm", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<time-of-day> am|pmon <day>", -4.834011758416939),
+                                    ("Mondayyear (latent)", -5.393627546352362),
+                                    ("dayday", -3.946708563416036),
+                                    ("on <day>September", -5.393627546352362),
+                                    ("time-of-day (latent)September", -5.681309618804143),
+                                    ("hourhour", -4.007333185232471),
+                                    ("time-of-day (latent)on <day>", -4.582697330136033),
+                                    ("Thursdaydd/mm", -6.0867747269123065),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.750453993965348),
-                                    ("dayyear", -3.1354942159291497),
-                                    ("New Year's Dayyear (latent)", -5.239628370199357),
-                                    ("time-of-day (latent)Sunday", -5.750453993965348),
-                                    ("Thursdayfrom|since|after <time>", -4.451171009835087),
-                                    ("Thursdayat <time-of-day>", -4.546481189639412),
+                                     -5.681309618804143),
+                                    ("dayyear", -3.283414346005772),
+                                    ("New Year's Dayyear (latent)", -5.170483995038151),
+                                    ("time-of-day (latent)Sunday", -5.681309618804143),
+                                    ("Thursdayfrom|since|after <time>", -4.382026634673881),
+                                    ("Thursdayat <time-of-day>", -4.477336814478207),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.155919102073512),
-                                    ("Aprilyear (latent)", -6.155919102073512),
-                                    ("the <day-of-month> (ordinal)July", -6.155919102073512),
-                                    ("the <day-of-month> (number)July", -6.155919102073512),
-                                    ("monthminute", -6.155919102073512),
-                                    ("<time-of-day> am|pmtomorrow", -5.750453993965348),
-                                    ("Thursdayhh:mm", -5.239628370199357),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.750453993965348),
-                                    ("minutemonth", -4.0158529385772415),
-                                    ("time-of-day (latent)Friday", -5.750453993965348),
-                                    ("minutehour", -6.155919102073512),
-                                    ("part of daysat <time-of-day>", -5.057306813405402),
+                                     -6.0867747269123065),
+                                    ("Aprilyear (latent)", -6.0867747269123065),
+                                    ("the <day-of-month> (ordinal)July", -6.0867747269123065),
+                                    ("the <day-of-month> (number)July", -6.0867747269123065),
+                                    ("monthminute", -6.0867747269123065),
+                                    ("<time-of-day> am|pmtomorrow", -5.681309618804143),
+                                    ("Thursdayhh:mm", -5.170483995038151),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.681309618804143),
+                                    ("minutemonth", -3.946708563416036),
+                                    ("time-of-day (latent)Friday", -5.681309618804143),
+                                    ("minutehour", -6.0867747269123065),
+                                    ("part of daysat <time-of-day>", -4.988162438244197),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.8045438449100346),
-                                    ("Augustyear (latent)", -5.750453993965348),
-                                    ("week-endin|during <named-month>|year", -6.155919102073512),
-                                    ("time-of-day (latent)Tuesday", -5.750453993965348),
+                                     -3.7353994697488293),
+                                    ("Augustyear (latent)", -5.681309618804143),
+                                    ("week-endin|during <named-month>|year", -6.0867747269123065),
+                                    ("time-of-day (latent)Tuesday", -5.681309618804143),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("July<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.155919102073512),
-                                    ("Sundayyear (latent)", -5.239628370199357),
-                                    ("hourweek", -5.239628370199357),
-                                    ("the <day-of-month> (ordinal)Monday", -5.462771921513567),
-                                    ("Christmasat <time-of-day>", -6.155919102073512),
-                                    ("from|since|after <time>year (latent)", -5.057306813405402),
-                                    ("hhhmmon <day>", -5.239628370199357),
-                                    ("yesterday<time-of-day> am|pm", -6.155919102073512),
-                                    ("<day-of-month> (ordinal)July", -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("Sundayyear (latent)", -5.170483995038151),
+                                    ("hourweek", -5.170483995038151),
+                                    ("the <day-of-month> (ordinal)Monday", -5.393627546352362),
+                                    ("Christmasat <time-of-day>", -6.0867747269123065),
+                                    ("from|since|after <time>year (latent)", -5.681309618804143),
+                                    ("hhhmmon <day>", -5.170483995038151),
+                                    ("yesterday<time-of-day> am|pm", -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)July", -5.393627546352362),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("August<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.155919102073512),
-                                    ("at <time-of-day>intersect", -5.239628370199357),
-                                    ("hh:mmyear (latent)", -4.769624740953621),
-                                    ("Holiyear (latent)", -6.155919102073512),
-                                    ("until <time><time-of-day> am|pm", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("at <time-of-day>intersect", -5.170483995038151),
+                                    ("Holiyear (latent)", -6.0867747269123065),
+                                    ("until <time><time-of-day> am|pm", -6.0867747269123065),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("dayminute", -3.322705758017296),
-                                    ("yyyy-mm-ddhh:mm", -5.750453993965348),
-                                    ("intersectfrom|since|after <time>", -5.750453993965348),
-                                    ("intersectSeptember", -4.28411692517192),
-                                    ("minuteday", -2.9989186809233987),
+                                     -5.681309618804143),
+                                    ("dayminute", -3.2535613828560908),
+                                    ("yyyy-mm-ddhh:mm", -5.681309618804143),
+                                    ("intersectfrom|since|after <time>", -5.681309618804143),
+                                    ("intersectSeptember", -4.214972550010716),
+                                    ("minuteday", -2.9297743057621934),
                                     ("absorption of , after named dayintersect",
-                                     -6.155919102073512),
-                                    ("intersectyear (latent)", -6.155919102073512),
-                                    ("Februaryin|during the <part-of-day>", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("intersectyear (latent)", -6.0867747269123065),
+                                    ("Februaryin|during the <part-of-day>", -6.0867747269123065),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.155919102073512),
-                                    ("time-of-day (latent)July", -5.462771921513567),
-                                    ("Saturdayyear (latent)", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("time-of-day (latent)July", -5.393627546352362),
+                                    ("Saturdayyear (latent)", -6.0867747269123065),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)Monday", -4.903156133578144),
-                                    ("at <time-of-day>on <day>", -5.239628370199357),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)Monday", -4.834011758416939),
+                                    ("at <time-of-day>on <day>", -5.170483995038151),
                                     ("absorption of , after named daySeptember",
-                                     -4.903156133578144),
-                                    ("Naraka Chaturdashiyear (latent)", -6.155919102073512),
-                                    ("from|since|after <time>on <day>", -5.239628370199357),
-                                    ("dayweek", -6.155919102073512),
-                                    ("Easter Sundayyear (latent)", -5.750453993965348),
-                                    ("Thursday<time-of-day> am|pm", -4.903156133578144),
-                                    ("weekyear", -5.750453993965348),
-                                    ("time-of-day (latent)Thursday", -5.750453993965348),
+                                     -4.834011758416939),
+                                    ("Naraka Chaturdashiyear (latent)", -6.0867747269123065),
+                                    ("from|since|after <time>on <day>", -5.170483995038151),
+                                    ("dayweek", -6.0867747269123065),
+                                    ("Easter Sundayyear (latent)", -5.681309618804143),
+                                    ("Thursday<time-of-day> am|pm", -4.834011758416939),
+                                    ("weekyear", -5.681309618804143),
+                                    ("time-of-day (latent)Thursday", -5.681309618804143),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)April", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)April", -6.0867747269123065),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.750453993965348),
+                                     -5.681309618804143),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.462771921513567),
-                                    ("Sundayfrom|since|after <time>", -6.155919102073512),
-                                    ("absorption of , after named dayFebruary", -5.239628370199357),
+                                     -5.393627546352362),
+                                    ("Sundayfrom|since|after <time>", -6.0867747269123065),
+                                    ("absorption of , after named dayFebruary", -5.170483995038151),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.750453993965348),
+                                     -5.681309618804143),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.155919102073512),
-                                    ("tomorrowat <time-of-day>", -6.155919102073512),
-                                    ("daynograin", -5.750453993965348),
-                                    ("Fridayin|during <named-month>|year", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("tomorrowat <time-of-day>", -6.0867747269123065),
+                                    ("daynograin", -5.681309618804143),
+                                    ("Fridayin|during <named-month>|year", -6.0867747269123065),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.750453993965348),
-                                    ("last <cycle> of <time>year (latent)", -5.750453993965348),
-                                    ("tomorrow<time-of-day> am|pm", -6.155919102073512),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.462771921513567),
-                                    ("Diwaliyear (latent)", -5.750453993965348),
+                                     -5.681309618804143),
+                                    ("last <cycle> of <time>year (latent)", -5.681309618804143),
+                                    ("tomorrow<time-of-day> am|pm", -6.0867747269123065),
+                                    ("Diwaliyear (latent)", -5.681309618804143),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.155919102073512),
-                                    ("this <part-of-day>at <time-of-day>", -5.239628370199357),
-                                    ("Fridayyear (latent)", -5.239628370199357),
-                                    ("time-of-day (latent)April", -6.155919102073512),
-                                    ("minuteyear", -3.9586945247372927)],
-                               n = 320}}),
+                                     -6.0867747269123065),
+                                    ("this <part-of-day>at <time-of-day>", -5.170483995038151),
+                                    ("Fridayyear (latent)", -5.170483995038151),
+                                    ("time-of-day (latent)April", -6.0867747269123065)],
+                               n = 291}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1742,22 +1730,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.14681486833704485,
-                               unseen = -5.393627546352362,
+                     ClassData{prior = -4.546237407675729e-2,
+                               unseen = -5.389071729816501,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.7779564107075706e-2),
-                                    ("intersect 2 numbers", -4.00277736869661)],
+                                   [("integer (numeric)", -2.320289707966387e-2),
+                                    ("intersect 2 numbers", -3.9982007016691985)],
                                n = 215},
                    koData =
-                     ClassData{prior = -1.9910923718485463,
-                               unseen = -3.6635616461296463,
+                     ClassData{prior = -3.1135153092103742, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.55814461804655),
-                                    ("negative numbers", -0.41871033485818493),
-                                    ("compose by multiplication", -2.2512917986064953)],
-                               n = 34}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.15415067982725836,

Duckling/Ranking/Classifiers/EN_CA.hs

@@ -284,7 +284,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -305,44 +305,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -1013,477 +1013,470 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4818380868927383, unseen = -7.220373836723949,
+                     ClassData{prior = -0.445906077666675, unseen = -7.215975002651466,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.52649485957079),
-                                    ("Father's Dayyear (latent)", -6.52649485957079),
-                                    ("Karva Chauthyear (latent)", -6.52649485957079),
+                                   [("Navaratriyear (latent)", -6.522092798170152),
+                                    ("Father's Dayyear (latent)", -6.522092798170152),
+                                    ("Karva Chauthyear (latent)", -6.522092798170152),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.52649485957079),
-                                    ("Maha Shivaratriyear (latent)", -6.52649485957079),
-                                    ("Ramadanyear (latent)", -5.273731891075422),
+                                     -6.522092798170152),
+                                    ("Maha Shivaratriyear (latent)", -6.522092798170152),
+                                    ("Ramadanyear (latent)", -5.269329829674785),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.140200498450899),
-                                    ("Bhai Doojyear (latent)", -6.52649485957079),
-                                    ("hourday", -4.511591839028525),
-                                    ("dayhour", -3.481972421847367),
+                                     -5.135798437050262),
+                                    ("Bhai Doojyear (latent)", -6.522092798170152),
+                                    ("hourday", -4.507189777627888),
+                                    ("dayhour", -3.4775703604467294),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.140200498450899),
-                                    ("Martin Luther King's Dayyear (latent)", -6.1210297514626255),
-                                    ("Shemini Atzeretyear (latent)", -6.52649485957079),
-                                    ("daymonth", -4.511591839028525),
-                                    ("monthday", -6.1210297514626255),
-                                    ("monthyear", -4.734735390342735),
-                                    ("Yom Ha'atzmautyear (latent)", -6.52649485957079),
-                                    ("Orthodox Good Fridayyear (latent)", -6.1210297514626255),
-                                    ("Vijayadashamiyear (latent)", -6.52649485957079),
+                                     -5.135798437050262),
+                                    ("Martin Luther King's Dayyear (latent)", -6.116627690061988),
+                                    ("Shemini Atzeretyear (latent)", -6.522092798170152),
+                                    ("daymonth", -4.507189777627888),
+                                    ("monthday", -6.116627690061988),
+                                    ("monthyear", -4.7303333289420975),
+                                    ("Yom Ha'atzmautyear (latent)", -6.522092798170152),
+                                    ("Orthodox Good Fridayyear (latent)", -6.116627690061988),
+                                    ("Vijayadashamiyear (latent)", -6.522092798170152),
                                     ("Administrative Professionals' Dayyear (latent)",
-                                     -6.1210297514626255),
-                                    ("Thanksgiving Dayyear (latent)", -5.42788257090268),
-                                    ("Thai Pongalyear (latent)", -5.833347679010845),
-                                    ("Thiru Onamyear (latent)", -5.833347679010845),
-                                    ("hhhmmabsorption of , after named day", -6.52649485957079),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.52649485957079),
+                                     -6.116627690061988),
+                                    ("Thanksgiving Dayyear (latent)", -5.423480509502043),
+                                    ("Thai Pongalyear (latent)", -5.8289456176102075),
+                                    ("Thiru Onamyear (latent)", -5.8289456176102075),
+                                    ("hhhmmabsorption of , after named day", -6.522092798170152),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.522092798170152),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.610204127696635),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.52649485957079),
-                                    ("Krishna Janmashtamiyear (latent)", -6.1210297514626255),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.52649485957079),
-                                    ("houryear", -5.610204127696635),
+                                     -5.605802066295998),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.522092798170152),
+                                    ("Krishna Janmashtamiyear (latent)", -6.116627690061988),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.522092798170152),
+                                    ("houryear", -5.605802066295998),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.52649485957079),
-                                    ("Christmas<time-of-day> am|pm", -6.52649485957079),
+                                     -6.522092798170152),
+                                    ("Christmas<time-of-day> am|pm", -6.522092798170152),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.52649485957079),
+                                     -6.522092798170152),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.833347679010845),
-                                    ("intersectin|during <named-month>|year", -6.52649485957079),
-                                    ("<time-of-day> am|pmintersect", -5.273731891075422),
-                                    ("Earth Houryear (latent)", -6.52649485957079),
-                                    ("Ganesh Chaturthiyear (latent)", -6.52649485957079),
-                                    ("Family Dayyear (latent)", -5.610204127696635),
-                                    ("Octoberyear (latent)", -5.022417462794516),
-                                    ("intersect<time-of-day> am|pm", -6.52649485957079),
-                                    ("Mattu Pongalyear (latent)", -6.52649485957079),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.52649485957079),
-                                    ("Shavuotyear (latent)", -6.52649485957079),
-                                    ("Parsi New Yearyear (latent)", -5.610204127696635),
+                                     -5.8289456176102075),
+                                    ("intersectin|during <named-month>|year", -6.522092798170152),
+                                    ("<time-of-day> am|pmintersect", -5.269329829674785),
+                                    ("Earth Houryear (latent)", -6.522092798170152),
+                                    ("Ganesh Chaturthiyear (latent)", -6.522092798170152),
+                                    ("Family Dayyear (latent)", -5.605802066295998),
+                                    ("Octoberyear (latent)", -5.018015401393878),
+                                    ("intersect<time-of-day> am|pm", -6.522092798170152),
+                                    ("Mattu Pongalyear (latent)", -6.522092798170152),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.522092798170152),
+                                    ("Shavuotyear (latent)", -6.522092798170152),
+                                    ("Parsi New Yearyear (latent)", -5.605802066295998),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.52649485957079),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.52649485957079),
-                                    ("todayin|within|after <duration>", -6.52649485957079),
+                                     -6.522092798170152),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.522092798170152),
+                                    ("todayin|within|after <duration>", -6.522092798170152),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.1210297514626255),
-                                    ("Marchyear (latent)", -6.52649485957079),
+                                     -6.116627690061988),
+                                    ("Marchyear (latent)", -6.522092798170152),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.1210297514626255),
-                                    ("Sukkotyear (latent)", -6.1210297514626255),
-                                    ("hhhmmintersect", -6.1210297514626255),
+                                     -6.116627690061988),
+                                    ("Sukkotyear (latent)", -6.116627690061988),
+                                    ("hhhmmintersect", -6.116627690061988),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.1210297514626255),
-                                    ("Clean Mondayyear (latent)", -6.1210297514626255),
-                                    ("monthhour", -6.1210297514626255),
+                                     -6.116627690061988),
+                                    ("Clean Mondayyear (latent)", -6.116627690061988),
+                                    ("monthhour", -6.116627690061988),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.610204127696635),
-                                    ("todayat <time-of-day>", -6.52649485957079),
-                                    ("Thursday<time> timezone", -4.1285995867724194),
-                                    ("tonight<time-of-day> am|pm", -6.52649485957079),
-                                    ("time-of-day (latent)tonight", -6.1210297514626255),
-                                    ("from|since|after <time>December", -6.52649485957079),
-                                    ("<time-of-day> am|pmon <day>", -4.511591839028525),
-                                    ("this <time>hh(:mm) - <time-of-day> am|pm", -6.52649485957079),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.1210297514626255),
-                                    ("dayday", -3.753906137331009),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.1210297514626255),
-                                    ("mm/ddat <time-of-day>", -6.52649485957079),
-                                    ("tonightat <time-of-day>", -5.42788257090268),
+                                     -5.605802066295998),
+                                    ("todayat <time-of-day>", -6.522092798170152),
+                                    ("Thursday<time> timezone", -4.124197525371781),
+                                    ("tonight<time-of-day> am|pm", -6.522092798170152),
+                                    ("time-of-day (latent)tonight", -6.116627690061988),
+                                    ("from|since|after <time>December", -6.522092798170152),
+                                    ("<time-of-day> am|pmon <day>", -4.507189777627888),
+                                    ("this <time>hh(:mm) - <time-of-day> am|pm",
+                                     -6.522092798170152),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.116627690061988),
+                                    ("dayday", -3.7495040759303713),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.116627690061988),
+                                    ("mm/ddat <time-of-day>", -6.522092798170152),
+                                    ("tonightat <time-of-day>", -5.423480509502043),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.833347679010845),
-                                    ("Dayananda Saraswati Jayantiyear (latent)", -6.52649485957079),
-                                    ("today<time-of-day> am|pm", -6.52649485957079),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.1210297514626255),
-                                    ("at <time-of-day><time> <part-of-day>", -6.52649485957079),
-                                    ("<day-of-month> (ordinal)intersect", -6.1210297514626255),
-                                    ("mm/dd<time-of-day> am|pm", -6.52649485957079),
-                                    ("hourhour", -3.5560803940010888),
-                                    ("Mahavir Jayantiyear (latent)", -6.1210297514626255),
-                                    ("Navaratriin|during <named-month>|year", -6.52649485957079),
-                                    ("National Patriots' Dayyear (latent)", -5.833347679010845),
-                                    ("Wednesdaythis|last|next <cycle>", -6.52649485957079),
-                                    ("Lentyear (latent)", -6.52649485957079),
+                                     -5.8289456176102075),
+                                    ("Dayananda Saraswati Jayantiyear (latent)",
+                                     -6.522092798170152),
+                                    ("today<time-of-day> am|pm", -6.522092798170152),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.116627690061988),
+                                    ("at <time-of-day><time> <part-of-day>", -6.522092798170152),
+                                    ("<day-of-month> (ordinal)intersect", -6.116627690061988),
+                                    ("mm/dd<time-of-day> am|pm", -6.522092798170152),
+                                    ("hourhour", -3.5516783326004515),
+                                    ("Mahavir Jayantiyear (latent)", -6.116627690061988),
+                                    ("Navaratriin|during <named-month>|year", -6.522092798170152),
+                                    ("National Patriots' Dayyear (latent)", -5.8289456176102075),
+                                    ("Wednesdaythis|last|next <cycle>", -6.522092798170152),
+                                    ("Lentyear (latent)", -6.522092798170152),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.654692682669198),
-                                    ("Boghiyear (latent)", -6.52649485957079),
-                                    ("dayyear", -1.863055765458723),
-                                    ("Karva Chauthin|during <named-month>|year", -6.52649485957079),
-                                    ("Thursdayfrom|since|after <time>", -6.1210297514626255),
+                                     -4.650290621268561),
+                                    ("Boghiyear (latent)", -6.522092798170152),
+                                    ("dayyear", -1.8586537040580853),
+                                    ("Karva Chauthin|during <named-month>|year",
+                                     -6.522092798170152),
+                                    ("Thursdayfrom|since|after <time>", -6.116627690061988),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.52649485957079),
-                                    ("Thursdayat <time-of-day>", -5.833347679010845),
-                                    ("Islamic New Yearyear (latent)", -6.1210297514626255),
-                                    ("Laylat al-Qadryear (latent)", -5.610204127696635),
-                                    ("part of days<time-of-day> am|pm", -6.52649485957079),
-                                    ("Discovery Dayyear (latent)", -6.1210297514626255),
-                                    ("Shrove Tuesdayyear (latent)", -6.52649485957079),
+                                     -6.522092798170152),
+                                    ("Thursdayat <time-of-day>", -5.8289456176102075),
+                                    ("Islamic New Yearyear (latent)", -6.116627690061988),
+                                    ("Laylat al-Qadryear (latent)", -5.605802066295998),
+                                    ("part of days<time-of-day> am|pm", -6.522092798170152),
+                                    ("Discovery Dayyear (latent)", -6.116627690061988),
+                                    ("Shrove Tuesdayyear (latent)", -6.522092798170152),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.833347679010845),
-                                    ("hourminute", -6.1210297514626255),
-                                    ("<time-of-day> am|pmtomorrow", -5.610204127696635),
-                                    ("Yom Kippuryear (latent)", -6.52649485957079),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.833347679010845),
-                                    ("<part-of-day> of <time>year (latent)", -6.52649485957079),
-                                    ("minutehour", -5.273731891075422),
-                                    ("Kaanum Pongalyear (latent)", -6.1210297514626255),
-                                    ("Maha Saptamiyear (latent)", -6.52649485957079),
+                                     -5.8289456176102075),
+                                    ("hourminute", -6.116627690061988),
+                                    ("<time-of-day> am|pmtomorrow", -5.605802066295998),
+                                    ("Yom Kippuryear (latent)", -6.522092798170152),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.8289456176102075),
+                                    ("<part-of-day> of <time>year (latent)", -6.522092798170152),
+                                    ("minutehour", -5.269329829674785),
+                                    ("Kaanum Pongalyear (latent)", -6.116627690061988),
+                                    ("Maha Saptamiyear (latent)", -6.522092798170152),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.833347679010845),
-                                    ("time-of-day (latent)tomorrow", -5.610204127696635),
-                                    ("part of daysat <time-of-day>", -4.91705694713669),
+                                     -5.8289456176102075),
+                                    ("time-of-day (latent)tomorrow", -5.605802066295998),
+                                    ("part of daysat <time-of-day>", -4.912654885736052),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.511591839028525),
-                                    ("for <duration> from <time>December", -6.52649485957079),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.52649485957079),
+                                     -4.507189777627888),
+                                    ("for <duration> from <time>December", -6.522092798170152),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.522092798170152),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.273731891075422),
+                                     -5.269329829674785),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.273731891075422),
-                                    ("time-of-day (latent)this <part-of-day>", -6.52649485957079),
-                                    ("Pentecostyear (latent)", -6.52649485957079),
+                                     -5.269329829674785),
+                                    ("time-of-day (latent)this <part-of-day>", -6.522092798170152),
+                                    ("Pentecostyear (latent)", -6.522092798170152),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.273731891075422),
-                                    ("<day-of-month> (ordinal)February", -6.52649485957079),
-                                    ("Eid al-Fitryear (latent)", -5.140200498450899),
+                                     -5.269329829674785),
+                                    ("<day-of-month> (ordinal)February", -6.522092798170152),
+                                    ("Eid al-Fitryear (latent)", -5.135798437050262),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.52649485957079),
-                                    ("Mondayin|during the <part-of-day>", -6.52649485957079),
-                                    ("Chhathin|during <named-month>|year", -6.52649485957079),
-                                    ("Diwaliin|during <named-month>|year", -6.52649485957079),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.52649485957079),
-                                    ("Vaisakhiin|during <named-month>|year", -6.52649485957079),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.273731891075422),
-                                    ("Raksha Bandhanyear (latent)", -6.52649485957079),
-                                    ("daysecond", -6.1210297514626255),
+                                     -6.522092798170152),
+                                    ("Mondayin|during the <part-of-day>", -6.522092798170152),
+                                    ("Chhathin|during <named-month>|year", -6.522092798170152),
+                                    ("Diwaliin|during <named-month>|year", -6.522092798170152),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.522092798170152),
+                                    ("Vaisakhiin|during <named-month>|year", -6.522092798170152),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.269329829674785),
+                                    ("Raksha Bandhanyear (latent)", -6.522092798170152),
+                                    ("daysecond", -6.116627690061988),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.1210297514626255),
-                                    ("Ratha-Yatrayear (latent)", -6.52649485957079),
-                                    ("Ashurayear (latent)", -6.52649485957079),
-                                    ("Tuesdayin|during <named-month>|year", -6.52649485957079),
-                                    ("Chinese New Yearyear (latent)", -6.52649485957079),
-                                    ("tomorrowintersect", -6.52649485957079),
-                                    ("Lag BaOmeryear (latent)", -6.52649485957079),
+                                     -6.116627690061988),
+                                    ("Ratha-Yatrayear (latent)", -6.522092798170152),
+                                    ("Ashurayear (latent)", -6.522092798170152),
+                                    ("Tuesdayin|during <named-month>|year", -6.522092798170152),
+                                    ("Chinese New Yearyear (latent)", -6.522092798170152),
+                                    ("tomorrowintersect", -6.522092798170152),
+                                    ("Lag BaOmeryear (latent)", -6.522092798170152),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.52649485957079),
-                                    ("Eid al-Adhayear (latent)", -4.386428696074519),
-                                    ("intersectin|during the <part-of-day>", -6.52649485957079),
-                                    ("Palm Sundayyear (latent)", -6.52649485957079),
-                                    ("Christmasat <time-of-day>", -6.52649485957079),
-                                    ("Passoveryear (latent)", -6.52649485957079),
-                                    ("Lazarus Saturdayyear (latent)", -6.52649485957079),
+                                     -6.522092798170152),
+                                    ("Eid al-Adhayear (latent)", -4.382026634673881),
+                                    ("intersectin|during the <part-of-day>", -6.522092798170152),
+                                    ("Palm Sundayyear (latent)", -6.522092798170152),
+                                    ("Christmasat <time-of-day>", -6.522092798170152),
+                                    ("Passoveryear (latent)", -6.522092798170152),
+                                    ("Lazarus Saturdayyear (latent)", -6.522092798170152),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.52649485957079),
-                                    ("hhhmmon <day>", -5.610204127696635),
-                                    ("Yom HaShoahyear (latent)", -6.1210297514626255),
+                                     -6.522092798170152),
+                                    ("hhhmmon <day>", -5.605802066295998),
+                                    ("Yom HaShoahyear (latent)", -6.116627690061988),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.1210297514626255),
+                                     -6.116627690061988),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.52649485957079),
-                                    ("Septemberyear (latent)", -6.1210297514626255),
+                                     -6.522092798170152),
+                                    ("Septemberyear (latent)", -6.116627690061988),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.022417462794516),
-                                    ("Halloweenyear (latent)", -6.52649485957079),
+                                     -5.018015401393878),
+                                    ("Halloweenyear (latent)", -6.522092798170152),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.1210297514626255),
+                                     -6.116627690061988),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.833347679010845),
+                                     -5.8289456176102075),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.52649485957079),
-                                    ("at <time-of-day>intersect", -5.610204127696635),
-                                    ("Rosh Hashanahyear (latent)", -5.833347679010845),
-                                    ("Dhanterasyear (latent)", -6.52649485957079),
-                                    ("Tu BiShvatyear (latent)", -6.52649485957079),
-                                    ("<day-of-month> (ordinal)December", -5.833347679010845),
-                                    ("Holiyear (latent)", -5.833347679010845),
+                                     -6.522092798170152),
+                                    ("at <time-of-day>intersect", -5.605802066295998),
+                                    ("Rosh Hashanahyear (latent)", -5.8289456176102075),
+                                    ("Dhanterasyear (latent)", -6.522092798170152),
+                                    ("Tu BiShvatyear (latent)", -6.522092798170152),
+                                    ("<day-of-month> (ordinal)December", -5.8289456176102075),
+                                    ("Holiyear (latent)", -5.8289456176102075),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.52649485957079),
-                                    ("Holika Dahanyear (latent)", -5.833347679010845),
+                                     -6.522092798170152),
+                                    ("Holika Dahanyear (latent)", -5.8289456176102075),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.1210297514626255),
-                                    ("dayminute", -3.1765907722961852),
-                                    ("Mawlidyear (latent)", -6.52649485957079),
+                                     -6.116627690061988),
+                                    ("dayminute", -3.1721887108955475),
+                                    ("Mawlidyear (latent)", -6.522092798170152),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.1210297514626255),
+                                     -6.116627690061988),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.52649485957079),
-                                    ("Jumu'atul-Widayear (latent)", -5.610204127696635),
-                                    ("minuteday", -2.776990783640419),
+                                     -6.522092798170152),
+                                    ("Jumu'atul-Widayear (latent)", -5.605802066295998),
+                                    ("minuteday", -2.772588722239781),
                                     ("absorption of , after named dayintersect",
-                                     -5.833347679010845),
-                                    ("intersectyear (latent)", -6.52649485957079),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.52649485957079),
+                                     -5.8289456176102075),
+                                    ("intersectyear (latent)", -6.522092798170152),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.522092798170152),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.52649485957079),
-                                    ("<ordinal> <cycle> of <time>year (latent)", -6.52649485957079),
-                                    ("intersecthhhmm", -6.1210297514626255),
+                                     -6.522092798170152),
+                                    ("<ordinal> <cycle> of <time>year (latent)",
+                                     -6.522092798170152),
+                                    ("intersecthhhmm", -6.116627690061988),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.52649485957079),
-                                    ("Boss's Dayyear (latent)", -6.1210297514626255),
+                                     -6.522092798170152),
+                                    ("Boss's Dayyear (latent)", -6.116627690061988),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.52649485957079),
-                                    ("Global Youth Service Dayyear (latent)", -6.52649485957079),
-                                    ("Dhanterasin|during <named-month>|year", -6.52649485957079),
-                                    ("tonight<time-of-day> o'clock", -6.52649485957079),
-                                    ("Tisha B'Avyear (latent)", -6.52649485957079),
-                                    ("Isra and Mi'rajyear (latent)", -5.610204127696635),
-                                    ("at <time-of-day>on <day>", -4.91705694713669),
+                                     -6.522092798170152),
+                                    ("Global Youth Service Dayyear (latent)", -6.522092798170152),
+                                    ("Dhanterasin|during <named-month>|year", -6.522092798170152),
+                                    ("tonight<time-of-day> o'clock", -6.522092798170152),
+                                    ("Tisha B'Avyear (latent)", -6.522092798170152),
+                                    ("Isra and Mi'rajyear (latent)", -5.605802066295998),
+                                    ("at <time-of-day>on <day>", -4.912654885736052),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.1210297514626255),
+                                     -6.116627690061988),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.833347679010845),
-                                    ("Christmasyear (latent)", -6.1210297514626255),
-                                    ("Saturdayintersect", -6.52649485957079),
-                                    ("Naraka Chaturdashiyear (latent)", -6.1210297514626255),
-                                    ("Thai Pongalin|during <named-month>|year", -6.52649485957079),
-                                    ("dayweek", -6.52649485957079),
-                                    ("Easter Sundayyear (latent)", -5.833347679010845),
+                                     -5.8289456176102075),
+                                    ("Christmasyear (latent)", -6.116627690061988),
+                                    ("Saturdayintersect", -6.522092798170152),
+                                    ("Naraka Chaturdashiyear (latent)", -6.116627690061988),
+                                    ("Thai Pongalin|during <named-month>|year", -6.522092798170152),
+                                    ("dayweek", -6.522092798170152),
+                                    ("Easter Sundayyear (latent)", -5.8289456176102075),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.1210297514626255),
-                                    ("Labour Dayyear (latent)", -6.52649485957079),
-                                    ("weekyear", -5.42788257090268),
-                                    ("King's Dayyear (latent)", -5.022417462794516),
-                                    ("hh:mmin|during the <part-of-day>", -5.610204127696635),
+                                     -6.116627690061988),
+                                    ("Labour Dayyear (latent)", -6.522092798170152),
+                                    ("weekyear", -5.423480509502043),
+                                    ("King's Dayyear (latent)", -5.018015401393878),
+                                    ("hh:mmin|during the <part-of-day>", -5.605802066295998),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.1210297514626255),
+                                     -6.116627690061988),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.833347679010845),
-                                    ("Hanukkahyear (latent)", -5.833347679010845),
-                                    ("Rama Navamiyear (latent)", -6.52649485957079),
-                                    ("February<time> <part-of-day>", -6.52649485957079),
+                                     -5.8289456176102075),
+                                    ("Hanukkahyear (latent)", -5.8289456176102075),
+                                    ("Rama Navamiyear (latent)", -6.522092798170152),
+                                    ("February<time> <part-of-day>", -6.522092798170152),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.833347679010845),
-                                    ("Great Lentyear (latent)", -6.52649485957079),
-                                    ("tomorrowat <time-of-day>", -5.833347679010845),
-                                    ("hhmm (latent)in|during the <part-of-day>", -6.52649485957079),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.1210297514626255),
-                                    ("Ugadiyear (latent)", -5.140200498450899),
-                                    ("Vaisakhiyear (latent)", -5.833347679010845),
+                                     -5.8289456176102075),
+                                    ("Great Lentyear (latent)", -6.522092798170152),
+                                    ("tomorrowat <time-of-day>", -5.8289456176102075),
+                                    ("hhmm (latent)in|during the <part-of-day>",
+                                     -6.522092798170152),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.116627690061988),
+                                    ("Ugadiyear (latent)", -5.135798437050262),
+                                    ("Vaisakhiyear (latent)", -5.8289456176102075),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.833347679010845),
-                                    ("last <cycle> of <time>year (latent)", -5.833347679010845),
-                                    ("at <time-of-day>tomorrow", -6.1210297514626255),
-                                    ("tomorrow<time-of-day> am|pm", -6.52649485957079),
+                                     -5.8289456176102075),
+                                    ("last <cycle> of <time>year (latent)", -5.8289456176102075),
+                                    ("at <time-of-day>tomorrow", -6.116627690061988),
+                                    ("tomorrow<time-of-day> am|pm", -6.522092798170152),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.52649485957079),
-                                    ("Diwaliyear (latent)", -6.52649485957079),
-                                    ("between <time> and <time>on <day>", -6.1210297514626255),
-                                    ("Black Fridayyear (latent)", -6.1210297514626255),
+                                     -6.522092798170152),
+                                    ("Diwaliyear (latent)", -6.522092798170152),
+                                    ("between <time> and <time>on <day>", -6.116627690061988),
+                                    ("Black Fridayyear (latent)", -6.116627690061988),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.52649485957079),
+                                     -6.522092798170152),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.52649485957079),
-                                    ("Chhathyear (latent)", -6.1210297514626255),
-                                    ("Vasant Panchamiyear (latent)", -6.52649485957079),
-                                    ("Rabindra Jayantiyear (latent)", -5.273731891075422),
-                                    ("this <part-of-day>at <time-of-day>", -5.273731891075422),
-                                    ("St Patrick's Dayyear (latent)", -6.52649485957079),
-                                    ("Thursday<time> (timezone)", -6.52649485957079),
+                                     -6.522092798170152),
+                                    ("Chhathyear (latent)", -6.116627690061988),
+                                    ("Vasant Panchamiyear (latent)", -6.522092798170152),
+                                    ("Rabindra Jayantiyear (latent)", -5.269329829674785),
+                                    ("this <part-of-day>at <time-of-day>", -5.269329829674785),
+                                    ("St Patrick's Dayyear (latent)", -6.522092798170152),
+                                    ("Thursday<time> (timezone)", -6.522092798170152),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.52649485957079),
-                                    ("Pargat Diwasyear (latent)", -5.273731891075422),
-                                    ("<datetime> - <datetime> (interval)July", -6.1210297514626255),
+                                     -6.522092798170152),
+                                    ("Pargat Diwasyear (latent)", -5.269329829674785),
+                                    ("<datetime> - <datetime> (interval)July", -6.116627690061988),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.833347679010845),
-                                    ("Februaryintersect", -6.52649485957079),
-                                    ("Mother's Dayyear (latent)", -6.52649485957079),
-                                    ("Simchat Torahyear (latent)", -6.52649485957079),
-                                    ("Victoria Dayyear (latent)", -6.1210297514626255),
-                                    ("minuteyear", -6.52649485957079)],
+                                     -5.8289456176102075),
+                                    ("Februaryintersect", -6.522092798170152),
+                                    ("Mother's Dayyear (latent)", -6.522092798170152),
+                                    ("Simchat Torahyear (latent)", -6.522092798170152),
+                                    ("Victoria Dayyear (latent)", -6.116627690061988),
+                                    ("minuteyear", -6.522092798170152)],
                                n = 525},
                    koData =
-                     ClassData{prior = -0.9614111671546247, unseen = -6.874198495453294,
+                     ClassData{prior = -1.022328983918479, unseen = -6.803505257608338,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.6759392568762985),
-                                    ("hourday", -3.577326968208189),
+                                   [("Thursdayhhhmm", -4.605170185988091),
+                                    ("hourday", -3.506557897319982),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.180016653652572),
-                                    ("<day-of-month> (ordinal)August", -6.180016653652572),
-                                    ("dayhour", -3.505868004226044),
-                                    ("<time> timezoneyear (latent)", -5.486869473092628),
+                                     -6.1092475827643655),
+                                    ("<day-of-month> (ordinal)August", -6.1092475827643655),
+                                    ("dayhour", -3.435098933337837),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.263725921778418),
-                                    ("Tuesdayfrom|since|after <time>", -5.486869473092628),
-                                    ("daymonth", -3.4719664525503626),
-                                    ("hourquarter", -5.263725921778418),
-                                    ("monthday", -5.7745515455444085),
-                                    ("monthyear", -4.927253685157205),
-                                    ("<time-of-day> am|pmyear (latent)", -5.486869473092628),
-                                    ("Thai Pongalyear (latent)", -5.486869473092628),
-                                    ("intersecthh:mm", -6.180016653652572),
+                                     -5.19295685089021),
+                                    ("Tuesdayfrom|since|after <time>", -5.41610040220442),
+                                    ("daymonth", -3.4011973816621555),
+                                    ("hourquarter", -5.19295685089021),
+                                    ("monthday", -5.703782474656201),
+                                    ("monthyear", -4.8564846142689975),
+                                    ("Thai Pongalyear (latent)", -5.41610040220442),
+                                    ("intersecthh:mm", -6.1092475827643655),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.7745515455444085),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.180016653652572),
-                                    ("houryear", -4.388257184424518),
+                                     -5.703782474656201),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.1092475827643655),
+                                    ("houryear", -4.722953221644475),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.180016653652572),
-                                    ("<day-of-month> (ordinal)October", -6.180016653652572),
+                                     -6.1092475827643655),
+                                    ("<day-of-month> (ordinal)October", -6.1092475827643655),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.486869473092628),
-                                    ("hournograin", -4.927253685157205),
-                                    ("<time-of-day> am|pmintersect", -4.927253685157205),
-                                    ("Octoberyear (latent)", -6.180016653652572),
-                                    ("Good Fridayyear (latent)", -5.7745515455444085),
+                                     -5.41610040220442),
+                                    ("hournograin", -4.8564846142689975),
+                                    ("<time-of-day> am|pmintersect", -4.8564846142689975),
+                                    ("Octoberyear (latent)", -6.1092475827643655),
+                                    ("Good Fridayyear (latent)", -5.703782474656201),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.7745515455444085),
-                                    ("early morningat <time-of-day>", -6.180016653652572),
-                                    ("until <time>on <day>", -5.486869473092628),
+                                     -5.703782474656201),
+                                    ("early morningat <time-of-day>", -6.1092475827643655),
+                                    ("until <time>on <day>", -5.41610040220442),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.180016653652572),
-                                    ("time-of-day (latent)intersect", -5.486869473092628),
-                                    ("todayin <number> (implicit minutes)", -6.180016653652572),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.486869473092628),
+                                     -6.1092475827643655),
+                                    ("time-of-day (latent)intersect", -5.41610040220442),
+                                    ("todayin <number> (implicit minutes)", -6.1092475827643655),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.180016653652572),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.180016653652572),
-                                    ("hh:mmon <day>", -4.927253685157205),
-                                    ("hhhmmintersect", -5.7745515455444085),
-                                    ("absorption of , after named dayJuly", -5.263725921778418),
-                                    ("from|since|after <time>July", -5.7745515455444085),
+                                     -6.1092475827643655),
+                                    ("hh:mmon <day>", -4.8564846142689975),
+                                    ("hhhmmintersect", -5.703782474656201),
+                                    ("absorption of , after named dayJuly", -5.19295685089021),
+                                    ("from|since|after <time>July", -5.703782474656201),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.263725921778418),
-                                    ("Clean Mondayyear (latent)", -6.180016653652572),
-                                    ("monthhour", -6.180016653652572),
+                                     -5.19295685089021),
+                                    ("Clean Mondayyear (latent)", -6.1092475827643655),
+                                    ("monthhour", -6.1092475827643655),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.7745515455444085),
-                                    ("hourmonth", -4.0399504901563015),
-                                    ("todayat <time-of-day>", -6.180016653652572),
-                                    ("hhhmmyear (latent)", -4.927253685157205),
-                                    ("from|since|after <time>December", -6.180016653652572),
+                                     -5.703782474656201),
+                                    ("hourmonth", -3.9691814192680948),
+                                    ("todayat <time-of-day>", -6.1092475827643655),
+                                    ("from|since|after <time>December", -6.1092475827643655),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.180016653652572),
-                                    ("<time-of-day> am|pmon <day>", -4.927253685157205),
-                                    ("Mondayyear (latent)", -5.486869473092628),
-                                    ("dayday", -4.0399504901563015),
-                                    ("mm/ddat <time-of-day>", -5.7745515455444085),
-                                    ("on <day>September", -5.486869473092628),
-                                    ("time-of-day (latent)September", -5.7745515455444085),
-                                    ("hourhour", -4.100575111972737),
-                                    ("time-of-day (latent)on <day>", -4.6759392568762985),
+                                     -6.1092475827643655),
+                                    ("<time-of-day> am|pmon <day>", -4.8564846142689975),
+                                    ("Mondayyear (latent)", -5.41610040220442),
+                                    ("dayday", -3.9691814192680948),
+                                    ("mm/ddat <time-of-day>", -5.703782474656201),
+                                    ("on <day>September", -5.41610040220442),
+                                    ("time-of-day (latent)September", -5.703782474656201),
+                                    ("hourhour", -4.029806041084529),
+                                    ("time-of-day (latent)on <day>", -4.605170185988091),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.7745515455444085),
-                                    ("dayyear", -3.1354942159291497),
-                                    ("Thursdaymm/dd", -6.180016653652572),
-                                    ("New Year's Dayyear (latent)", -5.263725921778418),
-                                    ("time-of-day (latent)Sunday", -5.7745515455444085),
-                                    ("Thursdayfrom|since|after <time>", -4.475268561414148),
-                                    ("Thursdayat <time-of-day>", -4.570578741218473),
+                                     -5.703782474656201),
+                                    ("dayyear", -3.3058872018578307),
+                                    ("Thursdaymm/dd", -6.1092475827643655),
+                                    ("New Year's Dayyear (latent)", -5.19295685089021),
+                                    ("time-of-day (latent)Sunday", -5.703782474656201),
+                                    ("Thursdayfrom|since|after <time>", -4.40449949052594),
+                                    ("Thursdayat <time-of-day>", -4.499809670330265),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.180016653652572),
-                                    ("Aprilyear (latent)", -6.180016653652572),
-                                    ("the <day-of-month> (ordinal)July", -6.180016653652572),
-                                    ("the <day-of-month> (number)July", -6.180016653652572),
-                                    ("monthminute", -6.180016653652572),
-                                    ("<time-of-day> am|pmtomorrow", -5.7745515455444085),
-                                    ("Thursdayhh:mm", -5.263725921778418),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.7745515455444085),
-                                    ("minutemonth", -4.0399504901563015),
-                                    ("time-of-day (latent)Friday", -5.7745515455444085),
-                                    ("minutehour", -6.180016653652572),
-                                    ("part of daysat <time-of-day>", -5.081404364984463),
+                                     -6.1092475827643655),
+                                    ("Aprilyear (latent)", -6.1092475827643655),
+                                    ("the <day-of-month> (ordinal)July", -6.1092475827643655),
+                                    ("the <day-of-month> (number)July", -6.1092475827643655),
+                                    ("monthminute", -6.1092475827643655),
+                                    ("<time-of-day> am|pmtomorrow", -5.703782474656201),
+                                    ("Thursdayhh:mm", -5.19295685089021),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.703782474656201),
+                                    ("minutemonth", -3.9691814192680948),
+                                    ("time-of-day (latent)Friday", -5.703782474656201),
+                                    ("minutehour", -6.1092475827643655),
+                                    ("part of daysat <time-of-day>", -5.0106352940962555),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.828641396489095),
-                                    ("Augustyear (latent)", -5.7745515455444085),
-                                    ("week-endin|during <named-month>|year", -6.180016653652572),
-                                    ("time-of-day (latent)Tuesday", -5.7745515455444085),
+                                     -3.757872325600888),
+                                    ("Augustyear (latent)", -5.703782474656201),
+                                    ("week-endin|during <named-month>|year", -6.1092475827643655),
+                                    ("time-of-day (latent)Tuesday", -5.703782474656201),
                                     ("mm/dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.7745515455444085),
+                                     -5.703782474656201),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.180016653652572),
+                                     -6.1092475827643655),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.180016653652572),
+                                     -6.1092475827643655),
                                     ("July<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.180016653652572),
-                                    ("Sundayyear (latent)", -5.263725921778418),
-                                    ("hourweek", -5.263725921778418),
-                                    ("the <day-of-month> (ordinal)Monday", -5.486869473092628),
-                                    ("Christmasat <time-of-day>", -6.180016653652572),
-                                    ("from|since|after <time>year (latent)", -5.081404364984463),
-                                    ("hhhmmon <day>", -5.263725921778418),
-                                    ("yesterday<time-of-day> am|pm", -6.180016653652572),
-                                    ("<day-of-month> (ordinal)July", -5.486869473092628),
+                                     -6.1092475827643655),
+                                    ("Sundayyear (latent)", -5.19295685089021),
+                                    ("hourweek", -5.19295685089021),
+                                    ("the <day-of-month> (ordinal)Monday", -5.41610040220442),
+                                    ("Christmasat <time-of-day>", -6.1092475827643655),
+                                    ("from|since|after <time>year (latent)", -5.703782474656201),
+                                    ("hhhmmon <day>", -5.19295685089021),
+                                    ("yesterday<time-of-day> am|pm", -6.1092475827643655),
+                                    ("<day-of-month> (ordinal)July", -5.41610040220442),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.180016653652572),
-                                    ("mm/ddyear (latent)", -6.180016653652572),
+                                     -6.1092475827643655),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.180016653652572),
+                                     -6.1092475827643655),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.180016653652572),
+                                     -6.1092475827643655),
                                     ("August<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.180016653652572),
-                                    ("at <time-of-day>intersect", -5.263725921778418),
-                                    ("hh:mmyear (latent)", -4.793722292532682),
-                                    ("Holiyear (latent)", -6.180016653652572),
-                                    ("until <time><time-of-day> am|pm", -6.180016653652572),
+                                     -6.1092475827643655),
+                                    ("at <time-of-day>intersect", -5.19295685089021),
+                                    ("Holiyear (latent)", -6.1092475827643655),
+                                    ("until <time><time-of-day> am|pm", -6.1092475827643655),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.7745515455444085),
-                                    ("dayminute", -3.317815772723104),
-                                    ("yyyy-mm-ddhh:mm", -5.7745515455444085),
-                                    ("intersectfrom|since|after <time>", -5.7745515455444085),
-                                    ("intersectSeptember", -4.308214476750981),
-                                    ("minuteday", -3.0230162325024597),
+                                     -5.703782474656201),
+                                    ("dayminute", -3.247046701834897),
+                                    ("yyyy-mm-ddhh:mm", -5.703782474656201),
+                                    ("intersectfrom|since|after <time>", -5.703782474656201),
+                                    ("intersectSeptember", -4.237445405862774),
+                                    ("minuteday", -2.952247161614252),
                                     ("absorption of , after named dayintersect",
-                                     -6.180016653652572),
-                                    ("intersectyear (latent)", -6.180016653652572),
-                                    ("Februaryin|during the <part-of-day>", -6.180016653652572),
+                                     -6.1092475827643655),
+                                    ("intersectyear (latent)", -6.1092475827643655),
+                                    ("Februaryin|during the <part-of-day>", -6.1092475827643655),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.180016653652572),
-                                    ("time-of-day (latent)July", -5.486869473092628),
-                                    ("Saturdayyear (latent)", -6.180016653652572),
+                                     -6.1092475827643655),
+                                    ("time-of-day (latent)July", -5.41610040220442),
+                                    ("Saturdayyear (latent)", -6.1092475827643655),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.180016653652572),
-                                    ("<day-of-month> (ordinal)Monday", -4.927253685157205),
-                                    ("at <time-of-day>on <day>", -5.263725921778418),
+                                     -6.1092475827643655),
+                                    ("<day-of-month> (ordinal)Monday", -4.8564846142689975),
+                                    ("at <time-of-day>on <day>", -5.19295685089021),
                                     ("absorption of , after named daySeptember",
-                                     -4.927253685157205),
-                                    ("Naraka Chaturdashiyear (latent)", -6.180016653652572),
-                                    ("from|since|after <time>on <day>", -5.263725921778418),
-                                    ("dayweek", -6.180016653652572),
-                                    ("Easter Sundayyear (latent)", -5.7745515455444085),
-                                    ("Thursday<time-of-day> am|pm", -4.927253685157205),
-                                    ("weekyear", -5.7745515455444085),
-                                    ("time-of-day (latent)Thursday", -5.7745515455444085),
+                                     -4.8564846142689975),
+                                    ("Naraka Chaturdashiyear (latent)", -6.1092475827643655),
+                                    ("from|since|after <time>on <day>", -5.19295685089021),
+                                    ("dayweek", -6.1092475827643655),
+                                    ("Easter Sundayyear (latent)", -5.703782474656201),
+                                    ("Thursday<time-of-day> am|pm", -4.8564846142689975),
+                                    ("weekyear", -5.703782474656201),
+                                    ("time-of-day (latent)Thursday", -5.703782474656201),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.180016653652572),
-                                    ("<day-of-month> (ordinal)April", -6.180016653652572),
+                                     -6.1092475827643655),
+                                    ("<day-of-month> (ordinal)April", -6.1092475827643655),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.7745515455444085),
+                                     -5.703782474656201),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.486869473092628),
-                                    ("Sundayfrom|since|after <time>", -6.180016653652572),
-                                    ("absorption of , after named dayFebruary", -5.263725921778418),
+                                     -5.41610040220442),
+                                    ("Sundayfrom|since|after <time>", -6.1092475827643655),
+                                    ("absorption of , after named dayFebruary", -5.19295685089021),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.7745515455444085),
+                                     -5.703782474656201),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.180016653652572),
-                                    ("tomorrowat <time-of-day>", -6.180016653652572),
-                                    ("daynograin", -5.7745515455444085),
-                                    ("Fridayin|during <named-month>|year", -6.180016653652572),
+                                     -6.1092475827643655),
+                                    ("tomorrowat <time-of-day>", -6.1092475827643655),
+                                    ("daynograin", -5.703782474656201),
+                                    ("Fridayin|during <named-month>|year", -6.1092475827643655),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.7745515455444085),
-                                    ("last <cycle> of <time>year (latent)", -5.7745515455444085),
-                                    ("tomorrow<time-of-day> am|pm", -6.180016653652572),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.486869473092628),
-                                    ("Diwaliyear (latent)", -5.7745515455444085),
+                                     -5.703782474656201),
+                                    ("last <cycle> of <time>year (latent)", -5.703782474656201),
+                                    ("tomorrow<time-of-day> am|pm", -6.1092475827643655),
+                                    ("Diwaliyear (latent)", -5.703782474656201),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.180016653652572),
-                                    ("this <part-of-day>at <time-of-day>", -5.263725921778418),
-                                    ("Fridayyear (latent)", -5.263725921778418),
-                                    ("time-of-day (latent)April", -6.180016653652572),
-                                    ("minuteyear", -3.982792076316353)],
-                               n = 325}}),
+                                     -6.1092475827643655),
+                                    ("this <part-of-day>at <time-of-day>", -5.19295685089021),
+                                    ("Fridayyear (latent)", -5.19295685089021),
+                                    ("time-of-day (latent)April", -6.1092475827643655)],
+                               n = 295}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1773,21 +1766,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.13828701585409087,
-                               unseen = -5.484796933490655,
+                     ClassData{prior = -4.1499730906752734e-2,
+                               unseen = -5.480638923341991,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.5317807984289897e-2),
-                                    ("intersect 2 numbers", -4.0943445622221)],
+                                   [("integer (numeric)", -2.1142436573809237e-2),
+                                    ("intersect 2 numbers", -4.09016919081162)],
                                n = 236},
                    koData =
-                     ClassData{prior = -2.046770759390287, unseen = -3.6888794541139363,
+                     ClassData{prior = -3.202746442938317, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.5841201044498106),
-                                    ("negative numbers", -0.40546510810816444),
-                                    ("compose by multiplication", -2.277267285009756)],
-                               n = 35}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("mm/dd/yyyy",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,

Duckling/Ranking/Classifiers/EN_GB.hs

@@ -283,7 +283,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -304,44 +304,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -999,482 +999,470 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4998922856476112, unseen = -7.204892510204673,
+                     ClassData{prior = -0.4639171831893333, unseen = -7.200424892944957,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.511002111475994),
-                                    ("Father's Dayyear (latent)", -6.511002111475994),
-                                    ("Karva Chauthyear (latent)", -6.511002111475994),
+                                   [("Navaratriyear (latent)", -6.506531165131227),
+                                    ("Father's Dayyear (latent)", -6.506531165131227),
+                                    ("Karva Chauthyear (latent)", -6.506531165131227),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.511002111475994),
-                                    ("Maha Shivaratriyear (latent)", -6.511002111475994),
-                                    ("Ramadanyear (latent)", -5.258239142980626),
+                                     -6.506531165131227),
+                                    ("Maha Shivaratriyear (latent)", -6.506531165131227),
+                                    ("Ramadanyear (latent)", -5.25376819663586),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.124707750356103),
-                                    ("Bhai Doojyear (latent)", -6.511002111475994),
-                                    ("hourday", -4.496099090933729),
-                                    ("dayhour", -3.466479673752571),
+                                     -5.120236804011337),
+                                    ("Bhai Doojyear (latent)", -6.506531165131227),
+                                    ("hourday", -4.4916281445889625),
+                                    ("dayhour", -3.462008727407804),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.124707750356103),
-                                    ("Martin Luther King's Dayyear (latent)", -6.10553700336783),
-                                    ("Shemini Atzeretyear (latent)", -6.511002111475994),
-                                    ("daymonth", -4.496099090933729),
-                                    ("monthday", -6.10553700336783),
-                                    ("monthyear", -4.719242642247939),
-                                    ("Yom Ha'atzmautyear (latent)", -6.511002111475994),
-                                    ("Orthodox Good Fridayyear (latent)", -6.10553700336783),
-                                    ("Vijayadashamiyear (latent)", -6.511002111475994),
-                                    ("Thanksgiving Dayyear (latent)", -5.412389822807884),
-                                    ("Thai Pongalyear (latent)", -5.817854930916049),
-                                    ("Thiru Onamyear (latent)", -5.817854930916049),
-                                    ("hhhmmabsorption of , after named day", -6.511002111475994),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.511002111475994),
+                                     -5.120236804011337),
+                                    ("Martin Luther King's Dayyear (latent)", -6.101066057023063),
+                                    ("Shemini Atzeretyear (latent)", -6.506531165131227),
+                                    ("daymonth", -4.4916281445889625),
+                                    ("monthday", -6.101066057023063),
+                                    ("monthyear", -4.714771695903172),
+                                    ("Yom Ha'atzmautyear (latent)", -6.506531165131227),
+                                    ("Orthodox Good Fridayyear (latent)", -6.101066057023063),
+                                    ("Vijayadashamiyear (latent)", -6.506531165131227),
+                                    ("Thanksgiving Dayyear (latent)", -5.407918876463118),
+                                    ("Thai Pongalyear (latent)", -5.813383984571282),
+                                    ("Thiru Onamyear (latent)", -5.813383984571282),
+                                    ("hhhmmabsorption of , after named day", -6.506531165131227),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.506531165131227),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.594711379601839),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.511002111475994),
-                                    ("Krishna Janmashtamiyear (latent)", -6.10553700336783),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.511002111475994),
-                                    ("houryear", -5.594711379601839),
+                                     -5.5902404332570725),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.506531165131227),
+                                    ("Krishna Janmashtamiyear (latent)", -6.101066057023063),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.506531165131227),
+                                    ("houryear", -5.5902404332570725),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.511002111475994),
-                                    ("Christmas<time-of-day> am|pm", -6.511002111475994),
+                                     -6.506531165131227),
+                                    ("Christmas<time-of-day> am|pm", -6.506531165131227),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.511002111475994),
+                                     -6.506531165131227),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.817854930916049),
-                                    ("intersectin|during <named-month>|year", -6.511002111475994),
-                                    ("<time-of-day> am|pmintersect", -5.258239142980626),
-                                    ("Earth Houryear (latent)", -6.511002111475994),
-                                    ("Ganesh Chaturthiyear (latent)", -6.511002111475994),
-                                    ("Octoberyear (latent)", -5.0069247146997204),
-                                    ("intersect<time-of-day> am|pm", -6.511002111475994),
-                                    ("Mattu Pongalyear (latent)", -6.511002111475994),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.511002111475994),
-                                    ("Shavuotyear (latent)", -6.511002111475994),
-                                    ("Parsi New Yearyear (latent)", -5.594711379601839),
+                                     -5.813383984571282),
+                                    ("intersectin|during <named-month>|year", -6.506531165131227),
+                                    ("<time-of-day> am|pmintersect", -5.25376819663586),
+                                    ("Earth Houryear (latent)", -6.506531165131227),
+                                    ("Ganesh Chaturthiyear (latent)", -6.506531165131227),
+                                    ("Octoberyear (latent)", -5.002453768354953),
+                                    ("intersect<time-of-day> am|pm", -6.506531165131227),
+                                    ("Mattu Pongalyear (latent)", -6.506531165131227),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.506531165131227),
+                                    ("Shavuotyear (latent)", -6.506531165131227),
+                                    ("Parsi New Yearyear (latent)", -5.5902404332570725),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.511002111475994),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.511002111475994),
-                                    ("todayin|within|after <duration>", -6.511002111475994),
+                                     -6.506531165131227),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.506531165131227),
+                                    ("todayin|within|after <duration>", -6.506531165131227),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.10553700336783),
-                                    ("Marchyear (latent)", -6.511002111475994),
+                                     -6.101066057023063),
+                                    ("Marchyear (latent)", -6.506531165131227),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.10553700336783),
-                                    ("Sukkotyear (latent)", -6.10553700336783),
-                                    ("hhhmmintersect", -6.10553700336783),
+                                     -6.101066057023063),
+                                    ("Sukkotyear (latent)", -6.101066057023063),
+                                    ("hhhmmintersect", -6.101066057023063),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.10553700336783),
-                                    ("Clean Mondayyear (latent)", -6.10553700336783),
-                                    ("monthhour", -6.10553700336783),
+                                     -6.101066057023063),
+                                    ("Clean Mondayyear (latent)", -6.101066057023063),
+                                    ("monthhour", -6.101066057023063),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.594711379601839),
-                                    ("todayat <time-of-day>", -6.511002111475994),
-                                    ("Thursday<time> timezone", -4.1131068386776235),
-                                    ("tonight<time-of-day> am|pm", -6.511002111475994),
-                                    ("time-of-day (latent)tonight", -6.10553700336783),
-                                    ("from|since|after <time>December", -6.511002111475994),
-                                    ("dd/mm<time-of-day> am|pm", -6.511002111475994),
-                                    ("<time-of-day> am|pmon <day>", -4.496099090933729),
+                                     -5.5902404332570725),
+                                    ("todayat <time-of-day>", -6.506531165131227),
+                                    ("Thursday<time> timezone", -4.108635892332857),
+                                    ("tonight<time-of-day> am|pm", -6.506531165131227),
+                                    ("time-of-day (latent)tonight", -6.101066057023063),
+                                    ("from|since|after <time>December", -6.506531165131227),
+                                    ("dd/mm<time-of-day> am|pm", -6.506531165131227),
+                                    ("<time-of-day> am|pmon <day>", -4.4916281445889625),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.511002111475994),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.10553700336783),
-                                    ("dayday", -3.738413389236213),
-                                    ("dd/mmat <time-of-day>", -6.511002111475994),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.10553700336783),
-                                    ("tonightat <time-of-day>", -5.412389822807884),
+                                     -6.506531165131227),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.101066057023063),
+                                    ("dayday", -3.733942442891446),
+                                    ("dd/mmat <time-of-day>", -6.506531165131227),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.101066057023063),
+                                    ("tonightat <time-of-day>", -5.407918876463118),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.817854930916049),
+                                     -5.813383984571282),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.511002111475994),
-                                    ("today<time-of-day> am|pm", -6.511002111475994),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.10553700336783),
-                                    ("at <time-of-day><time> <part-of-day>", -6.511002111475994),
-                                    ("<day-of-month> (ordinal)intersect", -6.10553700336783),
-                                    ("hourhour", -3.5405876459062933),
-                                    ("Mahavir Jayantiyear (latent)", -6.10553700336783),
-                                    ("Navaratriin|during <named-month>|year", -6.511002111475994),
-                                    ("Wednesdaythis|last|next <cycle>", -6.511002111475994),
-                                    ("Lentyear (latent)", -6.511002111475994),
+                                     -6.506531165131227),
+                                    ("today<time-of-day> am|pm", -6.506531165131227),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.101066057023063),
+                                    ("at <time-of-day><time> <part-of-day>", -6.506531165131227),
+                                    ("<day-of-month> (ordinal)intersect", -6.101066057023063),
+                                    ("hourhour", -3.536116699561526),
+                                    ("Mahavir Jayantiyear (latent)", -6.101066057023063),
+                                    ("Navaratriin|during <named-month>|year", -6.506531165131227),
+                                    ("Wednesdaythis|last|next <cycle>", -6.506531165131227),
+                                    ("Lentyear (latent)", -6.506531165131227),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.639199934574402),
-                                    ("Boghiyear (latent)", -6.511002111475994),
-                                    ("dayyear", -1.8958815946347347),
+                                     -4.634728988229636),
+                                    ("Boghiyear (latent)", -6.506531165131227),
+                                    ("dayyear", -1.8914106482899677),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.511002111475994),
-                                    ("Thursdayfrom|since|after <time>", -6.10553700336783),
+                                     -6.506531165131227),
+                                    ("Thursdayfrom|since|after <time>", -6.101066057023063),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.511002111475994),
-                                    ("Thursdayat <time-of-day>", -5.817854930916049),
-                                    ("Islamic New Yearyear (latent)", -6.10553700336783),
-                                    ("Laylat al-Qadryear (latent)", -5.594711379601839),
-                                    ("part of days<time-of-day> am|pm", -6.511002111475994),
-                                    ("Shrove Tuesdayyear (latent)", -6.511002111475994),
+                                     -6.506531165131227),
+                                    ("Thursdayat <time-of-day>", -5.813383984571282),
+                                    ("Islamic New Yearyear (latent)", -6.101066057023063),
+                                    ("Laylat al-Qadryear (latent)", -5.5902404332570725),
+                                    ("part of days<time-of-day> am|pm", -6.506531165131227),
+                                    ("Shrove Tuesdayyear (latent)", -6.506531165131227),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.817854930916049),
-                                    ("hourminute", -6.10553700336783),
-                                    ("<time-of-day> am|pmtomorrow", -5.594711379601839),
-                                    ("Yom Kippuryear (latent)", -6.511002111475994),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.817854930916049),
-                                    ("<part-of-day> of <time>year (latent)", -6.511002111475994),
-                                    ("minutehour", -5.258239142980626),
-                                    ("Kaanum Pongalyear (latent)", -6.10553700336783),
-                                    ("Maha Saptamiyear (latent)", -6.511002111475994),
+                                     -5.813383984571282),
+                                    ("hourminute", -6.101066057023063),
+                                    ("<time-of-day> am|pmtomorrow", -5.5902404332570725),
+                                    ("Yom Kippuryear (latent)", -6.506531165131227),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.813383984571282),
+                                    ("<part-of-day> of <time>year (latent)", -6.506531165131227),
+                                    ("minutehour", -5.25376819663586),
+                                    ("Kaanum Pongalyear (latent)", -6.101066057023063),
+                                    ("Maha Saptamiyear (latent)", -6.506531165131227),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.817854930916049),
-                                    ("time-of-day (latent)tomorrow", -5.594711379601839),
-                                    ("part of daysat <time-of-day>", -4.901564199041894),
+                                     -5.813383984571282),
+                                    ("time-of-day (latent)tomorrow", -5.5902404332570725),
+                                    ("part of daysat <time-of-day>", -4.897093252697127),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.496099090933729),
-                                    ("for <duration> from <time>December", -6.511002111475994),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.511002111475994),
+                                     -4.4916281445889625),
+                                    ("for <duration> from <time>December", -6.506531165131227),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.506531165131227),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.258239142980626),
+                                     -5.25376819663586),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.258239142980626),
-                                    ("time-of-day (latent)this <part-of-day>", -6.511002111475994),
-                                    ("Pentecostyear (latent)", -6.511002111475994),
+                                     -5.25376819663586),
+                                    ("time-of-day (latent)this <part-of-day>", -6.506531165131227),
+                                    ("Pentecostyear (latent)", -6.506531165131227),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.258239142980626),
-                                    ("<day-of-month> (ordinal)February", -6.511002111475994),
-                                    ("Eid al-Fitryear (latent)", -5.124707750356103),
+                                     -5.25376819663586),
+                                    ("<day-of-month> (ordinal)February", -6.506531165131227),
+                                    ("Eid al-Fitryear (latent)", -5.120236804011337),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.511002111475994),
-                                    ("Mondayin|during the <part-of-day>", -6.511002111475994),
-                                    ("Chhathin|during <named-month>|year", -6.511002111475994),
-                                    ("Diwaliin|during <named-month>|year", -6.511002111475994),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.511002111475994),
-                                    ("Vaisakhiin|during <named-month>|year", -6.511002111475994),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.258239142980626),
-                                    ("Raksha Bandhanyear (latent)", -6.511002111475994),
-                                    ("daysecond", -6.10553700336783),
+                                     -6.506531165131227),
+                                    ("Mondayin|during the <part-of-day>", -6.506531165131227),
+                                    ("Chhathin|during <named-month>|year", -6.506531165131227),
+                                    ("Diwaliin|during <named-month>|year", -6.506531165131227),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.506531165131227),
+                                    ("Vaisakhiin|during <named-month>|year", -6.506531165131227),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.25376819663586),
+                                    ("Raksha Bandhanyear (latent)", -6.506531165131227),
+                                    ("daysecond", -6.101066057023063),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.10553700336783),
-                                    ("Ratha-Yatrayear (latent)", -6.511002111475994),
-                                    ("Ashurayear (latent)", -6.511002111475994),
-                                    ("Tuesdayin|during <named-month>|year", -6.511002111475994),
-                                    ("Chinese New Yearyear (latent)", -6.511002111475994),
-                                    ("tomorrowintersect", -6.511002111475994),
-                                    ("Lag BaOmeryear (latent)", -6.511002111475994),
+                                     -6.101066057023063),
+                                    ("Ratha-Yatrayear (latent)", -6.506531165131227),
+                                    ("Ashurayear (latent)", -6.506531165131227),
+                                    ("Tuesdayin|during <named-month>|year", -6.506531165131227),
+                                    ("Chinese New Yearyear (latent)", -6.506531165131227),
+                                    ("tomorrowintersect", -6.506531165131227),
+                                    ("Lag BaOmeryear (latent)", -6.506531165131227),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.511002111475994),
-                                    ("Eid al-Adhayear (latent)", -4.370935947979723),
-                                    ("intersectin|during the <part-of-day>", -6.511002111475994),
-                                    ("Palm Sundayyear (latent)", -6.511002111475994),
-                                    ("Christmasat <time-of-day>", -6.511002111475994),
-                                    ("Passoveryear (latent)", -6.511002111475994),
-                                    ("Lazarus Saturdayyear (latent)", -6.511002111475994),
+                                     -6.506531165131227),
+                                    ("Eid al-Adhayear (latent)", -4.366465001634956),
+                                    ("intersectin|during the <part-of-day>", -6.506531165131227),
+                                    ("Palm Sundayyear (latent)", -6.506531165131227),
+                                    ("Christmasat <time-of-day>", -6.506531165131227),
+                                    ("Passoveryear (latent)", -6.506531165131227),
+                                    ("Lazarus Saturdayyear (latent)", -6.506531165131227),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.511002111475994),
-                                    ("hhhmmon <day>", -5.594711379601839),
-                                    ("Yom HaShoahyear (latent)", -6.10553700336783),
+                                     -6.506531165131227),
+                                    ("hhhmmon <day>", -5.5902404332570725),
+                                    ("Yom HaShoahyear (latent)", -6.101066057023063),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.10553700336783),
+                                     -6.101066057023063),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.511002111475994),
-                                    ("Septemberyear (latent)", -6.10553700336783),
+                                     -6.506531165131227),
+                                    ("Septemberyear (latent)", -6.101066057023063),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.0069247146997204),
-                                    ("Halloweenyear (latent)", -6.511002111475994),
+                                     -5.002453768354953),
+                                    ("Halloweenyear (latent)", -6.506531165131227),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.10553700336783),
+                                     -6.101066057023063),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.817854930916049),
+                                     -5.813383984571282),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.511002111475994),
-                                    ("at <time-of-day>intersect", -5.594711379601839),
-                                    ("Rosh Hashanahyear (latent)", -5.817854930916049),
-                                    ("Dhanterasyear (latent)", -6.511002111475994),
-                                    ("Tu BiShvatyear (latent)", -6.511002111475994),
-                                    ("<day-of-month> (ordinal)December", -5.817854930916049),
-                                    ("Holiyear (latent)", -5.817854930916049),
+                                     -6.506531165131227),
+                                    ("at <time-of-day>intersect", -5.5902404332570725),
+                                    ("Rosh Hashanahyear (latent)", -5.813383984571282),
+                                    ("Dhanterasyear (latent)", -6.506531165131227),
+                                    ("Tu BiShvatyear (latent)", -6.506531165131227),
+                                    ("<day-of-month> (ordinal)December", -5.813383984571282),
+                                    ("Holiyear (latent)", -5.813383984571282),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.511002111475994),
-                                    ("Holika Dahanyear (latent)", -5.817854930916049),
+                                     -6.506531165131227),
+                                    ("Holika Dahanyear (latent)", -5.813383984571282),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.10553700336783),
-                                    ("dayminute", -3.1610980242013893),
-                                    ("Mawlidyear (latent)", -6.511002111475994),
+                                     -6.101066057023063),
+                                    ("dayminute", -3.1566270778566223),
+                                    ("Mawlidyear (latent)", -6.506531165131227),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.10553700336783),
+                                     -6.101066057023063),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.511002111475994),
-                                    ("Jumu'atul-Widayear (latent)", -5.594711379601839),
-                                    ("minuteday", -2.761498035545623),
+                                     -6.506531165131227),
+                                    ("Jumu'atul-Widayear (latent)", -5.5902404332570725),
+                                    ("minuteday", -2.757027089200856),
                                     ("absorption of , after named dayintersect",
-                                     -5.817854930916049),
-                                    ("intersectyear (latent)", -6.511002111475994),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.511002111475994),
+                                     -5.813383984571282),
+                                    ("intersectyear (latent)", -6.506531165131227),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.506531165131227),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.511002111475994),
+                                     -6.506531165131227),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.511002111475994),
-                                    ("intersecthhhmm", -6.10553700336783),
+                                     -6.506531165131227),
+                                    ("intersecthhhmm", -6.101066057023063),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.511002111475994),
-                                    ("Mothering Sundayyear (latent)", -6.10553700336783),
-                                    ("Boss's Dayyear (latent)", -6.10553700336783),
+                                     -6.506531165131227),
+                                    ("Mothering Sundayyear (latent)", -6.101066057023063),
+                                    ("Boss's Dayyear (latent)", -6.101066057023063),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.511002111475994),
-                                    ("Global Youth Service Dayyear (latent)", -6.511002111475994),
-                                    ("Dhanterasin|during <named-month>|year", -6.511002111475994),
-                                    ("tonight<time-of-day> o'clock", -6.511002111475994),
-                                    ("Tisha B'Avyear (latent)", -6.511002111475994),
-                                    ("Isra and Mi'rajyear (latent)", -5.594711379601839),
-                                    ("at <time-of-day>on <day>", -4.901564199041894),
+                                     -6.506531165131227),
+                                    ("Global Youth Service Dayyear (latent)", -6.506531165131227),
+                                    ("Dhanterasin|during <named-month>|year", -6.506531165131227),
+                                    ("tonight<time-of-day> o'clock", -6.506531165131227),
+                                    ("Tisha B'Avyear (latent)", -6.506531165131227),
+                                    ("Isra and Mi'rajyear (latent)", -5.5902404332570725),
+                                    ("at <time-of-day>on <day>", -4.897093252697127),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.10553700336783),
+                                     -6.101066057023063),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.817854930916049),
-                                    ("Christmasyear (latent)", -6.10553700336783),
-                                    ("Saturdayintersect", -6.511002111475994),
-                                    ("Naraka Chaturdashiyear (latent)", -6.10553700336783),
-                                    ("Thai Pongalin|during <named-month>|year", -6.511002111475994),
-                                    ("dayweek", -6.511002111475994),
-                                    ("Easter Sundayyear (latent)", -5.817854930916049),
+                                     -5.813383984571282),
+                                    ("Christmasyear (latent)", -6.101066057023063),
+                                    ("Saturdayintersect", -6.506531165131227),
+                                    ("Naraka Chaturdashiyear (latent)", -6.101066057023063),
+                                    ("Thai Pongalin|during <named-month>|year", -6.506531165131227),
+                                    ("dayweek", -6.506531165131227),
+                                    ("Easter Sundayyear (latent)", -5.813383984571282),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.10553700336783),
-                                    ("weekyear", -5.412389822807884),
-                                    ("King's Dayyear (latent)", -5.0069247146997204),
-                                    ("hh:mmin|during the <part-of-day>", -5.594711379601839),
+                                     -6.101066057023063),
+                                    ("weekyear", -5.407918876463118),
+                                    ("King's Dayyear (latent)", -5.002453768354953),
+                                    ("hh:mmin|during the <part-of-day>", -5.5902404332570725),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.10553700336783),
+                                     -6.101066057023063),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.817854930916049),
-                                    ("Hanukkahyear (latent)", -5.817854930916049),
-                                    ("Rama Navamiyear (latent)", -6.511002111475994),
-                                    ("February<time> <part-of-day>", -6.511002111475994),
+                                     -5.813383984571282),
+                                    ("Hanukkahyear (latent)", -5.813383984571282),
+                                    ("Rama Navamiyear (latent)", -6.506531165131227),
+                                    ("February<time> <part-of-day>", -6.506531165131227),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.817854930916049),
-                                    ("Great Lentyear (latent)", -6.511002111475994),
-                                    ("tomorrowat <time-of-day>", -5.817854930916049),
+                                     -5.813383984571282),
+                                    ("Great Lentyear (latent)", -6.506531165131227),
+                                    ("tomorrowat <time-of-day>", -5.813383984571282),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.511002111475994),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.10553700336783),
-                                    ("Ugadiyear (latent)", -5.124707750356103),
-                                    ("Vaisakhiyear (latent)", -5.817854930916049),
+                                     -6.506531165131227),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.101066057023063),
+                                    ("Ugadiyear (latent)", -5.120236804011337),
+                                    ("Vaisakhiyear (latent)", -5.813383984571282),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.817854930916049),
-                                    ("last <cycle> of <time>year (latent)", -5.817854930916049),
-                                    ("at <time-of-day>tomorrow", -6.10553700336783),
-                                    ("tomorrow<time-of-day> am|pm", -6.511002111475994),
+                                     -5.813383984571282),
+                                    ("last <cycle> of <time>year (latent)", -5.813383984571282),
+                                    ("at <time-of-day>tomorrow", -6.101066057023063),
+                                    ("tomorrow<time-of-day> am|pm", -6.506531165131227),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.511002111475994),
-                                    ("Diwaliyear (latent)", -6.511002111475994),
-                                    ("between <time> and <time>on <day>", -6.10553700336783),
-                                    ("Black Fridayyear (latent)", -6.10553700336783),
+                                     -6.506531165131227),
+                                    ("Diwaliyear (latent)", -6.506531165131227),
+                                    ("between <time> and <time>on <day>", -6.101066057023063),
+                                    ("Black Fridayyear (latent)", -6.101066057023063),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.511002111475994),
+                                     -6.506531165131227),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.511002111475994),
-                                    ("Chhathyear (latent)", -6.10553700336783),
-                                    ("Vasant Panchamiyear (latent)", -6.511002111475994),
-                                    ("Rabindra Jayantiyear (latent)", -5.258239142980626),
-                                    ("this <part-of-day>at <time-of-day>", -5.258239142980626),
-                                    ("St Patrick's Dayyear (latent)", -6.511002111475994),
-                                    ("Thursday<time> (timezone)", -6.511002111475994),
+                                     -6.506531165131227),
+                                    ("Chhathyear (latent)", -6.101066057023063),
+                                    ("Vasant Panchamiyear (latent)", -6.506531165131227),
+                                    ("Rabindra Jayantiyear (latent)", -5.25376819663586),
+                                    ("this <part-of-day>at <time-of-day>", -5.25376819663586),
+                                    ("St Patrick's Dayyear (latent)", -6.506531165131227),
+                                    ("Thursday<time> (timezone)", -6.506531165131227),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.511002111475994),
-                                    ("Pargat Diwasyear (latent)", -5.258239142980626),
-                                    ("August Bank Holidayyear (latent)", -5.817854930916049),
-                                    ("<datetime> - <datetime> (interval)July", -6.10553700336783),
+                                     -6.506531165131227),
+                                    ("Pargat Diwasyear (latent)", -5.25376819663586),
+                                    ("August Bank Holidayyear (latent)", -5.813383984571282),
+                                    ("<datetime> - <datetime> (interval)July", -6.101066057023063),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.817854930916049),
-                                    ("Februaryintersect", -6.511002111475994),
-                                    ("Simchat Torahyear (latent)", -6.511002111475994),
-                                    ("minuteyear", -6.511002111475994)],
+                                     -5.813383984571282),
+                                    ("Februaryintersect", -6.506531165131227),
+                                    ("Simchat Torahyear (latent)", -6.506531165131227),
+                                    ("minuteyear", -6.506531165131227)],
                                n = 515},
                    koData =
-                     ClassData{prior = -0.9329181933346469, unseen = -6.891625897052253,
+                     ClassData{prior = -0.9910563824468477, unseen = -6.822197390620491,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.693384542810947),
+                                   [("Thursdayhhhmm", -4.6238828949202455),
                                     ("time-of-day (latent)<time-of-day> - <time-of-day> (interval)",
-                                     -5.791996831479057),
-                                    ("hourday", -3.5947722541428377),
+                                     -5.7224951835883555),
+                                    ("hourday", -3.525270606252136),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.197461939587221),
-                                    ("<day-of-month> (ordinal)August", -6.197461939587221),
-                                    ("dayhour", -3.5233132901606927),
-                                    ("<time> timezoneyear (latent)", -5.504314759027276),
+                                     -6.127960291696519),
+                                    ("<day-of-month> (ordinal)August", -6.127960291696519),
+                                    ("dayhour", -3.453811642269991),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.281171207713066),
-                                    ("Tuesdayfrom|since|after <time>", -5.504314759027276),
-                                    ("daymonth", -3.489411738485011),
-                                    ("hourquarter", -5.281171207713066),
-                                    ("monthday", -5.791996831479057),
-                                    ("monthyear", -4.944698971091853),
-                                    ("<time-of-day> am|pmyear (latent)", -5.504314759027276),
-                                    ("Thai Pongalyear (latent)", -5.504314759027276),
-                                    ("intersecthh:mm", -6.197461939587221),
+                                     -5.211669559822364),
+                                    ("Tuesdayfrom|since|after <time>", -5.434813111136574),
+                                    ("daymonth", -3.4199100905943096),
+                                    ("hourquarter", -5.211669559822364),
+                                    ("monthday", -5.7224951835883555),
+                                    ("monthyear", -4.875197323201151),
+                                    ("Thai Pongalyear (latent)", -5.434813111136574),
+                                    ("intersecthh:mm", -6.127960291696519),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.791996831479057),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.197461939587221),
-                                    ("houryear", -4.4057024703591665),
+                                     -5.7224951835883555),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.127960291696519),
+                                    ("houryear", -4.741665930576628),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.197461939587221),
-                                    ("<day-of-month> (ordinal)October", -6.197461939587221),
+                                     -6.127960291696519),
+                                    ("<day-of-month> (ordinal)October", -6.127960291696519),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.504314759027276),
-                                    ("hournograin", -4.944698971091853),
-                                    ("<time-of-day> am|pmintersect", -4.944698971091853),
-                                    ("Octoberyear (latent)", -6.197461939587221),
-                                    ("Good Fridayyear (latent)", -5.791996831479057),
+                                     -5.434813111136574),
+                                    ("hournograin", -4.875197323201151),
+                                    ("<time-of-day> am|pmintersect", -4.875197323201151),
+                                    ("Octoberyear (latent)", -6.127960291696519),
+                                    ("Good Fridayyear (latent)", -5.7224951835883555),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.791996831479057),
-                                    ("early morningat <time-of-day>", -6.197461939587221),
-                                    ("until <time>on <day>", -5.504314759027276),
+                                     -5.7224951835883555),
+                                    ("early morningat <time-of-day>", -6.127960291696519),
+                                    ("until <time>on <day>", -5.434813111136574),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.197461939587221),
-                                    ("time-of-day (latent)intersect", -5.504314759027276),
-                                    ("todayin <number> (implicit minutes)", -6.197461939587221),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.504314759027276),
+                                     -6.127960291696519),
+                                    ("time-of-day (latent)intersect", -5.434813111136574),
+                                    ("todayin <number> (implicit minutes)", -6.127960291696519),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.197461939587221),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.197461939587221),
-                                    ("hh:mmon <day>", -4.944698971091853),
-                                    ("hhhmmintersect", -5.791996831479057),
-                                    ("absorption of , after named dayJuly", -5.281171207713066),
-                                    ("from|since|after <time>July", -5.791996831479057),
+                                     -6.127960291696519),
+                                    ("hh:mmon <day>", -4.875197323201151),
+                                    ("hhhmmintersect", -5.7224951835883555),
+                                    ("absorption of , after named dayJuly", -5.211669559822364),
+                                    ("from|since|after <time>July", -5.7224951835883555),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.281171207713066),
-                                    ("Clean Mondayyear (latent)", -6.197461939587221),
-                                    ("monthhour", -6.197461939587221),
+                                     -5.211669559822364),
+                                    ("Clean Mondayyear (latent)", -6.127960291696519),
+                                    ("monthhour", -6.127960291696519),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.791996831479057),
-                                    ("hourmonth", -4.05739577609095),
-                                    ("todayat <time-of-day>", -6.197461939587221),
-                                    ("Bank Holidayyear (latent)", -5.504314759027276),
-                                    ("hhhmmyear (latent)", -4.944698971091853),
-                                    ("from|since|after <time>December", -6.197461939587221),
+                                     -5.7224951835883555),
+                                    ("hourmonth", -3.987894128200249),
+                                    ("todayat <time-of-day>", -6.127960291696519),
+                                    ("Bank Holidayyear (latent)", -5.434813111136574),
+                                    ("from|since|after <time>December", -6.127960291696519),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.197461939587221),
-                                    ("<time-of-day> am|pmon <day>", -4.944698971091853),
-                                    ("Mondayyear (latent)", -5.504314759027276),
-                                    ("dayday", -4.05739577609095),
-                                    ("dd/mmat <time-of-day>", -5.791996831479057),
-                                    ("on <day>September", -5.504314759027276),
-                                    ("time-of-day (latent)September", -5.791996831479057),
-                                    ("hourhour", -3.946170140980726),
-                                    ("time-of-day (latent)on <day>", -4.693384542810947),
-                                    ("Thursdaydd/mm", -6.197461939587221),
+                                     -6.127960291696519),
+                                    ("<time-of-day> am|pmon <day>", -4.875197323201151),
+                                    ("Mondayyear (latent)", -5.434813111136574),
+                                    ("dayday", -3.987894128200249),
+                                    ("dd/mmat <time-of-day>", -5.7224951835883555),
+                                    ("on <day>September", -5.434813111136574),
+                                    ("time-of-day (latent)September", -5.7224951835883555),
+                                    ("hourhour", -3.8766684930900244),
+                                    ("time-of-day (latent)on <day>", -4.6238828949202455),
+                                    ("Thursdaydd/mm", -6.127960291696519),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.791996831479057),
-                                    ("dayyear", -3.083946630376847),
-                                    ("New Year's Dayyear (latent)", -5.281171207713066),
-                                    ("time-of-day (latent)Sunday", -5.791996831479057),
-                                    ("Thursdayfrom|since|after <time>", -4.492713847348796),
-                                    ("Thursdayat <time-of-day>", -4.5880240271531205),
+                                     -5.7224951835883555),
+                                    ("dayyear", -3.2375885338003547),
+                                    ("New Year's Dayyear (latent)", -5.211669559822364),
+                                    ("time-of-day (latent)Sunday", -5.7224951835883555),
+                                    ("Thursdayfrom|since|after <time>", -4.423212199458094),
+                                    ("Thursdayat <time-of-day>", -4.518522379262419),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.197461939587221),
-                                    ("Aprilyear (latent)", -6.197461939587221),
-                                    ("the <day-of-month> (ordinal)July", -6.197461939587221),
-                                    ("the <day-of-month> (number)July", -6.197461939587221),
-                                    ("monthminute", -6.197461939587221),
-                                    ("hourminute", -5.504314759027276),
-                                    ("<time-of-day> am|pmtomorrow", -5.791996831479057),
-                                    ("Thursdayhh:mm", -5.281171207713066),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.791996831479057),
-                                    ("minutemonth", -4.05739577609095),
-                                    ("time-of-day (latent)Friday", -5.791996831479057),
-                                    ("minutehour", -6.197461939587221),
-                                    ("part of daysat <time-of-day>", -5.098849650919112),
+                                     -6.127960291696519),
+                                    ("Aprilyear (latent)", -6.127960291696519),
+                                    ("the <day-of-month> (ordinal)July", -6.127960291696519),
+                                    ("the <day-of-month> (number)July", -6.127960291696519),
+                                    ("monthminute", -6.127960291696519),
+                                    ("hourminute", -5.434813111136574),
+                                    ("<time-of-day> am|pmtomorrow", -5.7224951835883555),
+                                    ("Thursdayhh:mm", -5.211669559822364),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.7224951835883555),
+                                    ("minutemonth", -3.987894128200249),
+                                    ("time-of-day (latent)Friday", -5.7224951835883555),
+                                    ("minutehour", -6.127960291696519),
+                                    ("part of daysat <time-of-day>", -5.02934800302841),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.8460866824237434),
-                                    ("Augustyear (latent)", -5.791996831479057),
-                                    ("week-endin|during <named-month>|year", -6.197461939587221),
-                                    ("time-of-day (latent)Tuesday", -5.791996831479057),
+                                     -3.776585034533042),
+                                    ("Augustyear (latent)", -5.7224951835883555),
+                                    ("week-endin|during <named-month>|year", -6.127960291696519),
+                                    ("time-of-day (latent)Tuesday", -5.7224951835883555),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.197461939587221),
+                                     -6.127960291696519),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.197461939587221),
+                                     -6.127960291696519),
                                     ("July<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.197461939587221),
+                                     -6.127960291696519),
                                     ("dd/mm<time-of-day> - <time-of-day> (interval)",
-                                     -5.791996831479057),
-                                    ("Sundayyear (latent)", -5.281171207713066),
-                                    ("hourweek", -5.281171207713066),
-                                    ("the <day-of-month> (ordinal)Monday", -5.504314759027276),
-                                    ("Christmasat <time-of-day>", -6.197461939587221),
-                                    ("from|since|after <time>year (latent)", -5.098849650919112),
-                                    ("dd/mmyear (latent)", -6.197461939587221),
-                                    ("hhhmmon <day>", -5.281171207713066),
-                                    ("yesterday<time-of-day> am|pm", -6.197461939587221),
-                                    ("<day-of-month> (ordinal)July", -5.504314759027276),
+                                     -5.7224951835883555),
+                                    ("Sundayyear (latent)", -5.211669559822364),
+                                    ("hourweek", -5.211669559822364),
+                                    ("the <day-of-month> (ordinal)Monday", -5.434813111136574),
+                                    ("Christmasat <time-of-day>", -6.127960291696519),
+                                    ("from|since|after <time>year (latent)", -5.7224951835883555),
+                                    ("hhhmmon <day>", -5.211669559822364),
+                                    ("yesterday<time-of-day> am|pm", -6.127960291696519),
+                                    ("<day-of-month> (ordinal)July", -5.434813111136574),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.197461939587221),
+                                     -6.127960291696519),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.197461939587221),
+                                     -6.127960291696519),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.197461939587221),
+                                     -6.127960291696519),
                                     ("August<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.197461939587221),
-                                    ("at <time-of-day>intersect", -5.281171207713066),
-                                    ("hh:mmyear (latent)", -4.81116757846733),
-                                    ("Holiyear (latent)", -6.197461939587221),
-                                    ("until <time><time-of-day> am|pm", -6.197461939587221),
+                                     -6.127960291696519),
+                                    ("at <time-of-day>intersect", -5.211669559822364),
+                                    ("Holiyear (latent)", -6.127960291696519),
+                                    ("until <time><time-of-day> am|pm", -6.127960291696519),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.791996831479057),
-                                    ("dayminute", -3.335261058657753),
-                                    ("yyyy-mm-ddhh:mm", -5.791996831479057),
-                                    ("intersectfrom|since|after <time>", -5.791996831479057),
-                                    ("intersectSeptember", -4.32565976268563),
-                                    ("minuteday", -3.040461518437108),
+                                     -5.7224951835883555),
+                                    ("dayminute", -3.265759410767051),
+                                    ("yyyy-mm-ddhh:mm", -5.7224951835883555),
+                                    ("intersectfrom|since|after <time>", -5.7224951835883555),
+                                    ("intersectSeptember", -4.256158114794928),
+                                    ("minuteday", -2.970959870546406),
                                     ("absorption of , after named dayintersect",
-                                     -6.197461939587221),
-                                    ("intersectyear (latent)", -6.197461939587221),
-                                    ("Februaryin|during the <part-of-day>", -6.197461939587221),
+                                     -6.127960291696519),
+                                    ("intersectyear (latent)", -6.127960291696519),
+                                    ("Februaryin|during the <part-of-day>", -6.127960291696519),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.197461939587221),
-                                    ("time-of-day (latent)July", -5.504314759027276),
-                                    ("Saturdayyear (latent)", -6.197461939587221),
+                                     -6.127960291696519),
+                                    ("time-of-day (latent)July", -5.434813111136574),
+                                    ("Saturdayyear (latent)", -6.127960291696519),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.197461939587221),
-                                    ("<day-of-month> (ordinal)Monday", -4.944698971091853),
-                                    ("at <time-of-day>on <day>", -5.281171207713066),
-                                    ("time-of-day (latent)<time-of-day> am|pm", -6.197461939587221),
+                                     -6.127960291696519),
+                                    ("<day-of-month> (ordinal)Monday", -4.875197323201151),
+                                    ("at <time-of-day>on <day>", -5.211669559822364),
+                                    ("time-of-day (latent)<time-of-day> am|pm", -6.127960291696519),
                                     ("absorption of , after named daySeptember",
-                                     -4.944698971091853),
-                                    ("Naraka Chaturdashiyear (latent)", -6.197461939587221),
-                                    ("from|since|after <time>on <day>", -5.281171207713066),
-                                    ("dayweek", -6.197461939587221),
-                                    ("Easter Sundayyear (latent)", -5.791996831479057),
-                                    ("time-of-day (latent)at <time-of-day>", -5.504314759027276),
-                                    ("Thursday<time-of-day> am|pm", -4.944698971091853),
-                                    ("weekyear", -5.791996831479057),
-                                    ("time-of-day (latent)Thursday", -5.791996831479057),
+                                     -4.875197323201151),
+                                    ("Naraka Chaturdashiyear (latent)", -6.127960291696519),
+                                    ("from|since|after <time>on <day>", -5.211669559822364),
+                                    ("dayweek", -6.127960291696519),
+                                    ("Easter Sundayyear (latent)", -5.7224951835883555),
+                                    ("time-of-day (latent)at <time-of-day>", -5.434813111136574),
+                                    ("Thursday<time-of-day> am|pm", -4.875197323201151),
+                                    ("weekyear", -5.7224951835883555),
+                                    ("time-of-day (latent)Thursday", -5.7224951835883555),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.197461939587221),
-                                    ("<day-of-month> (ordinal)April", -6.197461939587221),
+                                     -6.127960291696519),
+                                    ("<day-of-month> (ordinal)April", -6.127960291696519),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.791996831479057),
+                                     -5.7224951835883555),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.504314759027276),
-                                    ("Sundayfrom|since|after <time>", -6.197461939587221),
-                                    ("absorption of , after named dayFebruary", -5.281171207713066),
+                                     -5.434813111136574),
+                                    ("Sundayfrom|since|after <time>", -6.127960291696519),
+                                    ("absorption of , after named dayFebruary", -5.211669559822364),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.791996831479057),
+                                     -5.7224951835883555),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.197461939587221),
-                                    ("tomorrowat <time-of-day>", -6.197461939587221),
-                                    ("daynograin", -5.791996831479057),
-                                    ("Fridayin|during <named-month>|year", -6.197461939587221),
+                                     -6.127960291696519),
+                                    ("tomorrowat <time-of-day>", -6.127960291696519),
+                                    ("daynograin", -5.7224951835883555),
+                                    ("Fridayin|during <named-month>|year", -6.127960291696519),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.791996831479057),
-                                    ("last <cycle> of <time>year (latent)", -5.791996831479057),
-                                    ("tomorrow<time-of-day> am|pm", -6.197461939587221),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.504314759027276),
-                                    ("Diwaliyear (latent)", -5.791996831479057),
+                                     -5.7224951835883555),
+                                    ("last <cycle> of <time>year (latent)", -5.7224951835883555),
+                                    ("tomorrow<time-of-day> am|pm", -6.127960291696519),
+                                    ("Diwaliyear (latent)", -5.7224951835883555),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.197461939587221),
-                                    ("this <part-of-day>at <time-of-day>", -5.281171207713066),
-                                    ("Fridayyear (latent)", -5.281171207713066),
-                                    ("time-of-day (latent)April", -6.197461939587221),
-                                    ("minuteyear", -4.000237362251002)],
-                               n = 334}}),
+                                     -6.127960291696519),
+                                    ("this <part-of-day>at <time-of-day>", -5.211669559822364),
+                                    ("Fridayyear (latent)", -5.211669559822364),
+                                    ("time-of-day (latent)April", -6.127960291696519)],
+                               n = 304}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1771,22 +1759,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.14398540805040755,
-                               unseen = -5.442417710521793,
+                     ClassData{prior = -4.329680575332419e-2,
+                               unseen = -5.438079308923196,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.6433257068155483e-2),
-                                    ("intersect 2 numbers", -4.051784947803305)],
+                                   [("integer (numeric)", -2.2075951699199847e-2),
+                                    ("intersect 2 numbers", -4.047427642434349)],
                                n = 226},
                    koData =
-                     ClassData{prior = -2.0091723458332797,
-                               unseen = -3.6888794541139363,
+                     ClassData{prior = -3.1612467120315646, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.5841201044498106),
-                                    ("negative numbers", -0.40546510810816444),
-                                    ("compose by multiplication", -2.277267285009756)],
-                               n = 35}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("Bank Holiday",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,

Duckling/Ranking/Classifiers/EN_IE.hs

@@ -276,7 +276,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -297,44 +297,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -992,467 +992,455 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.49314027536445065,
-                               unseen = -7.176254532017144,
+                     ClassData{prior = -0.4572231019431188, unseen = -7.172424577124845,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.482342533064276),
-                                    ("Karva Chauthyear (latent)", -6.482342533064276),
+                                   [("Navaratriyear (latent)", -6.478509642208569),
+                                    ("Karva Chauthyear (latent)", -6.478509642208569),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Maha Shivaratriyear (latent)", -6.482342533064276),
-                                    ("Ramadanyear (latent)", -5.229579564568908),
+                                     -6.478509642208569),
+                                    ("Maha Shivaratriyear (latent)", -6.478509642208569),
+                                    ("Ramadanyear (latent)", -5.225746673713201),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.096048171944386),
-                                    ("Bhai Doojyear (latent)", -6.482342533064276),
-                                    ("hourday", -4.467439512522012),
-                                    ("dayhour", -3.4378200953408538),
+                                     -5.092215281088679),
+                                    ("Bhai Doojyear (latent)", -6.478509642208569),
+                                    ("hourday", -4.463606621666305),
+                                    ("dayhour", -3.4339872044851463),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.096048171944386),
-                                    ("Martin Luther King's Dayyear (latent)", -6.076877424956113),
-                                    ("Shemini Atzeretyear (latent)", -6.482342533064276),
-                                    ("daymonth", -4.467439512522012),
-                                    ("monthday", -6.076877424956113),
-                                    ("monthyear", -4.690583063836222),
-                                    ("Yom Ha'atzmautyear (latent)", -6.482342533064276),
-                                    ("Orthodox Good Fridayyear (latent)", -6.076877424956113),
-                                    ("Vijayadashamiyear (latent)", -6.482342533064276),
-                                    ("Thai Pongalyear (latent)", -5.789195352504331),
-                                    ("Thiru Onamyear (latent)", -5.789195352504331),
-                                    ("hhhmmabsorption of , after named day", -6.482342533064276),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.482342533064276),
+                                     -5.092215281088679),
+                                    ("Martin Luther King's Dayyear (latent)", -6.073044534100405),
+                                    ("Shemini Atzeretyear (latent)", -6.478509642208569),
+                                    ("daymonth", -4.463606621666305),
+                                    ("monthday", -6.073044534100405),
+                                    ("monthyear", -4.686750172980514),
+                                    ("Yom Ha'atzmautyear (latent)", -6.478509642208569),
+                                    ("Orthodox Good Fridayyear (latent)", -6.073044534100405),
+                                    ("Vijayadashamiyear (latent)", -6.478509642208569),
+                                    ("Thai Pongalyear (latent)", -5.785362461648624),
+                                    ("Thiru Onamyear (latent)", -5.785362461648624),
+                                    ("hhhmmabsorption of , after named day", -6.478509642208569),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.478509642208569),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.566051801190121),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.482342533064276),
-                                    ("Krishna Janmashtamiyear (latent)", -6.076877424956113),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.482342533064276),
-                                    ("houryear", -5.566051801190121),
+                                     -5.562218910334414),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.478509642208569),
+                                    ("Krishna Janmashtamiyear (latent)", -6.073044534100405),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.478509642208569),
+                                    ("houryear", -5.562218910334414),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("Christmas<time-of-day> am|pm", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Christmas<time-of-day> am|pm", -6.478509642208569),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.789195352504331),
-                                    ("intersectin|during <named-month>|year", -6.482342533064276),
-                                    ("<time-of-day> am|pmintersect", -5.229579564568908),
-                                    ("Earth Houryear (latent)", -6.482342533064276),
-                                    ("Ganesh Chaturthiyear (latent)", -6.482342533064276),
-                                    ("Octoberyear (latent)", -4.978265136288003),
-                                    ("intersect<time-of-day> am|pm", -6.482342533064276),
-                                    ("Mattu Pongalyear (latent)", -6.482342533064276),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.482342533064276),
-                                    ("Shavuotyear (latent)", -6.482342533064276),
-                                    ("Parsi New Yearyear (latent)", -5.566051801190121),
+                                     -5.785362461648624),
+                                    ("intersectin|during <named-month>|year", -6.478509642208569),
+                                    ("<time-of-day> am|pmintersect", -5.225746673713201),
+                                    ("Earth Houryear (latent)", -6.478509642208569),
+                                    ("Ganesh Chaturthiyear (latent)", -6.478509642208569),
+                                    ("Octoberyear (latent)", -4.974432245432295),
+                                    ("intersect<time-of-day> am|pm", -6.478509642208569),
+                                    ("Mattu Pongalyear (latent)", -6.478509642208569),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.478509642208569),
+                                    ("Shavuotyear (latent)", -6.478509642208569),
+                                    ("Parsi New Yearyear (latent)", -5.562218910334414),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.482342533064276),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.482342533064276),
-                                    ("todayin|within|after <duration>", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.478509642208569),
+                                    ("todayin|within|after <duration>", -6.478509642208569),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.076877424956113),
-                                    ("Marchyear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("Marchyear (latent)", -6.478509642208569),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.076877424956113),
-                                    ("Sukkotyear (latent)", -6.076877424956113),
-                                    ("hhhmmintersect", -6.076877424956113),
+                                     -6.073044534100405),
+                                    ("Sukkotyear (latent)", -6.073044534100405),
+                                    ("hhhmmintersect", -6.073044534100405),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.076877424956113),
-                                    ("Clean Mondayyear (latent)", -6.076877424956113),
-                                    ("monthhour", -6.076877424956113),
+                                     -6.073044534100405),
+                                    ("Clean Mondayyear (latent)", -6.073044534100405),
+                                    ("monthhour", -6.073044534100405),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.566051801190121),
-                                    ("todayat <time-of-day>", -6.482342533064276),
-                                    ("Thursday<time> timezone", -4.0844472602659065),
-                                    ("tonight<time-of-day> am|pm", -6.482342533064276),
-                                    ("time-of-day (latent)tonight", -6.076877424956113),
-                                    ("from|since|after <time>December", -6.482342533064276),
-                                    ("<time-of-day> am|pmon <day>", -4.467439512522012),
+                                     -5.562218910334414),
+                                    ("todayat <time-of-day>", -6.478509642208569),
+                                    ("Thursday<time> timezone", -4.080614369410199),
+                                    ("tonight<time-of-day> am|pm", -6.478509642208569),
+                                    ("time-of-day (latent)tonight", -6.073044534100405),
+                                    ("from|since|after <time>December", -6.478509642208569),
+                                    ("<time-of-day> am|pmon <day>", -4.463606621666305),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.076877424956113),
-                                    ("dayday", -3.7097538108244956),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.076877424956113),
-                                    ("tonightat <time-of-day>", -5.383730244396167),
+                                     -6.478509642208569),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.073044534100405),
+                                    ("dayday", -3.705920919968788),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.073044534100405),
+                                    ("tonightat <time-of-day>", -5.37989735354046),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.789195352504331),
+                                     -5.785362461648624),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.482342533064276),
-                                    ("today<time-of-day> am|pm", -6.482342533064276),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.076877424956113),
-                                    ("at <time-of-day><time> <part-of-day>", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)intersect", -6.076877424956113),
-                                    ("hourhour", -3.5119280674945754),
-                                    ("Mahavir Jayantiyear (latent)", -6.076877424956113),
-                                    ("Navaratriin|during <named-month>|year", -6.482342533064276),
-                                    ("Wednesdaythis|last|next <cycle>", -6.482342533064276),
-                                    ("Lentyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("today<time-of-day> am|pm", -6.478509642208569),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.073044534100405),
+                                    ("at <time-of-day><time> <part-of-day>", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)intersect", -6.073044534100405),
+                                    ("hourhour", -3.5080951766388684),
+                                    ("Mahavir Jayantiyear (latent)", -6.073044534100405),
+                                    ("Navaratriin|during <named-month>|year", -6.478509642208569),
+                                    ("Wednesdaythis|last|next <cycle>", -6.478509642208569),
+                                    ("Lentyear (latent)", -6.478509642208569),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.610540356162685),
-                                    ("Boghiyear (latent)", -6.482342533064276),
-                                    ("dayyear", -1.923216285577592),
+                                     -4.606707465306978),
+                                    ("Boghiyear (latent)", -6.478509642208569),
+                                    ("dayyear", -1.9193833947218846),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.482342533064276),
-                                    ("Thursdayfrom|since|after <time>", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Thursdayfrom|since|after <time>", -6.073044534100405),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Thursdayat <time-of-day>", -5.789195352504331),
-                                    ("Islamic New Yearyear (latent)", -6.076877424956113),
-                                    ("Laylat al-Qadryear (latent)", -5.566051801190121),
-                                    ("part of days<time-of-day> am|pm", -6.482342533064276),
-                                    ("Shrove Tuesdayyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Thursdayat <time-of-day>", -5.785362461648624),
+                                    ("Islamic New Yearyear (latent)", -6.073044534100405),
+                                    ("Laylat al-Qadryear (latent)", -5.562218910334414),
+                                    ("part of days<time-of-day> am|pm", -6.478509642208569),
+                                    ("Shrove Tuesdayyear (latent)", -6.478509642208569),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.789195352504331),
-                                    ("hourminute", -6.076877424956113),
-                                    ("<time-of-day> am|pmtomorrow", -5.566051801190121),
-                                    ("Yom Kippuryear (latent)", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.789195352504331),
-                                    ("<part-of-day> of <time>year (latent)", -6.482342533064276),
-                                    ("minutehour", -5.229579564568908),
-                                    ("Kaanum Pongalyear (latent)", -6.076877424956113),
-                                    ("Maha Saptamiyear (latent)", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("hourminute", -6.073044534100405),
+                                    ("<time-of-day> am|pmtomorrow", -5.562218910334414),
+                                    ("Yom Kippuryear (latent)", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.785362461648624),
+                                    ("<part-of-day> of <time>year (latent)", -6.478509642208569),
+                                    ("minutehour", -5.225746673713201),
+                                    ("Kaanum Pongalyear (latent)", -6.073044534100405),
+                                    ("Maha Saptamiyear (latent)", -6.478509642208569),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.789195352504331),
-                                    ("time-of-day (latent)tomorrow", -5.566051801190121),
-                                    ("part of daysat <time-of-day>", -4.872904620630176),
+                                     -5.785362461648624),
+                                    ("time-of-day (latent)tomorrow", -5.562218910334414),
+                                    ("part of daysat <time-of-day>", -4.869071729774469),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.467439512522012),
-                                    ("for <duration> from <time>December", -6.482342533064276),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.482342533064276),
+                                     -4.463606621666305),
+                                    ("for <duration> from <time>December", -6.478509642208569),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.478509642208569),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.229579564568908),
+                                     -5.225746673713201),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.229579564568908),
-                                    ("time-of-day (latent)this <part-of-day>", -6.482342533064276),
-                                    ("Pentecostyear (latent)", -6.482342533064276),
+                                     -5.225746673713201),
+                                    ("time-of-day (latent)this <part-of-day>", -6.478509642208569),
+                                    ("Pentecostyear (latent)", -6.478509642208569),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.229579564568908),
-                                    ("<day-of-month> (ordinal)February", -6.482342533064276),
-                                    ("Eid al-Fitryear (latent)", -5.096048171944386),
+                                     -5.225746673713201),
+                                    ("<day-of-month> (ordinal)February", -6.478509642208569),
+                                    ("Eid al-Fitryear (latent)", -5.092215281088679),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.482342533064276),
-                                    ("Mondayin|during the <part-of-day>", -6.482342533064276),
-                                    ("Chhathin|during <named-month>|year", -6.482342533064276),
-                                    ("Diwaliin|during <named-month>|year", -6.482342533064276),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.482342533064276),
-                                    ("Vaisakhiin|during <named-month>|year", -6.482342533064276),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.229579564568908),
-                                    ("Raksha Bandhanyear (latent)", -6.482342533064276),
-                                    ("daysecond", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Mondayin|during the <part-of-day>", -6.478509642208569),
+                                    ("Chhathin|during <named-month>|year", -6.478509642208569),
+                                    ("Diwaliin|during <named-month>|year", -6.478509642208569),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.478509642208569),
+                                    ("Vaisakhiin|during <named-month>|year", -6.478509642208569),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.225746673713201),
+                                    ("Raksha Bandhanyear (latent)", -6.478509642208569),
+                                    ("daysecond", -6.073044534100405),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.076877424956113),
-                                    ("Ratha-Yatrayear (latent)", -6.482342533064276),
-                                    ("Ashurayear (latent)", -6.482342533064276),
-                                    ("Tuesdayin|during <named-month>|year", -6.482342533064276),
-                                    ("Chinese New Yearyear (latent)", -6.482342533064276),
-                                    ("tomorrowintersect", -6.482342533064276),
-                                    ("Lag BaOmeryear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("Ratha-Yatrayear (latent)", -6.478509642208569),
+                                    ("Ashurayear (latent)", -6.478509642208569),
+                                    ("Tuesdayin|during <named-month>|year", -6.478509642208569),
+                                    ("Chinese New Yearyear (latent)", -6.478509642208569),
+                                    ("tomorrowintersect", -6.478509642208569),
+                                    ("Lag BaOmeryear (latent)", -6.478509642208569),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.482342533064276),
-                                    ("Eid al-Adhayear (latent)", -4.342276369568006),
-                                    ("intersectin|during the <part-of-day>", -6.482342533064276),
-                                    ("Palm Sundayyear (latent)", -6.482342533064276),
-                                    ("Christmasat <time-of-day>", -6.482342533064276),
-                                    ("Passoveryear (latent)", -6.482342533064276),
-                                    ("Lazarus Saturdayyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Eid al-Adhayear (latent)", -4.338443478712298),
+                                    ("intersectin|during the <part-of-day>", -6.478509642208569),
+                                    ("Palm Sundayyear (latent)", -6.478509642208569),
+                                    ("Christmasat <time-of-day>", -6.478509642208569),
+                                    ("Passoveryear (latent)", -6.478509642208569),
+                                    ("Lazarus Saturdayyear (latent)", -6.478509642208569),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.482342533064276),
-                                    ("hhhmmon <day>", -5.566051801190121),
-                                    ("Yom HaShoahyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("hhhmmon <day>", -5.562218910334414),
+                                    ("Yom HaShoahyear (latent)", -6.073044534100405),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Septemberyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Septemberyear (latent)", -6.073044534100405),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.978265136288003),
-                                    ("Halloweenyear (latent)", -6.482342533064276),
+                                     -4.974432245432295),
+                                    ("Halloweenyear (latent)", -6.478509642208569),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.789195352504331),
+                                     -5.785362461648624),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("at <time-of-day>intersect", -5.566051801190121),
-                                    ("Rosh Hashanahyear (latent)", -5.789195352504331),
-                                    ("Dhanterasyear (latent)", -6.482342533064276),
-                                    ("Tu BiShvatyear (latent)", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)December", -5.789195352504331),
-                                    ("Holiyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("at <time-of-day>intersect", -5.562218910334414),
+                                    ("Rosh Hashanahyear (latent)", -5.785362461648624),
+                                    ("Dhanterasyear (latent)", -6.478509642208569),
+                                    ("Tu BiShvatyear (latent)", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)December", -5.785362461648624),
+                                    ("Holiyear (latent)", -5.785362461648624),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.482342533064276),
-                                    ("Holika Dahanyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("Holika Dahanyear (latent)", -5.785362461648624),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.076877424956113),
-                                    ("dayminute", -3.168156528391751),
-                                    ("Mawlidyear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("dayminute", -3.1643236375360435),
+                                    ("Mawlidyear (latent)", -6.478509642208569),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.482342533064276),
-                                    ("Jumu'atul-Widayear (latent)", -5.566051801190121),
-                                    ("minuteday", -2.7328384571339055),
+                                     -6.478509642208569),
+                                    ("Jumu'atul-Widayear (latent)", -5.562218910334414),
+                                    ("minuteday", -2.729005566278198),
                                     ("absorption of , after named dayintersect",
-                                     -5.789195352504331),
-                                    ("intersectyear (latent)", -6.482342533064276),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("intersectyear (latent)", -6.478509642208569),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.478509642208569),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.482342533064276),
-                                    ("intersecthhhmm", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("intersecthhhmm", -6.073044534100405),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Boss's Dayyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Boss's Dayyear (latent)", -6.073044534100405),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.482342533064276),
-                                    ("Global Youth Service Dayyear (latent)", -6.482342533064276),
-                                    ("Dhanterasin|during <named-month>|year", -6.482342533064276),
-                                    ("tonight<time-of-day> o'clock", -6.482342533064276),
-                                    ("Tisha B'Avyear (latent)", -6.482342533064276),
-                                    ("Isra and Mi'rajyear (latent)", -5.566051801190121),
-                                    ("at <time-of-day>on <day>", -4.872904620630176),
+                                     -6.478509642208569),
+                                    ("Global Youth Service Dayyear (latent)", -6.478509642208569),
+                                    ("Dhanterasin|during <named-month>|year", -6.478509642208569),
+                                    ("tonight<time-of-day> o'clock", -6.478509642208569),
+                                    ("Tisha B'Avyear (latent)", -6.478509642208569),
+                                    ("Isra and Mi'rajyear (latent)", -5.562218910334414),
+                                    ("at <time-of-day>on <day>", -4.869071729774469),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.789195352504331),
-                                    ("Christmasyear (latent)", -6.076877424956113),
-                                    ("Saturdayintersect", -6.482342533064276),
-                                    ("Naraka Chaturdashiyear (latent)", -6.076877424956113),
-                                    ("Thai Pongalin|during <named-month>|year", -6.482342533064276),
-                                    ("dayweek", -6.482342533064276),
-                                    ("Easter Sundayyear (latent)", -5.789195352504331),
+                                     -5.785362461648624),
+                                    ("Christmasyear (latent)", -6.073044534100405),
+                                    ("Saturdayintersect", -6.478509642208569),
+                                    ("Naraka Chaturdashiyear (latent)", -6.073044534100405),
+                                    ("Thai Pongalin|during <named-month>|year", -6.478509642208569),
+                                    ("dayweek", -6.478509642208569),
+                                    ("Easter Sundayyear (latent)", -5.785362461648624),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.076877424956113),
-                                    ("weekyear", -5.383730244396167),
-                                    ("King's Dayyear (latent)", -4.978265136288003),
-                                    ("hh:mmin|during the <part-of-day>", -5.566051801190121),
+                                     -6.073044534100405),
+                                    ("weekyear", -5.37989735354046),
+                                    ("King's Dayyear (latent)", -4.974432245432295),
+                                    ("hh:mmin|during the <part-of-day>", -5.562218910334414),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.789195352504331),
-                                    ("Hanukkahyear (latent)", -5.789195352504331),
-                                    ("Rama Navamiyear (latent)", -6.482342533064276),
-                                    ("February<time> <part-of-day>", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("Hanukkahyear (latent)", -5.785362461648624),
+                                    ("Rama Navamiyear (latent)", -6.478509642208569),
+                                    ("February<time> <part-of-day>", -6.478509642208569),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.789195352504331),
-                                    ("Great Lentyear (latent)", -6.482342533064276),
-                                    ("tomorrowat <time-of-day>", -5.789195352504331),
+                                     -5.785362461648624),
+                                    ("Great Lentyear (latent)", -6.478509642208569),
+                                    ("tomorrowat <time-of-day>", -5.785362461648624),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.076877424956113),
-                                    ("Ugadiyear (latent)", -5.096048171944386),
-                                    ("Vaisakhiyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.073044534100405),
+                                    ("Ugadiyear (latent)", -5.092215281088679),
+                                    ("Vaisakhiyear (latent)", -5.785362461648624),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.789195352504331),
-                                    ("last <cycle> of <time>year (latent)", -5.789195352504331),
-                                    ("at <time-of-day>tomorrow", -6.076877424956113),
-                                    ("tomorrow<time-of-day> am|pm", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("last <cycle> of <time>year (latent)", -5.785362461648624),
+                                    ("at <time-of-day>tomorrow", -6.073044534100405),
+                                    ("tomorrow<time-of-day> am|pm", -6.478509642208569),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.482342533064276),
-                                    ("Diwaliyear (latent)", -6.482342533064276),
-                                    ("between <time> and <time>on <day>", -6.076877424956113),
-                                    ("Black Fridayyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Diwaliyear (latent)", -6.478509642208569),
+                                    ("between <time> and <time>on <day>", -6.073044534100405),
+                                    ("Black Fridayyear (latent)", -6.073044534100405),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.482342533064276),
-                                    ("Chhathyear (latent)", -6.076877424956113),
-                                    ("Vasant Panchamiyear (latent)", -6.482342533064276),
-                                    ("Rabindra Jayantiyear (latent)", -5.229579564568908),
-                                    ("this <part-of-day>at <time-of-day>", -5.229579564568908),
-                                    ("St Patrick's Dayyear (latent)", -6.482342533064276),
-                                    ("Thursday<time> (timezone)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Chhathyear (latent)", -6.073044534100405),
+                                    ("Vasant Panchamiyear (latent)", -6.478509642208569),
+                                    ("Rabindra Jayantiyear (latent)", -5.225746673713201),
+                                    ("this <part-of-day>at <time-of-day>", -5.225746673713201),
+                                    ("St Patrick's Dayyear (latent)", -6.478509642208569),
+                                    ("Thursday<time> (timezone)", -6.478509642208569),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Pargat Diwasyear (latent)", -5.229579564568908),
-                                    ("<datetime> - <datetime> (interval)July", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Pargat Diwasyear (latent)", -5.225746673713201),
+                                    ("<datetime> - <datetime> (interval)July", -6.073044534100405),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.789195352504331),
-                                    ("Februaryintersect", -6.482342533064276),
-                                    ("Simchat Torahyear (latent)", -6.482342533064276),
-                                    ("minuteyear", -6.482342533064276)],
+                                     -5.785362461648624),
+                                    ("Februaryintersect", -6.478509642208569),
+                                    ("Simchat Torahyear (latent)", -6.478509642208569),
+                                    ("minuteyear", -6.478509642208569)],
                                n = 502},
                    koData =
-                     ClassData{prior = -0.9434193992624076, unseen = -6.8501261661455,
+                     ClassData{prior = -1.0024999544633555, unseen = -6.78105762593618,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.651841705297238),
-                                    ("hourday", -3.5532294166291285),
+                                   [("Thursdayhhhmm", -4.582697330136033),
+                                    ("hourday", -3.484085041467923),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)August", -6.155919102073512),
-                                    ("dayhour", -3.5909697446119755),
-                                    ("<time> timezoneyear (latent)", -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)August", -6.0867747269123065),
+                                    ("dayhour", -3.52182536945077),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.239628370199357),
-                                    ("Tuesdayfrom|since|after <time>", -5.462771921513567),
-                                    ("daymonth", -3.447868900971302),
-                                    ("hourquarter", -5.239628370199357),
-                                    ("monthday", -5.750453993965348),
-                                    ("monthyear", -4.903156133578144),
-                                    ("<time-of-day> am|pmyear (latent)", -5.462771921513567),
-                                    ("Thai Pongalyear (latent)", -5.462771921513567),
-                                    ("intersecthh:mm", -6.155919102073512),
+                                     -5.170483995038151),
+                                    ("Tuesdayfrom|since|after <time>", -5.393627546352362),
+                                    ("daymonth", -3.378724525810097),
+                                    ("hourquarter", -5.170483995038151),
+                                    ("monthday", -5.681309618804143),
+                                    ("monthyear", -4.834011758416939),
+                                    ("Thai Pongalyear (latent)", -5.393627546352362),
+                                    ("intersecthh:mm", -6.0867747269123065),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.750453993965348),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.155919102073512),
-                                    ("houryear", -4.364159632845457),
+                                     -5.681309618804143),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.0867747269123065),
+                                    ("houryear", -4.700480365792417),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)October", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)October", -6.0867747269123065),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.462771921513567),
-                                    ("hournograin", -4.903156133578144),
-                                    ("<time-of-day> am|pmintersect", -4.903156133578144),
-                                    ("Octoberyear (latent)", -6.155919102073512),
-                                    ("Good Fridayyear (latent)", -5.750453993965348),
+                                     -5.393627546352362),
+                                    ("hournograin", -4.834011758416939),
+                                    ("<time-of-day> am|pmintersect", -4.834011758416939),
+                                    ("Octoberyear (latent)", -6.0867747269123065),
+                                    ("Good Fridayyear (latent)", -5.681309618804143),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("early morningat <time-of-day>", -6.155919102073512),
-                                    ("until <time>on <day>", -5.462771921513567),
+                                     -5.681309618804143),
+                                    ("early morningat <time-of-day>", -6.0867747269123065),
+                                    ("until <time>on <day>", -5.393627546352362),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
-                                    ("time-of-day (latent)intersect", -5.462771921513567),
-                                    ("todayin <number> (implicit minutes)", -6.155919102073512),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("time-of-day (latent)intersect", -5.393627546352362),
+                                    ("todayin <number> (implicit minutes)", -6.0867747269123065),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.155919102073512),
-                                    ("hh:mmon <day>", -4.903156133578144),
-                                    ("hhhmmintersect", -5.750453993965348),
-                                    ("absorption of , after named dayJuly", -5.239628370199357),
-                                    ("from|since|after <time>July", -5.750453993965348),
+                                     -6.0867747269123065),
+                                    ("hh:mmon <day>", -4.834011758416939),
+                                    ("hhhmmintersect", -5.681309618804143),
+                                    ("absorption of , after named dayJuly", -5.170483995038151),
+                                    ("from|since|after <time>July", -5.681309618804143),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.239628370199357),
-                                    ("Clean Mondayyear (latent)", -6.155919102073512),
-                                    ("monthhour", -6.155919102073512),
+                                     -5.170483995038151),
+                                    ("Clean Mondayyear (latent)", -6.0867747269123065),
+                                    ("monthhour", -6.0867747269123065),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("hourmonth", -4.0158529385772415),
-                                    ("todayat <time-of-day>", -6.155919102073512),
-                                    ("hhhmmyear (latent)", -4.903156133578144),
-                                    ("from|since|after <time>December", -6.155919102073512),
+                                     -5.681309618804143),
+                                    ("hourmonth", -3.946708563416036),
+                                    ("todayat <time-of-day>", -6.0867747269123065),
+                                    ("from|since|after <time>December", -6.0867747269123065),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.155919102073512),
-                                    ("<time-of-day> am|pmon <day>", -4.903156133578144),
-                                    ("Mondayyear (latent)", -5.462771921513567),
-                                    ("dayday", -4.0158529385772415),
-                                    ("on <day>September", -5.462771921513567),
-                                    ("time-of-day (latent)September", -5.750453993965348),
-                                    ("hourhour", -4.076477560393676),
-                                    ("time-of-day (latent)on <day>", -4.651841705297238),
-                                    ("Thursdaydd/mm", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<time-of-day> am|pmon <day>", -4.834011758416939),
+                                    ("Mondayyear (latent)", -5.393627546352362),
+                                    ("dayday", -3.946708563416036),
+                                    ("on <day>September", -5.393627546352362),
+                                    ("time-of-day (latent)September", -5.681309618804143),
+                                    ("hourhour", -4.007333185232471),
+                                    ("time-of-day (latent)on <day>", -4.582697330136033),
+                                    ("Thursdaydd/mm", -6.0867747269123065),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.750453993965348),
-                                    ("dayyear", -3.1354942159291497),
-                                    ("New Year's Dayyear (latent)", -5.239628370199357),
-                                    ("time-of-day (latent)Sunday", -5.750453993965348),
-                                    ("Thursdayfrom|since|after <time>", -4.451171009835087),
-                                    ("Thursdayat <time-of-day>", -4.546481189639412),
+                                     -5.681309618804143),
+                                    ("dayyear", -3.283414346005772),
+                                    ("New Year's Dayyear (latent)", -5.170483995038151),
+                                    ("time-of-day (latent)Sunday", -5.681309618804143),
+                                    ("Thursdayfrom|since|after <time>", -4.382026634673881),
+                                    ("Thursdayat <time-of-day>", -4.477336814478207),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.155919102073512),
-                                    ("Aprilyear (latent)", -6.155919102073512),
-                                    ("the <day-of-month> (ordinal)July", -6.155919102073512),
-                                    ("the <day-of-month> (number)July", -6.155919102073512),
-                                    ("monthminute", -6.155919102073512),
-                                    ("<time-of-day> am|pmtomorrow", -5.750453993965348),
-                                    ("Thursdayhh:mm", -5.239628370199357),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.750453993965348),
-                                    ("minutemonth", -4.0158529385772415),
-                                    ("time-of-day (latent)Friday", -5.750453993965348),
-                                    ("minutehour", -6.155919102073512),
-                                    ("part of daysat <time-of-day>", -5.057306813405402),
+                                     -6.0867747269123065),
+                                    ("Aprilyear (latent)", -6.0867747269123065),
+                                    ("the <day-of-month> (ordinal)July", -6.0867747269123065),
+                                    ("the <day-of-month> (number)July", -6.0867747269123065),
+                                    ("monthminute", -6.0867747269123065),
+                                    ("<time-of-day> am|pmtomorrow", -5.681309618804143),
+                                    ("Thursdayhh:mm", -5.170483995038151),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.681309618804143),
+                                    ("minutemonth", -3.946708563416036),
+                                    ("time-of-day (latent)Friday", -5.681309618804143),
+                                    ("minutehour", -6.0867747269123065),
+                                    ("part of daysat <time-of-day>", -4.988162438244197),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.8045438449100346),
-                                    ("Augustyear (latent)", -5.750453993965348),
-                                    ("week-endin|during <named-month>|year", -6.155919102073512),
-                                    ("time-of-day (latent)Tuesday", -5.750453993965348),
+                                     -3.7353994697488293),
+                                    ("Augustyear (latent)", -5.681309618804143),
+                                    ("week-endin|during <named-month>|year", -6.0867747269123065),
+                                    ("time-of-day (latent)Tuesday", -5.681309618804143),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("July<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.155919102073512),
-                                    ("Sundayyear (latent)", -5.239628370199357),
-                                    ("hourweek", -5.239628370199357),
-                                    ("the <day-of-month> (ordinal)Monday", -5.462771921513567),
-                                    ("Christmasat <time-of-day>", -6.155919102073512),
-                                    ("from|since|after <time>year (latent)", -5.057306813405402),
-                                    ("hhhmmon <day>", -5.239628370199357),
-                                    ("yesterday<time-of-day> am|pm", -6.155919102073512),
-                                    ("<day-of-month> (ordinal)July", -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("Sundayyear (latent)", -5.170483995038151),
+                                    ("hourweek", -5.170483995038151),
+                                    ("the <day-of-month> (ordinal)Monday", -5.393627546352362),
+                                    ("Christmasat <time-of-day>", -6.0867747269123065),
+                                    ("from|since|after <time>year (latent)", -5.681309618804143),
+                                    ("hhhmmon <day>", -5.170483995038151),
+                                    ("yesterday<time-of-day> am|pm", -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)July", -5.393627546352362),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("August<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.155919102073512),
-                                    ("at <time-of-day>intersect", -5.239628370199357),
-                                    ("hh:mmyear (latent)", -4.769624740953621),
-                                    ("Holiyear (latent)", -6.155919102073512),
-                                    ("until <time><time-of-day> am|pm", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("at <time-of-day>intersect", -5.170483995038151),
+                                    ("Holiyear (latent)", -6.0867747269123065),
+                                    ("until <time><time-of-day> am|pm", -6.0867747269123065),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("dayminute", -3.322705758017296),
-                                    ("yyyy-mm-ddhh:mm", -5.750453993965348),
-                                    ("intersectfrom|since|after <time>", -5.750453993965348),
-                                    ("intersectSeptember", -4.28411692517192),
-                                    ("minuteday", -2.9989186809233987),
+                                     -5.681309618804143),
+                                    ("dayminute", -3.2535613828560908),
+                                    ("yyyy-mm-ddhh:mm", -5.681309618804143),
+                                    ("intersectfrom|since|after <time>", -5.681309618804143),
+                                    ("intersectSeptember", -4.214972550010716),
+                                    ("minuteday", -2.9297743057621934),
                                     ("absorption of , after named dayintersect",
-                                     -6.155919102073512),
-                                    ("intersectyear (latent)", -6.155919102073512),
-                                    ("Februaryin|during the <part-of-day>", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("intersectyear (latent)", -6.0867747269123065),
+                                    ("Februaryin|during the <part-of-day>", -6.0867747269123065),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.155919102073512),
-                                    ("time-of-day (latent)July", -5.462771921513567),
-                                    ("Saturdayyear (latent)", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("time-of-day (latent)July", -5.393627546352362),
+                                    ("Saturdayyear (latent)", -6.0867747269123065),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)Monday", -4.903156133578144),
-                                    ("at <time-of-day>on <day>", -5.239628370199357),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)Monday", -4.834011758416939),
+                                    ("at <time-of-day>on <day>", -5.170483995038151),
                                     ("absorption of , after named daySeptember",
-                                     -4.903156133578144),
-                                    ("Naraka Chaturdashiyear (latent)", -6.155919102073512),
-                                    ("from|since|after <time>on <day>", -5.239628370199357),
-                                    ("dayweek", -6.155919102073512),
-                                    ("Easter Sundayyear (latent)", -5.750453993965348),
-                                    ("Thursday<time-of-day> am|pm", -4.903156133578144),
-                                    ("weekyear", -5.750453993965348),
-                                    ("time-of-day (latent)Thursday", -5.750453993965348),
+                                     -4.834011758416939),
+                                    ("Naraka Chaturdashiyear (latent)", -6.0867747269123065),
+                                    ("from|since|after <time>on <day>", -5.170483995038151),
+                                    ("dayweek", -6.0867747269123065),
+                                    ("Easter Sundayyear (latent)", -5.681309618804143),
+                                    ("Thursday<time-of-day> am|pm", -4.834011758416939),
+                                    ("weekyear", -5.681309618804143),
+                                    ("time-of-day (latent)Thursday", -5.681309618804143),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)April", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)April", -6.0867747269123065),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.750453993965348),
+                                     -5.681309618804143),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.462771921513567),
-                                    ("Sundayfrom|since|after <time>", -6.155919102073512),
-                                    ("absorption of , after named dayFebruary", -5.239628370199357),
+                                     -5.393627546352362),
+                                    ("Sundayfrom|since|after <time>", -6.0867747269123065),
+                                    ("absorption of , after named dayFebruary", -5.170483995038151),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.750453993965348),
+                                     -5.681309618804143),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.155919102073512),
-                                    ("tomorrowat <time-of-day>", -6.155919102073512),
-                                    ("daynograin", -5.750453993965348),
-                                    ("Fridayin|during <named-month>|year", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("tomorrowat <time-of-day>", -6.0867747269123065),
+                                    ("daynograin", -5.681309618804143),
+                                    ("Fridayin|during <named-month>|year", -6.0867747269123065),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.750453993965348),
-                                    ("last <cycle> of <time>year (latent)", -5.750453993965348),
-                                    ("tomorrow<time-of-day> am|pm", -6.155919102073512),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.462771921513567),
-                                    ("Diwaliyear (latent)", -5.750453993965348),
+                                     -5.681309618804143),
+                                    ("last <cycle> of <time>year (latent)", -5.681309618804143),
+                                    ("tomorrow<time-of-day> am|pm", -6.0867747269123065),
+                                    ("Diwaliyear (latent)", -5.681309618804143),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.155919102073512),
-                                    ("this <part-of-day>at <time-of-day>", -5.239628370199357),
-                                    ("Fridayyear (latent)", -5.239628370199357),
-                                    ("time-of-day (latent)April", -6.155919102073512),
-                                    ("minuteyear", -3.9586945247372927)],
-                               n = 320}}),
+                                     -6.0867747269123065),
+                                    ("this <part-of-day>at <time-of-day>", -5.170483995038151),
+                                    ("Fridayyear (latent)", -5.170483995038151),
+                                    ("time-of-day (latent)April", -6.0867747269123065)],
+                               n = 291}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1742,22 +1730,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.14681486833704485,
-                               unseen = -5.393627546352362,
+                     ClassData{prior = -4.546237407675729e-2,
+                               unseen = -5.389071729816501,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.7779564107075706e-2),
-                                    ("intersect 2 numbers", -4.00277736869661)],
+                                   [("integer (numeric)", -2.320289707966387e-2),
+                                    ("intersect 2 numbers", -3.9982007016691985)],
                                n = 215},
                    koData =
-                     ClassData{prior = -1.9910923718485463,
-                               unseen = -3.6635616461296463,
+                     ClassData{prior = -3.1135153092103742, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.55814461804655),
-                                    ("negative numbers", -0.41871033485818493),
-                                    ("compose by multiplication", -2.2512917986064953)],
-                               n = 34}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.15415067982725836,

Duckling/Ranking/Classifiers/EN_IN.hs

@@ -276,7 +276,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -297,44 +297,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -992,467 +992,455 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.49314027536445065,
-                               unseen = -7.176254532017144,
+                     ClassData{prior = -0.4572231019431188, unseen = -7.172424577124845,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.482342533064276),
-                                    ("Karva Chauthyear (latent)", -6.482342533064276),
+                                   [("Navaratriyear (latent)", -6.478509642208569),
+                                    ("Karva Chauthyear (latent)", -6.478509642208569),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Maha Shivaratriyear (latent)", -6.482342533064276),
-                                    ("Ramadanyear (latent)", -5.229579564568908),
+                                     -6.478509642208569),
+                                    ("Maha Shivaratriyear (latent)", -6.478509642208569),
+                                    ("Ramadanyear (latent)", -5.225746673713201),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.096048171944386),
-                                    ("Bhai Doojyear (latent)", -6.482342533064276),
-                                    ("hourday", -4.467439512522012),
-                                    ("dayhour", -3.4378200953408538),
+                                     -5.092215281088679),
+                                    ("Bhai Doojyear (latent)", -6.478509642208569),
+                                    ("hourday", -4.463606621666305),
+                                    ("dayhour", -3.4339872044851463),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.096048171944386),
-                                    ("Martin Luther King's Dayyear (latent)", -6.076877424956113),
-                                    ("Shemini Atzeretyear (latent)", -6.482342533064276),
-                                    ("daymonth", -4.467439512522012),
-                                    ("monthday", -6.076877424956113),
-                                    ("monthyear", -4.690583063836222),
-                                    ("Yom Ha'atzmautyear (latent)", -6.482342533064276),
-                                    ("Orthodox Good Fridayyear (latent)", -6.076877424956113),
-                                    ("Vijayadashamiyear (latent)", -6.482342533064276),
-                                    ("Thai Pongalyear (latent)", -5.789195352504331),
-                                    ("Thiru Onamyear (latent)", -5.789195352504331),
-                                    ("hhhmmabsorption of , after named day", -6.482342533064276),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.482342533064276),
+                                     -5.092215281088679),
+                                    ("Martin Luther King's Dayyear (latent)", -6.073044534100405),
+                                    ("Shemini Atzeretyear (latent)", -6.478509642208569),
+                                    ("daymonth", -4.463606621666305),
+                                    ("monthday", -6.073044534100405),
+                                    ("monthyear", -4.686750172980514),
+                                    ("Yom Ha'atzmautyear (latent)", -6.478509642208569),
+                                    ("Orthodox Good Fridayyear (latent)", -6.073044534100405),
+                                    ("Vijayadashamiyear (latent)", -6.478509642208569),
+                                    ("Thai Pongalyear (latent)", -5.785362461648624),
+                                    ("Thiru Onamyear (latent)", -5.785362461648624),
+                                    ("hhhmmabsorption of , after named day", -6.478509642208569),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.478509642208569),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.566051801190121),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.482342533064276),
-                                    ("Krishna Janmashtamiyear (latent)", -6.076877424956113),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.482342533064276),
-                                    ("houryear", -5.566051801190121),
+                                     -5.562218910334414),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.478509642208569),
+                                    ("Krishna Janmashtamiyear (latent)", -6.073044534100405),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.478509642208569),
+                                    ("houryear", -5.562218910334414),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("Christmas<time-of-day> am|pm", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Christmas<time-of-day> am|pm", -6.478509642208569),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.789195352504331),
-                                    ("intersectin|during <named-month>|year", -6.482342533064276),
-                                    ("<time-of-day> am|pmintersect", -5.229579564568908),
-                                    ("Earth Houryear (latent)", -6.482342533064276),
-                                    ("Ganesh Chaturthiyear (latent)", -6.482342533064276),
-                                    ("Octoberyear (latent)", -4.978265136288003),
-                                    ("intersect<time-of-day> am|pm", -6.482342533064276),
-                                    ("Mattu Pongalyear (latent)", -6.482342533064276),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.482342533064276),
-                                    ("Shavuotyear (latent)", -6.482342533064276),
-                                    ("Parsi New Yearyear (latent)", -5.566051801190121),
+                                     -5.785362461648624),
+                                    ("intersectin|during <named-month>|year", -6.478509642208569),
+                                    ("<time-of-day> am|pmintersect", -5.225746673713201),
+                                    ("Earth Houryear (latent)", -6.478509642208569),
+                                    ("Ganesh Chaturthiyear (latent)", -6.478509642208569),
+                                    ("Octoberyear (latent)", -4.974432245432295),
+                                    ("intersect<time-of-day> am|pm", -6.478509642208569),
+                                    ("Mattu Pongalyear (latent)", -6.478509642208569),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.478509642208569),
+                                    ("Shavuotyear (latent)", -6.478509642208569),
+                                    ("Parsi New Yearyear (latent)", -5.562218910334414),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.482342533064276),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.482342533064276),
-                                    ("todayin|within|after <duration>", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.478509642208569),
+                                    ("todayin|within|after <duration>", -6.478509642208569),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.076877424956113),
-                                    ("Marchyear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("Marchyear (latent)", -6.478509642208569),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.076877424956113),
-                                    ("Sukkotyear (latent)", -6.076877424956113),
-                                    ("hhhmmintersect", -6.076877424956113),
+                                     -6.073044534100405),
+                                    ("Sukkotyear (latent)", -6.073044534100405),
+                                    ("hhhmmintersect", -6.073044534100405),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.076877424956113),
-                                    ("Clean Mondayyear (latent)", -6.076877424956113),
-                                    ("monthhour", -6.076877424956113),
+                                     -6.073044534100405),
+                                    ("Clean Mondayyear (latent)", -6.073044534100405),
+                                    ("monthhour", -6.073044534100405),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.566051801190121),
-                                    ("todayat <time-of-day>", -6.482342533064276),
-                                    ("Thursday<time> timezone", -4.0844472602659065),
-                                    ("tonight<time-of-day> am|pm", -6.482342533064276),
-                                    ("time-of-day (latent)tonight", -6.076877424956113),
-                                    ("from|since|after <time>December", -6.482342533064276),
-                                    ("<time-of-day> am|pmon <day>", -4.467439512522012),
+                                     -5.562218910334414),
+                                    ("todayat <time-of-day>", -6.478509642208569),
+                                    ("Thursday<time> timezone", -4.080614369410199),
+                                    ("tonight<time-of-day> am|pm", -6.478509642208569),
+                                    ("time-of-day (latent)tonight", -6.073044534100405),
+                                    ("from|since|after <time>December", -6.478509642208569),
+                                    ("<time-of-day> am|pmon <day>", -4.463606621666305),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.076877424956113),
-                                    ("dayday", -3.7097538108244956),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.076877424956113),
-                                    ("tonightat <time-of-day>", -5.383730244396167),
+                                     -6.478509642208569),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.073044534100405),
+                                    ("dayday", -3.705920919968788),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.073044534100405),
+                                    ("tonightat <time-of-day>", -5.37989735354046),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.789195352504331),
+                                     -5.785362461648624),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.482342533064276),
-                                    ("today<time-of-day> am|pm", -6.482342533064276),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.076877424956113),
-                                    ("at <time-of-day><time> <part-of-day>", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)intersect", -6.076877424956113),
-                                    ("hourhour", -3.5119280674945754),
-                                    ("Mahavir Jayantiyear (latent)", -6.076877424956113),
-                                    ("Navaratriin|during <named-month>|year", -6.482342533064276),
-                                    ("Wednesdaythis|last|next <cycle>", -6.482342533064276),
-                                    ("Lentyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("today<time-of-day> am|pm", -6.478509642208569),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.073044534100405),
+                                    ("at <time-of-day><time> <part-of-day>", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)intersect", -6.073044534100405),
+                                    ("hourhour", -3.5080951766388684),
+                                    ("Mahavir Jayantiyear (latent)", -6.073044534100405),
+                                    ("Navaratriin|during <named-month>|year", -6.478509642208569),
+                                    ("Wednesdaythis|last|next <cycle>", -6.478509642208569),
+                                    ("Lentyear (latent)", -6.478509642208569),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.610540356162685),
-                                    ("Boghiyear (latent)", -6.482342533064276),
-                                    ("dayyear", -1.923216285577592),
+                                     -4.606707465306978),
+                                    ("Boghiyear (latent)", -6.478509642208569),
+                                    ("dayyear", -1.9193833947218846),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.482342533064276),
-                                    ("Thursdayfrom|since|after <time>", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Thursdayfrom|since|after <time>", -6.073044534100405),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Thursdayat <time-of-day>", -5.789195352504331),
-                                    ("Islamic New Yearyear (latent)", -6.076877424956113),
-                                    ("Laylat al-Qadryear (latent)", -5.566051801190121),
-                                    ("part of days<time-of-day> am|pm", -6.482342533064276),
-                                    ("Shrove Tuesdayyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Thursdayat <time-of-day>", -5.785362461648624),
+                                    ("Islamic New Yearyear (latent)", -6.073044534100405),
+                                    ("Laylat al-Qadryear (latent)", -5.562218910334414),
+                                    ("part of days<time-of-day> am|pm", -6.478509642208569),
+                                    ("Shrove Tuesdayyear (latent)", -6.478509642208569),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.789195352504331),
-                                    ("hourminute", -6.076877424956113),
-                                    ("<time-of-day> am|pmtomorrow", -5.566051801190121),
-                                    ("Yom Kippuryear (latent)", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.789195352504331),
-                                    ("<part-of-day> of <time>year (latent)", -6.482342533064276),
-                                    ("minutehour", -5.229579564568908),
-                                    ("Kaanum Pongalyear (latent)", -6.076877424956113),
-                                    ("Maha Saptamiyear (latent)", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("hourminute", -6.073044534100405),
+                                    ("<time-of-day> am|pmtomorrow", -5.562218910334414),
+                                    ("Yom Kippuryear (latent)", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.785362461648624),
+                                    ("<part-of-day> of <time>year (latent)", -6.478509642208569),
+                                    ("minutehour", -5.225746673713201),
+                                    ("Kaanum Pongalyear (latent)", -6.073044534100405),
+                                    ("Maha Saptamiyear (latent)", -6.478509642208569),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.789195352504331),
-                                    ("time-of-day (latent)tomorrow", -5.566051801190121),
-                                    ("part of daysat <time-of-day>", -4.872904620630176),
+                                     -5.785362461648624),
+                                    ("time-of-day (latent)tomorrow", -5.562218910334414),
+                                    ("part of daysat <time-of-day>", -4.869071729774469),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.467439512522012),
-                                    ("for <duration> from <time>December", -6.482342533064276),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.482342533064276),
+                                     -4.463606621666305),
+                                    ("for <duration> from <time>December", -6.478509642208569),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.478509642208569),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.229579564568908),
+                                     -5.225746673713201),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.229579564568908),
-                                    ("time-of-day (latent)this <part-of-day>", -6.482342533064276),
-                                    ("Pentecostyear (latent)", -6.482342533064276),
+                                     -5.225746673713201),
+                                    ("time-of-day (latent)this <part-of-day>", -6.478509642208569),
+                                    ("Pentecostyear (latent)", -6.478509642208569),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.229579564568908),
-                                    ("<day-of-month> (ordinal)February", -6.482342533064276),
-                                    ("Eid al-Fitryear (latent)", -5.096048171944386),
+                                     -5.225746673713201),
+                                    ("<day-of-month> (ordinal)February", -6.478509642208569),
+                                    ("Eid al-Fitryear (latent)", -5.092215281088679),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.482342533064276),
-                                    ("Mondayin|during the <part-of-day>", -6.482342533064276),
-                                    ("Chhathin|during <named-month>|year", -6.482342533064276),
-                                    ("Diwaliin|during <named-month>|year", -6.482342533064276),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.482342533064276),
-                                    ("Vaisakhiin|during <named-month>|year", -6.482342533064276),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.229579564568908),
-                                    ("Raksha Bandhanyear (latent)", -6.482342533064276),
-                                    ("daysecond", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Mondayin|during the <part-of-day>", -6.478509642208569),
+                                    ("Chhathin|during <named-month>|year", -6.478509642208569),
+                                    ("Diwaliin|during <named-month>|year", -6.478509642208569),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.478509642208569),
+                                    ("Vaisakhiin|during <named-month>|year", -6.478509642208569),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.225746673713201),
+                                    ("Raksha Bandhanyear (latent)", -6.478509642208569),
+                                    ("daysecond", -6.073044534100405),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.076877424956113),
-                                    ("Ratha-Yatrayear (latent)", -6.482342533064276),
-                                    ("Ashurayear (latent)", -6.482342533064276),
-                                    ("Tuesdayin|during <named-month>|year", -6.482342533064276),
-                                    ("Chinese New Yearyear (latent)", -6.482342533064276),
-                                    ("tomorrowintersect", -6.482342533064276),
-                                    ("Lag BaOmeryear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("Ratha-Yatrayear (latent)", -6.478509642208569),
+                                    ("Ashurayear (latent)", -6.478509642208569),
+                                    ("Tuesdayin|during <named-month>|year", -6.478509642208569),
+                                    ("Chinese New Yearyear (latent)", -6.478509642208569),
+                                    ("tomorrowintersect", -6.478509642208569),
+                                    ("Lag BaOmeryear (latent)", -6.478509642208569),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.482342533064276),
-                                    ("Eid al-Adhayear (latent)", -4.342276369568006),
-                                    ("intersectin|during the <part-of-day>", -6.482342533064276),
-                                    ("Palm Sundayyear (latent)", -6.482342533064276),
-                                    ("Christmasat <time-of-day>", -6.482342533064276),
-                                    ("Passoveryear (latent)", -6.482342533064276),
-                                    ("Lazarus Saturdayyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Eid al-Adhayear (latent)", -4.338443478712298),
+                                    ("intersectin|during the <part-of-day>", -6.478509642208569),
+                                    ("Palm Sundayyear (latent)", -6.478509642208569),
+                                    ("Christmasat <time-of-day>", -6.478509642208569),
+                                    ("Passoveryear (latent)", -6.478509642208569),
+                                    ("Lazarus Saturdayyear (latent)", -6.478509642208569),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.482342533064276),
-                                    ("hhhmmon <day>", -5.566051801190121),
-                                    ("Yom HaShoahyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("hhhmmon <day>", -5.562218910334414),
+                                    ("Yom HaShoahyear (latent)", -6.073044534100405),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Septemberyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Septemberyear (latent)", -6.073044534100405),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.978265136288003),
-                                    ("Halloweenyear (latent)", -6.482342533064276),
+                                     -4.974432245432295),
+                                    ("Halloweenyear (latent)", -6.478509642208569),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.789195352504331),
+                                     -5.785362461648624),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("at <time-of-day>intersect", -5.566051801190121),
-                                    ("Rosh Hashanahyear (latent)", -5.789195352504331),
-                                    ("Dhanterasyear (latent)", -6.482342533064276),
-                                    ("Tu BiShvatyear (latent)", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)December", -5.789195352504331),
-                                    ("Holiyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("at <time-of-day>intersect", -5.562218910334414),
+                                    ("Rosh Hashanahyear (latent)", -5.785362461648624),
+                                    ("Dhanterasyear (latent)", -6.478509642208569),
+                                    ("Tu BiShvatyear (latent)", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)December", -5.785362461648624),
+                                    ("Holiyear (latent)", -5.785362461648624),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.482342533064276),
-                                    ("Holika Dahanyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("Holika Dahanyear (latent)", -5.785362461648624),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.076877424956113),
-                                    ("dayminute", -3.168156528391751),
-                                    ("Mawlidyear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("dayminute", -3.1643236375360435),
+                                    ("Mawlidyear (latent)", -6.478509642208569),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.482342533064276),
-                                    ("Jumu'atul-Widayear (latent)", -5.566051801190121),
-                                    ("minuteday", -2.7328384571339055),
+                                     -6.478509642208569),
+                                    ("Jumu'atul-Widayear (latent)", -5.562218910334414),
+                                    ("minuteday", -2.729005566278198),
                                     ("absorption of , after named dayintersect",
-                                     -5.789195352504331),
-                                    ("intersectyear (latent)", -6.482342533064276),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("intersectyear (latent)", -6.478509642208569),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.478509642208569),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.482342533064276),
-                                    ("intersecthhhmm", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("intersecthhhmm", -6.073044534100405),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Boss's Dayyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Boss's Dayyear (latent)", -6.073044534100405),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.482342533064276),
-                                    ("Global Youth Service Dayyear (latent)", -6.482342533064276),
-                                    ("Dhanterasin|during <named-month>|year", -6.482342533064276),
-                                    ("tonight<time-of-day> o'clock", -6.482342533064276),
-                                    ("Tisha B'Avyear (latent)", -6.482342533064276),
-                                    ("Isra and Mi'rajyear (latent)", -5.566051801190121),
-                                    ("at <time-of-day>on <day>", -4.872904620630176),
+                                     -6.478509642208569),
+                                    ("Global Youth Service Dayyear (latent)", -6.478509642208569),
+                                    ("Dhanterasin|during <named-month>|year", -6.478509642208569),
+                                    ("tonight<time-of-day> o'clock", -6.478509642208569),
+                                    ("Tisha B'Avyear (latent)", -6.478509642208569),
+                                    ("Isra and Mi'rajyear (latent)", -5.562218910334414),
+                                    ("at <time-of-day>on <day>", -4.869071729774469),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.789195352504331),
-                                    ("Christmasyear (latent)", -6.076877424956113),
-                                    ("Saturdayintersect", -6.482342533064276),
-                                    ("Naraka Chaturdashiyear (latent)", -6.076877424956113),
-                                    ("Thai Pongalin|during <named-month>|year", -6.482342533064276),
-                                    ("dayweek", -6.482342533064276),
-                                    ("Easter Sundayyear (latent)", -5.789195352504331),
+                                     -5.785362461648624),
+                                    ("Christmasyear (latent)", -6.073044534100405),
+                                    ("Saturdayintersect", -6.478509642208569),
+                                    ("Naraka Chaturdashiyear (latent)", -6.073044534100405),
+                                    ("Thai Pongalin|during <named-month>|year", -6.478509642208569),
+                                    ("dayweek", -6.478509642208569),
+                                    ("Easter Sundayyear (latent)", -5.785362461648624),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.076877424956113),
-                                    ("weekyear", -5.383730244396167),
-                                    ("King's Dayyear (latent)", -4.978265136288003),
-                                    ("hh:mmin|during the <part-of-day>", -5.566051801190121),
+                                     -6.073044534100405),
+                                    ("weekyear", -5.37989735354046),
+                                    ("King's Dayyear (latent)", -4.974432245432295),
+                                    ("hh:mmin|during the <part-of-day>", -5.562218910334414),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.789195352504331),
-                                    ("Hanukkahyear (latent)", -5.789195352504331),
-                                    ("Rama Navamiyear (latent)", -6.482342533064276),
-                                    ("February<time> <part-of-day>", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("Hanukkahyear (latent)", -5.785362461648624),
+                                    ("Rama Navamiyear (latent)", -6.478509642208569),
+                                    ("February<time> <part-of-day>", -6.478509642208569),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.789195352504331),
-                                    ("Great Lentyear (latent)", -6.482342533064276),
-                                    ("tomorrowat <time-of-day>", -5.789195352504331),
+                                     -5.785362461648624),
+                                    ("Great Lentyear (latent)", -6.478509642208569),
+                                    ("tomorrowat <time-of-day>", -5.785362461648624),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.076877424956113),
-                                    ("Ugadiyear (latent)", -5.096048171944386),
-                                    ("Vaisakhiyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.073044534100405),
+                                    ("Ugadiyear (latent)", -5.092215281088679),
+                                    ("Vaisakhiyear (latent)", -5.785362461648624),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.789195352504331),
-                                    ("last <cycle> of <time>year (latent)", -5.789195352504331),
-                                    ("at <time-of-day>tomorrow", -6.076877424956113),
-                                    ("tomorrow<time-of-day> am|pm", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("last <cycle> of <time>year (latent)", -5.785362461648624),
+                                    ("at <time-of-day>tomorrow", -6.073044534100405),
+                                    ("tomorrow<time-of-day> am|pm", -6.478509642208569),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.482342533064276),
-                                    ("Diwaliyear (latent)", -6.482342533064276),
-                                    ("between <time> and <time>on <day>", -6.076877424956113),
-                                    ("Black Fridayyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Diwaliyear (latent)", -6.478509642208569),
+                                    ("between <time> and <time>on <day>", -6.073044534100405),
+                                    ("Black Fridayyear (latent)", -6.073044534100405),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.482342533064276),
-                                    ("Chhathyear (latent)", -6.076877424956113),
-                                    ("Vasant Panchamiyear (latent)", -6.482342533064276),
-                                    ("Rabindra Jayantiyear (latent)", -5.229579564568908),
-                                    ("this <part-of-day>at <time-of-day>", -5.229579564568908),
-                                    ("St Patrick's Dayyear (latent)", -6.482342533064276),
-                                    ("Thursday<time> (timezone)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Chhathyear (latent)", -6.073044534100405),
+                                    ("Vasant Panchamiyear (latent)", -6.478509642208569),
+                                    ("Rabindra Jayantiyear (latent)", -5.225746673713201),
+                                    ("this <part-of-day>at <time-of-day>", -5.225746673713201),
+                                    ("St Patrick's Dayyear (latent)", -6.478509642208569),
+                                    ("Thursday<time> (timezone)", -6.478509642208569),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Pargat Diwasyear (latent)", -5.229579564568908),
-                                    ("<datetime> - <datetime> (interval)July", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Pargat Diwasyear (latent)", -5.225746673713201),
+                                    ("<datetime> - <datetime> (interval)July", -6.073044534100405),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.789195352504331),
-                                    ("Februaryintersect", -6.482342533064276),
-                                    ("Simchat Torahyear (latent)", -6.482342533064276),
-                                    ("minuteyear", -6.482342533064276)],
+                                     -5.785362461648624),
+                                    ("Februaryintersect", -6.478509642208569),
+                                    ("Simchat Torahyear (latent)", -6.478509642208569),
+                                    ("minuteyear", -6.478509642208569)],
                                n = 502},
                    koData =
-                     ClassData{prior = -0.9434193992624076, unseen = -6.8501261661455,
+                     ClassData{prior = -1.0024999544633555, unseen = -6.78105762593618,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.651841705297238),
-                                    ("hourday", -3.5532294166291285),
+                                   [("Thursdayhhhmm", -4.582697330136033),
+                                    ("hourday", -3.484085041467923),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)August", -6.155919102073512),
-                                    ("dayhour", -3.5909697446119755),
-                                    ("<time> timezoneyear (latent)", -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)August", -6.0867747269123065),
+                                    ("dayhour", -3.52182536945077),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.239628370199357),
-                                    ("Tuesdayfrom|since|after <time>", -5.462771921513567),
-                                    ("daymonth", -3.447868900971302),
-                                    ("hourquarter", -5.239628370199357),
-                                    ("monthday", -5.750453993965348),
-                                    ("monthyear", -4.903156133578144),
-                                    ("<time-of-day> am|pmyear (latent)", -5.462771921513567),
-                                    ("Thai Pongalyear (latent)", -5.462771921513567),
-                                    ("intersecthh:mm", -6.155919102073512),
+                                     -5.170483995038151),
+                                    ("Tuesdayfrom|since|after <time>", -5.393627546352362),
+                                    ("daymonth", -3.378724525810097),
+                                    ("hourquarter", -5.170483995038151),
+                                    ("monthday", -5.681309618804143),
+                                    ("monthyear", -4.834011758416939),
+                                    ("Thai Pongalyear (latent)", -5.393627546352362),
+                                    ("intersecthh:mm", -6.0867747269123065),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.750453993965348),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.155919102073512),
-                                    ("houryear", -4.364159632845457),
+                                     -5.681309618804143),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.0867747269123065),
+                                    ("houryear", -4.700480365792417),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)October", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)October", -6.0867747269123065),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.462771921513567),
-                                    ("hournograin", -4.903156133578144),
-                                    ("<time-of-day> am|pmintersect", -4.903156133578144),
-                                    ("Octoberyear (latent)", -6.155919102073512),
-                                    ("Good Fridayyear (latent)", -5.750453993965348),
+                                     -5.393627546352362),
+                                    ("hournograin", -4.834011758416939),
+                                    ("<time-of-day> am|pmintersect", -4.834011758416939),
+                                    ("Octoberyear (latent)", -6.0867747269123065),
+                                    ("Good Fridayyear (latent)", -5.681309618804143),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("early morningat <time-of-day>", -6.155919102073512),
-                                    ("until <time>on <day>", -5.462771921513567),
+                                     -5.681309618804143),
+                                    ("early morningat <time-of-day>", -6.0867747269123065),
+                                    ("until <time>on <day>", -5.393627546352362),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
-                                    ("time-of-day (latent)intersect", -5.462771921513567),
-                                    ("todayin <number> (implicit minutes)", -6.155919102073512),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("time-of-day (latent)intersect", -5.393627546352362),
+                                    ("todayin <number> (implicit minutes)", -6.0867747269123065),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.155919102073512),
-                                    ("hh:mmon <day>", -4.903156133578144),
-                                    ("hhhmmintersect", -5.750453993965348),
-                                    ("absorption of , after named dayJuly", -5.239628370199357),
-                                    ("from|since|after <time>July", -5.750453993965348),
+                                     -6.0867747269123065),
+                                    ("hh:mmon <day>", -4.834011758416939),
+                                    ("hhhmmintersect", -5.681309618804143),
+                                    ("absorption of , after named dayJuly", -5.170483995038151),
+                                    ("from|since|after <time>July", -5.681309618804143),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.239628370199357),
-                                    ("Clean Mondayyear (latent)", -6.155919102073512),
-                                    ("monthhour", -6.155919102073512),
+                                     -5.170483995038151),
+                                    ("Clean Mondayyear (latent)", -6.0867747269123065),
+                                    ("monthhour", -6.0867747269123065),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("hourmonth", -4.0158529385772415),
-                                    ("todayat <time-of-day>", -6.155919102073512),
-                                    ("hhhmmyear (latent)", -4.903156133578144),
-                                    ("from|since|after <time>December", -6.155919102073512),
+                                     -5.681309618804143),
+                                    ("hourmonth", -3.946708563416036),
+                                    ("todayat <time-of-day>", -6.0867747269123065),
+                                    ("from|since|after <time>December", -6.0867747269123065),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.155919102073512),
-                                    ("<time-of-day> am|pmon <day>", -4.903156133578144),
-                                    ("Mondayyear (latent)", -5.462771921513567),
-                                    ("dayday", -4.0158529385772415),
-                                    ("on <day>September", -5.462771921513567),
-                                    ("time-of-day (latent)September", -5.750453993965348),
-                                    ("hourhour", -4.076477560393676),
-                                    ("time-of-day (latent)on <day>", -4.651841705297238),
-                                    ("Thursdaydd/mm", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<time-of-day> am|pmon <day>", -4.834011758416939),
+                                    ("Mondayyear (latent)", -5.393627546352362),
+                                    ("dayday", -3.946708563416036),
+                                    ("on <day>September", -5.393627546352362),
+                                    ("time-of-day (latent)September", -5.681309618804143),
+                                    ("hourhour", -4.007333185232471),
+                                    ("time-of-day (latent)on <day>", -4.582697330136033),
+                                    ("Thursdaydd/mm", -6.0867747269123065),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.750453993965348),
-                                    ("dayyear", -3.1354942159291497),
-                                    ("New Year's Dayyear (latent)", -5.239628370199357),
-                                    ("time-of-day (latent)Sunday", -5.750453993965348),
-                                    ("Thursdayfrom|since|after <time>", -4.451171009835087),
-                                    ("Thursdayat <time-of-day>", -4.546481189639412),
+                                     -5.681309618804143),
+                                    ("dayyear", -3.283414346005772),
+                                    ("New Year's Dayyear (latent)", -5.170483995038151),
+                                    ("time-of-day (latent)Sunday", -5.681309618804143),
+                                    ("Thursdayfrom|since|after <time>", -4.382026634673881),
+                                    ("Thursdayat <time-of-day>", -4.477336814478207),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.155919102073512),
-                                    ("Aprilyear (latent)", -6.155919102073512),
-                                    ("the <day-of-month> (ordinal)July", -6.155919102073512),
-                                    ("the <day-of-month> (number)July", -6.155919102073512),
-                                    ("monthminute", -6.155919102073512),
-                                    ("<time-of-day> am|pmtomorrow", -5.750453993965348),
-                                    ("Thursdayhh:mm", -5.239628370199357),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.750453993965348),
-                                    ("minutemonth", -4.0158529385772415),
-                                    ("time-of-day (latent)Friday", -5.750453993965348),
-                                    ("minutehour", -6.155919102073512),
-                                    ("part of daysat <time-of-day>", -5.057306813405402),
+                                     -6.0867747269123065),
+                                    ("Aprilyear (latent)", -6.0867747269123065),
+                                    ("the <day-of-month> (ordinal)July", -6.0867747269123065),
+                                    ("the <day-of-month> (number)July", -6.0867747269123065),
+                                    ("monthminute", -6.0867747269123065),
+                                    ("<time-of-day> am|pmtomorrow", -5.681309618804143),
+                                    ("Thursdayhh:mm", -5.170483995038151),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.681309618804143),
+                                    ("minutemonth", -3.946708563416036),
+                                    ("time-of-day (latent)Friday", -5.681309618804143),
+                                    ("minutehour", -6.0867747269123065),
+                                    ("part of daysat <time-of-day>", -4.988162438244197),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.8045438449100346),
-                                    ("Augustyear (latent)", -5.750453993965348),
-                                    ("week-endin|during <named-month>|year", -6.155919102073512),
-                                    ("time-of-day (latent)Tuesday", -5.750453993965348),
+                                     -3.7353994697488293),
+                                    ("Augustyear (latent)", -5.681309618804143),
+                                    ("week-endin|during <named-month>|year", -6.0867747269123065),
+                                    ("time-of-day (latent)Tuesday", -5.681309618804143),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("July<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.155919102073512),
-                                    ("Sundayyear (latent)", -5.239628370199357),
-                                    ("hourweek", -5.239628370199357),
-                                    ("the <day-of-month> (ordinal)Monday", -5.462771921513567),
-                                    ("Christmasat <time-of-day>", -6.155919102073512),
-                                    ("from|since|after <time>year (latent)", -5.057306813405402),
-                                    ("hhhmmon <day>", -5.239628370199357),
-                                    ("yesterday<time-of-day> am|pm", -6.155919102073512),
-                                    ("<day-of-month> (ordinal)July", -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("Sundayyear (latent)", -5.170483995038151),
+                                    ("hourweek", -5.170483995038151),
+                                    ("the <day-of-month> (ordinal)Monday", -5.393627546352362),
+                                    ("Christmasat <time-of-day>", -6.0867747269123065),
+                                    ("from|since|after <time>year (latent)", -5.681309618804143),
+                                    ("hhhmmon <day>", -5.170483995038151),
+                                    ("yesterday<time-of-day> am|pm", -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)July", -5.393627546352362),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("August<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.155919102073512),
-                                    ("at <time-of-day>intersect", -5.239628370199357),
-                                    ("hh:mmyear (latent)", -4.769624740953621),
-                                    ("Holiyear (latent)", -6.155919102073512),
-                                    ("until <time><time-of-day> am|pm", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("at <time-of-day>intersect", -5.170483995038151),
+                                    ("Holiyear (latent)", -6.0867747269123065),
+                                    ("until <time><time-of-day> am|pm", -6.0867747269123065),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("dayminute", -3.322705758017296),
-                                    ("yyyy-mm-ddhh:mm", -5.750453993965348),
-                                    ("intersectfrom|since|after <time>", -5.750453993965348),
-                                    ("intersectSeptember", -4.28411692517192),
-                                    ("minuteday", -2.9989186809233987),
+                                     -5.681309618804143),
+                                    ("dayminute", -3.2535613828560908),
+                                    ("yyyy-mm-ddhh:mm", -5.681309618804143),
+                                    ("intersectfrom|since|after <time>", -5.681309618804143),
+                                    ("intersectSeptember", -4.214972550010716),
+                                    ("minuteday", -2.9297743057621934),
                                     ("absorption of , after named dayintersect",
-                                     -6.155919102073512),
-                                    ("intersectyear (latent)", -6.155919102073512),
-                                    ("Februaryin|during the <part-of-day>", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("intersectyear (latent)", -6.0867747269123065),
+                                    ("Februaryin|during the <part-of-day>", -6.0867747269123065),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.155919102073512),
-                                    ("time-of-day (latent)July", -5.462771921513567),
-                                    ("Saturdayyear (latent)", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("time-of-day (latent)July", -5.393627546352362),
+                                    ("Saturdayyear (latent)", -6.0867747269123065),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)Monday", -4.903156133578144),
-                                    ("at <time-of-day>on <day>", -5.239628370199357),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)Monday", -4.834011758416939),
+                                    ("at <time-of-day>on <day>", -5.170483995038151),
                                     ("absorption of , after named daySeptember",
-                                     -4.903156133578144),
-                                    ("Naraka Chaturdashiyear (latent)", -6.155919102073512),
-                                    ("from|since|after <time>on <day>", -5.239628370199357),
-                                    ("dayweek", -6.155919102073512),
-                                    ("Easter Sundayyear (latent)", -5.750453993965348),
-                                    ("Thursday<time-of-day> am|pm", -4.903156133578144),
-                                    ("weekyear", -5.750453993965348),
-                                    ("time-of-day (latent)Thursday", -5.750453993965348),
+                                     -4.834011758416939),
+                                    ("Naraka Chaturdashiyear (latent)", -6.0867747269123065),
+                                    ("from|since|after <time>on <day>", -5.170483995038151),
+                                    ("dayweek", -6.0867747269123065),
+                                    ("Easter Sundayyear (latent)", -5.681309618804143),
+                                    ("Thursday<time-of-day> am|pm", -4.834011758416939),
+                                    ("weekyear", -5.681309618804143),
+                                    ("time-of-day (latent)Thursday", -5.681309618804143),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)April", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)April", -6.0867747269123065),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.750453993965348),
+                                     -5.681309618804143),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.462771921513567),
-                                    ("Sundayfrom|since|after <time>", -6.155919102073512),
-                                    ("absorption of , after named dayFebruary", -5.239628370199357),
+                                     -5.393627546352362),
+                                    ("Sundayfrom|since|after <time>", -6.0867747269123065),
+                                    ("absorption of , after named dayFebruary", -5.170483995038151),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.750453993965348),
+                                     -5.681309618804143),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.155919102073512),
-                                    ("tomorrowat <time-of-day>", -6.155919102073512),
-                                    ("daynograin", -5.750453993965348),
-                                    ("Fridayin|during <named-month>|year", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("tomorrowat <time-of-day>", -6.0867747269123065),
+                                    ("daynograin", -5.681309618804143),
+                                    ("Fridayin|during <named-month>|year", -6.0867747269123065),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.750453993965348),
-                                    ("last <cycle> of <time>year (latent)", -5.750453993965348),
-                                    ("tomorrow<time-of-day> am|pm", -6.155919102073512),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.462771921513567),
-                                    ("Diwaliyear (latent)", -5.750453993965348),
+                                     -5.681309618804143),
+                                    ("last <cycle> of <time>year (latent)", -5.681309618804143),
+                                    ("tomorrow<time-of-day> am|pm", -6.0867747269123065),
+                                    ("Diwaliyear (latent)", -5.681309618804143),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.155919102073512),
-                                    ("this <part-of-day>at <time-of-day>", -5.239628370199357),
-                                    ("Fridayyear (latent)", -5.239628370199357),
-                                    ("time-of-day (latent)April", -6.155919102073512),
-                                    ("minuteyear", -3.9586945247372927)],
-                               n = 320}}),
+                                     -6.0867747269123065),
+                                    ("this <part-of-day>at <time-of-day>", -5.170483995038151),
+                                    ("Fridayyear (latent)", -5.170483995038151),
+                                    ("time-of-day (latent)April", -6.0867747269123065)],
+                               n = 291}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1742,22 +1730,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.14681486833704485,
-                               unseen = -5.393627546352362,
+                     ClassData{prior = -4.546237407675729e-2,
+                               unseen = -5.389071729816501,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.7779564107075706e-2),
-                                    ("intersect 2 numbers", -4.00277736869661)],
+                                   [("integer (numeric)", -2.320289707966387e-2),
+                                    ("intersect 2 numbers", -3.9982007016691985)],
                                n = 215},
                    koData =
-                     ClassData{prior = -1.9910923718485463,
-                               unseen = -3.6635616461296463,
+                     ClassData{prior = -3.1135153092103742, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.55814461804655),
-                                    ("negative numbers", -0.41871033485818493),
-                                    ("compose by multiplication", -2.2512917986064953)],
-                               n = 34}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.15415067982725836,

Duckling/Ranking/Classifiers/EN_JM.hs

@@ -276,7 +276,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -297,44 +297,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -992,467 +992,455 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.49314027536445065,
-                               unseen = -7.176254532017144,
+                     ClassData{prior = -0.4572231019431188, unseen = -7.172424577124845,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.482342533064276),
-                                    ("Karva Chauthyear (latent)", -6.482342533064276),
+                                   [("Navaratriyear (latent)", -6.478509642208569),
+                                    ("Karva Chauthyear (latent)", -6.478509642208569),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Maha Shivaratriyear (latent)", -6.482342533064276),
-                                    ("Ramadanyear (latent)", -5.229579564568908),
+                                     -6.478509642208569),
+                                    ("Maha Shivaratriyear (latent)", -6.478509642208569),
+                                    ("Ramadanyear (latent)", -5.225746673713201),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.096048171944386),
-                                    ("Bhai Doojyear (latent)", -6.482342533064276),
-                                    ("hourday", -4.467439512522012),
-                                    ("dayhour", -3.4378200953408538),
+                                     -5.092215281088679),
+                                    ("Bhai Doojyear (latent)", -6.478509642208569),
+                                    ("hourday", -4.463606621666305),
+                                    ("dayhour", -3.4339872044851463),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.096048171944386),
-                                    ("Martin Luther King's Dayyear (latent)", -6.076877424956113),
-                                    ("Shemini Atzeretyear (latent)", -6.482342533064276),
-                                    ("daymonth", -4.467439512522012),
-                                    ("monthday", -6.076877424956113),
-                                    ("monthyear", -4.690583063836222),
-                                    ("Yom Ha'atzmautyear (latent)", -6.482342533064276),
-                                    ("Orthodox Good Fridayyear (latent)", -6.076877424956113),
-                                    ("Vijayadashamiyear (latent)", -6.482342533064276),
-                                    ("Thai Pongalyear (latent)", -5.789195352504331),
-                                    ("Thiru Onamyear (latent)", -5.789195352504331),
-                                    ("hhhmmabsorption of , after named day", -6.482342533064276),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.482342533064276),
+                                     -5.092215281088679),
+                                    ("Martin Luther King's Dayyear (latent)", -6.073044534100405),
+                                    ("Shemini Atzeretyear (latent)", -6.478509642208569),
+                                    ("daymonth", -4.463606621666305),
+                                    ("monthday", -6.073044534100405),
+                                    ("monthyear", -4.686750172980514),
+                                    ("Yom Ha'atzmautyear (latent)", -6.478509642208569),
+                                    ("Orthodox Good Fridayyear (latent)", -6.073044534100405),
+                                    ("Vijayadashamiyear (latent)", -6.478509642208569),
+                                    ("Thai Pongalyear (latent)", -5.785362461648624),
+                                    ("Thiru Onamyear (latent)", -5.785362461648624),
+                                    ("hhhmmabsorption of , after named day", -6.478509642208569),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.478509642208569),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.566051801190121),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.482342533064276),
-                                    ("Krishna Janmashtamiyear (latent)", -6.076877424956113),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.482342533064276),
-                                    ("houryear", -5.566051801190121),
+                                     -5.562218910334414),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.478509642208569),
+                                    ("Krishna Janmashtamiyear (latent)", -6.073044534100405),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.478509642208569),
+                                    ("houryear", -5.562218910334414),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("Christmas<time-of-day> am|pm", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Christmas<time-of-day> am|pm", -6.478509642208569),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.789195352504331),
-                                    ("intersectin|during <named-month>|year", -6.482342533064276),
-                                    ("<time-of-day> am|pmintersect", -5.229579564568908),
-                                    ("Earth Houryear (latent)", -6.482342533064276),
-                                    ("Ganesh Chaturthiyear (latent)", -6.482342533064276),
-                                    ("Octoberyear (latent)", -4.978265136288003),
-                                    ("intersect<time-of-day> am|pm", -6.482342533064276),
-                                    ("Mattu Pongalyear (latent)", -6.482342533064276),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.482342533064276),
-                                    ("Shavuotyear (latent)", -6.482342533064276),
-                                    ("Parsi New Yearyear (latent)", -5.566051801190121),
+                                     -5.785362461648624),
+                                    ("intersectin|during <named-month>|year", -6.478509642208569),
+                                    ("<time-of-day> am|pmintersect", -5.225746673713201),
+                                    ("Earth Houryear (latent)", -6.478509642208569),
+                                    ("Ganesh Chaturthiyear (latent)", -6.478509642208569),
+                                    ("Octoberyear (latent)", -4.974432245432295),
+                                    ("intersect<time-of-day> am|pm", -6.478509642208569),
+                                    ("Mattu Pongalyear (latent)", -6.478509642208569),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.478509642208569),
+                                    ("Shavuotyear (latent)", -6.478509642208569),
+                                    ("Parsi New Yearyear (latent)", -5.562218910334414),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.482342533064276),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.482342533064276),
-                                    ("todayin|within|after <duration>", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.478509642208569),
+                                    ("todayin|within|after <duration>", -6.478509642208569),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.076877424956113),
-                                    ("Marchyear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("Marchyear (latent)", -6.478509642208569),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.076877424956113),
-                                    ("Sukkotyear (latent)", -6.076877424956113),
-                                    ("hhhmmintersect", -6.076877424956113),
+                                     -6.073044534100405),
+                                    ("Sukkotyear (latent)", -6.073044534100405),
+                                    ("hhhmmintersect", -6.073044534100405),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.076877424956113),
-                                    ("Clean Mondayyear (latent)", -6.076877424956113),
-                                    ("monthhour", -6.076877424956113),
+                                     -6.073044534100405),
+                                    ("Clean Mondayyear (latent)", -6.073044534100405),
+                                    ("monthhour", -6.073044534100405),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.566051801190121),
-                                    ("todayat <time-of-day>", -6.482342533064276),
-                                    ("Thursday<time> timezone", -4.0844472602659065),
-                                    ("tonight<time-of-day> am|pm", -6.482342533064276),
-                                    ("time-of-day (latent)tonight", -6.076877424956113),
-                                    ("from|since|after <time>December", -6.482342533064276),
-                                    ("<time-of-day> am|pmon <day>", -4.467439512522012),
+                                     -5.562218910334414),
+                                    ("todayat <time-of-day>", -6.478509642208569),
+                                    ("Thursday<time> timezone", -4.080614369410199),
+                                    ("tonight<time-of-day> am|pm", -6.478509642208569),
+                                    ("time-of-day (latent)tonight", -6.073044534100405),
+                                    ("from|since|after <time>December", -6.478509642208569),
+                                    ("<time-of-day> am|pmon <day>", -4.463606621666305),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.076877424956113),
-                                    ("dayday", -3.7097538108244956),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.076877424956113),
-                                    ("tonightat <time-of-day>", -5.383730244396167),
+                                     -6.478509642208569),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.073044534100405),
+                                    ("dayday", -3.705920919968788),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.073044534100405),
+                                    ("tonightat <time-of-day>", -5.37989735354046),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.789195352504331),
+                                     -5.785362461648624),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.482342533064276),
-                                    ("today<time-of-day> am|pm", -6.482342533064276),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.076877424956113),
-                                    ("at <time-of-day><time> <part-of-day>", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)intersect", -6.076877424956113),
-                                    ("hourhour", -3.5119280674945754),
-                                    ("Mahavir Jayantiyear (latent)", -6.076877424956113),
-                                    ("Navaratriin|during <named-month>|year", -6.482342533064276),
-                                    ("Wednesdaythis|last|next <cycle>", -6.482342533064276),
-                                    ("Lentyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("today<time-of-day> am|pm", -6.478509642208569),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.073044534100405),
+                                    ("at <time-of-day><time> <part-of-day>", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)intersect", -6.073044534100405),
+                                    ("hourhour", -3.5080951766388684),
+                                    ("Mahavir Jayantiyear (latent)", -6.073044534100405),
+                                    ("Navaratriin|during <named-month>|year", -6.478509642208569),
+                                    ("Wednesdaythis|last|next <cycle>", -6.478509642208569),
+                                    ("Lentyear (latent)", -6.478509642208569),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.610540356162685),
-                                    ("Boghiyear (latent)", -6.482342533064276),
-                                    ("dayyear", -1.923216285577592),
+                                     -4.606707465306978),
+                                    ("Boghiyear (latent)", -6.478509642208569),
+                                    ("dayyear", -1.9193833947218846),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.482342533064276),
-                                    ("Thursdayfrom|since|after <time>", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Thursdayfrom|since|after <time>", -6.073044534100405),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Thursdayat <time-of-day>", -5.789195352504331),
-                                    ("Islamic New Yearyear (latent)", -6.076877424956113),
-                                    ("Laylat al-Qadryear (latent)", -5.566051801190121),
-                                    ("part of days<time-of-day> am|pm", -6.482342533064276),
-                                    ("Shrove Tuesdayyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Thursdayat <time-of-day>", -5.785362461648624),
+                                    ("Islamic New Yearyear (latent)", -6.073044534100405),
+                                    ("Laylat al-Qadryear (latent)", -5.562218910334414),
+                                    ("part of days<time-of-day> am|pm", -6.478509642208569),
+                                    ("Shrove Tuesdayyear (latent)", -6.478509642208569),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.789195352504331),
-                                    ("hourminute", -6.076877424956113),
-                                    ("<time-of-day> am|pmtomorrow", -5.566051801190121),
-                                    ("Yom Kippuryear (latent)", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.789195352504331),
-                                    ("<part-of-day> of <time>year (latent)", -6.482342533064276),
-                                    ("minutehour", -5.229579564568908),
-                                    ("Kaanum Pongalyear (latent)", -6.076877424956113),
-                                    ("Maha Saptamiyear (latent)", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("hourminute", -6.073044534100405),
+                                    ("<time-of-day> am|pmtomorrow", -5.562218910334414),
+                                    ("Yom Kippuryear (latent)", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.785362461648624),
+                                    ("<part-of-day> of <time>year (latent)", -6.478509642208569),
+                                    ("minutehour", -5.225746673713201),
+                                    ("Kaanum Pongalyear (latent)", -6.073044534100405),
+                                    ("Maha Saptamiyear (latent)", -6.478509642208569),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.789195352504331),
-                                    ("time-of-day (latent)tomorrow", -5.566051801190121),
-                                    ("part of daysat <time-of-day>", -4.872904620630176),
+                                     -5.785362461648624),
+                                    ("time-of-day (latent)tomorrow", -5.562218910334414),
+                                    ("part of daysat <time-of-day>", -4.869071729774469),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.467439512522012),
-                                    ("for <duration> from <time>December", -6.482342533064276),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.482342533064276),
+                                     -4.463606621666305),
+                                    ("for <duration> from <time>December", -6.478509642208569),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.478509642208569),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.229579564568908),
+                                     -5.225746673713201),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.229579564568908),
-                                    ("time-of-day (latent)this <part-of-day>", -6.482342533064276),
-                                    ("Pentecostyear (latent)", -6.482342533064276),
+                                     -5.225746673713201),
+                                    ("time-of-day (latent)this <part-of-day>", -6.478509642208569),
+                                    ("Pentecostyear (latent)", -6.478509642208569),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.229579564568908),
-                                    ("<day-of-month> (ordinal)February", -6.482342533064276),
-                                    ("Eid al-Fitryear (latent)", -5.096048171944386),
+                                     -5.225746673713201),
+                                    ("<day-of-month> (ordinal)February", -6.478509642208569),
+                                    ("Eid al-Fitryear (latent)", -5.092215281088679),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.482342533064276),
-                                    ("Mondayin|during the <part-of-day>", -6.482342533064276),
-                                    ("Chhathin|during <named-month>|year", -6.482342533064276),
-                                    ("Diwaliin|during <named-month>|year", -6.482342533064276),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.482342533064276),
-                                    ("Vaisakhiin|during <named-month>|year", -6.482342533064276),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.229579564568908),
-                                    ("Raksha Bandhanyear (latent)", -6.482342533064276),
-                                    ("daysecond", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Mondayin|during the <part-of-day>", -6.478509642208569),
+                                    ("Chhathin|during <named-month>|year", -6.478509642208569),
+                                    ("Diwaliin|during <named-month>|year", -6.478509642208569),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.478509642208569),
+                                    ("Vaisakhiin|during <named-month>|year", -6.478509642208569),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.225746673713201),
+                                    ("Raksha Bandhanyear (latent)", -6.478509642208569),
+                                    ("daysecond", -6.073044534100405),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.076877424956113),
-                                    ("Ratha-Yatrayear (latent)", -6.482342533064276),
-                                    ("Ashurayear (latent)", -6.482342533064276),
-                                    ("Tuesdayin|during <named-month>|year", -6.482342533064276),
-                                    ("Chinese New Yearyear (latent)", -6.482342533064276),
-                                    ("tomorrowintersect", -6.482342533064276),
-                                    ("Lag BaOmeryear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("Ratha-Yatrayear (latent)", -6.478509642208569),
+                                    ("Ashurayear (latent)", -6.478509642208569),
+                                    ("Tuesdayin|during <named-month>|year", -6.478509642208569),
+                                    ("Chinese New Yearyear (latent)", -6.478509642208569),
+                                    ("tomorrowintersect", -6.478509642208569),
+                                    ("Lag BaOmeryear (latent)", -6.478509642208569),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.482342533064276),
-                                    ("Eid al-Adhayear (latent)", -4.342276369568006),
-                                    ("intersectin|during the <part-of-day>", -6.482342533064276),
-                                    ("Palm Sundayyear (latent)", -6.482342533064276),
-                                    ("Christmasat <time-of-day>", -6.482342533064276),
-                                    ("Passoveryear (latent)", -6.482342533064276),
-                                    ("Lazarus Saturdayyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Eid al-Adhayear (latent)", -4.338443478712298),
+                                    ("intersectin|during the <part-of-day>", -6.478509642208569),
+                                    ("Palm Sundayyear (latent)", -6.478509642208569),
+                                    ("Christmasat <time-of-day>", -6.478509642208569),
+                                    ("Passoveryear (latent)", -6.478509642208569),
+                                    ("Lazarus Saturdayyear (latent)", -6.478509642208569),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.482342533064276),
-                                    ("hhhmmon <day>", -5.566051801190121),
-                                    ("Yom HaShoahyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("hhhmmon <day>", -5.562218910334414),
+                                    ("Yom HaShoahyear (latent)", -6.073044534100405),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Septemberyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Septemberyear (latent)", -6.073044534100405),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.978265136288003),
-                                    ("Halloweenyear (latent)", -6.482342533064276),
+                                     -4.974432245432295),
+                                    ("Halloweenyear (latent)", -6.478509642208569),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.789195352504331),
+                                     -5.785362461648624),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("at <time-of-day>intersect", -5.566051801190121),
-                                    ("Rosh Hashanahyear (latent)", -5.789195352504331),
-                                    ("Dhanterasyear (latent)", -6.482342533064276),
-                                    ("Tu BiShvatyear (latent)", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)December", -5.789195352504331),
-                                    ("Holiyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("at <time-of-day>intersect", -5.562218910334414),
+                                    ("Rosh Hashanahyear (latent)", -5.785362461648624),
+                                    ("Dhanterasyear (latent)", -6.478509642208569),
+                                    ("Tu BiShvatyear (latent)", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)December", -5.785362461648624),
+                                    ("Holiyear (latent)", -5.785362461648624),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.482342533064276),
-                                    ("Holika Dahanyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("Holika Dahanyear (latent)", -5.785362461648624),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.076877424956113),
-                                    ("dayminute", -3.168156528391751),
-                                    ("Mawlidyear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("dayminute", -3.1643236375360435),
+                                    ("Mawlidyear (latent)", -6.478509642208569),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.482342533064276),
-                                    ("Jumu'atul-Widayear (latent)", -5.566051801190121),
-                                    ("minuteday", -2.7328384571339055),
+                                     -6.478509642208569),
+                                    ("Jumu'atul-Widayear (latent)", -5.562218910334414),
+                                    ("minuteday", -2.729005566278198),
                                     ("absorption of , after named dayintersect",
-                                     -5.789195352504331),
-                                    ("intersectyear (latent)", -6.482342533064276),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("intersectyear (latent)", -6.478509642208569),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.478509642208569),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.482342533064276),
-                                    ("intersecthhhmm", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("intersecthhhmm", -6.073044534100405),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Boss's Dayyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Boss's Dayyear (latent)", -6.073044534100405),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.482342533064276),
-                                    ("Global Youth Service Dayyear (latent)", -6.482342533064276),
-                                    ("Dhanterasin|during <named-month>|year", -6.482342533064276),
-                                    ("tonight<time-of-day> o'clock", -6.482342533064276),
-                                    ("Tisha B'Avyear (latent)", -6.482342533064276),
-                                    ("Isra and Mi'rajyear (latent)", -5.566051801190121),
-                                    ("at <time-of-day>on <day>", -4.872904620630176),
+                                     -6.478509642208569),
+                                    ("Global Youth Service Dayyear (latent)", -6.478509642208569),
+                                    ("Dhanterasin|during <named-month>|year", -6.478509642208569),
+                                    ("tonight<time-of-day> o'clock", -6.478509642208569),
+                                    ("Tisha B'Avyear (latent)", -6.478509642208569),
+                                    ("Isra and Mi'rajyear (latent)", -5.562218910334414),
+                                    ("at <time-of-day>on <day>", -4.869071729774469),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.789195352504331),
-                                    ("Christmasyear (latent)", -6.076877424956113),
-                                    ("Saturdayintersect", -6.482342533064276),
-                                    ("Naraka Chaturdashiyear (latent)", -6.076877424956113),
-                                    ("Thai Pongalin|during <named-month>|year", -6.482342533064276),
-                                    ("dayweek", -6.482342533064276),
-                                    ("Easter Sundayyear (latent)", -5.789195352504331),
+                                     -5.785362461648624),
+                                    ("Christmasyear (latent)", -6.073044534100405),
+                                    ("Saturdayintersect", -6.478509642208569),
+                                    ("Naraka Chaturdashiyear (latent)", -6.073044534100405),
+                                    ("Thai Pongalin|during <named-month>|year", -6.478509642208569),
+                                    ("dayweek", -6.478509642208569),
+                                    ("Easter Sundayyear (latent)", -5.785362461648624),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.076877424956113),
-                                    ("weekyear", -5.383730244396167),
-                                    ("King's Dayyear (latent)", -4.978265136288003),
-                                    ("hh:mmin|during the <part-of-day>", -5.566051801190121),
+                                     -6.073044534100405),
+                                    ("weekyear", -5.37989735354046),
+                                    ("King's Dayyear (latent)", -4.974432245432295),
+                                    ("hh:mmin|during the <part-of-day>", -5.562218910334414),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.789195352504331),
-                                    ("Hanukkahyear (latent)", -5.789195352504331),
-                                    ("Rama Navamiyear (latent)", -6.482342533064276),
-                                    ("February<time> <part-of-day>", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("Hanukkahyear (latent)", -5.785362461648624),
+                                    ("Rama Navamiyear (latent)", -6.478509642208569),
+                                    ("February<time> <part-of-day>", -6.478509642208569),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.789195352504331),
-                                    ("Great Lentyear (latent)", -6.482342533064276),
-                                    ("tomorrowat <time-of-day>", -5.789195352504331),
+                                     -5.785362461648624),
+                                    ("Great Lentyear (latent)", -6.478509642208569),
+                                    ("tomorrowat <time-of-day>", -5.785362461648624),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.076877424956113),
-                                    ("Ugadiyear (latent)", -5.096048171944386),
-                                    ("Vaisakhiyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.073044534100405),
+                                    ("Ugadiyear (latent)", -5.092215281088679),
+                                    ("Vaisakhiyear (latent)", -5.785362461648624),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.789195352504331),
-                                    ("last <cycle> of <time>year (latent)", -5.789195352504331),
-                                    ("at <time-of-day>tomorrow", -6.076877424956113),
-                                    ("tomorrow<time-of-day> am|pm", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("last <cycle> of <time>year (latent)", -5.785362461648624),
+                                    ("at <time-of-day>tomorrow", -6.073044534100405),
+                                    ("tomorrow<time-of-day> am|pm", -6.478509642208569),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.482342533064276),
-                                    ("Diwaliyear (latent)", -6.482342533064276),
-                                    ("between <time> and <time>on <day>", -6.076877424956113),
-                                    ("Black Fridayyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Diwaliyear (latent)", -6.478509642208569),
+                                    ("between <time> and <time>on <day>", -6.073044534100405),
+                                    ("Black Fridayyear (latent)", -6.073044534100405),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.482342533064276),
-                                    ("Chhathyear (latent)", -6.076877424956113),
-                                    ("Vasant Panchamiyear (latent)", -6.482342533064276),
-                                    ("Rabindra Jayantiyear (latent)", -5.229579564568908),
-                                    ("this <part-of-day>at <time-of-day>", -5.229579564568908),
-                                    ("St Patrick's Dayyear (latent)", -6.482342533064276),
-                                    ("Thursday<time> (timezone)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Chhathyear (latent)", -6.073044534100405),
+                                    ("Vasant Panchamiyear (latent)", -6.478509642208569),
+                                    ("Rabindra Jayantiyear (latent)", -5.225746673713201),
+                                    ("this <part-of-day>at <time-of-day>", -5.225746673713201),
+                                    ("St Patrick's Dayyear (latent)", -6.478509642208569),
+                                    ("Thursday<time> (timezone)", -6.478509642208569),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Pargat Diwasyear (latent)", -5.229579564568908),
-                                    ("<datetime> - <datetime> (interval)July", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Pargat Diwasyear (latent)", -5.225746673713201),
+                                    ("<datetime> - <datetime> (interval)July", -6.073044534100405),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.789195352504331),
-                                    ("Februaryintersect", -6.482342533064276),
-                                    ("Simchat Torahyear (latent)", -6.482342533064276),
-                                    ("minuteyear", -6.482342533064276)],
+                                     -5.785362461648624),
+                                    ("Februaryintersect", -6.478509642208569),
+                                    ("Simchat Torahyear (latent)", -6.478509642208569),
+                                    ("minuteyear", -6.478509642208569)],
                                n = 502},
                    koData =
-                     ClassData{prior = -0.9434193992624076, unseen = -6.8501261661455,
+                     ClassData{prior = -1.0024999544633555, unseen = -6.78105762593618,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.651841705297238),
-                                    ("hourday", -3.5532294166291285),
+                                   [("Thursdayhhhmm", -4.582697330136033),
+                                    ("hourday", -3.484085041467923),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)August", -6.155919102073512),
-                                    ("dayhour", -3.5909697446119755),
-                                    ("<time> timezoneyear (latent)", -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)August", -6.0867747269123065),
+                                    ("dayhour", -3.52182536945077),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.239628370199357),
-                                    ("Tuesdayfrom|since|after <time>", -5.462771921513567),
-                                    ("daymonth", -3.447868900971302),
-                                    ("hourquarter", -5.239628370199357),
-                                    ("monthday", -5.750453993965348),
-                                    ("monthyear", -4.903156133578144),
-                                    ("<time-of-day> am|pmyear (latent)", -5.462771921513567),
-                                    ("Thai Pongalyear (latent)", -5.462771921513567),
-                                    ("intersecthh:mm", -6.155919102073512),
+                                     -5.170483995038151),
+                                    ("Tuesdayfrom|since|after <time>", -5.393627546352362),
+                                    ("daymonth", -3.378724525810097),
+                                    ("hourquarter", -5.170483995038151),
+                                    ("monthday", -5.681309618804143),
+                                    ("monthyear", -4.834011758416939),
+                                    ("Thai Pongalyear (latent)", -5.393627546352362),
+                                    ("intersecthh:mm", -6.0867747269123065),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.750453993965348),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.155919102073512),
-                                    ("houryear", -4.364159632845457),
+                                     -5.681309618804143),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.0867747269123065),
+                                    ("houryear", -4.700480365792417),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)October", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)October", -6.0867747269123065),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.462771921513567),
-                                    ("hournograin", -4.903156133578144),
-                                    ("<time-of-day> am|pmintersect", -4.903156133578144),
-                                    ("Octoberyear (latent)", -6.155919102073512),
-                                    ("Good Fridayyear (latent)", -5.750453993965348),
+                                     -5.393627546352362),
+                                    ("hournograin", -4.834011758416939),
+                                    ("<time-of-day> am|pmintersect", -4.834011758416939),
+                                    ("Octoberyear (latent)", -6.0867747269123065),
+                                    ("Good Fridayyear (latent)", -5.681309618804143),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("early morningat <time-of-day>", -6.155919102073512),
-                                    ("until <time>on <day>", -5.462771921513567),
+                                     -5.681309618804143),
+                                    ("early morningat <time-of-day>", -6.0867747269123065),
+                                    ("until <time>on <day>", -5.393627546352362),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
-                                    ("time-of-day (latent)intersect", -5.462771921513567),
-                                    ("todayin <number> (implicit minutes)", -6.155919102073512),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("time-of-day (latent)intersect", -5.393627546352362),
+                                    ("todayin <number> (implicit minutes)", -6.0867747269123065),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.155919102073512),
-                                    ("hh:mmon <day>", -4.903156133578144),
-                                    ("hhhmmintersect", -5.750453993965348),
-                                    ("absorption of , after named dayJuly", -5.239628370199357),
-                                    ("from|since|after <time>July", -5.750453993965348),
+                                     -6.0867747269123065),
+                                    ("hh:mmon <day>", -4.834011758416939),
+                                    ("hhhmmintersect", -5.681309618804143),
+                                    ("absorption of , after named dayJuly", -5.170483995038151),
+                                    ("from|since|after <time>July", -5.681309618804143),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.239628370199357),
-                                    ("Clean Mondayyear (latent)", -6.155919102073512),
-                                    ("monthhour", -6.155919102073512),
+                                     -5.170483995038151),
+                                    ("Clean Mondayyear (latent)", -6.0867747269123065),
+                                    ("monthhour", -6.0867747269123065),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("hourmonth", -4.0158529385772415),
-                                    ("todayat <time-of-day>", -6.155919102073512),
-                                    ("hhhmmyear (latent)", -4.903156133578144),
-                                    ("from|since|after <time>December", -6.155919102073512),
+                                     -5.681309618804143),
+                                    ("hourmonth", -3.946708563416036),
+                                    ("todayat <time-of-day>", -6.0867747269123065),
+                                    ("from|since|after <time>December", -6.0867747269123065),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.155919102073512),
-                                    ("<time-of-day> am|pmon <day>", -4.903156133578144),
-                                    ("Mondayyear (latent)", -5.462771921513567),
-                                    ("dayday", -4.0158529385772415),
-                                    ("on <day>September", -5.462771921513567),
-                                    ("time-of-day (latent)September", -5.750453993965348),
-                                    ("hourhour", -4.076477560393676),
-                                    ("time-of-day (latent)on <day>", -4.651841705297238),
-                                    ("Thursdaydd/mm", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<time-of-day> am|pmon <day>", -4.834011758416939),
+                                    ("Mondayyear (latent)", -5.393627546352362),
+                                    ("dayday", -3.946708563416036),
+                                    ("on <day>September", -5.393627546352362),
+                                    ("time-of-day (latent)September", -5.681309618804143),
+                                    ("hourhour", -4.007333185232471),
+                                    ("time-of-day (latent)on <day>", -4.582697330136033),
+                                    ("Thursdaydd/mm", -6.0867747269123065),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.750453993965348),
-                                    ("dayyear", -3.1354942159291497),
-                                    ("New Year's Dayyear (latent)", -5.239628370199357),
-                                    ("time-of-day (latent)Sunday", -5.750453993965348),
-                                    ("Thursdayfrom|since|after <time>", -4.451171009835087),
-                                    ("Thursdayat <time-of-day>", -4.546481189639412),
+                                     -5.681309618804143),
+                                    ("dayyear", -3.283414346005772),
+                                    ("New Year's Dayyear (latent)", -5.170483995038151),
+                                    ("time-of-day (latent)Sunday", -5.681309618804143),
+                                    ("Thursdayfrom|since|after <time>", -4.382026634673881),
+                                    ("Thursdayat <time-of-day>", -4.477336814478207),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.155919102073512),
-                                    ("Aprilyear (latent)", -6.155919102073512),
-                                    ("the <day-of-month> (ordinal)July", -6.155919102073512),
-                                    ("the <day-of-month> (number)July", -6.155919102073512),
-                                    ("monthminute", -6.155919102073512),
-                                    ("<time-of-day> am|pmtomorrow", -5.750453993965348),
-                                    ("Thursdayhh:mm", -5.239628370199357),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.750453993965348),
-                                    ("minutemonth", -4.0158529385772415),
-                                    ("time-of-day (latent)Friday", -5.750453993965348),
-                                    ("minutehour", -6.155919102073512),
-                                    ("part of daysat <time-of-day>", -5.057306813405402),
+                                     -6.0867747269123065),
+                                    ("Aprilyear (latent)", -6.0867747269123065),
+                                    ("the <day-of-month> (ordinal)July", -6.0867747269123065),
+                                    ("the <day-of-month> (number)July", -6.0867747269123065),
+                                    ("monthminute", -6.0867747269123065),
+                                    ("<time-of-day> am|pmtomorrow", -5.681309618804143),
+                                    ("Thursdayhh:mm", -5.170483995038151),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.681309618804143),
+                                    ("minutemonth", -3.946708563416036),
+                                    ("time-of-day (latent)Friday", -5.681309618804143),
+                                    ("minutehour", -6.0867747269123065),
+                                    ("part of daysat <time-of-day>", -4.988162438244197),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.8045438449100346),
-                                    ("Augustyear (latent)", -5.750453993965348),
-                                    ("week-endin|during <named-month>|year", -6.155919102073512),
-                                    ("time-of-day (latent)Tuesday", -5.750453993965348),
+                                     -3.7353994697488293),
+                                    ("Augustyear (latent)", -5.681309618804143),
+                                    ("week-endin|during <named-month>|year", -6.0867747269123065),
+                                    ("time-of-day (latent)Tuesday", -5.681309618804143),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("July<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.155919102073512),
-                                    ("Sundayyear (latent)", -5.239628370199357),
-                                    ("hourweek", -5.239628370199357),
-                                    ("the <day-of-month> (ordinal)Monday", -5.462771921513567),
-                                    ("Christmasat <time-of-day>", -6.155919102073512),
-                                    ("from|since|after <time>year (latent)", -5.057306813405402),
-                                    ("hhhmmon <day>", -5.239628370199357),
-                                    ("yesterday<time-of-day> am|pm", -6.155919102073512),
-                                    ("<day-of-month> (ordinal)July", -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("Sundayyear (latent)", -5.170483995038151),
+                                    ("hourweek", -5.170483995038151),
+                                    ("the <day-of-month> (ordinal)Monday", -5.393627546352362),
+                                    ("Christmasat <time-of-day>", -6.0867747269123065),
+                                    ("from|since|after <time>year (latent)", -5.681309618804143),
+                                    ("hhhmmon <day>", -5.170483995038151),
+                                    ("yesterday<time-of-day> am|pm", -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)July", -5.393627546352362),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("August<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.155919102073512),
-                                    ("at <time-of-day>intersect", -5.239628370199357),
-                                    ("hh:mmyear (latent)", -4.769624740953621),
-                                    ("Holiyear (latent)", -6.155919102073512),
-                                    ("until <time><time-of-day> am|pm", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("at <time-of-day>intersect", -5.170483995038151),
+                                    ("Holiyear (latent)", -6.0867747269123065),
+                                    ("until <time><time-of-day> am|pm", -6.0867747269123065),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("dayminute", -3.322705758017296),
-                                    ("yyyy-mm-ddhh:mm", -5.750453993965348),
-                                    ("intersectfrom|since|after <time>", -5.750453993965348),
-                                    ("intersectSeptember", -4.28411692517192),
-                                    ("minuteday", -2.9989186809233987),
+                                     -5.681309618804143),
+                                    ("dayminute", -3.2535613828560908),
+                                    ("yyyy-mm-ddhh:mm", -5.681309618804143),
+                                    ("intersectfrom|since|after <time>", -5.681309618804143),
+                                    ("intersectSeptember", -4.214972550010716),
+                                    ("minuteday", -2.9297743057621934),
                                     ("absorption of , after named dayintersect",
-                                     -6.155919102073512),
-                                    ("intersectyear (latent)", -6.155919102073512),
-                                    ("Februaryin|during the <part-of-day>", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("intersectyear (latent)", -6.0867747269123065),
+                                    ("Februaryin|during the <part-of-day>", -6.0867747269123065),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.155919102073512),
-                                    ("time-of-day (latent)July", -5.462771921513567),
-                                    ("Saturdayyear (latent)", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("time-of-day (latent)July", -5.393627546352362),
+                                    ("Saturdayyear (latent)", -6.0867747269123065),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)Monday", -4.903156133578144),
-                                    ("at <time-of-day>on <day>", -5.239628370199357),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)Monday", -4.834011758416939),
+                                    ("at <time-of-day>on <day>", -5.170483995038151),
                                     ("absorption of , after named daySeptember",
-                                     -4.903156133578144),
-                                    ("Naraka Chaturdashiyear (latent)", -6.155919102073512),
-                                    ("from|since|after <time>on <day>", -5.239628370199357),
-                                    ("dayweek", -6.155919102073512),
-                                    ("Easter Sundayyear (latent)", -5.750453993965348),
-                                    ("Thursday<time-of-day> am|pm", -4.903156133578144),
-                                    ("weekyear", -5.750453993965348),
-                                    ("time-of-day (latent)Thursday", -5.750453993965348),
+                                     -4.834011758416939),
+                                    ("Naraka Chaturdashiyear (latent)", -6.0867747269123065),
+                                    ("from|since|after <time>on <day>", -5.170483995038151),
+                                    ("dayweek", -6.0867747269123065),
+                                    ("Easter Sundayyear (latent)", -5.681309618804143),
+                                    ("Thursday<time-of-day> am|pm", -4.834011758416939),
+                                    ("weekyear", -5.681309618804143),
+                                    ("time-of-day (latent)Thursday", -5.681309618804143),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)April", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)April", -6.0867747269123065),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.750453993965348),
+                                     -5.681309618804143),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.462771921513567),
-                                    ("Sundayfrom|since|after <time>", -6.155919102073512),
-                                    ("absorption of , after named dayFebruary", -5.239628370199357),
+                                     -5.393627546352362),
+                                    ("Sundayfrom|since|after <time>", -6.0867747269123065),
+                                    ("absorption of , after named dayFebruary", -5.170483995038151),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.750453993965348),
+                                     -5.681309618804143),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.155919102073512),
-                                    ("tomorrowat <time-of-day>", -6.155919102073512),
-                                    ("daynograin", -5.750453993965348),
-                                    ("Fridayin|during <named-month>|year", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("tomorrowat <time-of-day>", -6.0867747269123065),
+                                    ("daynograin", -5.681309618804143),
+                                    ("Fridayin|during <named-month>|year", -6.0867747269123065),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.750453993965348),
-                                    ("last <cycle> of <time>year (latent)", -5.750453993965348),
-                                    ("tomorrow<time-of-day> am|pm", -6.155919102073512),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.462771921513567),
-                                    ("Diwaliyear (latent)", -5.750453993965348),
+                                     -5.681309618804143),
+                                    ("last <cycle> of <time>year (latent)", -5.681309618804143),
+                                    ("tomorrow<time-of-day> am|pm", -6.0867747269123065),
+                                    ("Diwaliyear (latent)", -5.681309618804143),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.155919102073512),
-                                    ("this <part-of-day>at <time-of-day>", -5.239628370199357),
-                                    ("Fridayyear (latent)", -5.239628370199357),
-                                    ("time-of-day (latent)April", -6.155919102073512),
-                                    ("minuteyear", -3.9586945247372927)],
-                               n = 320}}),
+                                     -6.0867747269123065),
+                                    ("this <part-of-day>at <time-of-day>", -5.170483995038151),
+                                    ("Fridayyear (latent)", -5.170483995038151),
+                                    ("time-of-day (latent)April", -6.0867747269123065)],
+                               n = 291}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1742,22 +1730,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.14681486833704485,
-                               unseen = -5.393627546352362,
+                     ClassData{prior = -4.546237407675729e-2,
+                               unseen = -5.389071729816501,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.7779564107075706e-2),
-                                    ("intersect 2 numbers", -4.00277736869661)],
+                                   [("integer (numeric)", -2.320289707966387e-2),
+                                    ("intersect 2 numbers", -3.9982007016691985)],
                                n = 215},
                    koData =
-                     ClassData{prior = -1.9910923718485463,
-                               unseen = -3.6635616461296463,
+                     ClassData{prior = -3.1135153092103742, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.55814461804655),
-                                    ("negative numbers", -0.41871033485818493),
-                                    ("compose by multiplication", -2.2512917986064953)],
-                               n = 34}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.15415067982725836,

Duckling/Ranking/Classifiers/EN_NZ.hs

@@ -276,7 +276,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -297,44 +297,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -992,467 +992,455 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.49314027536445065,
-                               unseen = -7.176254532017144,
+                     ClassData{prior = -0.4572231019431188, unseen = -7.172424577124845,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.482342533064276),
-                                    ("Karva Chauthyear (latent)", -6.482342533064276),
+                                   [("Navaratriyear (latent)", -6.478509642208569),
+                                    ("Karva Chauthyear (latent)", -6.478509642208569),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Maha Shivaratriyear (latent)", -6.482342533064276),
-                                    ("Ramadanyear (latent)", -5.229579564568908),
+                                     -6.478509642208569),
+                                    ("Maha Shivaratriyear (latent)", -6.478509642208569),
+                                    ("Ramadanyear (latent)", -5.225746673713201),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.096048171944386),
-                                    ("Bhai Doojyear (latent)", -6.482342533064276),
-                                    ("hourday", -4.467439512522012),
-                                    ("dayhour", -3.4378200953408538),
+                                     -5.092215281088679),
+                                    ("Bhai Doojyear (latent)", -6.478509642208569),
+                                    ("hourday", -4.463606621666305),
+                                    ("dayhour", -3.4339872044851463),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.096048171944386),
-                                    ("Martin Luther King's Dayyear (latent)", -6.076877424956113),
-                                    ("Shemini Atzeretyear (latent)", -6.482342533064276),
-                                    ("daymonth", -4.467439512522012),
-                                    ("monthday", -6.076877424956113),
-                                    ("monthyear", -4.690583063836222),
-                                    ("Yom Ha'atzmautyear (latent)", -6.482342533064276),
-                                    ("Orthodox Good Fridayyear (latent)", -6.076877424956113),
-                                    ("Vijayadashamiyear (latent)", -6.482342533064276),
-                                    ("Thai Pongalyear (latent)", -5.789195352504331),
-                                    ("Thiru Onamyear (latent)", -5.789195352504331),
-                                    ("hhhmmabsorption of , after named day", -6.482342533064276),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.482342533064276),
+                                     -5.092215281088679),
+                                    ("Martin Luther King's Dayyear (latent)", -6.073044534100405),
+                                    ("Shemini Atzeretyear (latent)", -6.478509642208569),
+                                    ("daymonth", -4.463606621666305),
+                                    ("monthday", -6.073044534100405),
+                                    ("monthyear", -4.686750172980514),
+                                    ("Yom Ha'atzmautyear (latent)", -6.478509642208569),
+                                    ("Orthodox Good Fridayyear (latent)", -6.073044534100405),
+                                    ("Vijayadashamiyear (latent)", -6.478509642208569),
+                                    ("Thai Pongalyear (latent)", -5.785362461648624),
+                                    ("Thiru Onamyear (latent)", -5.785362461648624),
+                                    ("hhhmmabsorption of , after named day", -6.478509642208569),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.478509642208569),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.566051801190121),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.482342533064276),
-                                    ("Krishna Janmashtamiyear (latent)", -6.076877424956113),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.482342533064276),
-                                    ("houryear", -5.566051801190121),
+                                     -5.562218910334414),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.478509642208569),
+                                    ("Krishna Janmashtamiyear (latent)", -6.073044534100405),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.478509642208569),
+                                    ("houryear", -5.562218910334414),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("Christmas<time-of-day> am|pm", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Christmas<time-of-day> am|pm", -6.478509642208569),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.789195352504331),
-                                    ("intersectin|during <named-month>|year", -6.482342533064276),
-                                    ("<time-of-day> am|pmintersect", -5.229579564568908),
-                                    ("Earth Houryear (latent)", -6.482342533064276),
-                                    ("Ganesh Chaturthiyear (latent)", -6.482342533064276),
-                                    ("Octoberyear (latent)", -4.978265136288003),
-                                    ("intersect<time-of-day> am|pm", -6.482342533064276),
-                                    ("Mattu Pongalyear (latent)", -6.482342533064276),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.482342533064276),
-                                    ("Shavuotyear (latent)", -6.482342533064276),
-                                    ("Parsi New Yearyear (latent)", -5.566051801190121),
+                                     -5.785362461648624),
+                                    ("intersectin|during <named-month>|year", -6.478509642208569),
+                                    ("<time-of-day> am|pmintersect", -5.225746673713201),
+                                    ("Earth Houryear (latent)", -6.478509642208569),
+                                    ("Ganesh Chaturthiyear (latent)", -6.478509642208569),
+                                    ("Octoberyear (latent)", -4.974432245432295),
+                                    ("intersect<time-of-day> am|pm", -6.478509642208569),
+                                    ("Mattu Pongalyear (latent)", -6.478509642208569),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.478509642208569),
+                                    ("Shavuotyear (latent)", -6.478509642208569),
+                                    ("Parsi New Yearyear (latent)", -5.562218910334414),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.482342533064276),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.482342533064276),
-                                    ("todayin|within|after <duration>", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.478509642208569),
+                                    ("todayin|within|after <duration>", -6.478509642208569),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.076877424956113),
-                                    ("Marchyear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("Marchyear (latent)", -6.478509642208569),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.076877424956113),
-                                    ("Sukkotyear (latent)", -6.076877424956113),
-                                    ("hhhmmintersect", -6.076877424956113),
+                                     -6.073044534100405),
+                                    ("Sukkotyear (latent)", -6.073044534100405),
+                                    ("hhhmmintersect", -6.073044534100405),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.076877424956113),
-                                    ("Clean Mondayyear (latent)", -6.076877424956113),
-                                    ("monthhour", -6.076877424956113),
+                                     -6.073044534100405),
+                                    ("Clean Mondayyear (latent)", -6.073044534100405),
+                                    ("monthhour", -6.073044534100405),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.566051801190121),
-                                    ("todayat <time-of-day>", -6.482342533064276),
-                                    ("Thursday<time> timezone", -4.0844472602659065),
-                                    ("tonight<time-of-day> am|pm", -6.482342533064276),
-                                    ("time-of-day (latent)tonight", -6.076877424956113),
-                                    ("from|since|after <time>December", -6.482342533064276),
-                                    ("<time-of-day> am|pmon <day>", -4.467439512522012),
+                                     -5.562218910334414),
+                                    ("todayat <time-of-day>", -6.478509642208569),
+                                    ("Thursday<time> timezone", -4.080614369410199),
+                                    ("tonight<time-of-day> am|pm", -6.478509642208569),
+                                    ("time-of-day (latent)tonight", -6.073044534100405),
+                                    ("from|since|after <time>December", -6.478509642208569),
+                                    ("<time-of-day> am|pmon <day>", -4.463606621666305),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.076877424956113),
-                                    ("dayday", -3.7097538108244956),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.076877424956113),
-                                    ("tonightat <time-of-day>", -5.383730244396167),
+                                     -6.478509642208569),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.073044534100405),
+                                    ("dayday", -3.705920919968788),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.073044534100405),
+                                    ("tonightat <time-of-day>", -5.37989735354046),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.789195352504331),
+                                     -5.785362461648624),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.482342533064276),
-                                    ("today<time-of-day> am|pm", -6.482342533064276),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.076877424956113),
-                                    ("at <time-of-day><time> <part-of-day>", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)intersect", -6.076877424956113),
-                                    ("hourhour", -3.5119280674945754),
-                                    ("Mahavir Jayantiyear (latent)", -6.076877424956113),
-                                    ("Navaratriin|during <named-month>|year", -6.482342533064276),
-                                    ("Wednesdaythis|last|next <cycle>", -6.482342533064276),
-                                    ("Lentyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("today<time-of-day> am|pm", -6.478509642208569),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.073044534100405),
+                                    ("at <time-of-day><time> <part-of-day>", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)intersect", -6.073044534100405),
+                                    ("hourhour", -3.5080951766388684),
+                                    ("Mahavir Jayantiyear (latent)", -6.073044534100405),
+                                    ("Navaratriin|during <named-month>|year", -6.478509642208569),
+                                    ("Wednesdaythis|last|next <cycle>", -6.478509642208569),
+                                    ("Lentyear (latent)", -6.478509642208569),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.610540356162685),
-                                    ("Boghiyear (latent)", -6.482342533064276),
-                                    ("dayyear", -1.923216285577592),
+                                     -4.606707465306978),
+                                    ("Boghiyear (latent)", -6.478509642208569),
+                                    ("dayyear", -1.9193833947218846),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.482342533064276),
-                                    ("Thursdayfrom|since|after <time>", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Thursdayfrom|since|after <time>", -6.073044534100405),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Thursdayat <time-of-day>", -5.789195352504331),
-                                    ("Islamic New Yearyear (latent)", -6.076877424956113),
-                                    ("Laylat al-Qadryear (latent)", -5.566051801190121),
-                                    ("part of days<time-of-day> am|pm", -6.482342533064276),
-                                    ("Shrove Tuesdayyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Thursdayat <time-of-day>", -5.785362461648624),
+                                    ("Islamic New Yearyear (latent)", -6.073044534100405),
+                                    ("Laylat al-Qadryear (latent)", -5.562218910334414),
+                                    ("part of days<time-of-day> am|pm", -6.478509642208569),
+                                    ("Shrove Tuesdayyear (latent)", -6.478509642208569),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.789195352504331),
-                                    ("hourminute", -6.076877424956113),
-                                    ("<time-of-day> am|pmtomorrow", -5.566051801190121),
-                                    ("Yom Kippuryear (latent)", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.789195352504331),
-                                    ("<part-of-day> of <time>year (latent)", -6.482342533064276),
-                                    ("minutehour", -5.229579564568908),
-                                    ("Kaanum Pongalyear (latent)", -6.076877424956113),
-                                    ("Maha Saptamiyear (latent)", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("hourminute", -6.073044534100405),
+                                    ("<time-of-day> am|pmtomorrow", -5.562218910334414),
+                                    ("Yom Kippuryear (latent)", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.785362461648624),
+                                    ("<part-of-day> of <time>year (latent)", -6.478509642208569),
+                                    ("minutehour", -5.225746673713201),
+                                    ("Kaanum Pongalyear (latent)", -6.073044534100405),
+                                    ("Maha Saptamiyear (latent)", -6.478509642208569),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.789195352504331),
-                                    ("time-of-day (latent)tomorrow", -5.566051801190121),
-                                    ("part of daysat <time-of-day>", -4.872904620630176),
+                                     -5.785362461648624),
+                                    ("time-of-day (latent)tomorrow", -5.562218910334414),
+                                    ("part of daysat <time-of-day>", -4.869071729774469),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.467439512522012),
-                                    ("for <duration> from <time>December", -6.482342533064276),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.482342533064276),
+                                     -4.463606621666305),
+                                    ("for <duration> from <time>December", -6.478509642208569),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.478509642208569),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.229579564568908),
+                                     -5.225746673713201),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.229579564568908),
-                                    ("time-of-day (latent)this <part-of-day>", -6.482342533064276),
-                                    ("Pentecostyear (latent)", -6.482342533064276),
+                                     -5.225746673713201),
+                                    ("time-of-day (latent)this <part-of-day>", -6.478509642208569),
+                                    ("Pentecostyear (latent)", -6.478509642208569),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.229579564568908),
-                                    ("<day-of-month> (ordinal)February", -6.482342533064276),
-                                    ("Eid al-Fitryear (latent)", -5.096048171944386),
+                                     -5.225746673713201),
+                                    ("<day-of-month> (ordinal)February", -6.478509642208569),
+                                    ("Eid al-Fitryear (latent)", -5.092215281088679),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.482342533064276),
-                                    ("Mondayin|during the <part-of-day>", -6.482342533064276),
-                                    ("Chhathin|during <named-month>|year", -6.482342533064276),
-                                    ("Diwaliin|during <named-month>|year", -6.482342533064276),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.482342533064276),
-                                    ("Vaisakhiin|during <named-month>|year", -6.482342533064276),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.229579564568908),
-                                    ("Raksha Bandhanyear (latent)", -6.482342533064276),
-                                    ("daysecond", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Mondayin|during the <part-of-day>", -6.478509642208569),
+                                    ("Chhathin|during <named-month>|year", -6.478509642208569),
+                                    ("Diwaliin|during <named-month>|year", -6.478509642208569),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.478509642208569),
+                                    ("Vaisakhiin|during <named-month>|year", -6.478509642208569),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.225746673713201),
+                                    ("Raksha Bandhanyear (latent)", -6.478509642208569),
+                                    ("daysecond", -6.073044534100405),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.076877424956113),
-                                    ("Ratha-Yatrayear (latent)", -6.482342533064276),
-                                    ("Ashurayear (latent)", -6.482342533064276),
-                                    ("Tuesdayin|during <named-month>|year", -6.482342533064276),
-                                    ("Chinese New Yearyear (latent)", -6.482342533064276),
-                                    ("tomorrowintersect", -6.482342533064276),
-                                    ("Lag BaOmeryear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("Ratha-Yatrayear (latent)", -6.478509642208569),
+                                    ("Ashurayear (latent)", -6.478509642208569),
+                                    ("Tuesdayin|during <named-month>|year", -6.478509642208569),
+                                    ("Chinese New Yearyear (latent)", -6.478509642208569),
+                                    ("tomorrowintersect", -6.478509642208569),
+                                    ("Lag BaOmeryear (latent)", -6.478509642208569),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.482342533064276),
-                                    ("Eid al-Adhayear (latent)", -4.342276369568006),
-                                    ("intersectin|during the <part-of-day>", -6.482342533064276),
-                                    ("Palm Sundayyear (latent)", -6.482342533064276),
-                                    ("Christmasat <time-of-day>", -6.482342533064276),
-                                    ("Passoveryear (latent)", -6.482342533064276),
-                                    ("Lazarus Saturdayyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Eid al-Adhayear (latent)", -4.338443478712298),
+                                    ("intersectin|during the <part-of-day>", -6.478509642208569),
+                                    ("Palm Sundayyear (latent)", -6.478509642208569),
+                                    ("Christmasat <time-of-day>", -6.478509642208569),
+                                    ("Passoveryear (latent)", -6.478509642208569),
+                                    ("Lazarus Saturdayyear (latent)", -6.478509642208569),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.482342533064276),
-                                    ("hhhmmon <day>", -5.566051801190121),
-                                    ("Yom HaShoahyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("hhhmmon <day>", -5.562218910334414),
+                                    ("Yom HaShoahyear (latent)", -6.073044534100405),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Septemberyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Septemberyear (latent)", -6.073044534100405),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.978265136288003),
-                                    ("Halloweenyear (latent)", -6.482342533064276),
+                                     -4.974432245432295),
+                                    ("Halloweenyear (latent)", -6.478509642208569),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.789195352504331),
+                                     -5.785362461648624),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("at <time-of-day>intersect", -5.566051801190121),
-                                    ("Rosh Hashanahyear (latent)", -5.789195352504331),
-                                    ("Dhanterasyear (latent)", -6.482342533064276),
-                                    ("Tu BiShvatyear (latent)", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)December", -5.789195352504331),
-                                    ("Holiyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("at <time-of-day>intersect", -5.562218910334414),
+                                    ("Rosh Hashanahyear (latent)", -5.785362461648624),
+                                    ("Dhanterasyear (latent)", -6.478509642208569),
+                                    ("Tu BiShvatyear (latent)", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)December", -5.785362461648624),
+                                    ("Holiyear (latent)", -5.785362461648624),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.482342533064276),
-                                    ("Holika Dahanyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("Holika Dahanyear (latent)", -5.785362461648624),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.076877424956113),
-                                    ("dayminute", -3.168156528391751),
-                                    ("Mawlidyear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("dayminute", -3.1643236375360435),
+                                    ("Mawlidyear (latent)", -6.478509642208569),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.482342533064276),
-                                    ("Jumu'atul-Widayear (latent)", -5.566051801190121),
-                                    ("minuteday", -2.7328384571339055),
+                                     -6.478509642208569),
+                                    ("Jumu'atul-Widayear (latent)", -5.562218910334414),
+                                    ("minuteday", -2.729005566278198),
                                     ("absorption of , after named dayintersect",
-                                     -5.789195352504331),
-                                    ("intersectyear (latent)", -6.482342533064276),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("intersectyear (latent)", -6.478509642208569),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.478509642208569),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.482342533064276),
-                                    ("intersecthhhmm", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("intersecthhhmm", -6.073044534100405),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Boss's Dayyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Boss's Dayyear (latent)", -6.073044534100405),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.482342533064276),
-                                    ("Global Youth Service Dayyear (latent)", -6.482342533064276),
-                                    ("Dhanterasin|during <named-month>|year", -6.482342533064276),
-                                    ("tonight<time-of-day> o'clock", -6.482342533064276),
-                                    ("Tisha B'Avyear (latent)", -6.482342533064276),
-                                    ("Isra and Mi'rajyear (latent)", -5.566051801190121),
-                                    ("at <time-of-day>on <day>", -4.872904620630176),
+                                     -6.478509642208569),
+                                    ("Global Youth Service Dayyear (latent)", -6.478509642208569),
+                                    ("Dhanterasin|during <named-month>|year", -6.478509642208569),
+                                    ("tonight<time-of-day> o'clock", -6.478509642208569),
+                                    ("Tisha B'Avyear (latent)", -6.478509642208569),
+                                    ("Isra and Mi'rajyear (latent)", -5.562218910334414),
+                                    ("at <time-of-day>on <day>", -4.869071729774469),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.789195352504331),
-                                    ("Christmasyear (latent)", -6.076877424956113),
-                                    ("Saturdayintersect", -6.482342533064276),
-                                    ("Naraka Chaturdashiyear (latent)", -6.076877424956113),
-                                    ("Thai Pongalin|during <named-month>|year", -6.482342533064276),
-                                    ("dayweek", -6.482342533064276),
-                                    ("Easter Sundayyear (latent)", -5.789195352504331),
+                                     -5.785362461648624),
+                                    ("Christmasyear (latent)", -6.073044534100405),
+                                    ("Saturdayintersect", -6.478509642208569),
+                                    ("Naraka Chaturdashiyear (latent)", -6.073044534100405),
+                                    ("Thai Pongalin|during <named-month>|year", -6.478509642208569),
+                                    ("dayweek", -6.478509642208569),
+                                    ("Easter Sundayyear (latent)", -5.785362461648624),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.076877424956113),
-                                    ("weekyear", -5.383730244396167),
-                                    ("King's Dayyear (latent)", -4.978265136288003),
-                                    ("hh:mmin|during the <part-of-day>", -5.566051801190121),
+                                     -6.073044534100405),
+                                    ("weekyear", -5.37989735354046),
+                                    ("King's Dayyear (latent)", -4.974432245432295),
+                                    ("hh:mmin|during the <part-of-day>", -5.562218910334414),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.789195352504331),
-                                    ("Hanukkahyear (latent)", -5.789195352504331),
-                                    ("Rama Navamiyear (latent)", -6.482342533064276),
-                                    ("February<time> <part-of-day>", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("Hanukkahyear (latent)", -5.785362461648624),
+                                    ("Rama Navamiyear (latent)", -6.478509642208569),
+                                    ("February<time> <part-of-day>", -6.478509642208569),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.789195352504331),
-                                    ("Great Lentyear (latent)", -6.482342533064276),
-                                    ("tomorrowat <time-of-day>", -5.789195352504331),
+                                     -5.785362461648624),
+                                    ("Great Lentyear (latent)", -6.478509642208569),
+                                    ("tomorrowat <time-of-day>", -5.785362461648624),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.076877424956113),
-                                    ("Ugadiyear (latent)", -5.096048171944386),
-                                    ("Vaisakhiyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.073044534100405),
+                                    ("Ugadiyear (latent)", -5.092215281088679),
+                                    ("Vaisakhiyear (latent)", -5.785362461648624),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.789195352504331),
-                                    ("last <cycle> of <time>year (latent)", -5.789195352504331),
-                                    ("at <time-of-day>tomorrow", -6.076877424956113),
-                                    ("tomorrow<time-of-day> am|pm", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("last <cycle> of <time>year (latent)", -5.785362461648624),
+                                    ("at <time-of-day>tomorrow", -6.073044534100405),
+                                    ("tomorrow<time-of-day> am|pm", -6.478509642208569),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.482342533064276),
-                                    ("Diwaliyear (latent)", -6.482342533064276),
-                                    ("between <time> and <time>on <day>", -6.076877424956113),
-                                    ("Black Fridayyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Diwaliyear (latent)", -6.478509642208569),
+                                    ("between <time> and <time>on <day>", -6.073044534100405),
+                                    ("Black Fridayyear (latent)", -6.073044534100405),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.482342533064276),
-                                    ("Chhathyear (latent)", -6.076877424956113),
-                                    ("Vasant Panchamiyear (latent)", -6.482342533064276),
-                                    ("Rabindra Jayantiyear (latent)", -5.229579564568908),
-                                    ("this <part-of-day>at <time-of-day>", -5.229579564568908),
-                                    ("St Patrick's Dayyear (latent)", -6.482342533064276),
-                                    ("Thursday<time> (timezone)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Chhathyear (latent)", -6.073044534100405),
+                                    ("Vasant Panchamiyear (latent)", -6.478509642208569),
+                                    ("Rabindra Jayantiyear (latent)", -5.225746673713201),
+                                    ("this <part-of-day>at <time-of-day>", -5.225746673713201),
+                                    ("St Patrick's Dayyear (latent)", -6.478509642208569),
+                                    ("Thursday<time> (timezone)", -6.478509642208569),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Pargat Diwasyear (latent)", -5.229579564568908),
-                                    ("<datetime> - <datetime> (interval)July", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Pargat Diwasyear (latent)", -5.225746673713201),
+                                    ("<datetime> - <datetime> (interval)July", -6.073044534100405),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.789195352504331),
-                                    ("Februaryintersect", -6.482342533064276),
-                                    ("Simchat Torahyear (latent)", -6.482342533064276),
-                                    ("minuteyear", -6.482342533064276)],
+                                     -5.785362461648624),
+                                    ("Februaryintersect", -6.478509642208569),
+                                    ("Simchat Torahyear (latent)", -6.478509642208569),
+                                    ("minuteyear", -6.478509642208569)],
                                n = 502},
                    koData =
-                     ClassData{prior = -0.9434193992624076, unseen = -6.8501261661455,
+                     ClassData{prior = -1.0024999544633555, unseen = -6.78105762593618,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.651841705297238),
-                                    ("hourday", -3.5532294166291285),
+                                   [("Thursdayhhhmm", -4.582697330136033),
+                                    ("hourday", -3.484085041467923),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)August", -6.155919102073512),
-                                    ("dayhour", -3.5909697446119755),
-                                    ("<time> timezoneyear (latent)", -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)August", -6.0867747269123065),
+                                    ("dayhour", -3.52182536945077),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.239628370199357),
-                                    ("Tuesdayfrom|since|after <time>", -5.462771921513567),
-                                    ("daymonth", -3.447868900971302),
-                                    ("hourquarter", -5.239628370199357),
-                                    ("monthday", -5.750453993965348),
-                                    ("monthyear", -4.903156133578144),
-                                    ("<time-of-day> am|pmyear (latent)", -5.462771921513567),
-                                    ("Thai Pongalyear (latent)", -5.462771921513567),
-                                    ("intersecthh:mm", -6.155919102073512),
+                                     -5.170483995038151),
+                                    ("Tuesdayfrom|since|after <time>", -5.393627546352362),
+                                    ("daymonth", -3.378724525810097),
+                                    ("hourquarter", -5.170483995038151),
+                                    ("monthday", -5.681309618804143),
+                                    ("monthyear", -4.834011758416939),
+                                    ("Thai Pongalyear (latent)", -5.393627546352362),
+                                    ("intersecthh:mm", -6.0867747269123065),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.750453993965348),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.155919102073512),
-                                    ("houryear", -4.364159632845457),
+                                     -5.681309618804143),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.0867747269123065),
+                                    ("houryear", -4.700480365792417),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)October", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)October", -6.0867747269123065),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.462771921513567),
-                                    ("hournograin", -4.903156133578144),
-                                    ("<time-of-day> am|pmintersect", -4.903156133578144),
-                                    ("Octoberyear (latent)", -6.155919102073512),
-                                    ("Good Fridayyear (latent)", -5.750453993965348),
+                                     -5.393627546352362),
+                                    ("hournograin", -4.834011758416939),
+                                    ("<time-of-day> am|pmintersect", -4.834011758416939),
+                                    ("Octoberyear (latent)", -6.0867747269123065),
+                                    ("Good Fridayyear (latent)", -5.681309618804143),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("early morningat <time-of-day>", -6.155919102073512),
-                                    ("until <time>on <day>", -5.462771921513567),
+                                     -5.681309618804143),
+                                    ("early morningat <time-of-day>", -6.0867747269123065),
+                                    ("until <time>on <day>", -5.393627546352362),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
-                                    ("time-of-day (latent)intersect", -5.462771921513567),
-                                    ("todayin <number> (implicit minutes)", -6.155919102073512),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("time-of-day (latent)intersect", -5.393627546352362),
+                                    ("todayin <number> (implicit minutes)", -6.0867747269123065),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.155919102073512),
-                                    ("hh:mmon <day>", -4.903156133578144),
-                                    ("hhhmmintersect", -5.750453993965348),
-                                    ("absorption of , after named dayJuly", -5.239628370199357),
-                                    ("from|since|after <time>July", -5.750453993965348),
+                                     -6.0867747269123065),
+                                    ("hh:mmon <day>", -4.834011758416939),
+                                    ("hhhmmintersect", -5.681309618804143),
+                                    ("absorption of , after named dayJuly", -5.170483995038151),
+                                    ("from|since|after <time>July", -5.681309618804143),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.239628370199357),
-                                    ("Clean Mondayyear (latent)", -6.155919102073512),
-                                    ("monthhour", -6.155919102073512),
+                                     -5.170483995038151),
+                                    ("Clean Mondayyear (latent)", -6.0867747269123065),
+                                    ("monthhour", -6.0867747269123065),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("hourmonth", -4.0158529385772415),
-                                    ("todayat <time-of-day>", -6.155919102073512),
-                                    ("hhhmmyear (latent)", -4.903156133578144),
-                                    ("from|since|after <time>December", -6.155919102073512),
+                                     -5.681309618804143),
+                                    ("hourmonth", -3.946708563416036),
+                                    ("todayat <time-of-day>", -6.0867747269123065),
+                                    ("from|since|after <time>December", -6.0867747269123065),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.155919102073512),
-                                    ("<time-of-day> am|pmon <day>", -4.903156133578144),
-                                    ("Mondayyear (latent)", -5.462771921513567),
-                                    ("dayday", -4.0158529385772415),
-                                    ("on <day>September", -5.462771921513567),
-                                    ("time-of-day (latent)September", -5.750453993965348),
-                                    ("hourhour", -4.076477560393676),
-                                    ("time-of-day (latent)on <day>", -4.651841705297238),
-                                    ("Thursdaydd/mm", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<time-of-day> am|pmon <day>", -4.834011758416939),
+                                    ("Mondayyear (latent)", -5.393627546352362),
+                                    ("dayday", -3.946708563416036),
+                                    ("on <day>September", -5.393627546352362),
+                                    ("time-of-day (latent)September", -5.681309618804143),
+                                    ("hourhour", -4.007333185232471),
+                                    ("time-of-day (latent)on <day>", -4.582697330136033),
+                                    ("Thursdaydd/mm", -6.0867747269123065),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.750453993965348),
-                                    ("dayyear", -3.1354942159291497),
-                                    ("New Year's Dayyear (latent)", -5.239628370199357),
-                                    ("time-of-day (latent)Sunday", -5.750453993965348),
-                                    ("Thursdayfrom|since|after <time>", -4.451171009835087),
-                                    ("Thursdayat <time-of-day>", -4.546481189639412),
+                                     -5.681309618804143),
+                                    ("dayyear", -3.283414346005772),
+                                    ("New Year's Dayyear (latent)", -5.170483995038151),
+                                    ("time-of-day (latent)Sunday", -5.681309618804143),
+                                    ("Thursdayfrom|since|after <time>", -4.382026634673881),
+                                    ("Thursdayat <time-of-day>", -4.477336814478207),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.155919102073512),
-                                    ("Aprilyear (latent)", -6.155919102073512),
-                                    ("the <day-of-month> (ordinal)July", -6.155919102073512),
-                                    ("the <day-of-month> (number)July", -6.155919102073512),
-                                    ("monthminute", -6.155919102073512),
-                                    ("<time-of-day> am|pmtomorrow", -5.750453993965348),
-                                    ("Thursdayhh:mm", -5.239628370199357),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.750453993965348),
-                                    ("minutemonth", -4.0158529385772415),
-                                    ("time-of-day (latent)Friday", -5.750453993965348),
-                                    ("minutehour", -6.155919102073512),
-                                    ("part of daysat <time-of-day>", -5.057306813405402),
+                                     -6.0867747269123065),
+                                    ("Aprilyear (latent)", -6.0867747269123065),
+                                    ("the <day-of-month> (ordinal)July", -6.0867747269123065),
+                                    ("the <day-of-month> (number)July", -6.0867747269123065),
+                                    ("monthminute", -6.0867747269123065),
+                                    ("<time-of-day> am|pmtomorrow", -5.681309618804143),
+                                    ("Thursdayhh:mm", -5.170483995038151),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.681309618804143),
+                                    ("minutemonth", -3.946708563416036),
+                                    ("time-of-day (latent)Friday", -5.681309618804143),
+                                    ("minutehour", -6.0867747269123065),
+                                    ("part of daysat <time-of-day>", -4.988162438244197),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.8045438449100346),
-                                    ("Augustyear (latent)", -5.750453993965348),
-                                    ("week-endin|during <named-month>|year", -6.155919102073512),
-                                    ("time-of-day (latent)Tuesday", -5.750453993965348),
+                                     -3.7353994697488293),
+                                    ("Augustyear (latent)", -5.681309618804143),
+                                    ("week-endin|during <named-month>|year", -6.0867747269123065),
+                                    ("time-of-day (latent)Tuesday", -5.681309618804143),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("July<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.155919102073512),
-                                    ("Sundayyear (latent)", -5.239628370199357),
-                                    ("hourweek", -5.239628370199357),
-                                    ("the <day-of-month> (ordinal)Monday", -5.462771921513567),
-                                    ("Christmasat <time-of-day>", -6.155919102073512),
-                                    ("from|since|after <time>year (latent)", -5.057306813405402),
-                                    ("hhhmmon <day>", -5.239628370199357),
-                                    ("yesterday<time-of-day> am|pm", -6.155919102073512),
-                                    ("<day-of-month> (ordinal)July", -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("Sundayyear (latent)", -5.170483995038151),
+                                    ("hourweek", -5.170483995038151),
+                                    ("the <day-of-month> (ordinal)Monday", -5.393627546352362),
+                                    ("Christmasat <time-of-day>", -6.0867747269123065),
+                                    ("from|since|after <time>year (latent)", -5.681309618804143),
+                                    ("hhhmmon <day>", -5.170483995038151),
+                                    ("yesterday<time-of-day> am|pm", -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)July", -5.393627546352362),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("August<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.155919102073512),
-                                    ("at <time-of-day>intersect", -5.239628370199357),
-                                    ("hh:mmyear (latent)", -4.769624740953621),
-                                    ("Holiyear (latent)", -6.155919102073512),
-                                    ("until <time><time-of-day> am|pm", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("at <time-of-day>intersect", -5.170483995038151),
+                                    ("Holiyear (latent)", -6.0867747269123065),
+                                    ("until <time><time-of-day> am|pm", -6.0867747269123065),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("dayminute", -3.322705758017296),
-                                    ("yyyy-mm-ddhh:mm", -5.750453993965348),
-                                    ("intersectfrom|since|after <time>", -5.750453993965348),
-                                    ("intersectSeptember", -4.28411692517192),
-                                    ("minuteday", -2.9989186809233987),
+                                     -5.681309618804143),
+                                    ("dayminute", -3.2535613828560908),
+                                    ("yyyy-mm-ddhh:mm", -5.681309618804143),
+                                    ("intersectfrom|since|after <time>", -5.681309618804143),
+                                    ("intersectSeptember", -4.214972550010716),
+                                    ("minuteday", -2.9297743057621934),
                                     ("absorption of , after named dayintersect",
-                                     -6.155919102073512),
-                                    ("intersectyear (latent)", -6.155919102073512),
-                                    ("Februaryin|during the <part-of-day>", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("intersectyear (latent)", -6.0867747269123065),
+                                    ("Februaryin|during the <part-of-day>", -6.0867747269123065),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.155919102073512),
-                                    ("time-of-day (latent)July", -5.462771921513567),
-                                    ("Saturdayyear (latent)", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("time-of-day (latent)July", -5.393627546352362),
+                                    ("Saturdayyear (latent)", -6.0867747269123065),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)Monday", -4.903156133578144),
-                                    ("at <time-of-day>on <day>", -5.239628370199357),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)Monday", -4.834011758416939),
+                                    ("at <time-of-day>on <day>", -5.170483995038151),
                                     ("absorption of , after named daySeptember",
-                                     -4.903156133578144),
-                                    ("Naraka Chaturdashiyear (latent)", -6.155919102073512),
-                                    ("from|since|after <time>on <day>", -5.239628370199357),
-                                    ("dayweek", -6.155919102073512),
-                                    ("Easter Sundayyear (latent)", -5.750453993965348),
-                                    ("Thursday<time-of-day> am|pm", -4.903156133578144),
-                                    ("weekyear", -5.750453993965348),
-                                    ("time-of-day (latent)Thursday", -5.750453993965348),
+                                     -4.834011758416939),
+                                    ("Naraka Chaturdashiyear (latent)", -6.0867747269123065),
+                                    ("from|since|after <time>on <day>", -5.170483995038151),
+                                    ("dayweek", -6.0867747269123065),
+                                    ("Easter Sundayyear (latent)", -5.681309618804143),
+                                    ("Thursday<time-of-day> am|pm", -4.834011758416939),
+                                    ("weekyear", -5.681309618804143),
+                                    ("time-of-day (latent)Thursday", -5.681309618804143),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)April", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)April", -6.0867747269123065),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.750453993965348),
+                                     -5.681309618804143),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.462771921513567),
-                                    ("Sundayfrom|since|after <time>", -6.155919102073512),
-                                    ("absorption of , after named dayFebruary", -5.239628370199357),
+                                     -5.393627546352362),
+                                    ("Sundayfrom|since|after <time>", -6.0867747269123065),
+                                    ("absorption of , after named dayFebruary", -5.170483995038151),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.750453993965348),
+                                     -5.681309618804143),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.155919102073512),
-                                    ("tomorrowat <time-of-day>", -6.155919102073512),
-                                    ("daynograin", -5.750453993965348),
-                                    ("Fridayin|during <named-month>|year", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("tomorrowat <time-of-day>", -6.0867747269123065),
+                                    ("daynograin", -5.681309618804143),
+                                    ("Fridayin|during <named-month>|year", -6.0867747269123065),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.750453993965348),
-                                    ("last <cycle> of <time>year (latent)", -5.750453993965348),
-                                    ("tomorrow<time-of-day> am|pm", -6.155919102073512),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.462771921513567),
-                                    ("Diwaliyear (latent)", -5.750453993965348),
+                                     -5.681309618804143),
+                                    ("last <cycle> of <time>year (latent)", -5.681309618804143),
+                                    ("tomorrow<time-of-day> am|pm", -6.0867747269123065),
+                                    ("Diwaliyear (latent)", -5.681309618804143),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.155919102073512),
-                                    ("this <part-of-day>at <time-of-day>", -5.239628370199357),
-                                    ("Fridayyear (latent)", -5.239628370199357),
-                                    ("time-of-day (latent)April", -6.155919102073512),
-                                    ("minuteyear", -3.9586945247372927)],
-                               n = 320}}),
+                                     -6.0867747269123065),
+                                    ("this <part-of-day>at <time-of-day>", -5.170483995038151),
+                                    ("Fridayyear (latent)", -5.170483995038151),
+                                    ("time-of-day (latent)April", -6.0867747269123065)],
+                               n = 291}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1742,22 +1730,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.14681486833704485,
-                               unseen = -5.393627546352362,
+                     ClassData{prior = -4.546237407675729e-2,
+                               unseen = -5.389071729816501,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.7779564107075706e-2),
-                                    ("intersect 2 numbers", -4.00277736869661)],
+                                   [("integer (numeric)", -2.320289707966387e-2),
+                                    ("intersect 2 numbers", -3.9982007016691985)],
                                n = 215},
                    koData =
-                     ClassData{prior = -1.9910923718485463,
-                               unseen = -3.6635616461296463,
+                     ClassData{prior = -3.1135153092103742, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.55814461804655),
-                                    ("negative numbers", -0.41871033485818493),
-                                    ("compose by multiplication", -2.2512917986064953)],
-                               n = 34}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.15415067982725836,

Duckling/Ranking/Classifiers/EN_PH.hs

@@ -276,7 +276,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -297,44 +297,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -992,467 +992,455 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.49314027536445065,
-                               unseen = -7.176254532017144,
+                     ClassData{prior = -0.4572231019431188, unseen = -7.172424577124845,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.482342533064276),
-                                    ("Karva Chauthyear (latent)", -6.482342533064276),
+                                   [("Navaratriyear (latent)", -6.478509642208569),
+                                    ("Karva Chauthyear (latent)", -6.478509642208569),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Maha Shivaratriyear (latent)", -6.482342533064276),
-                                    ("Ramadanyear (latent)", -5.229579564568908),
+                                     -6.478509642208569),
+                                    ("Maha Shivaratriyear (latent)", -6.478509642208569),
+                                    ("Ramadanyear (latent)", -5.225746673713201),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.096048171944386),
-                                    ("Bhai Doojyear (latent)", -6.482342533064276),
-                                    ("hourday", -4.467439512522012),
-                                    ("dayhour", -3.4378200953408538),
+                                     -5.092215281088679),
+                                    ("Bhai Doojyear (latent)", -6.478509642208569),
+                                    ("hourday", -4.463606621666305),
+                                    ("dayhour", -3.4339872044851463),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.096048171944386),
-                                    ("Martin Luther King's Dayyear (latent)", -6.076877424956113),
-                                    ("Shemini Atzeretyear (latent)", -6.482342533064276),
-                                    ("daymonth", -4.467439512522012),
-                                    ("monthday", -6.076877424956113),
-                                    ("monthyear", -4.690583063836222),
-                                    ("Yom Ha'atzmautyear (latent)", -6.482342533064276),
-                                    ("Orthodox Good Fridayyear (latent)", -6.076877424956113),
-                                    ("Vijayadashamiyear (latent)", -6.482342533064276),
-                                    ("Thai Pongalyear (latent)", -5.789195352504331),
-                                    ("Thiru Onamyear (latent)", -5.789195352504331),
-                                    ("hhhmmabsorption of , after named day", -6.482342533064276),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.482342533064276),
+                                     -5.092215281088679),
+                                    ("Martin Luther King's Dayyear (latent)", -6.073044534100405),
+                                    ("Shemini Atzeretyear (latent)", -6.478509642208569),
+                                    ("daymonth", -4.463606621666305),
+                                    ("monthday", -6.073044534100405),
+                                    ("monthyear", -4.686750172980514),
+                                    ("Yom Ha'atzmautyear (latent)", -6.478509642208569),
+                                    ("Orthodox Good Fridayyear (latent)", -6.073044534100405),
+                                    ("Vijayadashamiyear (latent)", -6.478509642208569),
+                                    ("Thai Pongalyear (latent)", -5.785362461648624),
+                                    ("Thiru Onamyear (latent)", -5.785362461648624),
+                                    ("hhhmmabsorption of , after named day", -6.478509642208569),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.478509642208569),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.566051801190121),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.482342533064276),
-                                    ("Krishna Janmashtamiyear (latent)", -6.076877424956113),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.482342533064276),
-                                    ("houryear", -5.566051801190121),
+                                     -5.562218910334414),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.478509642208569),
+                                    ("Krishna Janmashtamiyear (latent)", -6.073044534100405),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.478509642208569),
+                                    ("houryear", -5.562218910334414),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("Christmas<time-of-day> am|pm", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Christmas<time-of-day> am|pm", -6.478509642208569),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.789195352504331),
-                                    ("intersectin|during <named-month>|year", -6.482342533064276),
-                                    ("<time-of-day> am|pmintersect", -5.229579564568908),
-                                    ("Earth Houryear (latent)", -6.482342533064276),
-                                    ("Ganesh Chaturthiyear (latent)", -6.482342533064276),
-                                    ("Octoberyear (latent)", -4.978265136288003),
-                                    ("intersect<time-of-day> am|pm", -6.482342533064276),
-                                    ("Mattu Pongalyear (latent)", -6.482342533064276),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.482342533064276),
-                                    ("Shavuotyear (latent)", -6.482342533064276),
-                                    ("Parsi New Yearyear (latent)", -5.566051801190121),
+                                     -5.785362461648624),
+                                    ("intersectin|during <named-month>|year", -6.478509642208569),
+                                    ("<time-of-day> am|pmintersect", -5.225746673713201),
+                                    ("Earth Houryear (latent)", -6.478509642208569),
+                                    ("Ganesh Chaturthiyear (latent)", -6.478509642208569),
+                                    ("Octoberyear (latent)", -4.974432245432295),
+                                    ("intersect<time-of-day> am|pm", -6.478509642208569),
+                                    ("Mattu Pongalyear (latent)", -6.478509642208569),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.478509642208569),
+                                    ("Shavuotyear (latent)", -6.478509642208569),
+                                    ("Parsi New Yearyear (latent)", -5.562218910334414),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.482342533064276),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.482342533064276),
-                                    ("todayin|within|after <duration>", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.478509642208569),
+                                    ("todayin|within|after <duration>", -6.478509642208569),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.076877424956113),
-                                    ("Marchyear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("Marchyear (latent)", -6.478509642208569),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.076877424956113),
-                                    ("Sukkotyear (latent)", -6.076877424956113),
-                                    ("hhhmmintersect", -6.076877424956113),
+                                     -6.073044534100405),
+                                    ("Sukkotyear (latent)", -6.073044534100405),
+                                    ("hhhmmintersect", -6.073044534100405),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.076877424956113),
-                                    ("Clean Mondayyear (latent)", -6.076877424956113),
-                                    ("monthhour", -6.076877424956113),
+                                     -6.073044534100405),
+                                    ("Clean Mondayyear (latent)", -6.073044534100405),
+                                    ("monthhour", -6.073044534100405),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.566051801190121),
-                                    ("todayat <time-of-day>", -6.482342533064276),
-                                    ("Thursday<time> timezone", -4.0844472602659065),
-                                    ("tonight<time-of-day> am|pm", -6.482342533064276),
-                                    ("time-of-day (latent)tonight", -6.076877424956113),
-                                    ("from|since|after <time>December", -6.482342533064276),
-                                    ("<time-of-day> am|pmon <day>", -4.467439512522012),
+                                     -5.562218910334414),
+                                    ("todayat <time-of-day>", -6.478509642208569),
+                                    ("Thursday<time> timezone", -4.080614369410199),
+                                    ("tonight<time-of-day> am|pm", -6.478509642208569),
+                                    ("time-of-day (latent)tonight", -6.073044534100405),
+                                    ("from|since|after <time>December", -6.478509642208569),
+                                    ("<time-of-day> am|pmon <day>", -4.463606621666305),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.076877424956113),
-                                    ("dayday", -3.7097538108244956),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.076877424956113),
-                                    ("tonightat <time-of-day>", -5.383730244396167),
+                                     -6.478509642208569),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.073044534100405),
+                                    ("dayday", -3.705920919968788),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.073044534100405),
+                                    ("tonightat <time-of-day>", -5.37989735354046),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.789195352504331),
+                                     -5.785362461648624),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.482342533064276),
-                                    ("today<time-of-day> am|pm", -6.482342533064276),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.076877424956113),
-                                    ("at <time-of-day><time> <part-of-day>", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)intersect", -6.076877424956113),
-                                    ("hourhour", -3.5119280674945754),
-                                    ("Mahavir Jayantiyear (latent)", -6.076877424956113),
-                                    ("Navaratriin|during <named-month>|year", -6.482342533064276),
-                                    ("Wednesdaythis|last|next <cycle>", -6.482342533064276),
-                                    ("Lentyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("today<time-of-day> am|pm", -6.478509642208569),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.073044534100405),
+                                    ("at <time-of-day><time> <part-of-day>", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)intersect", -6.073044534100405),
+                                    ("hourhour", -3.5080951766388684),
+                                    ("Mahavir Jayantiyear (latent)", -6.073044534100405),
+                                    ("Navaratriin|during <named-month>|year", -6.478509642208569),
+                                    ("Wednesdaythis|last|next <cycle>", -6.478509642208569),
+                                    ("Lentyear (latent)", -6.478509642208569),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.610540356162685),
-                                    ("Boghiyear (latent)", -6.482342533064276),
-                                    ("dayyear", -1.923216285577592),
+                                     -4.606707465306978),
+                                    ("Boghiyear (latent)", -6.478509642208569),
+                                    ("dayyear", -1.9193833947218846),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.482342533064276),
-                                    ("Thursdayfrom|since|after <time>", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Thursdayfrom|since|after <time>", -6.073044534100405),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Thursdayat <time-of-day>", -5.789195352504331),
-                                    ("Islamic New Yearyear (latent)", -6.076877424956113),
-                                    ("Laylat al-Qadryear (latent)", -5.566051801190121),
-                                    ("part of days<time-of-day> am|pm", -6.482342533064276),
-                                    ("Shrove Tuesdayyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Thursdayat <time-of-day>", -5.785362461648624),
+                                    ("Islamic New Yearyear (latent)", -6.073044534100405),
+                                    ("Laylat al-Qadryear (latent)", -5.562218910334414),
+                                    ("part of days<time-of-day> am|pm", -6.478509642208569),
+                                    ("Shrove Tuesdayyear (latent)", -6.478509642208569),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.789195352504331),
-                                    ("hourminute", -6.076877424956113),
-                                    ("<time-of-day> am|pmtomorrow", -5.566051801190121),
-                                    ("Yom Kippuryear (latent)", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.789195352504331),
-                                    ("<part-of-day> of <time>year (latent)", -6.482342533064276),
-                                    ("minutehour", -5.229579564568908),
-                                    ("Kaanum Pongalyear (latent)", -6.076877424956113),
-                                    ("Maha Saptamiyear (latent)", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("hourminute", -6.073044534100405),
+                                    ("<time-of-day> am|pmtomorrow", -5.562218910334414),
+                                    ("Yom Kippuryear (latent)", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.785362461648624),
+                                    ("<part-of-day> of <time>year (latent)", -6.478509642208569),
+                                    ("minutehour", -5.225746673713201),
+                                    ("Kaanum Pongalyear (latent)", -6.073044534100405),
+                                    ("Maha Saptamiyear (latent)", -6.478509642208569),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.789195352504331),
-                                    ("time-of-day (latent)tomorrow", -5.566051801190121),
-                                    ("part of daysat <time-of-day>", -4.872904620630176),
+                                     -5.785362461648624),
+                                    ("time-of-day (latent)tomorrow", -5.562218910334414),
+                                    ("part of daysat <time-of-day>", -4.869071729774469),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.467439512522012),
-                                    ("for <duration> from <time>December", -6.482342533064276),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.482342533064276),
+                                     -4.463606621666305),
+                                    ("for <duration> from <time>December", -6.478509642208569),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.478509642208569),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.229579564568908),
+                                     -5.225746673713201),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.229579564568908),
-                                    ("time-of-day (latent)this <part-of-day>", -6.482342533064276),
-                                    ("Pentecostyear (latent)", -6.482342533064276),
+                                     -5.225746673713201),
+                                    ("time-of-day (latent)this <part-of-day>", -6.478509642208569),
+                                    ("Pentecostyear (latent)", -6.478509642208569),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.229579564568908),
-                                    ("<day-of-month> (ordinal)February", -6.482342533064276),
-                                    ("Eid al-Fitryear (latent)", -5.096048171944386),
+                                     -5.225746673713201),
+                                    ("<day-of-month> (ordinal)February", -6.478509642208569),
+                                    ("Eid al-Fitryear (latent)", -5.092215281088679),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.482342533064276),
-                                    ("Mondayin|during the <part-of-day>", -6.482342533064276),
-                                    ("Chhathin|during <named-month>|year", -6.482342533064276),
-                                    ("Diwaliin|during <named-month>|year", -6.482342533064276),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.482342533064276),
-                                    ("Vaisakhiin|during <named-month>|year", -6.482342533064276),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.229579564568908),
-                                    ("Raksha Bandhanyear (latent)", -6.482342533064276),
-                                    ("daysecond", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Mondayin|during the <part-of-day>", -6.478509642208569),
+                                    ("Chhathin|during <named-month>|year", -6.478509642208569),
+                                    ("Diwaliin|during <named-month>|year", -6.478509642208569),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.478509642208569),
+                                    ("Vaisakhiin|during <named-month>|year", -6.478509642208569),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.225746673713201),
+                                    ("Raksha Bandhanyear (latent)", -6.478509642208569),
+                                    ("daysecond", -6.073044534100405),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.076877424956113),
-                                    ("Ratha-Yatrayear (latent)", -6.482342533064276),
-                                    ("Ashurayear (latent)", -6.482342533064276),
-                                    ("Tuesdayin|during <named-month>|year", -6.482342533064276),
-                                    ("Chinese New Yearyear (latent)", -6.482342533064276),
-                                    ("tomorrowintersect", -6.482342533064276),
-                                    ("Lag BaOmeryear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("Ratha-Yatrayear (latent)", -6.478509642208569),
+                                    ("Ashurayear (latent)", -6.478509642208569),
+                                    ("Tuesdayin|during <named-month>|year", -6.478509642208569),
+                                    ("Chinese New Yearyear (latent)", -6.478509642208569),
+                                    ("tomorrowintersect", -6.478509642208569),
+                                    ("Lag BaOmeryear (latent)", -6.478509642208569),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.482342533064276),
-                                    ("Eid al-Adhayear (latent)", -4.342276369568006),
-                                    ("intersectin|during the <part-of-day>", -6.482342533064276),
-                                    ("Palm Sundayyear (latent)", -6.482342533064276),
-                                    ("Christmasat <time-of-day>", -6.482342533064276),
-                                    ("Passoveryear (latent)", -6.482342533064276),
-                                    ("Lazarus Saturdayyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Eid al-Adhayear (latent)", -4.338443478712298),
+                                    ("intersectin|during the <part-of-day>", -6.478509642208569),
+                                    ("Palm Sundayyear (latent)", -6.478509642208569),
+                                    ("Christmasat <time-of-day>", -6.478509642208569),
+                                    ("Passoveryear (latent)", -6.478509642208569),
+                                    ("Lazarus Saturdayyear (latent)", -6.478509642208569),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.482342533064276),
-                                    ("hhhmmon <day>", -5.566051801190121),
-                                    ("Yom HaShoahyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("hhhmmon <day>", -5.562218910334414),
+                                    ("Yom HaShoahyear (latent)", -6.073044534100405),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Septemberyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Septemberyear (latent)", -6.073044534100405),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.978265136288003),
-                                    ("Halloweenyear (latent)", -6.482342533064276),
+                                     -4.974432245432295),
+                                    ("Halloweenyear (latent)", -6.478509642208569),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.789195352504331),
+                                     -5.785362461648624),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("at <time-of-day>intersect", -5.566051801190121),
-                                    ("Rosh Hashanahyear (latent)", -5.789195352504331),
-                                    ("Dhanterasyear (latent)", -6.482342533064276),
-                                    ("Tu BiShvatyear (latent)", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)December", -5.789195352504331),
-                                    ("Holiyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("at <time-of-day>intersect", -5.562218910334414),
+                                    ("Rosh Hashanahyear (latent)", -5.785362461648624),
+                                    ("Dhanterasyear (latent)", -6.478509642208569),
+                                    ("Tu BiShvatyear (latent)", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)December", -5.785362461648624),
+                                    ("Holiyear (latent)", -5.785362461648624),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.482342533064276),
-                                    ("Holika Dahanyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("Holika Dahanyear (latent)", -5.785362461648624),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.076877424956113),
-                                    ("dayminute", -3.168156528391751),
-                                    ("Mawlidyear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("dayminute", -3.1643236375360435),
+                                    ("Mawlidyear (latent)", -6.478509642208569),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.482342533064276),
-                                    ("Jumu'atul-Widayear (latent)", -5.566051801190121),
-                                    ("minuteday", -2.7328384571339055),
+                                     -6.478509642208569),
+                                    ("Jumu'atul-Widayear (latent)", -5.562218910334414),
+                                    ("minuteday", -2.729005566278198),
                                     ("absorption of , after named dayintersect",
-                                     -5.789195352504331),
-                                    ("intersectyear (latent)", -6.482342533064276),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("intersectyear (latent)", -6.478509642208569),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.478509642208569),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.482342533064276),
-                                    ("intersecthhhmm", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("intersecthhhmm", -6.073044534100405),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Boss's Dayyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Boss's Dayyear (latent)", -6.073044534100405),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.482342533064276),
-                                    ("Global Youth Service Dayyear (latent)", -6.482342533064276),
-                                    ("Dhanterasin|during <named-month>|year", -6.482342533064276),
-                                    ("tonight<time-of-day> o'clock", -6.482342533064276),
-                                    ("Tisha B'Avyear (latent)", -6.482342533064276),
-                                    ("Isra and Mi'rajyear (latent)", -5.566051801190121),
-                                    ("at <time-of-day>on <day>", -4.872904620630176),
+                                     -6.478509642208569),
+                                    ("Global Youth Service Dayyear (latent)", -6.478509642208569),
+                                    ("Dhanterasin|during <named-month>|year", -6.478509642208569),
+                                    ("tonight<time-of-day> o'clock", -6.478509642208569),
+                                    ("Tisha B'Avyear (latent)", -6.478509642208569),
+                                    ("Isra and Mi'rajyear (latent)", -5.562218910334414),
+                                    ("at <time-of-day>on <day>", -4.869071729774469),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.789195352504331),
-                                    ("Christmasyear (latent)", -6.076877424956113),
-                                    ("Saturdayintersect", -6.482342533064276),
-                                    ("Naraka Chaturdashiyear (latent)", -6.076877424956113),
-                                    ("Thai Pongalin|during <named-month>|year", -6.482342533064276),
-                                    ("dayweek", -6.482342533064276),
-                                    ("Easter Sundayyear (latent)", -5.789195352504331),
+                                     -5.785362461648624),
+                                    ("Christmasyear (latent)", -6.073044534100405),
+                                    ("Saturdayintersect", -6.478509642208569),
+                                    ("Naraka Chaturdashiyear (latent)", -6.073044534100405),
+                                    ("Thai Pongalin|during <named-month>|year", -6.478509642208569),
+                                    ("dayweek", -6.478509642208569),
+                                    ("Easter Sundayyear (latent)", -5.785362461648624),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.076877424956113),
-                                    ("weekyear", -5.383730244396167),
-                                    ("King's Dayyear (latent)", -4.978265136288003),
-                                    ("hh:mmin|during the <part-of-day>", -5.566051801190121),
+                                     -6.073044534100405),
+                                    ("weekyear", -5.37989735354046),
+                                    ("King's Dayyear (latent)", -4.974432245432295),
+                                    ("hh:mmin|during the <part-of-day>", -5.562218910334414),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.789195352504331),
-                                    ("Hanukkahyear (latent)", -5.789195352504331),
-                                    ("Rama Navamiyear (latent)", -6.482342533064276),
-                                    ("February<time> <part-of-day>", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("Hanukkahyear (latent)", -5.785362461648624),
+                                    ("Rama Navamiyear (latent)", -6.478509642208569),
+                                    ("February<time> <part-of-day>", -6.478509642208569),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.789195352504331),
-                                    ("Great Lentyear (latent)", -6.482342533064276),
-                                    ("tomorrowat <time-of-day>", -5.789195352504331),
+                                     -5.785362461648624),
+                                    ("Great Lentyear (latent)", -6.478509642208569),
+                                    ("tomorrowat <time-of-day>", -5.785362461648624),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.076877424956113),
-                                    ("Ugadiyear (latent)", -5.096048171944386),
-                                    ("Vaisakhiyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.073044534100405),
+                                    ("Ugadiyear (latent)", -5.092215281088679),
+                                    ("Vaisakhiyear (latent)", -5.785362461648624),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.789195352504331),
-                                    ("last <cycle> of <time>year (latent)", -5.789195352504331),
-                                    ("at <time-of-day>tomorrow", -6.076877424956113),
-                                    ("tomorrow<time-of-day> am|pm", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("last <cycle> of <time>year (latent)", -5.785362461648624),
+                                    ("at <time-of-day>tomorrow", -6.073044534100405),
+                                    ("tomorrow<time-of-day> am|pm", -6.478509642208569),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.482342533064276),
-                                    ("Diwaliyear (latent)", -6.482342533064276),
-                                    ("between <time> and <time>on <day>", -6.076877424956113),
-                                    ("Black Fridayyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Diwaliyear (latent)", -6.478509642208569),
+                                    ("between <time> and <time>on <day>", -6.073044534100405),
+                                    ("Black Fridayyear (latent)", -6.073044534100405),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.482342533064276),
-                                    ("Chhathyear (latent)", -6.076877424956113),
-                                    ("Vasant Panchamiyear (latent)", -6.482342533064276),
-                                    ("Rabindra Jayantiyear (latent)", -5.229579564568908),
-                                    ("this <part-of-day>at <time-of-day>", -5.229579564568908),
-                                    ("St Patrick's Dayyear (latent)", -6.482342533064276),
-                                    ("Thursday<time> (timezone)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Chhathyear (latent)", -6.073044534100405),
+                                    ("Vasant Panchamiyear (latent)", -6.478509642208569),
+                                    ("Rabindra Jayantiyear (latent)", -5.225746673713201),
+                                    ("this <part-of-day>at <time-of-day>", -5.225746673713201),
+                                    ("St Patrick's Dayyear (latent)", -6.478509642208569),
+                                    ("Thursday<time> (timezone)", -6.478509642208569),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Pargat Diwasyear (latent)", -5.229579564568908),
-                                    ("<datetime> - <datetime> (interval)July", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Pargat Diwasyear (latent)", -5.225746673713201),
+                                    ("<datetime> - <datetime> (interval)July", -6.073044534100405),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.789195352504331),
-                                    ("Februaryintersect", -6.482342533064276),
-                                    ("Simchat Torahyear (latent)", -6.482342533064276),
-                                    ("minuteyear", -6.482342533064276)],
+                                     -5.785362461648624),
+                                    ("Februaryintersect", -6.478509642208569),
+                                    ("Simchat Torahyear (latent)", -6.478509642208569),
+                                    ("minuteyear", -6.478509642208569)],
                                n = 502},
                    koData =
-                     ClassData{prior = -0.9434193992624076, unseen = -6.8501261661455,
+                     ClassData{prior = -1.0024999544633555, unseen = -6.78105762593618,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.651841705297238),
-                                    ("hourday", -3.5532294166291285),
+                                   [("Thursdayhhhmm", -4.582697330136033),
+                                    ("hourday", -3.484085041467923),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)August", -6.155919102073512),
-                                    ("dayhour", -3.5909697446119755),
-                                    ("<time> timezoneyear (latent)", -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)August", -6.0867747269123065),
+                                    ("dayhour", -3.52182536945077),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.239628370199357),
-                                    ("Tuesdayfrom|since|after <time>", -5.462771921513567),
-                                    ("daymonth", -3.447868900971302),
-                                    ("hourquarter", -5.239628370199357),
-                                    ("monthday", -5.750453993965348),
-                                    ("monthyear", -4.903156133578144),
-                                    ("<time-of-day> am|pmyear (latent)", -5.462771921513567),
-                                    ("Thai Pongalyear (latent)", -5.462771921513567),
-                                    ("intersecthh:mm", -6.155919102073512),
+                                     -5.170483995038151),
+                                    ("Tuesdayfrom|since|after <time>", -5.393627546352362),
+                                    ("daymonth", -3.378724525810097),
+                                    ("hourquarter", -5.170483995038151),
+                                    ("monthday", -5.681309618804143),
+                                    ("monthyear", -4.834011758416939),
+                                    ("Thai Pongalyear (latent)", -5.393627546352362),
+                                    ("intersecthh:mm", -6.0867747269123065),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.750453993965348),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.155919102073512),
-                                    ("houryear", -4.364159632845457),
+                                     -5.681309618804143),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.0867747269123065),
+                                    ("houryear", -4.700480365792417),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)October", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)October", -6.0867747269123065),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.462771921513567),
-                                    ("hournograin", -4.903156133578144),
-                                    ("<time-of-day> am|pmintersect", -4.903156133578144),
-                                    ("Octoberyear (latent)", -6.155919102073512),
-                                    ("Good Fridayyear (latent)", -5.750453993965348),
+                                     -5.393627546352362),
+                                    ("hournograin", -4.834011758416939),
+                                    ("<time-of-day> am|pmintersect", -4.834011758416939),
+                                    ("Octoberyear (latent)", -6.0867747269123065),
+                                    ("Good Fridayyear (latent)", -5.681309618804143),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("early morningat <time-of-day>", -6.155919102073512),
-                                    ("until <time>on <day>", -5.462771921513567),
+                                     -5.681309618804143),
+                                    ("early morningat <time-of-day>", -6.0867747269123065),
+                                    ("until <time>on <day>", -5.393627546352362),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
-                                    ("time-of-day (latent)intersect", -5.462771921513567),
-                                    ("todayin <number> (implicit minutes)", -6.155919102073512),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("time-of-day (latent)intersect", -5.393627546352362),
+                                    ("todayin <number> (implicit minutes)", -6.0867747269123065),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.155919102073512),
-                                    ("hh:mmon <day>", -4.903156133578144),
-                                    ("hhhmmintersect", -5.750453993965348),
-                                    ("absorption of , after named dayJuly", -5.239628370199357),
-                                    ("from|since|after <time>July", -5.750453993965348),
+                                     -6.0867747269123065),
+                                    ("hh:mmon <day>", -4.834011758416939),
+                                    ("hhhmmintersect", -5.681309618804143),
+                                    ("absorption of , after named dayJuly", -5.170483995038151),
+                                    ("from|since|after <time>July", -5.681309618804143),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.239628370199357),
-                                    ("Clean Mondayyear (latent)", -6.155919102073512),
-                                    ("monthhour", -6.155919102073512),
+                                     -5.170483995038151),
+                                    ("Clean Mondayyear (latent)", -6.0867747269123065),
+                                    ("monthhour", -6.0867747269123065),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("hourmonth", -4.0158529385772415),
-                                    ("todayat <time-of-day>", -6.155919102073512),
-                                    ("hhhmmyear (latent)", -4.903156133578144),
-                                    ("from|since|after <time>December", -6.155919102073512),
+                                     -5.681309618804143),
+                                    ("hourmonth", -3.946708563416036),
+                                    ("todayat <time-of-day>", -6.0867747269123065),
+                                    ("from|since|after <time>December", -6.0867747269123065),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.155919102073512),
-                                    ("<time-of-day> am|pmon <day>", -4.903156133578144),
-                                    ("Mondayyear (latent)", -5.462771921513567),
-                                    ("dayday", -4.0158529385772415),
-                                    ("on <day>September", -5.462771921513567),
-                                    ("time-of-day (latent)September", -5.750453993965348),
-                                    ("hourhour", -4.076477560393676),
-                                    ("time-of-day (latent)on <day>", -4.651841705297238),
+                                     -6.0867747269123065),
+                                    ("<time-of-day> am|pmon <day>", -4.834011758416939),
+                                    ("Mondayyear (latent)", -5.393627546352362),
+                                    ("dayday", -3.946708563416036),
+                                    ("on <day>September", -5.393627546352362),
+                                    ("time-of-day (latent)September", -5.681309618804143),
+                                    ("hourhour", -4.007333185232471),
+                                    ("time-of-day (latent)on <day>", -4.582697330136033),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.750453993965348),
-                                    ("dayyear", -3.1354942159291497),
-                                    ("Thursdaymm/dd", -6.155919102073512),
-                                    ("New Year's Dayyear (latent)", -5.239628370199357),
-                                    ("time-of-day (latent)Sunday", -5.750453993965348),
-                                    ("Thursdayfrom|since|after <time>", -4.451171009835087),
-                                    ("Thursdayat <time-of-day>", -4.546481189639412),
+                                     -5.681309618804143),
+                                    ("dayyear", -3.283414346005772),
+                                    ("Thursdaymm/dd", -6.0867747269123065),
+                                    ("New Year's Dayyear (latent)", -5.170483995038151),
+                                    ("time-of-day (latent)Sunday", -5.681309618804143),
+                                    ("Thursdayfrom|since|after <time>", -4.382026634673881),
+                                    ("Thursdayat <time-of-day>", -4.477336814478207),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.155919102073512),
-                                    ("Aprilyear (latent)", -6.155919102073512),
-                                    ("the <day-of-month> (ordinal)July", -6.155919102073512),
-                                    ("the <day-of-month> (number)July", -6.155919102073512),
-                                    ("monthminute", -6.155919102073512),
-                                    ("<time-of-day> am|pmtomorrow", -5.750453993965348),
-                                    ("Thursdayhh:mm", -5.239628370199357),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.750453993965348),
-                                    ("minutemonth", -4.0158529385772415),
-                                    ("time-of-day (latent)Friday", -5.750453993965348),
-                                    ("minutehour", -6.155919102073512),
-                                    ("part of daysat <time-of-day>", -5.057306813405402),
+                                     -6.0867747269123065),
+                                    ("Aprilyear (latent)", -6.0867747269123065),
+                                    ("the <day-of-month> (ordinal)July", -6.0867747269123065),
+                                    ("the <day-of-month> (number)July", -6.0867747269123065),
+                                    ("monthminute", -6.0867747269123065),
+                                    ("<time-of-day> am|pmtomorrow", -5.681309618804143),
+                                    ("Thursdayhh:mm", -5.170483995038151),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.681309618804143),
+                                    ("minutemonth", -3.946708563416036),
+                                    ("time-of-day (latent)Friday", -5.681309618804143),
+                                    ("minutehour", -6.0867747269123065),
+                                    ("part of daysat <time-of-day>", -4.988162438244197),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.8045438449100346),
-                                    ("Augustyear (latent)", -5.750453993965348),
-                                    ("week-endin|during <named-month>|year", -6.155919102073512),
-                                    ("time-of-day (latent)Tuesday", -5.750453993965348),
+                                     -3.7353994697488293),
+                                    ("Augustyear (latent)", -5.681309618804143),
+                                    ("week-endin|during <named-month>|year", -6.0867747269123065),
+                                    ("time-of-day (latent)Tuesday", -5.681309618804143),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("July<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.155919102073512),
-                                    ("Sundayyear (latent)", -5.239628370199357),
-                                    ("hourweek", -5.239628370199357),
-                                    ("the <day-of-month> (ordinal)Monday", -5.462771921513567),
-                                    ("Christmasat <time-of-day>", -6.155919102073512),
-                                    ("from|since|after <time>year (latent)", -5.057306813405402),
-                                    ("hhhmmon <day>", -5.239628370199357),
-                                    ("yesterday<time-of-day> am|pm", -6.155919102073512),
-                                    ("<day-of-month> (ordinal)July", -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("Sundayyear (latent)", -5.170483995038151),
+                                    ("hourweek", -5.170483995038151),
+                                    ("the <day-of-month> (ordinal)Monday", -5.393627546352362),
+                                    ("Christmasat <time-of-day>", -6.0867747269123065),
+                                    ("from|since|after <time>year (latent)", -5.681309618804143),
+                                    ("hhhmmon <day>", -5.170483995038151),
+                                    ("yesterday<time-of-day> am|pm", -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)July", -5.393627546352362),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("August<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.155919102073512),
-                                    ("at <time-of-day>intersect", -5.239628370199357),
-                                    ("hh:mmyear (latent)", -4.769624740953621),
-                                    ("Holiyear (latent)", -6.155919102073512),
-                                    ("until <time><time-of-day> am|pm", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("at <time-of-day>intersect", -5.170483995038151),
+                                    ("Holiyear (latent)", -6.0867747269123065),
+                                    ("until <time><time-of-day> am|pm", -6.0867747269123065),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("dayminute", -3.322705758017296),
-                                    ("yyyy-mm-ddhh:mm", -5.750453993965348),
-                                    ("intersectfrom|since|after <time>", -5.750453993965348),
-                                    ("intersectSeptember", -4.28411692517192),
-                                    ("minuteday", -2.9989186809233987),
+                                     -5.681309618804143),
+                                    ("dayminute", -3.2535613828560908),
+                                    ("yyyy-mm-ddhh:mm", -5.681309618804143),
+                                    ("intersectfrom|since|after <time>", -5.681309618804143),
+                                    ("intersectSeptember", -4.214972550010716),
+                                    ("minuteday", -2.9297743057621934),
                                     ("absorption of , after named dayintersect",
-                                     -6.155919102073512),
-                                    ("intersectyear (latent)", -6.155919102073512),
-                                    ("Februaryin|during the <part-of-day>", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("intersectyear (latent)", -6.0867747269123065),
+                                    ("Februaryin|during the <part-of-day>", -6.0867747269123065),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.155919102073512),
-                                    ("time-of-day (latent)July", -5.462771921513567),
-                                    ("Saturdayyear (latent)", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("time-of-day (latent)July", -5.393627546352362),
+                                    ("Saturdayyear (latent)", -6.0867747269123065),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)Monday", -4.903156133578144),
-                                    ("at <time-of-day>on <day>", -5.239628370199357),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)Monday", -4.834011758416939),
+                                    ("at <time-of-day>on <day>", -5.170483995038151),
                                     ("absorption of , after named daySeptember",
-                                     -4.903156133578144),
-                                    ("Naraka Chaturdashiyear (latent)", -6.155919102073512),
-                                    ("from|since|after <time>on <day>", -5.239628370199357),
-                                    ("dayweek", -6.155919102073512),
-                                    ("Easter Sundayyear (latent)", -5.750453993965348),
-                                    ("Thursday<time-of-day> am|pm", -4.903156133578144),
-                                    ("weekyear", -5.750453993965348),
-                                    ("time-of-day (latent)Thursday", -5.750453993965348),
+                                     -4.834011758416939),
+                                    ("Naraka Chaturdashiyear (latent)", -6.0867747269123065),
+                                    ("from|since|after <time>on <day>", -5.170483995038151),
+                                    ("dayweek", -6.0867747269123065),
+                                    ("Easter Sundayyear (latent)", -5.681309618804143),
+                                    ("Thursday<time-of-day> am|pm", -4.834011758416939),
+                                    ("weekyear", -5.681309618804143),
+                                    ("time-of-day (latent)Thursday", -5.681309618804143),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)April", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)April", -6.0867747269123065),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.750453993965348),
+                                     -5.681309618804143),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.462771921513567),
-                                    ("Sundayfrom|since|after <time>", -6.155919102073512),
-                                    ("absorption of , after named dayFebruary", -5.239628370199357),
+                                     -5.393627546352362),
+                                    ("Sundayfrom|since|after <time>", -6.0867747269123065),
+                                    ("absorption of , after named dayFebruary", -5.170483995038151),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.750453993965348),
+                                     -5.681309618804143),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.155919102073512),
-                                    ("tomorrowat <time-of-day>", -6.155919102073512),
-                                    ("daynograin", -5.750453993965348),
-                                    ("Fridayin|during <named-month>|year", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("tomorrowat <time-of-day>", -6.0867747269123065),
+                                    ("daynograin", -5.681309618804143),
+                                    ("Fridayin|during <named-month>|year", -6.0867747269123065),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.750453993965348),
-                                    ("last <cycle> of <time>year (latent)", -5.750453993965348),
-                                    ("tomorrow<time-of-day> am|pm", -6.155919102073512),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.462771921513567),
-                                    ("Diwaliyear (latent)", -5.750453993965348),
+                                     -5.681309618804143),
+                                    ("last <cycle> of <time>year (latent)", -5.681309618804143),
+                                    ("tomorrow<time-of-day> am|pm", -6.0867747269123065),
+                                    ("Diwaliyear (latent)", -5.681309618804143),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.155919102073512),
-                                    ("this <part-of-day>at <time-of-day>", -5.239628370199357),
-                                    ("Fridayyear (latent)", -5.239628370199357),
-                                    ("time-of-day (latent)April", -6.155919102073512),
-                                    ("minuteyear", -3.9586945247372927)],
-                               n = 320}}),
+                                     -6.0867747269123065),
+                                    ("this <part-of-day>at <time-of-day>", -5.170483995038151),
+                                    ("Fridayyear (latent)", -5.170483995038151),
+                                    ("time-of-day (latent)April", -6.0867747269123065)],
+                               n = 291}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1742,22 +1730,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.14681486833704485,
-                               unseen = -5.393627546352362,
+                     ClassData{prior = -4.546237407675729e-2,
+                               unseen = -5.389071729816501,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.7779564107075706e-2),
-                                    ("intersect 2 numbers", -4.00277736869661)],
+                                   [("integer (numeric)", -2.320289707966387e-2),
+                                    ("intersect 2 numbers", -3.9982007016691985)],
                                n = 215},
                    koData =
-                     ClassData{prior = -1.9910923718485463,
-                               unseen = -3.6635616461296463,
+                     ClassData{prior = -3.1135153092103742, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.55814461804655),
-                                    ("negative numbers", -0.41871033485818493),
-                                    ("compose by multiplication", -2.2512917986064953)],
-                               n = 34}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("mm/dd/yyyy",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,

Duckling/Ranking/Classifiers/EN_TT.hs

@@ -276,7 +276,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -297,44 +297,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -992,467 +992,455 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.49314027536445065,
-                               unseen = -7.176254532017144,
+                     ClassData{prior = -0.4572231019431188, unseen = -7.172424577124845,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.482342533064276),
-                                    ("Karva Chauthyear (latent)", -6.482342533064276),
+                                   [("Navaratriyear (latent)", -6.478509642208569),
+                                    ("Karva Chauthyear (latent)", -6.478509642208569),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Maha Shivaratriyear (latent)", -6.482342533064276),
-                                    ("Ramadanyear (latent)", -5.229579564568908),
+                                     -6.478509642208569),
+                                    ("Maha Shivaratriyear (latent)", -6.478509642208569),
+                                    ("Ramadanyear (latent)", -5.225746673713201),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.096048171944386),
-                                    ("Bhai Doojyear (latent)", -6.482342533064276),
-                                    ("hourday", -4.467439512522012),
-                                    ("dayhour", -3.4378200953408538),
+                                     -5.092215281088679),
+                                    ("Bhai Doojyear (latent)", -6.478509642208569),
+                                    ("hourday", -4.463606621666305),
+                                    ("dayhour", -3.4339872044851463),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.096048171944386),
-                                    ("Martin Luther King's Dayyear (latent)", -6.076877424956113),
-                                    ("Shemini Atzeretyear (latent)", -6.482342533064276),
-                                    ("daymonth", -4.467439512522012),
-                                    ("monthday", -6.076877424956113),
-                                    ("monthyear", -4.690583063836222),
-                                    ("Yom Ha'atzmautyear (latent)", -6.482342533064276),
-                                    ("Orthodox Good Fridayyear (latent)", -6.076877424956113),
-                                    ("Vijayadashamiyear (latent)", -6.482342533064276),
-                                    ("Thai Pongalyear (latent)", -5.789195352504331),
-                                    ("Thiru Onamyear (latent)", -5.789195352504331),
-                                    ("hhhmmabsorption of , after named day", -6.482342533064276),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.482342533064276),
+                                     -5.092215281088679),
+                                    ("Martin Luther King's Dayyear (latent)", -6.073044534100405),
+                                    ("Shemini Atzeretyear (latent)", -6.478509642208569),
+                                    ("daymonth", -4.463606621666305),
+                                    ("monthday", -6.073044534100405),
+                                    ("monthyear", -4.686750172980514),
+                                    ("Yom Ha'atzmautyear (latent)", -6.478509642208569),
+                                    ("Orthodox Good Fridayyear (latent)", -6.073044534100405),
+                                    ("Vijayadashamiyear (latent)", -6.478509642208569),
+                                    ("Thai Pongalyear (latent)", -5.785362461648624),
+                                    ("Thiru Onamyear (latent)", -5.785362461648624),
+                                    ("hhhmmabsorption of , after named day", -6.478509642208569),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.478509642208569),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.566051801190121),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.482342533064276),
-                                    ("Krishna Janmashtamiyear (latent)", -6.076877424956113),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.482342533064276),
-                                    ("houryear", -5.566051801190121),
+                                     -5.562218910334414),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.478509642208569),
+                                    ("Krishna Janmashtamiyear (latent)", -6.073044534100405),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.478509642208569),
+                                    ("houryear", -5.562218910334414),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("Christmas<time-of-day> am|pm", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Christmas<time-of-day> am|pm", -6.478509642208569),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.789195352504331),
-                                    ("intersectin|during <named-month>|year", -6.482342533064276),
-                                    ("<time-of-day> am|pmintersect", -5.229579564568908),
-                                    ("Earth Houryear (latent)", -6.482342533064276),
-                                    ("Ganesh Chaturthiyear (latent)", -6.482342533064276),
-                                    ("Octoberyear (latent)", -4.978265136288003),
-                                    ("intersect<time-of-day> am|pm", -6.482342533064276),
-                                    ("Mattu Pongalyear (latent)", -6.482342533064276),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.482342533064276),
-                                    ("Shavuotyear (latent)", -6.482342533064276),
-                                    ("Parsi New Yearyear (latent)", -5.566051801190121),
+                                     -5.785362461648624),
+                                    ("intersectin|during <named-month>|year", -6.478509642208569),
+                                    ("<time-of-day> am|pmintersect", -5.225746673713201),
+                                    ("Earth Houryear (latent)", -6.478509642208569),
+                                    ("Ganesh Chaturthiyear (latent)", -6.478509642208569),
+                                    ("Octoberyear (latent)", -4.974432245432295),
+                                    ("intersect<time-of-day> am|pm", -6.478509642208569),
+                                    ("Mattu Pongalyear (latent)", -6.478509642208569),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.478509642208569),
+                                    ("Shavuotyear (latent)", -6.478509642208569),
+                                    ("Parsi New Yearyear (latent)", -5.562218910334414),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.482342533064276),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.482342533064276),
-                                    ("todayin|within|after <duration>", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.478509642208569),
+                                    ("todayin|within|after <duration>", -6.478509642208569),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.076877424956113),
-                                    ("Marchyear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("Marchyear (latent)", -6.478509642208569),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.076877424956113),
-                                    ("Sukkotyear (latent)", -6.076877424956113),
-                                    ("hhhmmintersect", -6.076877424956113),
+                                     -6.073044534100405),
+                                    ("Sukkotyear (latent)", -6.073044534100405),
+                                    ("hhhmmintersect", -6.073044534100405),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.076877424956113),
-                                    ("Clean Mondayyear (latent)", -6.076877424956113),
-                                    ("monthhour", -6.076877424956113),
+                                     -6.073044534100405),
+                                    ("Clean Mondayyear (latent)", -6.073044534100405),
+                                    ("monthhour", -6.073044534100405),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.566051801190121),
-                                    ("todayat <time-of-day>", -6.482342533064276),
-                                    ("Thursday<time> timezone", -4.0844472602659065),
-                                    ("tonight<time-of-day> am|pm", -6.482342533064276),
-                                    ("time-of-day (latent)tonight", -6.076877424956113),
-                                    ("from|since|after <time>December", -6.482342533064276),
-                                    ("<time-of-day> am|pmon <day>", -4.467439512522012),
+                                     -5.562218910334414),
+                                    ("todayat <time-of-day>", -6.478509642208569),
+                                    ("Thursday<time> timezone", -4.080614369410199),
+                                    ("tonight<time-of-day> am|pm", -6.478509642208569),
+                                    ("time-of-day (latent)tonight", -6.073044534100405),
+                                    ("from|since|after <time>December", -6.478509642208569),
+                                    ("<time-of-day> am|pmon <day>", -4.463606621666305),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.076877424956113),
-                                    ("dayday", -3.7097538108244956),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.076877424956113),
-                                    ("tonightat <time-of-day>", -5.383730244396167),
+                                     -6.478509642208569),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.073044534100405),
+                                    ("dayday", -3.705920919968788),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.073044534100405),
+                                    ("tonightat <time-of-day>", -5.37989735354046),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.789195352504331),
+                                     -5.785362461648624),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.482342533064276),
-                                    ("today<time-of-day> am|pm", -6.482342533064276),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.076877424956113),
-                                    ("at <time-of-day><time> <part-of-day>", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)intersect", -6.076877424956113),
-                                    ("hourhour", -3.5119280674945754),
-                                    ("Mahavir Jayantiyear (latent)", -6.076877424956113),
-                                    ("Navaratriin|during <named-month>|year", -6.482342533064276),
-                                    ("Wednesdaythis|last|next <cycle>", -6.482342533064276),
-                                    ("Lentyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("today<time-of-day> am|pm", -6.478509642208569),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.073044534100405),
+                                    ("at <time-of-day><time> <part-of-day>", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)intersect", -6.073044534100405),
+                                    ("hourhour", -3.5080951766388684),
+                                    ("Mahavir Jayantiyear (latent)", -6.073044534100405),
+                                    ("Navaratriin|during <named-month>|year", -6.478509642208569),
+                                    ("Wednesdaythis|last|next <cycle>", -6.478509642208569),
+                                    ("Lentyear (latent)", -6.478509642208569),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.610540356162685),
-                                    ("Boghiyear (latent)", -6.482342533064276),
-                                    ("dayyear", -1.923216285577592),
+                                     -4.606707465306978),
+                                    ("Boghiyear (latent)", -6.478509642208569),
+                                    ("dayyear", -1.9193833947218846),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.482342533064276),
-                                    ("Thursdayfrom|since|after <time>", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Thursdayfrom|since|after <time>", -6.073044534100405),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Thursdayat <time-of-day>", -5.789195352504331),
-                                    ("Islamic New Yearyear (latent)", -6.076877424956113),
-                                    ("Laylat al-Qadryear (latent)", -5.566051801190121),
-                                    ("part of days<time-of-day> am|pm", -6.482342533064276),
-                                    ("Shrove Tuesdayyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Thursdayat <time-of-day>", -5.785362461648624),
+                                    ("Islamic New Yearyear (latent)", -6.073044534100405),
+                                    ("Laylat al-Qadryear (latent)", -5.562218910334414),
+                                    ("part of days<time-of-day> am|pm", -6.478509642208569),
+                                    ("Shrove Tuesdayyear (latent)", -6.478509642208569),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.789195352504331),
-                                    ("hourminute", -6.076877424956113),
-                                    ("<time-of-day> am|pmtomorrow", -5.566051801190121),
-                                    ("Yom Kippuryear (latent)", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.789195352504331),
-                                    ("<part-of-day> of <time>year (latent)", -6.482342533064276),
-                                    ("minutehour", -5.229579564568908),
-                                    ("Kaanum Pongalyear (latent)", -6.076877424956113),
-                                    ("Maha Saptamiyear (latent)", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("hourminute", -6.073044534100405),
+                                    ("<time-of-day> am|pmtomorrow", -5.562218910334414),
+                                    ("Yom Kippuryear (latent)", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.785362461648624),
+                                    ("<part-of-day> of <time>year (latent)", -6.478509642208569),
+                                    ("minutehour", -5.225746673713201),
+                                    ("Kaanum Pongalyear (latent)", -6.073044534100405),
+                                    ("Maha Saptamiyear (latent)", -6.478509642208569),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.789195352504331),
-                                    ("time-of-day (latent)tomorrow", -5.566051801190121),
-                                    ("part of daysat <time-of-day>", -4.872904620630176),
+                                     -5.785362461648624),
+                                    ("time-of-day (latent)tomorrow", -5.562218910334414),
+                                    ("part of daysat <time-of-day>", -4.869071729774469),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.467439512522012),
-                                    ("for <duration> from <time>December", -6.482342533064276),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.482342533064276),
+                                     -4.463606621666305),
+                                    ("for <duration> from <time>December", -6.478509642208569),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.478509642208569),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.229579564568908),
+                                     -5.225746673713201),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.229579564568908),
-                                    ("time-of-day (latent)this <part-of-day>", -6.482342533064276),
-                                    ("Pentecostyear (latent)", -6.482342533064276),
+                                     -5.225746673713201),
+                                    ("time-of-day (latent)this <part-of-day>", -6.478509642208569),
+                                    ("Pentecostyear (latent)", -6.478509642208569),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.229579564568908),
-                                    ("<day-of-month> (ordinal)February", -6.482342533064276),
-                                    ("Eid al-Fitryear (latent)", -5.096048171944386),
+                                     -5.225746673713201),
+                                    ("<day-of-month> (ordinal)February", -6.478509642208569),
+                                    ("Eid al-Fitryear (latent)", -5.092215281088679),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.482342533064276),
-                                    ("Mondayin|during the <part-of-day>", -6.482342533064276),
-                                    ("Chhathin|during <named-month>|year", -6.482342533064276),
-                                    ("Diwaliin|during <named-month>|year", -6.482342533064276),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.482342533064276),
-                                    ("Vaisakhiin|during <named-month>|year", -6.482342533064276),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.229579564568908),
-                                    ("Raksha Bandhanyear (latent)", -6.482342533064276),
-                                    ("daysecond", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Mondayin|during the <part-of-day>", -6.478509642208569),
+                                    ("Chhathin|during <named-month>|year", -6.478509642208569),
+                                    ("Diwaliin|during <named-month>|year", -6.478509642208569),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.478509642208569),
+                                    ("Vaisakhiin|during <named-month>|year", -6.478509642208569),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.225746673713201),
+                                    ("Raksha Bandhanyear (latent)", -6.478509642208569),
+                                    ("daysecond", -6.073044534100405),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.076877424956113),
-                                    ("Ratha-Yatrayear (latent)", -6.482342533064276),
-                                    ("Ashurayear (latent)", -6.482342533064276),
-                                    ("Tuesdayin|during <named-month>|year", -6.482342533064276),
-                                    ("Chinese New Yearyear (latent)", -6.482342533064276),
-                                    ("tomorrowintersect", -6.482342533064276),
-                                    ("Lag BaOmeryear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("Ratha-Yatrayear (latent)", -6.478509642208569),
+                                    ("Ashurayear (latent)", -6.478509642208569),
+                                    ("Tuesdayin|during <named-month>|year", -6.478509642208569),
+                                    ("Chinese New Yearyear (latent)", -6.478509642208569),
+                                    ("tomorrowintersect", -6.478509642208569),
+                                    ("Lag BaOmeryear (latent)", -6.478509642208569),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.482342533064276),
-                                    ("Eid al-Adhayear (latent)", -4.342276369568006),
-                                    ("intersectin|during the <part-of-day>", -6.482342533064276),
-                                    ("Palm Sundayyear (latent)", -6.482342533064276),
-                                    ("Christmasat <time-of-day>", -6.482342533064276),
-                                    ("Passoveryear (latent)", -6.482342533064276),
-                                    ("Lazarus Saturdayyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Eid al-Adhayear (latent)", -4.338443478712298),
+                                    ("intersectin|during the <part-of-day>", -6.478509642208569),
+                                    ("Palm Sundayyear (latent)", -6.478509642208569),
+                                    ("Christmasat <time-of-day>", -6.478509642208569),
+                                    ("Passoveryear (latent)", -6.478509642208569),
+                                    ("Lazarus Saturdayyear (latent)", -6.478509642208569),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.482342533064276),
-                                    ("hhhmmon <day>", -5.566051801190121),
-                                    ("Yom HaShoahyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("hhhmmon <day>", -5.562218910334414),
+                                    ("Yom HaShoahyear (latent)", -6.073044534100405),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Septemberyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Septemberyear (latent)", -6.073044534100405),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.978265136288003),
-                                    ("Halloweenyear (latent)", -6.482342533064276),
+                                     -4.974432245432295),
+                                    ("Halloweenyear (latent)", -6.478509642208569),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.789195352504331),
+                                     -5.785362461648624),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("at <time-of-day>intersect", -5.566051801190121),
-                                    ("Rosh Hashanahyear (latent)", -5.789195352504331),
-                                    ("Dhanterasyear (latent)", -6.482342533064276),
-                                    ("Tu BiShvatyear (latent)", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)December", -5.789195352504331),
-                                    ("Holiyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("at <time-of-day>intersect", -5.562218910334414),
+                                    ("Rosh Hashanahyear (latent)", -5.785362461648624),
+                                    ("Dhanterasyear (latent)", -6.478509642208569),
+                                    ("Tu BiShvatyear (latent)", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)December", -5.785362461648624),
+                                    ("Holiyear (latent)", -5.785362461648624),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.482342533064276),
-                                    ("Holika Dahanyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("Holika Dahanyear (latent)", -5.785362461648624),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.076877424956113),
-                                    ("dayminute", -3.168156528391751),
-                                    ("Mawlidyear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("dayminute", -3.1643236375360435),
+                                    ("Mawlidyear (latent)", -6.478509642208569),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.482342533064276),
-                                    ("Jumu'atul-Widayear (latent)", -5.566051801190121),
-                                    ("minuteday", -2.7328384571339055),
+                                     -6.478509642208569),
+                                    ("Jumu'atul-Widayear (latent)", -5.562218910334414),
+                                    ("minuteday", -2.729005566278198),
                                     ("absorption of , after named dayintersect",
-                                     -5.789195352504331),
-                                    ("intersectyear (latent)", -6.482342533064276),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("intersectyear (latent)", -6.478509642208569),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.478509642208569),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.482342533064276),
-                                    ("intersecthhhmm", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("intersecthhhmm", -6.073044534100405),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Boss's Dayyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Boss's Dayyear (latent)", -6.073044534100405),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.482342533064276),
-                                    ("Global Youth Service Dayyear (latent)", -6.482342533064276),
-                                    ("Dhanterasin|during <named-month>|year", -6.482342533064276),
-                                    ("tonight<time-of-day> o'clock", -6.482342533064276),
-                                    ("Tisha B'Avyear (latent)", -6.482342533064276),
-                                    ("Isra and Mi'rajyear (latent)", -5.566051801190121),
-                                    ("at <time-of-day>on <day>", -4.872904620630176),
+                                     -6.478509642208569),
+                                    ("Global Youth Service Dayyear (latent)", -6.478509642208569),
+                                    ("Dhanterasin|during <named-month>|year", -6.478509642208569),
+                                    ("tonight<time-of-day> o'clock", -6.478509642208569),
+                                    ("Tisha B'Avyear (latent)", -6.478509642208569),
+                                    ("Isra and Mi'rajyear (latent)", -5.562218910334414),
+                                    ("at <time-of-day>on <day>", -4.869071729774469),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.789195352504331),
-                                    ("Christmasyear (latent)", -6.076877424956113),
-                                    ("Saturdayintersect", -6.482342533064276),
-                                    ("Naraka Chaturdashiyear (latent)", -6.076877424956113),
-                                    ("Thai Pongalin|during <named-month>|year", -6.482342533064276),
-                                    ("dayweek", -6.482342533064276),
-                                    ("Easter Sundayyear (latent)", -5.789195352504331),
+                                     -5.785362461648624),
+                                    ("Christmasyear (latent)", -6.073044534100405),
+                                    ("Saturdayintersect", -6.478509642208569),
+                                    ("Naraka Chaturdashiyear (latent)", -6.073044534100405),
+                                    ("Thai Pongalin|during <named-month>|year", -6.478509642208569),
+                                    ("dayweek", -6.478509642208569),
+                                    ("Easter Sundayyear (latent)", -5.785362461648624),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.076877424956113),
-                                    ("weekyear", -5.383730244396167),
-                                    ("King's Dayyear (latent)", -4.978265136288003),
-                                    ("hh:mmin|during the <part-of-day>", -5.566051801190121),
+                                     -6.073044534100405),
+                                    ("weekyear", -5.37989735354046),
+                                    ("King's Dayyear (latent)", -4.974432245432295),
+                                    ("hh:mmin|during the <part-of-day>", -5.562218910334414),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.789195352504331),
-                                    ("Hanukkahyear (latent)", -5.789195352504331),
-                                    ("Rama Navamiyear (latent)", -6.482342533064276),
-                                    ("February<time> <part-of-day>", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("Hanukkahyear (latent)", -5.785362461648624),
+                                    ("Rama Navamiyear (latent)", -6.478509642208569),
+                                    ("February<time> <part-of-day>", -6.478509642208569),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.789195352504331),
-                                    ("Great Lentyear (latent)", -6.482342533064276),
-                                    ("tomorrowat <time-of-day>", -5.789195352504331),
+                                     -5.785362461648624),
+                                    ("Great Lentyear (latent)", -6.478509642208569),
+                                    ("tomorrowat <time-of-day>", -5.785362461648624),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.076877424956113),
-                                    ("Ugadiyear (latent)", -5.096048171944386),
-                                    ("Vaisakhiyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.073044534100405),
+                                    ("Ugadiyear (latent)", -5.092215281088679),
+                                    ("Vaisakhiyear (latent)", -5.785362461648624),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.789195352504331),
-                                    ("last <cycle> of <time>year (latent)", -5.789195352504331),
-                                    ("at <time-of-day>tomorrow", -6.076877424956113),
-                                    ("tomorrow<time-of-day> am|pm", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("last <cycle> of <time>year (latent)", -5.785362461648624),
+                                    ("at <time-of-day>tomorrow", -6.073044534100405),
+                                    ("tomorrow<time-of-day> am|pm", -6.478509642208569),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.482342533064276),
-                                    ("Diwaliyear (latent)", -6.482342533064276),
-                                    ("between <time> and <time>on <day>", -6.076877424956113),
-                                    ("Black Fridayyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Diwaliyear (latent)", -6.478509642208569),
+                                    ("between <time> and <time>on <day>", -6.073044534100405),
+                                    ("Black Fridayyear (latent)", -6.073044534100405),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.482342533064276),
-                                    ("Chhathyear (latent)", -6.076877424956113),
-                                    ("Vasant Panchamiyear (latent)", -6.482342533064276),
-                                    ("Rabindra Jayantiyear (latent)", -5.229579564568908),
-                                    ("this <part-of-day>at <time-of-day>", -5.229579564568908),
-                                    ("St Patrick's Dayyear (latent)", -6.482342533064276),
-                                    ("Thursday<time> (timezone)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Chhathyear (latent)", -6.073044534100405),
+                                    ("Vasant Panchamiyear (latent)", -6.478509642208569),
+                                    ("Rabindra Jayantiyear (latent)", -5.225746673713201),
+                                    ("this <part-of-day>at <time-of-day>", -5.225746673713201),
+                                    ("St Patrick's Dayyear (latent)", -6.478509642208569),
+                                    ("Thursday<time> (timezone)", -6.478509642208569),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Pargat Diwasyear (latent)", -5.229579564568908),
-                                    ("<datetime> - <datetime> (interval)July", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Pargat Diwasyear (latent)", -5.225746673713201),
+                                    ("<datetime> - <datetime> (interval)July", -6.073044534100405),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.789195352504331),
-                                    ("Februaryintersect", -6.482342533064276),
-                                    ("Simchat Torahyear (latent)", -6.482342533064276),
-                                    ("minuteyear", -6.482342533064276)],
+                                     -5.785362461648624),
+                                    ("Februaryintersect", -6.478509642208569),
+                                    ("Simchat Torahyear (latent)", -6.478509642208569),
+                                    ("minuteyear", -6.478509642208569)],
                                n = 502},
                    koData =
-                     ClassData{prior = -0.9434193992624076, unseen = -6.8501261661455,
+                     ClassData{prior = -1.0024999544633555, unseen = -6.78105762593618,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.651841705297238),
-                                    ("hourday", -3.5532294166291285),
+                                   [("Thursdayhhhmm", -4.582697330136033),
+                                    ("hourday", -3.484085041467923),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)August", -6.155919102073512),
-                                    ("dayhour", -3.5909697446119755),
-                                    ("<time> timezoneyear (latent)", -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)August", -6.0867747269123065),
+                                    ("dayhour", -3.52182536945077),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.239628370199357),
-                                    ("Tuesdayfrom|since|after <time>", -5.462771921513567),
-                                    ("daymonth", -3.447868900971302),
-                                    ("hourquarter", -5.239628370199357),
-                                    ("monthday", -5.750453993965348),
-                                    ("monthyear", -4.903156133578144),
-                                    ("<time-of-day> am|pmyear (latent)", -5.462771921513567),
-                                    ("Thai Pongalyear (latent)", -5.462771921513567),
-                                    ("intersecthh:mm", -6.155919102073512),
+                                     -5.170483995038151),
+                                    ("Tuesdayfrom|since|after <time>", -5.393627546352362),
+                                    ("daymonth", -3.378724525810097),
+                                    ("hourquarter", -5.170483995038151),
+                                    ("monthday", -5.681309618804143),
+                                    ("monthyear", -4.834011758416939),
+                                    ("Thai Pongalyear (latent)", -5.393627546352362),
+                                    ("intersecthh:mm", -6.0867747269123065),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.750453993965348),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.155919102073512),
-                                    ("houryear", -4.364159632845457),
+                                     -5.681309618804143),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.0867747269123065),
+                                    ("houryear", -4.700480365792417),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)October", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)October", -6.0867747269123065),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.462771921513567),
-                                    ("hournograin", -4.903156133578144),
-                                    ("<time-of-day> am|pmintersect", -4.903156133578144),
-                                    ("Octoberyear (latent)", -6.155919102073512),
-                                    ("Good Fridayyear (latent)", -5.750453993965348),
+                                     -5.393627546352362),
+                                    ("hournograin", -4.834011758416939),
+                                    ("<time-of-day> am|pmintersect", -4.834011758416939),
+                                    ("Octoberyear (latent)", -6.0867747269123065),
+                                    ("Good Fridayyear (latent)", -5.681309618804143),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("early morningat <time-of-day>", -6.155919102073512),
-                                    ("until <time>on <day>", -5.462771921513567),
+                                     -5.681309618804143),
+                                    ("early morningat <time-of-day>", -6.0867747269123065),
+                                    ("until <time>on <day>", -5.393627546352362),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
-                                    ("time-of-day (latent)intersect", -5.462771921513567),
-                                    ("todayin <number> (implicit minutes)", -6.155919102073512),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("time-of-day (latent)intersect", -5.393627546352362),
+                                    ("todayin <number> (implicit minutes)", -6.0867747269123065),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.155919102073512),
-                                    ("hh:mmon <day>", -4.903156133578144),
-                                    ("hhhmmintersect", -5.750453993965348),
-                                    ("absorption of , after named dayJuly", -5.239628370199357),
-                                    ("from|since|after <time>July", -5.750453993965348),
+                                     -6.0867747269123065),
+                                    ("hh:mmon <day>", -4.834011758416939),
+                                    ("hhhmmintersect", -5.681309618804143),
+                                    ("absorption of , after named dayJuly", -5.170483995038151),
+                                    ("from|since|after <time>July", -5.681309618804143),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.239628370199357),
-                                    ("Clean Mondayyear (latent)", -6.155919102073512),
-                                    ("monthhour", -6.155919102073512),
+                                     -5.170483995038151),
+                                    ("Clean Mondayyear (latent)", -6.0867747269123065),
+                                    ("monthhour", -6.0867747269123065),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("hourmonth", -4.0158529385772415),
-                                    ("todayat <time-of-day>", -6.155919102073512),
-                                    ("hhhmmyear (latent)", -4.903156133578144),
-                                    ("from|since|after <time>December", -6.155919102073512),
+                                     -5.681309618804143),
+                                    ("hourmonth", -3.946708563416036),
+                                    ("todayat <time-of-day>", -6.0867747269123065),
+                                    ("from|since|after <time>December", -6.0867747269123065),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.155919102073512),
-                                    ("<time-of-day> am|pmon <day>", -4.903156133578144),
-                                    ("Mondayyear (latent)", -5.462771921513567),
-                                    ("dayday", -4.0158529385772415),
-                                    ("on <day>September", -5.462771921513567),
-                                    ("time-of-day (latent)September", -5.750453993965348),
-                                    ("hourhour", -4.076477560393676),
-                                    ("time-of-day (latent)on <day>", -4.651841705297238),
-                                    ("Thursdaydd/mm", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<time-of-day> am|pmon <day>", -4.834011758416939),
+                                    ("Mondayyear (latent)", -5.393627546352362),
+                                    ("dayday", -3.946708563416036),
+                                    ("on <day>September", -5.393627546352362),
+                                    ("time-of-day (latent)September", -5.681309618804143),
+                                    ("hourhour", -4.007333185232471),
+                                    ("time-of-day (latent)on <day>", -4.582697330136033),
+                                    ("Thursdaydd/mm", -6.0867747269123065),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.750453993965348),
-                                    ("dayyear", -3.1354942159291497),
-                                    ("New Year's Dayyear (latent)", -5.239628370199357),
-                                    ("time-of-day (latent)Sunday", -5.750453993965348),
-                                    ("Thursdayfrom|since|after <time>", -4.451171009835087),
-                                    ("Thursdayat <time-of-day>", -4.546481189639412),
+                                     -5.681309618804143),
+                                    ("dayyear", -3.283414346005772),
+                                    ("New Year's Dayyear (latent)", -5.170483995038151),
+                                    ("time-of-day (latent)Sunday", -5.681309618804143),
+                                    ("Thursdayfrom|since|after <time>", -4.382026634673881),
+                                    ("Thursdayat <time-of-day>", -4.477336814478207),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.155919102073512),
-                                    ("Aprilyear (latent)", -6.155919102073512),
-                                    ("the <day-of-month> (ordinal)July", -6.155919102073512),
-                                    ("the <day-of-month> (number)July", -6.155919102073512),
-                                    ("monthminute", -6.155919102073512),
-                                    ("<time-of-day> am|pmtomorrow", -5.750453993965348),
-                                    ("Thursdayhh:mm", -5.239628370199357),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.750453993965348),
-                                    ("minutemonth", -4.0158529385772415),
-                                    ("time-of-day (latent)Friday", -5.750453993965348),
-                                    ("minutehour", -6.155919102073512),
-                                    ("part of daysat <time-of-day>", -5.057306813405402),
+                                     -6.0867747269123065),
+                                    ("Aprilyear (latent)", -6.0867747269123065),
+                                    ("the <day-of-month> (ordinal)July", -6.0867747269123065),
+                                    ("the <day-of-month> (number)July", -6.0867747269123065),
+                                    ("monthminute", -6.0867747269123065),
+                                    ("<time-of-day> am|pmtomorrow", -5.681309618804143),
+                                    ("Thursdayhh:mm", -5.170483995038151),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.681309618804143),
+                                    ("minutemonth", -3.946708563416036),
+                                    ("time-of-day (latent)Friday", -5.681309618804143),
+                                    ("minutehour", -6.0867747269123065),
+                                    ("part of daysat <time-of-day>", -4.988162438244197),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.8045438449100346),
-                                    ("Augustyear (latent)", -5.750453993965348),
-                                    ("week-endin|during <named-month>|year", -6.155919102073512),
-                                    ("time-of-day (latent)Tuesday", -5.750453993965348),
+                                     -3.7353994697488293),
+                                    ("Augustyear (latent)", -5.681309618804143),
+                                    ("week-endin|during <named-month>|year", -6.0867747269123065),
+                                    ("time-of-day (latent)Tuesday", -5.681309618804143),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("July<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.155919102073512),
-                                    ("Sundayyear (latent)", -5.239628370199357),
-                                    ("hourweek", -5.239628370199357),
-                                    ("the <day-of-month> (ordinal)Monday", -5.462771921513567),
-                                    ("Christmasat <time-of-day>", -6.155919102073512),
-                                    ("from|since|after <time>year (latent)", -5.057306813405402),
-                                    ("hhhmmon <day>", -5.239628370199357),
-                                    ("yesterday<time-of-day> am|pm", -6.155919102073512),
-                                    ("<day-of-month> (ordinal)July", -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("Sundayyear (latent)", -5.170483995038151),
+                                    ("hourweek", -5.170483995038151),
+                                    ("the <day-of-month> (ordinal)Monday", -5.393627546352362),
+                                    ("Christmasat <time-of-day>", -6.0867747269123065),
+                                    ("from|since|after <time>year (latent)", -5.681309618804143),
+                                    ("hhhmmon <day>", -5.170483995038151),
+                                    ("yesterday<time-of-day> am|pm", -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)July", -5.393627546352362),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("August<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.155919102073512),
-                                    ("at <time-of-day>intersect", -5.239628370199357),
-                                    ("hh:mmyear (latent)", -4.769624740953621),
-                                    ("Holiyear (latent)", -6.155919102073512),
-                                    ("until <time><time-of-day> am|pm", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("at <time-of-day>intersect", -5.170483995038151),
+                                    ("Holiyear (latent)", -6.0867747269123065),
+                                    ("until <time><time-of-day> am|pm", -6.0867747269123065),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("dayminute", -3.322705758017296),
-                                    ("yyyy-mm-ddhh:mm", -5.750453993965348),
-                                    ("intersectfrom|since|after <time>", -5.750453993965348),
-                                    ("intersectSeptember", -4.28411692517192),
-                                    ("minuteday", -2.9989186809233987),
+                                     -5.681309618804143),
+                                    ("dayminute", -3.2535613828560908),
+                                    ("yyyy-mm-ddhh:mm", -5.681309618804143),
+                                    ("intersectfrom|since|after <time>", -5.681309618804143),
+                                    ("intersectSeptember", -4.214972550010716),
+                                    ("minuteday", -2.9297743057621934),
                                     ("absorption of , after named dayintersect",
-                                     -6.155919102073512),
-                                    ("intersectyear (latent)", -6.155919102073512),
-                                    ("Februaryin|during the <part-of-day>", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("intersectyear (latent)", -6.0867747269123065),
+                                    ("Februaryin|during the <part-of-day>", -6.0867747269123065),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.155919102073512),
-                                    ("time-of-day (latent)July", -5.462771921513567),
-                                    ("Saturdayyear (latent)", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("time-of-day (latent)July", -5.393627546352362),
+                                    ("Saturdayyear (latent)", -6.0867747269123065),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)Monday", -4.903156133578144),
-                                    ("at <time-of-day>on <day>", -5.239628370199357),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)Monday", -4.834011758416939),
+                                    ("at <time-of-day>on <day>", -5.170483995038151),
                                     ("absorption of , after named daySeptember",
-                                     -4.903156133578144),
-                                    ("Naraka Chaturdashiyear (latent)", -6.155919102073512),
-                                    ("from|since|after <time>on <day>", -5.239628370199357),
-                                    ("dayweek", -6.155919102073512),
-                                    ("Easter Sundayyear (latent)", -5.750453993965348),
-                                    ("Thursday<time-of-day> am|pm", -4.903156133578144),
-                                    ("weekyear", -5.750453993965348),
-                                    ("time-of-day (latent)Thursday", -5.750453993965348),
+                                     -4.834011758416939),
+                                    ("Naraka Chaturdashiyear (latent)", -6.0867747269123065),
+                                    ("from|since|after <time>on <day>", -5.170483995038151),
+                                    ("dayweek", -6.0867747269123065),
+                                    ("Easter Sundayyear (latent)", -5.681309618804143),
+                                    ("Thursday<time-of-day> am|pm", -4.834011758416939),
+                                    ("weekyear", -5.681309618804143),
+                                    ("time-of-day (latent)Thursday", -5.681309618804143),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)April", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)April", -6.0867747269123065),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.750453993965348),
+                                     -5.681309618804143),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.462771921513567),
-                                    ("Sundayfrom|since|after <time>", -6.155919102073512),
-                                    ("absorption of , after named dayFebruary", -5.239628370199357),
+                                     -5.393627546352362),
+                                    ("Sundayfrom|since|after <time>", -6.0867747269123065),
+                                    ("absorption of , after named dayFebruary", -5.170483995038151),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.750453993965348),
+                                     -5.681309618804143),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.155919102073512),
-                                    ("tomorrowat <time-of-day>", -6.155919102073512),
-                                    ("daynograin", -5.750453993965348),
-                                    ("Fridayin|during <named-month>|year", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("tomorrowat <time-of-day>", -6.0867747269123065),
+                                    ("daynograin", -5.681309618804143),
+                                    ("Fridayin|during <named-month>|year", -6.0867747269123065),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.750453993965348),
-                                    ("last <cycle> of <time>year (latent)", -5.750453993965348),
-                                    ("tomorrow<time-of-day> am|pm", -6.155919102073512),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.462771921513567),
-                                    ("Diwaliyear (latent)", -5.750453993965348),
+                                     -5.681309618804143),
+                                    ("last <cycle> of <time>year (latent)", -5.681309618804143),
+                                    ("tomorrow<time-of-day> am|pm", -6.0867747269123065),
+                                    ("Diwaliyear (latent)", -5.681309618804143),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.155919102073512),
-                                    ("this <part-of-day>at <time-of-day>", -5.239628370199357),
-                                    ("Fridayyear (latent)", -5.239628370199357),
-                                    ("time-of-day (latent)April", -6.155919102073512),
-                                    ("minuteyear", -3.9586945247372927)],
-                               n = 320}}),
+                                     -6.0867747269123065),
+                                    ("this <part-of-day>at <time-of-day>", -5.170483995038151),
+                                    ("Fridayyear (latent)", -5.170483995038151),
+                                    ("time-of-day (latent)April", -6.0867747269123065)],
+                               n = 291}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1742,22 +1730,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.14681486833704485,
-                               unseen = -5.393627546352362,
+                     ClassData{prior = -4.546237407675729e-2,
+                               unseen = -5.389071729816501,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.7779564107075706e-2),
-                                    ("intersect 2 numbers", -4.00277736869661)],
+                                   [("integer (numeric)", -2.320289707966387e-2),
+                                    ("intersect 2 numbers", -3.9982007016691985)],
                                n = 215},
                    koData =
-                     ClassData{prior = -1.9910923718485463,
-                               unseen = -3.6635616461296463,
+                     ClassData{prior = -3.1135153092103742, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.55814461804655),
-                                    ("negative numbers", -0.41871033485818493),
-                                    ("compose by multiplication", -2.2512917986064953)],
-                               n = 34}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.15415067982725836,

Duckling/Ranking/Classifiers/EN_XX.hs

@@ -276,7 +276,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.70810943994113, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6877697557040074, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -297,45 +297,43 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.19992526121220253,
-                               unseen = -5.638354669333745,
+                     ClassData{prior = -0.204483128596807, unseen = -5.616771097666572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.02535169073515),
-                                    ("week", -4.941642422609305),
+                                   [("<integer> to|till|before <hour-of-day>", -4.00369019395397),
+                                    ("week", -4.919980925828125),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.941642422609305),
-                                    ("today", -4.941642422609305),
-                                    ("intersect", -2.995732273553991),
-                                    ("<time> for <duration>", -4.248495242049359),
-                                    ("second", -4.941642422609305), ("now", -3.236894330370879),
-                                    ("tomorrow", -4.53617731450114),
-                                    ("this|last|next <cycle>", -4.941642422609305),
-                                    ("day", -1.784642001459191),
-                                    ("the <day-of-month> (ordinal)", -4.53617731450114),
-                                    ("the <day-of-month> (number)", -3.5553480614894135),
-                                    ("time-of-day (latent)", -2.4992953872401),
-                                    ("<time-of-day> am|pm", -4.248495242049359),
-                                    ("hh:mm", -4.53617731450114), ("nograin", -3.236894330370879),
+                                     -4.919980925828125),
+                                    ("today", -4.919980925828125), ("intersect", -3.2152328335897),
+                                    ("<time> for <duration>", -4.22683374526818),
+                                    ("second", -4.919980925828125), ("now", -3.2152328335897),
+                                    ("tomorrow", -4.5145158177199605),
+                                    ("this|last|next <cycle>", -4.919980925828125),
+                                    ("day", -1.8064656166177504),
+                                    ("the <day-of-month> (ordinal)", -4.5145158177199605),
+                                    ("the <day-of-month> (number)", -3.5336865647082343),
+                                    ("time-of-day (latent)", -2.477633890458921),
+                                    ("<time-of-day> am|pm", -4.22683374526818),
+                                    ("hh:mm", -4.5145158177199605), ("nograin", -3.2152328335897),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.53617731450114),
+                                     -4.5145158177199605),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.941642422609305),
-                                    ("<day-of-month> (ordinal)", -3.8430301339411947),
-                                    ("Easter Sunday", -4.941642422609305),
-                                    ("Christmas", -4.248495242049359),
-                                    ("hour", -2.3389527371649206), ("month", -4.941642422609305),
-                                    ("<datetime> - <datetime> (interval)", -2.744417845273085),
+                                     -4.919980925828125),
+                                    ("<day-of-month> (ordinal)", -3.821368637160015),
+                                    ("Easter Sunday", -4.919980925828125),
+                                    ("Christmas", -4.22683374526818), ("hour", -2.317291240383741),
+                                    ("month", -4.919980925828125),
+                                    ("<datetime> - <datetime> (interval)", -2.7227563484919055),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.995732273553991),
+                                     -2.9740707767728116),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.53617731450114),
-                                    ("minute", -1.9972034434428638),
-                                    ("right now", -4.941642422609305),
-                                    ("<month> dd-dd (interval)", -4.248495242049359),
-                                    ("part of days", -4.941642422609305),
-                                    ("dd-dd <month> (interval)", -4.53617731450114)],
-                               n = 122}}),
+                                     -4.5145158177199605),
+                                    ("minute", -2.0022101937438457),
+                                    ("right now", -4.919980925828125),
+                                    ("<month> dd-dd (interval)", -4.22683374526818),
+                                    ("part of days", -4.919980925828125),
+                                    ("dd-dd <month> (interval)", -4.5145158177199605)],
+                               n = 119}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -998,479 +996,463 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.49559392917049166,
-                               unseen = -7.202661196523238,
+                     ClassData{prior = -0.4570813477593, unseen = -7.197435354096591,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.508769136971682),
-                                    ("Karva Chauthyear (latent)", -6.508769136971682),
+                                   [("Navaratriyear (latent)", -6.503539390274405),
+                                    ("Karva Chauthyear (latent)", -6.503539390274405),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.508769136971682),
-                                    ("Maha Shivaratriyear (latent)", -6.508769136971682),
-                                    ("Ramadanyear (latent)", -5.256006168476314),
+                                     -6.503539390274405),
+                                    ("Maha Shivaratriyear (latent)", -6.503539390274405),
+                                    ("Ramadanyear (latent)", -5.250776421779037),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.122474775851791),
-                                    ("Bhai Doojyear (latent)", -6.508769136971682),
-                                    ("hourday", -4.493866116429417),
-                                    ("dayhour", -3.4642466992482586),
+                                     -5.117245029154514),
+                                    ("Bhai Doojyear (latent)", -6.503539390274405),
+                                    ("hourday", -4.48863636973214),
+                                    ("dayhour", -3.4590169525509817),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.122474775851791),
-                                    ("Martin Luther King's Dayyear (latent)", -6.103304028863517),
-                                    ("Shemini Atzeretyear (latent)", -6.508769136971682),
-                                    ("daymonth", -4.368702973475411),
-                                    ("monthday", -6.103304028863517),
-                                    ("monthyear", -4.63696696007009),
-                                    ("Yom Ha'atzmautyear (latent)", -6.508769136971682),
-                                    ("Orthodox Good Fridayyear (latent)", -6.103304028863517),
-                                    ("Vijayadashamiyear (latent)", -6.508769136971682),
-                                    ("Thanksgiving Dayyear (latent)", -5.410156848303572),
-                                    ("Thai Pongalyear (latent)", -5.815621956411737),
-                                    ("Thiru Onamyear (latent)", -5.815621956411737),
-                                    ("hhhmmabsorption of , after named day", -6.508769136971682),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.508769136971682),
+                                     -5.117245029154514),
+                                    ("Martin Luther King's Dayyear (latent)", -6.09807428216624),
+                                    ("Shemini Atzeretyear (latent)", -6.503539390274405),
+                                    ("daymonth", -4.363473226778134),
+                                    ("monthday", -6.09807428216624),
+                                    ("monthyear", -4.631737213372813),
+                                    ("Yom Ha'atzmautyear (latent)", -6.503539390274405),
+                                    ("Orthodox Good Fridayyear (latent)", -6.09807428216624),
+                                    ("Vijayadashamiyear (latent)", -6.503539390274405),
+                                    ("Thanksgiving Dayyear (latent)", -5.404927101606295),
+                                    ("Thai Pongalyear (latent)", -5.810392209714459),
+                                    ("Thiru Onamyear (latent)", -5.810392209714459),
+                                    ("hhhmmabsorption of , after named day", -6.503539390274405),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.503539390274405),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.592478405097527),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.508769136971682),
-                                    ("Krishna Janmashtamiyear (latent)", -6.103304028863517),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.508769136971682),
-                                    ("houryear", -5.592478405097527),
+                                     -5.58724865840025),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.503539390274405),
+                                    ("Krishna Janmashtamiyear (latent)", -6.09807428216624),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.503539390274405),
+                                    ("houryear", -5.58724865840025),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.508769136971682),
-                                    ("Christmas<time-of-day> am|pm", -6.508769136971682),
-                                    ("<day-of-month> (ordinal)October", -6.508769136971682),
+                                     -6.503539390274405),
+                                    ("Christmas<time-of-day> am|pm", -6.503539390274405),
+                                    ("<day-of-month> (ordinal)October", -6.503539390274405),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.508769136971682),
+                                     -6.503539390274405),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.815621956411737),
-                                    ("intersectin|during <named-month>|year", -6.508769136971682),
-                                    ("<time-of-day> am|pmintersect", -5.256006168476314),
-                                    ("Earth Houryear (latent)", -6.508769136971682),
-                                    ("Ganesh Chaturthiyear (latent)", -6.508769136971682),
-                                    ("Octoberyear (latent)", -4.8993312245375815),
-                                    ("intersect<time-of-day> am|pm", -6.508769136971682),
-                                    ("Mattu Pongalyear (latent)", -6.508769136971682),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.508769136971682),
-                                    ("Shavuotyear (latent)", -6.508769136971682),
-                                    ("Parsi New Yearyear (latent)", -5.592478405097527),
+                                     -5.810392209714459),
+                                    ("intersectin|during <named-month>|year", -6.503539390274405),
+                                    ("<time-of-day> am|pmintersect", -5.250776421779037),
+                                    ("Earth Houryear (latent)", -6.503539390274405),
+                                    ("Ganesh Chaturthiyear (latent)", -6.503539390274405),
+                                    ("Octoberyear (latent)", -4.894101477840304),
+                                    ("intersect<time-of-day> am|pm", -6.503539390274405),
+                                    ("Mattu Pongalyear (latent)", -6.503539390274405),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.503539390274405),
+                                    ("Shavuotyear (latent)", -6.503539390274405),
+                                    ("Parsi New Yearyear (latent)", -5.58724865840025),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.508769136971682),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.508769136971682),
-                                    ("todayin|within|after <duration>", -6.508769136971682),
+                                     -6.503539390274405),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.503539390274405),
+                                    ("todayin|within|after <duration>", -6.503539390274405),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.103304028863517),
-                                    ("Marchyear (latent)", -6.508769136971682),
+                                     -6.09807428216624),
+                                    ("Marchyear (latent)", -6.503539390274405),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.103304028863517),
-                                    ("Sukkotyear (latent)", -6.103304028863517),
-                                    ("hhhmmintersect", -6.103304028863517),
+                                     -6.09807428216624),
+                                    ("Sukkotyear (latent)", -6.09807428216624),
+                                    ("hhhmmintersect", -6.09807428216624),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.103304028863517),
-                                    ("Clean Mondayyear (latent)", -6.103304028863517),
-                                    ("monthhour", -6.103304028863517),
+                                     -6.09807428216624),
+                                    ("Clean Mondayyear (latent)", -6.09807428216624),
+                                    ("monthhour", -6.09807428216624),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.592478405097527),
-                                    ("todayat <time-of-day>", -6.508769136971682),
-                                    ("Thursday<time> timezone", -4.110873864173311),
-                                    ("tonight<time-of-day> am|pm", -6.508769136971682),
-                                    ("time-of-day (latent)tonight", -6.103304028863517),
-                                    ("from|since|after <time>December", -6.508769136971682),
-                                    ("<time-of-day> am|pmon <day>", -4.493866116429417),
+                                     -5.58724865840025),
+                                    ("todayat <time-of-day>", -6.503539390274405),
+                                    ("Thursday<time> timezone", -4.105644117476034),
+                                    ("tonight<time-of-day> am|pm", -6.503539390274405),
+                                    ("time-of-day (latent)tonight", -6.09807428216624),
+                                    ("from|since|after <time>December", -6.503539390274405),
+                                    ("<time-of-day> am|pmon <day>", -4.48863636973214),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.508769136971682),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.103304028863517),
-                                    ("dayday", -3.7361804147319004),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.103304028863517),
-                                    ("mm/ddat <time-of-day>", -5.815621956411737),
-                                    ("tonightat <time-of-day>", -5.410156848303572),
+                                     -6.503539390274405),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.09807428216624),
+                                    ("dayday", -3.730950668034623),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.09807428216624),
+                                    ("mm/ddat <time-of-day>", -5.810392209714459),
+                                    ("tonightat <time-of-day>", -5.404927101606295),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.815621956411737),
+                                     -5.810392209714459),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.508769136971682),
-                                    ("today<time-of-day> am|pm", -6.508769136971682),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.103304028863517),
-                                    ("at <time-of-day><time> <part-of-day>", -6.508769136971682),
-                                    ("<day-of-month> (ordinal)intersect", -5.815621956411737),
-                                    ("mm/dd<time-of-day> am|pm", -6.508769136971682),
-                                    ("hourhour", -3.5383546714019807),
-                                    ("Mahavir Jayantiyear (latent)", -6.103304028863517),
-                                    ("Navaratriin|during <named-month>|year", -6.508769136971682),
-                                    ("Wednesdaythis|last|next <cycle>", -6.508769136971682),
-                                    ("Lentyear (latent)", -6.508769136971682),
+                                     -6.503539390274405),
+                                    ("today<time-of-day> am|pm", -6.503539390274405),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.09807428216624),
+                                    ("at <time-of-day><time> <part-of-day>", -6.503539390274405),
+                                    ("<day-of-month> (ordinal)intersect", -5.810392209714459),
+                                    ("mm/dd<time-of-day> am|pm", -6.503539390274405),
+                                    ("hourhour", -3.5331249247047034),
+                                    ("Mahavir Jayantiyear (latent)", -6.09807428216624),
+                                    ("Navaratriin|during <named-month>|year", -6.503539390274405),
+                                    ("Wednesdaythis|last|next <cycle>", -6.503539390274405),
+                                    ("Lentyear (latent)", -6.503539390274405),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.63696696007009),
-                                    ("Boghiyear (latent)", -6.508769136971682),
-                                    ("dayyear", -1.9136492868370918),
+                                     -4.631737213372813),
+                                    ("Boghiyear (latent)", -6.503539390274405),
+                                    ("dayyear", -1.9084195401398145),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.508769136971682),
-                                    ("Thursdayfrom|since|after <time>", -6.103304028863517),
+                                     -6.503539390274405),
+                                    ("Thursdayfrom|since|after <time>", -6.09807428216624),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.508769136971682),
-                                    ("Thursdayat <time-of-day>", -5.815621956411737),
-                                    ("Islamic New Yearyear (latent)", -6.103304028863517),
-                                    ("Laylat al-Qadryear (latent)", -5.592478405097527),
-                                    ("part of days<time-of-day> am|pm", -6.508769136971682),
-                                    ("Shrove Tuesdayyear (latent)", -6.508769136971682),
+                                     -6.503539390274405),
+                                    ("Thursdayat <time-of-day>", -5.810392209714459),
+                                    ("Islamic New Yearyear (latent)", -6.09807428216624),
+                                    ("Laylat al-Qadryear (latent)", -5.58724865840025),
+                                    ("part of days<time-of-day> am|pm", -6.503539390274405),
+                                    ("Shrove Tuesdayyear (latent)", -6.503539390274405),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.815621956411737),
-                                    ("hourminute", -6.103304028863517),
-                                    ("<time-of-day> am|pmtomorrow", -5.592478405097527),
-                                    ("Yom Kippuryear (latent)", -6.508769136971682),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.815621956411737),
-                                    ("<part-of-day> of <time>year (latent)", -6.508769136971682),
-                                    ("minutehour", -5.256006168476314),
-                                    ("Kaanum Pongalyear (latent)", -6.103304028863517),
-                                    ("Maha Saptamiyear (latent)", -6.508769136971682),
+                                     -5.810392209714459),
+                                    ("hourminute", -6.09807428216624),
+                                    ("<time-of-day> am|pmtomorrow", -5.58724865840025),
+                                    ("Yom Kippuryear (latent)", -6.503539390274405),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.810392209714459),
+                                    ("<part-of-day> of <time>year (latent)", -6.503539390274405),
+                                    ("minutehour", -5.250776421779037),
+                                    ("Kaanum Pongalyear (latent)", -6.09807428216624),
+                                    ("Maha Saptamiyear (latent)", -6.503539390274405),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.815621956411737),
-                                    ("time-of-day (latent)tomorrow", -5.592478405097527),
-                                    ("part of daysat <time-of-day>", -4.8993312245375815),
+                                     -5.810392209714459),
+                                    ("time-of-day (latent)tomorrow", -5.58724865840025),
+                                    ("part of daysat <time-of-day>", -4.894101477840304),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.493866116429417),
-                                    ("for <duration> from <time>December", -6.508769136971682),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.508769136971682),
+                                     -4.48863636973214),
+                                    ("for <duration> from <time>December", -6.503539390274405),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.503539390274405),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.256006168476314),
+                                     -5.250776421779037),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.256006168476314),
-                                    ("time-of-day (latent)this <part-of-day>", -6.508769136971682),
-                                    ("Pentecostyear (latent)", -6.508769136971682),
+                                     -5.250776421779037),
+                                    ("time-of-day (latent)this <part-of-day>", -6.503539390274405),
+                                    ("Pentecostyear (latent)", -6.503539390274405),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.256006168476314),
-                                    ("<day-of-month> (ordinal)February", -6.508769136971682),
-                                    ("Eid al-Fitryear (latent)", -5.122474775851791),
+                                     -5.250776421779037),
+                                    ("<day-of-month> (ordinal)February", -6.503539390274405),
+                                    ("Eid al-Fitryear (latent)", -5.117245029154514),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.508769136971682),
-                                    ("Mondayin|during the <part-of-day>", -6.508769136971682),
-                                    ("Chhathin|during <named-month>|year", -6.508769136971682),
-                                    ("Diwaliin|during <named-month>|year", -6.508769136971682),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.508769136971682),
-                                    ("Vaisakhiin|during <named-month>|year", -6.508769136971682),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.256006168476314),
-                                    ("Raksha Bandhanyear (latent)", -6.508769136971682),
-                                    ("daysecond", -6.103304028863517),
+                                     -6.503539390274405),
+                                    ("Mondayin|during the <part-of-day>", -6.503539390274405),
+                                    ("Chhathin|during <named-month>|year", -6.503539390274405),
+                                    ("Diwaliin|during <named-month>|year", -6.503539390274405),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.503539390274405),
+                                    ("Vaisakhiin|during <named-month>|year", -6.503539390274405),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.250776421779037),
+                                    ("Raksha Bandhanyear (latent)", -6.503539390274405),
+                                    ("daysecond", -6.09807428216624),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.103304028863517),
-                                    ("Ratha-Yatrayear (latent)", -6.508769136971682),
-                                    ("Ashurayear (latent)", -6.508769136971682),
-                                    ("Tuesdayin|during <named-month>|year", -6.508769136971682),
-                                    ("Chinese New Yearyear (latent)", -6.508769136971682),
-                                    ("tomorrowintersect", -6.508769136971682),
-                                    ("Lag BaOmeryear (latent)", -6.508769136971682),
+                                     -6.09807428216624),
+                                    ("Ratha-Yatrayear (latent)", -6.503539390274405),
+                                    ("Ashurayear (latent)", -6.503539390274405),
+                                    ("Tuesdayin|during <named-month>|year", -6.503539390274405),
+                                    ("Chinese New Yearyear (latent)", -6.503539390274405),
+                                    ("tomorrowintersect", -6.503539390274405),
+                                    ("Lag BaOmeryear (latent)", -6.503539390274405),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.508769136971682),
-                                    ("Eid al-Adhayear (latent)", -4.368702973475411),
-                                    ("intersectin|during the <part-of-day>", -6.508769136971682),
-                                    ("Palm Sundayyear (latent)", -6.508769136971682),
-                                    ("Christmasat <time-of-day>", -6.508769136971682),
-                                    ("Passoveryear (latent)", -6.508769136971682),
-                                    ("Lazarus Saturdayyear (latent)", -6.508769136971682),
+                                     -6.503539390274405),
+                                    ("Eid al-Adhayear (latent)", -4.363473226778134),
+                                    ("intersectin|during the <part-of-day>", -6.503539390274405),
+                                    ("Palm Sundayyear (latent)", -6.503539390274405),
+                                    ("Christmasat <time-of-day>", -6.503539390274405),
+                                    ("Passoveryear (latent)", -6.503539390274405),
+                                    ("Lazarus Saturdayyear (latent)", -6.503539390274405),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.103304028863517),
-                                    ("hhhmmon <day>", -5.592478405097527),
-                                    ("Yom HaShoahyear (latent)", -6.103304028863517),
+                                     -6.09807428216624),
+                                    ("hhhmmon <day>", -5.58724865840025),
+                                    ("Yom HaShoahyear (latent)", -6.09807428216624),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.103304028863517),
+                                     -6.09807428216624),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.508769136971682),
-                                    ("Septemberyear (latent)", -6.103304028863517),
+                                     -6.503539390274405),
+                                    ("Septemberyear (latent)", -6.09807428216624),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.004691740195407),
-                                    ("Halloweenyear (latent)", -6.508769136971682),
+                                     -4.99946199349813),
+                                    ("Halloweenyear (latent)", -6.503539390274405),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.103304028863517),
+                                     -6.09807428216624),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.815621956411737),
+                                     -5.810392209714459),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.508769136971682),
-                                    ("at <time-of-day>intersect", -5.592478405097527),
-                                    ("Rosh Hashanahyear (latent)", -5.815621956411737),
-                                    ("Dhanterasyear (latent)", -6.508769136971682),
-                                    ("Tu BiShvatyear (latent)", -6.508769136971682),
-                                    ("<day-of-month> (ordinal)December", -5.815621956411737),
-                                    ("Holiyear (latent)", -5.815621956411737),
+                                     -6.503539390274405),
+                                    ("at <time-of-day>intersect", -5.58724865840025),
+                                    ("Rosh Hashanahyear (latent)", -5.810392209714459),
+                                    ("Dhanterasyear (latent)", -6.503539390274405),
+                                    ("Tu BiShvatyear (latent)", -6.503539390274405),
+                                    ("<day-of-month> (ordinal)December", -5.810392209714459),
+                                    ("Holiyear (latent)", -5.810392209714459),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.508769136971682),
-                                    ("Holika Dahanyear (latent)", -5.815621956411737),
+                                     -6.503539390274405),
+                                    ("Holika Dahanyear (latent)", -5.810392209714459),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.103304028863517),
-                                    ("dayminute", -3.1243788736259077),
-                                    ("Mawlidyear (latent)", -6.508769136971682),
+                                     -6.09807428216624),
+                                    ("dayminute", -3.1191491269286304),
+                                    ("Mawlidyear (latent)", -6.503539390274405),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.103304028863517),
+                                     -6.09807428216624),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.508769136971682),
-                                    ("Jumu'atul-Widayear (latent)", -5.592478405097527),
-                                    ("minuteday", -2.7592650610413108),
+                                     -6.503539390274405),
+                                    ("Jumu'atul-Widayear (latent)", -5.58724865840025),
+                                    ("minuteday", -2.7540353143440335),
                                     ("absorption of , after named dayintersect",
-                                     -5.815621956411737),
-                                    ("intersectyear (latent)", -6.103304028863517),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.508769136971682),
+                                     -5.810392209714459),
+                                    ("intersectyear (latent)", -6.09807428216624),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.503539390274405),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.508769136971682),
+                                     -6.503539390274405),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.508769136971682),
-                                    ("intersecthhhmm", -6.103304028863517),
+                                     -6.503539390274405),
+                                    ("intersecthhhmm", -6.09807428216624),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.508769136971682),
-                                    ("Boss's Dayyear (latent)", -6.103304028863517),
+                                     -6.503539390274405),
+                                    ("Boss's Dayyear (latent)", -6.09807428216624),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.508769136971682),
-                                    ("Global Youth Service Dayyear (latent)", -6.508769136971682),
-                                    ("Dhanterasin|during <named-month>|year", -6.508769136971682),
-                                    ("tonight<time-of-day> o'clock", -6.508769136971682),
-                                    ("Tisha B'Avyear (latent)", -6.508769136971682),
-                                    ("Isra and Mi'rajyear (latent)", -5.592478405097527),
-                                    ("at <time-of-day>on <day>", -4.8993312245375815),
+                                     -6.503539390274405),
+                                    ("Global Youth Service Dayyear (latent)", -6.503539390274405),
+                                    ("Dhanterasin|during <named-month>|year", -6.503539390274405),
+                                    ("tonight<time-of-day> o'clock", -6.503539390274405),
+                                    ("Tisha B'Avyear (latent)", -6.503539390274405),
+                                    ("Isra and Mi'rajyear (latent)", -5.58724865840025),
+                                    ("at <time-of-day>on <day>", -4.894101477840304),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.103304028863517),
+                                     -6.09807428216624),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.815621956411737),
-                                    ("Christmasyear (latent)", -6.103304028863517),
-                                    ("Saturdayintersect", -6.508769136971682),
-                                    ("Naraka Chaturdashiyear (latent)", -6.103304028863517),
-                                    ("Thai Pongalin|during <named-month>|year", -6.508769136971682),
-                                    ("dayweek", -6.508769136971682),
-                                    ("Easter Sundayyear (latent)", -5.815621956411737),
+                                     -5.810392209714459),
+                                    ("Christmasyear (latent)", -6.09807428216624),
+                                    ("Saturdayintersect", -6.503539390274405),
+                                    ("Naraka Chaturdashiyear (latent)", -6.09807428216624),
+                                    ("Thai Pongalin|during <named-month>|year", -6.503539390274405),
+                                    ("dayweek", -6.503539390274405),
+                                    ("Easter Sundayyear (latent)", -5.810392209714459),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.103304028863517),
-                                    ("weekyear", -5.410156848303572),
-                                    ("King's Dayyear (latent)", -5.004691740195407),
-                                    ("hh:mmin|during the <part-of-day>", -5.592478405097527),
+                                     -6.09807428216624),
+                                    ("weekyear", -5.404927101606295),
+                                    ("King's Dayyear (latent)", -4.99946199349813),
+                                    ("hh:mmin|during the <part-of-day>", -5.58724865840025),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.103304028863517),
+                                     -6.09807428216624),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.815621956411737),
-                                    ("Hanukkahyear (latent)", -5.815621956411737),
-                                    ("Rama Navamiyear (latent)", -6.508769136971682),
-                                    ("February<time> <part-of-day>", -6.508769136971682),
+                                     -5.810392209714459),
+                                    ("Hanukkahyear (latent)", -5.810392209714459),
+                                    ("Rama Navamiyear (latent)", -6.503539390274405),
+                                    ("February<time> <part-of-day>", -6.503539390274405),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.815621956411737),
-                                    ("Great Lentyear (latent)", -6.508769136971682),
-                                    ("tomorrowat <time-of-day>", -5.815621956411737),
+                                     -5.810392209714459),
+                                    ("Great Lentyear (latent)", -6.503539390274405),
+                                    ("tomorrowat <time-of-day>", -5.810392209714459),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.508769136971682),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.103304028863517),
-                                    ("Ugadiyear (latent)", -5.122474775851791),
-                                    ("Vaisakhiyear (latent)", -5.815621956411737),
+                                     -6.503539390274405),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.09807428216624),
+                                    ("Ugadiyear (latent)", -5.117245029154514),
+                                    ("Vaisakhiyear (latent)", -5.810392209714459),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.815621956411737),
-                                    ("last <cycle> of <time>year (latent)", -5.815621956411737),
-                                    ("at <time-of-day>tomorrow", -6.103304028863517),
-                                    ("tomorrow<time-of-day> am|pm", -6.508769136971682),
+                                     -5.810392209714459),
+                                    ("last <cycle> of <time>year (latent)", -5.810392209714459),
+                                    ("at <time-of-day>tomorrow", -6.09807428216624),
+                                    ("tomorrow<time-of-day> am|pm", -6.503539390274405),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.508769136971682),
-                                    ("Diwaliyear (latent)", -6.508769136971682),
-                                    ("between <time> and <time>on <day>", -6.103304028863517),
-                                    ("Black Fridayyear (latent)", -6.103304028863517),
+                                     -6.503539390274405),
+                                    ("Diwaliyear (latent)", -6.503539390274405),
+                                    ("between <time> and <time>on <day>", -6.09807428216624),
+                                    ("Black Fridayyear (latent)", -6.09807428216624),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.508769136971682),
+                                     -6.503539390274405),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.508769136971682),
-                                    ("Chhathyear (latent)", -6.103304028863517),
-                                    ("Vasant Panchamiyear (latent)", -6.508769136971682),
-                                    ("Rabindra Jayantiyear (latent)", -5.256006168476314),
-                                    ("this <part-of-day>at <time-of-day>", -5.256006168476314),
-                                    ("St Patrick's Dayyear (latent)", -6.508769136971682),
-                                    ("Thursday<time> (timezone)", -6.508769136971682),
+                                     -6.503539390274405),
+                                    ("Chhathyear (latent)", -6.09807428216624),
+                                    ("Vasant Panchamiyear (latent)", -6.503539390274405),
+                                    ("Rabindra Jayantiyear (latent)", -5.250776421779037),
+                                    ("this <part-of-day>at <time-of-day>", -5.250776421779037),
+                                    ("St Patrick's Dayyear (latent)", -6.503539390274405),
+                                    ("Thursday<time> (timezone)", -6.503539390274405),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.508769136971682),
-                                    ("Pargat Diwasyear (latent)", -5.256006168476314),
-                                    ("<datetime> - <datetime> (interval)July", -6.103304028863517),
+                                     -6.503539390274405),
+                                    ("Pargat Diwasyear (latent)", -5.250776421779037),
+                                    ("<datetime> - <datetime> (interval)July", -6.09807428216624),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.815621956411737),
-                                    ("Februaryintersect", -6.508769136971682),
-                                    ("Simchat Torahyear (latent)", -6.508769136971682),
-                                    ("minuteyear", -6.508769136971682)],
+                                     -5.810392209714459),
+                                    ("Februaryintersect", -6.503539390274405),
+                                    ("Simchat Torahyear (latent)", -6.503539390274405),
+                                    ("minuteyear", -6.503539390274405)],
                                n = 516},
                    koData =
-                     ClassData{prior = -0.9395823192749915, unseen = -6.880384082186005,
+                     ClassData{prior = -1.0027445398501762, unseen = -6.804614520062624,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.68213122712422),
-                                    ("hourday", -3.58351893845611),
+                                   [("Thursdayhhhmm", -4.606280680272119),
+                                    ("hourday", -3.507668391604009),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.186208623900494),
-                                    ("<day-of-month> (ordinal)August", -6.186208623900494),
-                                    ("dayhour", -3.4453685999752928),
-                                    ("<time> timezoneyear (latent)", -5.493061443340548),
+                                     -6.110358077048392),
+                                    ("<day-of-month> (ordinal)August", -6.110358077048392),
+                                    ("dayhour", -3.3695180531231914),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.2699178920263385),
-                                    ("Tuesdayfrom|since|after <time>", -5.493061443340548),
-                                    ("daymonth", -3.4781584227982836),
-                                    ("hourquarter", -5.2699178920263385),
-                                    ("monthday", -5.780743515792329),
-                                    ("monthyear", -4.799914262780603),
-                                    ("<time-of-day> am|pmyear (latent)", -5.493061443340548),
-                                    ("Thai Pongalyear (latent)", -5.493061443340548),
-                                    ("intersecthh:mm", -6.186208623900494),
+                                     -5.194067345174237),
+                                    ("Tuesdayfrom|since|after <time>", -5.417210896488447),
+                                    ("daymonth", -3.4023078759461827),
+                                    ("hourquarter", -5.194067345174237),
+                                    ("monthday", -5.704892968940229),
+                                    ("monthyear", -4.857595108553024),
+                                    ("Thai Pongalyear (latent)", -5.417210896488447),
+                                    ("intersecthh:mm", -6.110358077048392),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.780743515792329),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.186208623900494),
-                                    ("houryear", -4.394449154672439),
+                                     -5.704892968940229),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.110358077048392),
+                                    ("houryear", -4.724063715928502),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.186208623900494),
-                                    ("<day-of-month> (ordinal)October", -6.186208623900494),
+                                     -6.110358077048392),
+                                    ("<day-of-month> (ordinal)October", -6.110358077048392),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.493061443340548),
-                                    ("hournograin", -4.933445655405126),
-                                    ("<time-of-day> am|pmintersect", -4.933445655405126),
-                                    ("Octoberyear (latent)", -5.780743515792329),
-                                    ("Good Fridayyear (latent)", -5.780743515792329),
+                                     -5.417210896488447),
+                                    ("hournograin", -4.857595108553024),
+                                    ("<time-of-day> am|pmintersect", -4.857595108553024),
+                                    ("Octoberyear (latent)", -6.110358077048392),
+                                    ("Good Fridayyear (latent)", -5.704892968940229),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.780743515792329),
-                                    ("early morningat <time-of-day>", -6.186208623900494),
-                                    ("until <time>on <day>", -5.493061443340548),
+                                     -5.704892968940229),
+                                    ("early morningat <time-of-day>", -6.110358077048392),
+                                    ("until <time>on <day>", -5.417210896488447),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.186208623900494),
-                                    ("time-of-day (latent)intersect", -5.493061443340548),
-                                    ("todayin <number> (implicit minutes)", -6.186208623900494),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.493061443340548),
+                                     -6.110358077048392),
+                                    ("time-of-day (latent)intersect", -5.417210896488447),
+                                    ("todayin <number> (implicit minutes)", -6.110358077048392),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.186208623900494),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.186208623900494),
-                                    ("hh:mmon <day>", -4.933445655405126),
-                                    ("hhhmmintersect", -5.780743515792329),
-                                    ("absorption of , after named dayJuly", -5.2699178920263385),
-                                    ("from|since|after <time>July", -5.780743515792329),
+                                     -6.110358077048392),
+                                    ("hh:mmon <day>", -4.857595108553024),
+                                    ("hhhmmintersect", -5.704892968940229),
+                                    ("absorption of , after named dayJuly", -5.194067345174237),
+                                    ("from|since|after <time>July", -5.704892968940229),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.2699178920263385),
-                                    ("Clean Mondayyear (latent)", -6.186208623900494),
-                                    ("monthhour", -6.186208623900494),
+                                     -5.194067345174237),
+                                    ("Clean Mondayyear (latent)", -6.110358077048392),
+                                    ("monthhour", -6.110358077048392),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.780743515792329),
-                                    ("hourmonth", -3.9349168252939983),
-                                    ("todayat <time-of-day>", -6.186208623900494),
-                                    ("hhhmmyear (latent)", -4.933445655405126),
-                                    ("from|since|after <time>December", -6.186208623900494),
+                                     -5.704892968940229),
+                                    ("hourmonth", -3.8590662784418974),
+                                    ("todayat <time-of-day>", -6.110358077048392),
+                                    ("from|since|after <time>December", -6.110358077048392),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.186208623900494),
-                                    ("<time-of-day> am|pmon <day>", -4.933445655405126),
-                                    ("Mondayyear (latent)", -5.493061443340548),
-                                    ("dayday", -4.046142460404223),
-                                    ("mm/ddat <time-of-day>", -5.2699178920263385),
-                                    ("on <day>September", -5.493061443340548),
-                                    ("time-of-day (latent)September", -5.780743515792329),
-                                    ("hourhour", -4.1067670822206574),
-                                    ("time-of-day (latent)on <day>", -4.68213122712422),
-                                    ("time-of-day (latent)February", -5.780743515792329),
+                                     -6.110358077048392),
+                                    ("<time-of-day> am|pmon <day>", -4.857595108553024),
+                                    ("Mondayyear (latent)", -5.417210896488447),
+                                    ("dayday", -3.970291913552122),
+                                    ("mm/ddat <time-of-day>", -5.194067345174237),
+                                    ("on <day>September", -5.417210896488447),
+                                    ("time-of-day (latent)September", -5.704892968940229),
+                                    ("hourhour", -4.030916535368557),
+                                    ("time-of-day (latent)on <day>", -4.606280680272119),
+                                    ("time-of-day (latent)February", -5.704892968940229),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.780743515792329),
-                                    ("dayyear", -3.1181556887668767),
-                                    ("Thursdaymm/dd", -6.186208623900494),
-                                    ("New Year's Dayyear (latent)", -5.2699178920263385),
-                                    ("time-of-day (latent)Sunday", -5.780743515792329),
-                                    ("Thursdayfrom|since|after <time>", -4.481460531662068),
-                                    ("Thursdayat <time-of-day>", -4.576770711466393),
+                                     -5.704892968940229),
+                                    ("dayyear", -3.306997696141858),
+                                    ("Thursdaymm/dd", -6.110358077048392),
+                                    ("New Year's Dayyear (latent)", -5.194067345174237),
+                                    ("time-of-day (latent)Sunday", -5.704892968940229),
+                                    ("Thursdayfrom|since|after <time>", -4.405609984809967),
+                                    ("Thursdayat <time-of-day>", -4.500920164614293),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.186208623900494),
-                                    ("Aprilyear (latent)", -6.186208623900494),
-                                    ("<day-of-month> (ordinal or number) of <named-month>year (latent)",
-                                     -6.186208623900494),
-                                    ("the <day-of-month> (ordinal)July", -6.186208623900494),
-                                    ("the <day-of-month> (number)July", -6.186208623900494),
-                                    ("monthminute", -6.186208623900494),
-                                    ("<time-of-day> am|pmtomorrow", -5.780743515792329),
-                                    ("Thursdayhh:mm", -5.2699178920263385),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.780743515792329),
-                                    ("minutemonth", -4.046142460404223),
-                                    ("time-of-day (latent)Friday", -5.780743515792329),
-                                    ("minutehour", -6.186208623900494),
-                                    ("part of daysat <time-of-day>", -5.0875963352323845),
+                                     -6.110358077048392),
+                                    ("Aprilyear (latent)", -6.110358077048392),
+                                    ("the <day-of-month> (ordinal)July", -6.110358077048392),
+                                    ("the <day-of-month> (number)July", -6.110358077048392),
+                                    ("monthminute", -6.110358077048392),
+                                    ("<time-of-day> am|pmtomorrow", -5.704892968940229),
+                                    ("Thursdayhh:mm", -5.194067345174237),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.704892968940229),
+                                    ("minutemonth", -3.970291913552122),
+                                    ("time-of-day (latent)Friday", -5.704892968940229),
+                                    ("minutehour", -6.110358077048392),
+                                    ("part of daysat <time-of-day>", -5.011745788380283),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.834833366737016),
-                                    ("Augustyear (latent)", -5.780743515792329),
-                                    ("week-endin|during <named-month>|year", -6.186208623900494),
-                                    ("time-of-day (latent)Tuesday", -5.780743515792329),
+                                     -3.758982819884915),
+                                    ("Augustyear (latent)", -5.704892968940229),
+                                    ("week-endin|during <named-month>|year", -6.110358077048392),
+                                    ("time-of-day (latent)Tuesday", -5.704892968940229),
                                     ("mm/dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.780743515792329),
+                                     -5.704892968940229),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.186208623900494),
+                                     -6.110358077048392),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.186208623900494),
+                                     -6.110358077048392),
                                     ("July<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.186208623900494),
-                                    ("Sundayyear (latent)", -5.2699178920263385),
-                                    ("hourweek", -5.2699178920263385),
-                                    ("the <day-of-month> (ordinal)Monday", -5.493061443340548),
-                                    ("Christmasat <time-of-day>", -6.186208623900494),
-                                    ("from|since|after <time>year (latent)", -5.0875963352323845),
-                                    ("hhhmmon <day>", -5.2699178920263385),
-                                    ("yesterday<time-of-day> am|pm", -6.186208623900494),
-                                    ("<day-of-month> (ordinal)July", -5.493061443340548),
+                                     -6.110358077048392),
+                                    ("Sundayyear (latent)", -5.194067345174237),
+                                    ("hourweek", -5.194067345174237),
+                                    ("the <day-of-month> (ordinal)Monday", -5.417210896488447),
+                                    ("Christmasat <time-of-day>", -6.110358077048392),
+                                    ("from|since|after <time>year (latent)", -5.704892968940229),
+                                    ("hhhmmon <day>", -5.194067345174237),
+                                    ("yesterday<time-of-day> am|pm", -6.110358077048392),
+                                    ("<day-of-month> (ordinal)July", -5.417210896488447),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.186208623900494),
-                                    ("mm/ddyear (latent)", -6.186208623900494),
+                                     -6.110358077048392),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.186208623900494),
+                                     -6.110358077048392),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.186208623900494),
+                                     -6.110358077048392),
                                     ("August<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.186208623900494),
-                                    ("at <time-of-day>intersect", -5.2699178920263385),
-                                    ("hh:mmyear (latent)", -4.799914262780603),
-                                    ("Holiyear (latent)", -6.186208623900494),
-                                    ("until <time><time-of-day> am|pm", -6.186208623900494),
+                                     -6.110358077048392),
+                                    ("at <time-of-day>intersect", -5.194067345174237),
+                                    ("Holiyear (latent)", -6.110358077048392),
+                                    ("until <time><time-of-day> am|pm", -6.110358077048392),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.780743515792329),
-                                    ("dayminute", -3.3240077429710255),
-                                    ("yyyy-mm-ddhh:mm", -5.780743515792329),
-                                    ("intersectfrom|since|after <time>", -5.780743515792329),
-                                    ("intersectSeptember", -4.314406446998903),
-                                    ("minuteday", -3.0292082027503806),
+                                     -5.704892968940229),
+                                    ("dayminute", -3.248157196118924),
+                                    ("yyyy-mm-ddhh:mm", -5.704892968940229),
+                                    ("intersectfrom|since|after <time>", -5.704892968940229),
+                                    ("intersectSeptember", -4.238555900146801),
+                                    ("minuteday", -2.9533576558982793),
                                     ("absorption of , after named dayintersect",
-                                     -6.186208623900494),
-                                    ("intersectyear (latent)", -6.186208623900494),
-                                    ("Februaryin|during the <part-of-day>", -6.186208623900494),
+                                     -6.110358077048392),
+                                    ("intersectyear (latent)", -6.110358077048392),
+                                    ("Februaryin|during the <part-of-day>", -6.110358077048392),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.186208623900494),
-                                    ("time-of-day (latent)July", -5.493061443340548),
-                                    ("Saturdayyear (latent)", -6.186208623900494),
+                                     -6.110358077048392),
+                                    ("time-of-day (latent)July", -5.417210896488447),
+                                    ("Saturdayyear (latent)", -6.110358077048392),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.186208623900494),
-                                    ("<day-of-month> (ordinal)Monday", -4.933445655405126),
-                                    ("at <time-of-day>on <day>", -5.2699178920263385),
+                                     -6.110358077048392),
+                                    ("<day-of-month> (ordinal)Monday", -4.857595108553024),
+                                    ("at <time-of-day>on <day>", -5.194067345174237),
                                     ("absorption of , after named daySeptember",
-                                     -4.933445655405126),
-                                    ("Naraka Chaturdashiyear (latent)", -6.186208623900494),
-                                    ("from|since|after <time>on <day>", -5.2699178920263385),
-                                    ("dayweek", -6.186208623900494),
-                                    ("Easter Sundayyear (latent)", -5.780743515792329),
-                                    ("Thursday<time-of-day> am|pm", -4.933445655405126),
-                                    ("weekyear", -5.780743515792329),
-                                    ("time-of-day (latent)Thursday", -5.780743515792329),
+                                     -4.857595108553024),
+                                    ("Naraka Chaturdashiyear (latent)", -6.110358077048392),
+                                    ("from|since|after <time>on <day>", -5.194067345174237),
+                                    ("dayweek", -6.110358077048392),
+                                    ("Easter Sundayyear (latent)", -5.704892968940229),
+                                    ("Thursday<time-of-day> am|pm", -4.857595108553024),
+                                    ("weekyear", -5.704892968940229),
+                                    ("time-of-day (latent)Thursday", -5.704892968940229),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.186208623900494),
-                                    ("<day-of-month> (ordinal)April", -6.186208623900494),
+                                     -6.110358077048392),
+                                    ("<day-of-month> (ordinal)April", -6.110358077048392),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.780743515792329),
+                                     -5.704892968940229),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.493061443340548),
-                                    ("Sundayfrom|since|after <time>", -6.186208623900494),
-                                    ("absorption of , after named dayFebruary",
-                                     -5.2699178920263385),
+                                     -5.417210896488447),
+                                    ("Sundayfrom|since|after <time>", -6.110358077048392),
+                                    ("absorption of , after named dayFebruary", -5.194067345174237),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.780743515792329),
+                                     -5.704892968940229),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.186208623900494),
-                                    ("tomorrowat <time-of-day>", -6.186208623900494),
-                                    ("daynograin", -5.780743515792329),
-                                    ("Fridayin|during <named-month>|year", -6.186208623900494),
+                                     -6.110358077048392),
+                                    ("tomorrowat <time-of-day>", -6.110358077048392),
+                                    ("daynograin", -5.704892968940229),
+                                    ("Fridayin|during <named-month>|year", -6.110358077048392),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.780743515792329),
-                                    ("last <cycle> of <time>year (latent)", -5.780743515792329),
-                                    ("tomorrow<time-of-day> am|pm", -6.186208623900494),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.493061443340548),
-                                    ("Diwaliyear (latent)", -5.780743515792329),
+                                     -5.704892968940229),
+                                    ("last <cycle> of <time>year (latent)", -5.704892968940229),
+                                    ("tomorrow<time-of-day> am|pm", -6.110358077048392),
+                                    ("Diwaliyear (latent)", -5.704892968940229),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.186208623900494),
-                                    ("this <part-of-day>at <time-of-day>", -5.2699178920263385),
-                                    ("Fridayyear (latent)", -5.2699178920263385),
-                                    ("time-of-day (latent)April", -6.186208623900494),
-                                    ("minuteyear", -3.9889840465642745)],
-                               n = 331}}),
+                                     -6.110358077048392),
+                                    ("this <part-of-day>at <time-of-day>", -5.194067345174237),
+                                    ("Fridayyear (latent)", -5.194067345174237),
+                                    ("time-of-day (latent)April", -6.110358077048392)],
+                               n = 299}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1761,21 +1743,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.15091338337746693,
-                               unseen = -5.420534999272286,
+                     ClassData{prior = -4.42550090040407e-2, unseen = -5.41610040220442,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.702867238791926e-2),
-                                    ("intersect 2 numbers", -4.029806041084529)],
+                                   [("integer (numeric)", -2.2574322038539065e-2),
+                                    ("intersect 2 numbers", -4.02535169073515)],
                                n = 221},
                    koData =
-                     ClassData{prior = -1.9655571464391097, unseen = -3.713572066704308,
+                     ClassData{prior = -3.139832617527748, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.6094379124341003),
-                                    ("negative numbers", -0.3930425881096072),
-                                    ("compose by multiplication", -2.3025850929940455)],
-                               n = 36}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("mm/dd/yyyy",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,

Duckling/Ranking/Classifiers/EN_ZA.hs

@@ -276,7 +276,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -297,44 +297,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -992,467 +992,455 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.49314027536445065,
-                               unseen = -7.176254532017144,
+                     ClassData{prior = -0.4572231019431188, unseen = -7.172424577124845,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.482342533064276),
-                                    ("Karva Chauthyear (latent)", -6.482342533064276),
+                                   [("Navaratriyear (latent)", -6.478509642208569),
+                                    ("Karva Chauthyear (latent)", -6.478509642208569),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Maha Shivaratriyear (latent)", -6.482342533064276),
-                                    ("Ramadanyear (latent)", -5.229579564568908),
+                                     -6.478509642208569),
+                                    ("Maha Shivaratriyear (latent)", -6.478509642208569),
+                                    ("Ramadanyear (latent)", -5.225746673713201),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.096048171944386),
-                                    ("Bhai Doojyear (latent)", -6.482342533064276),
-                                    ("hourday", -4.467439512522012),
-                                    ("dayhour", -3.4378200953408538),
+                                     -5.092215281088679),
+                                    ("Bhai Doojyear (latent)", -6.478509642208569),
+                                    ("hourday", -4.463606621666305),
+                                    ("dayhour", -3.4339872044851463),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.096048171944386),
-                                    ("Martin Luther King's Dayyear (latent)", -6.076877424956113),
-                                    ("Shemini Atzeretyear (latent)", -6.482342533064276),
-                                    ("daymonth", -4.467439512522012),
-                                    ("monthday", -6.076877424956113),
-                                    ("monthyear", -4.690583063836222),
-                                    ("Yom Ha'atzmautyear (latent)", -6.482342533064276),
-                                    ("Orthodox Good Fridayyear (latent)", -6.076877424956113),
-                                    ("Vijayadashamiyear (latent)", -6.482342533064276),
-                                    ("Thai Pongalyear (latent)", -5.789195352504331),
-                                    ("Thiru Onamyear (latent)", -5.789195352504331),
-                                    ("hhhmmabsorption of , after named day", -6.482342533064276),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.482342533064276),
+                                     -5.092215281088679),
+                                    ("Martin Luther King's Dayyear (latent)", -6.073044534100405),
+                                    ("Shemini Atzeretyear (latent)", -6.478509642208569),
+                                    ("daymonth", -4.463606621666305),
+                                    ("monthday", -6.073044534100405),
+                                    ("monthyear", -4.686750172980514),
+                                    ("Yom Ha'atzmautyear (latent)", -6.478509642208569),
+                                    ("Orthodox Good Fridayyear (latent)", -6.073044534100405),
+                                    ("Vijayadashamiyear (latent)", -6.478509642208569),
+                                    ("Thai Pongalyear (latent)", -5.785362461648624),
+                                    ("Thiru Onamyear (latent)", -5.785362461648624),
+                                    ("hhhmmabsorption of , after named day", -6.478509642208569),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.478509642208569),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.566051801190121),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.482342533064276),
-                                    ("Krishna Janmashtamiyear (latent)", -6.076877424956113),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.482342533064276),
-                                    ("houryear", -5.566051801190121),
+                                     -5.562218910334414),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.478509642208569),
+                                    ("Krishna Janmashtamiyear (latent)", -6.073044534100405),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.478509642208569),
+                                    ("houryear", -5.562218910334414),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("Christmas<time-of-day> am|pm", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Christmas<time-of-day> am|pm", -6.478509642208569),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.789195352504331),
-                                    ("intersectin|during <named-month>|year", -6.482342533064276),
-                                    ("<time-of-day> am|pmintersect", -5.229579564568908),
-                                    ("Earth Houryear (latent)", -6.482342533064276),
-                                    ("Ganesh Chaturthiyear (latent)", -6.482342533064276),
-                                    ("Octoberyear (latent)", -4.978265136288003),
-                                    ("intersect<time-of-day> am|pm", -6.482342533064276),
-                                    ("Mattu Pongalyear (latent)", -6.482342533064276),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.482342533064276),
-                                    ("Shavuotyear (latent)", -6.482342533064276),
-                                    ("Parsi New Yearyear (latent)", -5.566051801190121),
+                                     -5.785362461648624),
+                                    ("intersectin|during <named-month>|year", -6.478509642208569),
+                                    ("<time-of-day> am|pmintersect", -5.225746673713201),
+                                    ("Earth Houryear (latent)", -6.478509642208569),
+                                    ("Ganesh Chaturthiyear (latent)", -6.478509642208569),
+                                    ("Octoberyear (latent)", -4.974432245432295),
+                                    ("intersect<time-of-day> am|pm", -6.478509642208569),
+                                    ("Mattu Pongalyear (latent)", -6.478509642208569),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.478509642208569),
+                                    ("Shavuotyear (latent)", -6.478509642208569),
+                                    ("Parsi New Yearyear (latent)", -5.562218910334414),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.482342533064276),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.482342533064276),
-                                    ("todayin|within|after <duration>", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.478509642208569),
+                                    ("todayin|within|after <duration>", -6.478509642208569),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.076877424956113),
-                                    ("Marchyear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("Marchyear (latent)", -6.478509642208569),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.076877424956113),
-                                    ("Sukkotyear (latent)", -6.076877424956113),
-                                    ("hhhmmintersect", -6.076877424956113),
+                                     -6.073044534100405),
+                                    ("Sukkotyear (latent)", -6.073044534100405),
+                                    ("hhhmmintersect", -6.073044534100405),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.076877424956113),
-                                    ("Clean Mondayyear (latent)", -6.076877424956113),
-                                    ("monthhour", -6.076877424956113),
+                                     -6.073044534100405),
+                                    ("Clean Mondayyear (latent)", -6.073044534100405),
+                                    ("monthhour", -6.073044534100405),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.566051801190121),
-                                    ("todayat <time-of-day>", -6.482342533064276),
-                                    ("Thursday<time> timezone", -4.0844472602659065),
-                                    ("tonight<time-of-day> am|pm", -6.482342533064276),
-                                    ("time-of-day (latent)tonight", -6.076877424956113),
-                                    ("from|since|after <time>December", -6.482342533064276),
-                                    ("<time-of-day> am|pmon <day>", -4.467439512522012),
+                                     -5.562218910334414),
+                                    ("todayat <time-of-day>", -6.478509642208569),
+                                    ("Thursday<time> timezone", -4.080614369410199),
+                                    ("tonight<time-of-day> am|pm", -6.478509642208569),
+                                    ("time-of-day (latent)tonight", -6.073044534100405),
+                                    ("from|since|after <time>December", -6.478509642208569),
+                                    ("<time-of-day> am|pmon <day>", -4.463606621666305),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.076877424956113),
-                                    ("dayday", -3.7097538108244956),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.076877424956113),
-                                    ("tonightat <time-of-day>", -5.383730244396167),
+                                     -6.478509642208569),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.073044534100405),
+                                    ("dayday", -3.705920919968788),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.073044534100405),
+                                    ("tonightat <time-of-day>", -5.37989735354046),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.789195352504331),
+                                     -5.785362461648624),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.482342533064276),
-                                    ("today<time-of-day> am|pm", -6.482342533064276),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.076877424956113),
-                                    ("at <time-of-day><time> <part-of-day>", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)intersect", -6.076877424956113),
-                                    ("hourhour", -3.5119280674945754),
-                                    ("Mahavir Jayantiyear (latent)", -6.076877424956113),
-                                    ("Navaratriin|during <named-month>|year", -6.482342533064276),
-                                    ("Wednesdaythis|last|next <cycle>", -6.482342533064276),
-                                    ("Lentyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("today<time-of-day> am|pm", -6.478509642208569),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.073044534100405),
+                                    ("at <time-of-day><time> <part-of-day>", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)intersect", -6.073044534100405),
+                                    ("hourhour", -3.5080951766388684),
+                                    ("Mahavir Jayantiyear (latent)", -6.073044534100405),
+                                    ("Navaratriin|during <named-month>|year", -6.478509642208569),
+                                    ("Wednesdaythis|last|next <cycle>", -6.478509642208569),
+                                    ("Lentyear (latent)", -6.478509642208569),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.610540356162685),
-                                    ("Boghiyear (latent)", -6.482342533064276),
-                                    ("dayyear", -1.923216285577592),
+                                     -4.606707465306978),
+                                    ("Boghiyear (latent)", -6.478509642208569),
+                                    ("dayyear", -1.9193833947218846),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.482342533064276),
-                                    ("Thursdayfrom|since|after <time>", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Thursdayfrom|since|after <time>", -6.073044534100405),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Thursdayat <time-of-day>", -5.789195352504331),
-                                    ("Islamic New Yearyear (latent)", -6.076877424956113),
-                                    ("Laylat al-Qadryear (latent)", -5.566051801190121),
-                                    ("part of days<time-of-day> am|pm", -6.482342533064276),
-                                    ("Shrove Tuesdayyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Thursdayat <time-of-day>", -5.785362461648624),
+                                    ("Islamic New Yearyear (latent)", -6.073044534100405),
+                                    ("Laylat al-Qadryear (latent)", -5.562218910334414),
+                                    ("part of days<time-of-day> am|pm", -6.478509642208569),
+                                    ("Shrove Tuesdayyear (latent)", -6.478509642208569),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.789195352504331),
-                                    ("hourminute", -6.076877424956113),
-                                    ("<time-of-day> am|pmtomorrow", -5.566051801190121),
-                                    ("Yom Kippuryear (latent)", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.789195352504331),
-                                    ("<part-of-day> of <time>year (latent)", -6.482342533064276),
-                                    ("minutehour", -5.229579564568908),
-                                    ("Kaanum Pongalyear (latent)", -6.076877424956113),
-                                    ("Maha Saptamiyear (latent)", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("hourminute", -6.073044534100405),
+                                    ("<time-of-day> am|pmtomorrow", -5.562218910334414),
+                                    ("Yom Kippuryear (latent)", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.785362461648624),
+                                    ("<part-of-day> of <time>year (latent)", -6.478509642208569),
+                                    ("minutehour", -5.225746673713201),
+                                    ("Kaanum Pongalyear (latent)", -6.073044534100405),
+                                    ("Maha Saptamiyear (latent)", -6.478509642208569),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.789195352504331),
-                                    ("time-of-day (latent)tomorrow", -5.566051801190121),
-                                    ("part of daysat <time-of-day>", -4.872904620630176),
+                                     -5.785362461648624),
+                                    ("time-of-day (latent)tomorrow", -5.562218910334414),
+                                    ("part of daysat <time-of-day>", -4.869071729774469),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.467439512522012),
-                                    ("for <duration> from <time>December", -6.482342533064276),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.482342533064276),
+                                     -4.463606621666305),
+                                    ("for <duration> from <time>December", -6.478509642208569),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.478509642208569),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.229579564568908),
+                                     -5.225746673713201),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.229579564568908),
-                                    ("time-of-day (latent)this <part-of-day>", -6.482342533064276),
-                                    ("Pentecostyear (latent)", -6.482342533064276),
+                                     -5.225746673713201),
+                                    ("time-of-day (latent)this <part-of-day>", -6.478509642208569),
+                                    ("Pentecostyear (latent)", -6.478509642208569),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.229579564568908),
-                                    ("<day-of-month> (ordinal)February", -6.482342533064276),
-                                    ("Eid al-Fitryear (latent)", -5.096048171944386),
+                                     -5.225746673713201),
+                                    ("<day-of-month> (ordinal)February", -6.478509642208569),
+                                    ("Eid al-Fitryear (latent)", -5.092215281088679),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.482342533064276),
-                                    ("Mondayin|during the <part-of-day>", -6.482342533064276),
-                                    ("Chhathin|during <named-month>|year", -6.482342533064276),
-                                    ("Diwaliin|during <named-month>|year", -6.482342533064276),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.482342533064276),
-                                    ("Vaisakhiin|during <named-month>|year", -6.482342533064276),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.229579564568908),
-                                    ("Raksha Bandhanyear (latent)", -6.482342533064276),
-                                    ("daysecond", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Mondayin|during the <part-of-day>", -6.478509642208569),
+                                    ("Chhathin|during <named-month>|year", -6.478509642208569),
+                                    ("Diwaliin|during <named-month>|year", -6.478509642208569),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.478509642208569),
+                                    ("Vaisakhiin|during <named-month>|year", -6.478509642208569),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.225746673713201),
+                                    ("Raksha Bandhanyear (latent)", -6.478509642208569),
+                                    ("daysecond", -6.073044534100405),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.076877424956113),
-                                    ("Ratha-Yatrayear (latent)", -6.482342533064276),
-                                    ("Ashurayear (latent)", -6.482342533064276),
-                                    ("Tuesdayin|during <named-month>|year", -6.482342533064276),
-                                    ("Chinese New Yearyear (latent)", -6.482342533064276),
-                                    ("tomorrowintersect", -6.482342533064276),
-                                    ("Lag BaOmeryear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("Ratha-Yatrayear (latent)", -6.478509642208569),
+                                    ("Ashurayear (latent)", -6.478509642208569),
+                                    ("Tuesdayin|during <named-month>|year", -6.478509642208569),
+                                    ("Chinese New Yearyear (latent)", -6.478509642208569),
+                                    ("tomorrowintersect", -6.478509642208569),
+                                    ("Lag BaOmeryear (latent)", -6.478509642208569),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.482342533064276),
-                                    ("Eid al-Adhayear (latent)", -4.342276369568006),
-                                    ("intersectin|during the <part-of-day>", -6.482342533064276),
-                                    ("Palm Sundayyear (latent)", -6.482342533064276),
-                                    ("Christmasat <time-of-day>", -6.482342533064276),
-                                    ("Passoveryear (latent)", -6.482342533064276),
-                                    ("Lazarus Saturdayyear (latent)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Eid al-Adhayear (latent)", -4.338443478712298),
+                                    ("intersectin|during the <part-of-day>", -6.478509642208569),
+                                    ("Palm Sundayyear (latent)", -6.478509642208569),
+                                    ("Christmasat <time-of-day>", -6.478509642208569),
+                                    ("Passoveryear (latent)", -6.478509642208569),
+                                    ("Lazarus Saturdayyear (latent)", -6.478509642208569),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.482342533064276),
-                                    ("hhhmmon <day>", -5.566051801190121),
-                                    ("Yom HaShoahyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("hhhmmon <day>", -5.562218910334414),
+                                    ("Yom HaShoahyear (latent)", -6.073044534100405),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Septemberyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Septemberyear (latent)", -6.073044534100405),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.978265136288003),
-                                    ("Halloweenyear (latent)", -6.482342533064276),
+                                     -4.974432245432295),
+                                    ("Halloweenyear (latent)", -6.478509642208569),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.789195352504331),
+                                     -5.785362461648624),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.482342533064276),
-                                    ("at <time-of-day>intersect", -5.566051801190121),
-                                    ("Rosh Hashanahyear (latent)", -5.789195352504331),
-                                    ("Dhanterasyear (latent)", -6.482342533064276),
-                                    ("Tu BiShvatyear (latent)", -6.482342533064276),
-                                    ("<day-of-month> (ordinal)December", -5.789195352504331),
-                                    ("Holiyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("at <time-of-day>intersect", -5.562218910334414),
+                                    ("Rosh Hashanahyear (latent)", -5.785362461648624),
+                                    ("Dhanterasyear (latent)", -6.478509642208569),
+                                    ("Tu BiShvatyear (latent)", -6.478509642208569),
+                                    ("<day-of-month> (ordinal)December", -5.785362461648624),
+                                    ("Holiyear (latent)", -5.785362461648624),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.482342533064276),
-                                    ("Holika Dahanyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("Holika Dahanyear (latent)", -5.785362461648624),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.076877424956113),
-                                    ("dayminute", -3.168156528391751),
-                                    ("Mawlidyear (latent)", -6.482342533064276),
+                                     -6.073044534100405),
+                                    ("dayminute", -3.1643236375360435),
+                                    ("Mawlidyear (latent)", -6.478509642208569),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.482342533064276),
-                                    ("Jumu'atul-Widayear (latent)", -5.566051801190121),
-                                    ("minuteday", -2.7328384571339055),
+                                     -6.478509642208569),
+                                    ("Jumu'atul-Widayear (latent)", -5.562218910334414),
+                                    ("minuteday", -2.729005566278198),
                                     ("absorption of , after named dayintersect",
-                                     -5.789195352504331),
-                                    ("intersectyear (latent)", -6.482342533064276),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("intersectyear (latent)", -6.478509642208569),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.478509642208569),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.482342533064276),
-                                    ("intersecthhhmm", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("intersecthhhmm", -6.073044534100405),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Boss's Dayyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Boss's Dayyear (latent)", -6.073044534100405),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.482342533064276),
-                                    ("Global Youth Service Dayyear (latent)", -6.482342533064276),
-                                    ("Dhanterasin|during <named-month>|year", -6.482342533064276),
-                                    ("tonight<time-of-day> o'clock", -6.482342533064276),
-                                    ("Tisha B'Avyear (latent)", -6.482342533064276),
-                                    ("Isra and Mi'rajyear (latent)", -5.566051801190121),
-                                    ("at <time-of-day>on <day>", -4.872904620630176),
+                                     -6.478509642208569),
+                                    ("Global Youth Service Dayyear (latent)", -6.478509642208569),
+                                    ("Dhanterasin|during <named-month>|year", -6.478509642208569),
+                                    ("tonight<time-of-day> o'clock", -6.478509642208569),
+                                    ("Tisha B'Avyear (latent)", -6.478509642208569),
+                                    ("Isra and Mi'rajyear (latent)", -5.562218910334414),
+                                    ("at <time-of-day>on <day>", -4.869071729774469),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.789195352504331),
-                                    ("Christmasyear (latent)", -6.076877424956113),
-                                    ("Saturdayintersect", -6.482342533064276),
-                                    ("Naraka Chaturdashiyear (latent)", -6.076877424956113),
-                                    ("Thai Pongalin|during <named-month>|year", -6.482342533064276),
-                                    ("dayweek", -6.482342533064276),
-                                    ("Easter Sundayyear (latent)", -5.789195352504331),
+                                     -5.785362461648624),
+                                    ("Christmasyear (latent)", -6.073044534100405),
+                                    ("Saturdayintersect", -6.478509642208569),
+                                    ("Naraka Chaturdashiyear (latent)", -6.073044534100405),
+                                    ("Thai Pongalin|during <named-month>|year", -6.478509642208569),
+                                    ("dayweek", -6.478509642208569),
+                                    ("Easter Sundayyear (latent)", -5.785362461648624),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.076877424956113),
-                                    ("weekyear", -5.383730244396167),
-                                    ("King's Dayyear (latent)", -4.978265136288003),
-                                    ("hh:mmin|during the <part-of-day>", -5.566051801190121),
+                                     -6.073044534100405),
+                                    ("weekyear", -5.37989735354046),
+                                    ("King's Dayyear (latent)", -4.974432245432295),
+                                    ("hh:mmin|during the <part-of-day>", -5.562218910334414),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.076877424956113),
+                                     -6.073044534100405),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.789195352504331),
-                                    ("Hanukkahyear (latent)", -5.789195352504331),
-                                    ("Rama Navamiyear (latent)", -6.482342533064276),
-                                    ("February<time> <part-of-day>", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("Hanukkahyear (latent)", -5.785362461648624),
+                                    ("Rama Navamiyear (latent)", -6.478509642208569),
+                                    ("February<time> <part-of-day>", -6.478509642208569),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.789195352504331),
-                                    ("Great Lentyear (latent)", -6.482342533064276),
-                                    ("tomorrowat <time-of-day>", -5.789195352504331),
+                                     -5.785362461648624),
+                                    ("Great Lentyear (latent)", -6.478509642208569),
+                                    ("tomorrowat <time-of-day>", -5.785362461648624),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.076877424956113),
-                                    ("Ugadiyear (latent)", -5.096048171944386),
-                                    ("Vaisakhiyear (latent)", -5.789195352504331),
+                                     -6.478509642208569),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.073044534100405),
+                                    ("Ugadiyear (latent)", -5.092215281088679),
+                                    ("Vaisakhiyear (latent)", -5.785362461648624),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.789195352504331),
-                                    ("last <cycle> of <time>year (latent)", -5.789195352504331),
-                                    ("at <time-of-day>tomorrow", -6.076877424956113),
-                                    ("tomorrow<time-of-day> am|pm", -6.482342533064276),
+                                     -5.785362461648624),
+                                    ("last <cycle> of <time>year (latent)", -5.785362461648624),
+                                    ("at <time-of-day>tomorrow", -6.073044534100405),
+                                    ("tomorrow<time-of-day> am|pm", -6.478509642208569),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.482342533064276),
-                                    ("Diwaliyear (latent)", -6.482342533064276),
-                                    ("between <time> and <time>on <day>", -6.076877424956113),
-                                    ("Black Fridayyear (latent)", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Diwaliyear (latent)", -6.478509642208569),
+                                    ("between <time> and <time>on <day>", -6.073044534100405),
+                                    ("Black Fridayyear (latent)", -6.073044534100405),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.482342533064276),
+                                     -6.478509642208569),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.482342533064276),
-                                    ("Chhathyear (latent)", -6.076877424956113),
-                                    ("Vasant Panchamiyear (latent)", -6.482342533064276),
-                                    ("Rabindra Jayantiyear (latent)", -5.229579564568908),
-                                    ("this <part-of-day>at <time-of-day>", -5.229579564568908),
-                                    ("St Patrick's Dayyear (latent)", -6.482342533064276),
-                                    ("Thursday<time> (timezone)", -6.482342533064276),
+                                     -6.478509642208569),
+                                    ("Chhathyear (latent)", -6.073044534100405),
+                                    ("Vasant Panchamiyear (latent)", -6.478509642208569),
+                                    ("Rabindra Jayantiyear (latent)", -5.225746673713201),
+                                    ("this <part-of-day>at <time-of-day>", -5.225746673713201),
+                                    ("St Patrick's Dayyear (latent)", -6.478509642208569),
+                                    ("Thursday<time> (timezone)", -6.478509642208569),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.482342533064276),
-                                    ("Pargat Diwasyear (latent)", -5.229579564568908),
-                                    ("<datetime> - <datetime> (interval)July", -6.076877424956113),
+                                     -6.478509642208569),
+                                    ("Pargat Diwasyear (latent)", -5.225746673713201),
+                                    ("<datetime> - <datetime> (interval)July", -6.073044534100405),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.789195352504331),
-                                    ("Februaryintersect", -6.482342533064276),
-                                    ("Simchat Torahyear (latent)", -6.482342533064276),
-                                    ("minuteyear", -6.482342533064276)],
+                                     -5.785362461648624),
+                                    ("Februaryintersect", -6.478509642208569),
+                                    ("Simchat Torahyear (latent)", -6.478509642208569),
+                                    ("minuteyear", -6.478509642208569)],
                                n = 502},
                    koData =
-                     ClassData{prior = -0.9434193992624076, unseen = -6.8501261661455,
+                     ClassData{prior = -1.0024999544633555, unseen = -6.78105762593618,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.651841705297238),
-                                    ("hourday", -3.5532294166291285),
+                                   [("Thursdayhhhmm", -4.582697330136033),
+                                    ("hourday", -3.484085041467923),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)August", -6.155919102073512),
-                                    ("dayhour", -3.5909697446119755),
-                                    ("<time> timezoneyear (latent)", -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)August", -6.0867747269123065),
+                                    ("dayhour", -3.52182536945077),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.239628370199357),
-                                    ("Tuesdayfrom|since|after <time>", -5.462771921513567),
-                                    ("daymonth", -3.447868900971302),
-                                    ("hourquarter", -5.239628370199357),
-                                    ("monthday", -5.750453993965348),
-                                    ("monthyear", -4.903156133578144),
-                                    ("<time-of-day> am|pmyear (latent)", -5.462771921513567),
-                                    ("Thai Pongalyear (latent)", -5.462771921513567),
-                                    ("intersecthh:mm", -6.155919102073512),
+                                     -5.170483995038151),
+                                    ("Tuesdayfrom|since|after <time>", -5.393627546352362),
+                                    ("daymonth", -3.378724525810097),
+                                    ("hourquarter", -5.170483995038151),
+                                    ("monthday", -5.681309618804143),
+                                    ("monthyear", -4.834011758416939),
+                                    ("Thai Pongalyear (latent)", -5.393627546352362),
+                                    ("intersecthh:mm", -6.0867747269123065),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.750453993965348),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.155919102073512),
-                                    ("houryear", -4.364159632845457),
+                                     -5.681309618804143),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.0867747269123065),
+                                    ("houryear", -4.700480365792417),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)October", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)October", -6.0867747269123065),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.462771921513567),
-                                    ("hournograin", -4.903156133578144),
-                                    ("<time-of-day> am|pmintersect", -4.903156133578144),
-                                    ("Octoberyear (latent)", -6.155919102073512),
-                                    ("Good Fridayyear (latent)", -5.750453993965348),
+                                     -5.393627546352362),
+                                    ("hournograin", -4.834011758416939),
+                                    ("<time-of-day> am|pmintersect", -4.834011758416939),
+                                    ("Octoberyear (latent)", -6.0867747269123065),
+                                    ("Good Fridayyear (latent)", -5.681309618804143),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("early morningat <time-of-day>", -6.155919102073512),
-                                    ("until <time>on <day>", -5.462771921513567),
+                                     -5.681309618804143),
+                                    ("early morningat <time-of-day>", -6.0867747269123065),
+                                    ("until <time>on <day>", -5.393627546352362),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
-                                    ("time-of-day (latent)intersect", -5.462771921513567),
-                                    ("todayin <number> (implicit minutes)", -6.155919102073512),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("time-of-day (latent)intersect", -5.393627546352362),
+                                    ("todayin <number> (implicit minutes)", -6.0867747269123065),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.155919102073512),
-                                    ("hh:mmon <day>", -4.903156133578144),
-                                    ("hhhmmintersect", -5.750453993965348),
-                                    ("absorption of , after named dayJuly", -5.239628370199357),
-                                    ("from|since|after <time>July", -5.750453993965348),
+                                     -6.0867747269123065),
+                                    ("hh:mmon <day>", -4.834011758416939),
+                                    ("hhhmmintersect", -5.681309618804143),
+                                    ("absorption of , after named dayJuly", -5.170483995038151),
+                                    ("from|since|after <time>July", -5.681309618804143),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.239628370199357),
-                                    ("Clean Mondayyear (latent)", -6.155919102073512),
-                                    ("monthhour", -6.155919102073512),
+                                     -5.170483995038151),
+                                    ("Clean Mondayyear (latent)", -6.0867747269123065),
+                                    ("monthhour", -6.0867747269123065),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("hourmonth", -4.0158529385772415),
-                                    ("todayat <time-of-day>", -6.155919102073512),
-                                    ("hhhmmyear (latent)", -4.903156133578144),
-                                    ("from|since|after <time>December", -6.155919102073512),
+                                     -5.681309618804143),
+                                    ("hourmonth", -3.946708563416036),
+                                    ("todayat <time-of-day>", -6.0867747269123065),
+                                    ("from|since|after <time>December", -6.0867747269123065),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.155919102073512),
-                                    ("<time-of-day> am|pmon <day>", -4.903156133578144),
-                                    ("Mondayyear (latent)", -5.462771921513567),
-                                    ("dayday", -4.0158529385772415),
-                                    ("on <day>September", -5.462771921513567),
-                                    ("time-of-day (latent)September", -5.750453993965348),
-                                    ("hourhour", -4.076477560393676),
-                                    ("time-of-day (latent)on <day>", -4.651841705297238),
+                                     -6.0867747269123065),
+                                    ("<time-of-day> am|pmon <day>", -4.834011758416939),
+                                    ("Mondayyear (latent)", -5.393627546352362),
+                                    ("dayday", -3.946708563416036),
+                                    ("on <day>September", -5.393627546352362),
+                                    ("time-of-day (latent)September", -5.681309618804143),
+                                    ("hourhour", -4.007333185232471),
+                                    ("time-of-day (latent)on <day>", -4.582697330136033),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.750453993965348),
-                                    ("dayyear", -3.1354942159291497),
-                                    ("Thursdaymm/dd", -6.155919102073512),
-                                    ("New Year's Dayyear (latent)", -5.239628370199357),
-                                    ("time-of-day (latent)Sunday", -5.750453993965348),
-                                    ("Thursdayfrom|since|after <time>", -4.451171009835087),
-                                    ("Thursdayat <time-of-day>", -4.546481189639412),
+                                     -5.681309618804143),
+                                    ("dayyear", -3.283414346005772),
+                                    ("Thursdaymm/dd", -6.0867747269123065),
+                                    ("New Year's Dayyear (latent)", -5.170483995038151),
+                                    ("time-of-day (latent)Sunday", -5.681309618804143),
+                                    ("Thursdayfrom|since|after <time>", -4.382026634673881),
+                                    ("Thursdayat <time-of-day>", -4.477336814478207),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.155919102073512),
-                                    ("Aprilyear (latent)", -6.155919102073512),
-                                    ("the <day-of-month> (ordinal)July", -6.155919102073512),
-                                    ("the <day-of-month> (number)July", -6.155919102073512),
-                                    ("monthminute", -6.155919102073512),
-                                    ("<time-of-day> am|pmtomorrow", -5.750453993965348),
-                                    ("Thursdayhh:mm", -5.239628370199357),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.750453993965348),
-                                    ("minutemonth", -4.0158529385772415),
-                                    ("time-of-day (latent)Friday", -5.750453993965348),
-                                    ("minutehour", -6.155919102073512),
-                                    ("part of daysat <time-of-day>", -5.057306813405402),
+                                     -6.0867747269123065),
+                                    ("Aprilyear (latent)", -6.0867747269123065),
+                                    ("the <day-of-month> (ordinal)July", -6.0867747269123065),
+                                    ("the <day-of-month> (number)July", -6.0867747269123065),
+                                    ("monthminute", -6.0867747269123065),
+                                    ("<time-of-day> am|pmtomorrow", -5.681309618804143),
+                                    ("Thursdayhh:mm", -5.170483995038151),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.681309618804143),
+                                    ("minutemonth", -3.946708563416036),
+                                    ("time-of-day (latent)Friday", -5.681309618804143),
+                                    ("minutehour", -6.0867747269123065),
+                                    ("part of daysat <time-of-day>", -4.988162438244197),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.8045438449100346),
-                                    ("Augustyear (latent)", -5.750453993965348),
-                                    ("week-endin|during <named-month>|year", -6.155919102073512),
-                                    ("time-of-day (latent)Tuesday", -5.750453993965348),
+                                     -3.7353994697488293),
+                                    ("Augustyear (latent)", -5.681309618804143),
+                                    ("week-endin|during <named-month>|year", -6.0867747269123065),
+                                    ("time-of-day (latent)Tuesday", -5.681309618804143),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("July<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.155919102073512),
-                                    ("Sundayyear (latent)", -5.239628370199357),
-                                    ("hourweek", -5.239628370199357),
-                                    ("the <day-of-month> (ordinal)Monday", -5.462771921513567),
-                                    ("Christmasat <time-of-day>", -6.155919102073512),
-                                    ("from|since|after <time>year (latent)", -5.057306813405402),
-                                    ("hhhmmon <day>", -5.239628370199357),
-                                    ("yesterday<time-of-day> am|pm", -6.155919102073512),
-                                    ("<day-of-month> (ordinal)July", -5.462771921513567),
+                                     -6.0867747269123065),
+                                    ("Sundayyear (latent)", -5.170483995038151),
+                                    ("hourweek", -5.170483995038151),
+                                    ("the <day-of-month> (ordinal)Monday", -5.393627546352362),
+                                    ("Christmasat <time-of-day>", -6.0867747269123065),
+                                    ("from|since|after <time>year (latent)", -5.681309618804143),
+                                    ("hhhmmon <day>", -5.170483995038151),
+                                    ("yesterday<time-of-day> am|pm", -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)July", -5.393627546352362),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.155919102073512),
+                                     -6.0867747269123065),
                                     ("August<day-of-month> (ordinal or number) of <named-month>",
-                                     -6.155919102073512),
-                                    ("at <time-of-day>intersect", -5.239628370199357),
-                                    ("hh:mmyear (latent)", -4.769624740953621),
-                                    ("Holiyear (latent)", -6.155919102073512),
-                                    ("until <time><time-of-day> am|pm", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("at <time-of-day>intersect", -5.170483995038151),
+                                    ("Holiyear (latent)", -6.0867747269123065),
+                                    ("until <time><time-of-day> am|pm", -6.0867747269123065),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.750453993965348),
-                                    ("dayminute", -3.322705758017296),
-                                    ("yyyy-mm-ddhh:mm", -5.750453993965348),
-                                    ("intersectfrom|since|after <time>", -5.750453993965348),
-                                    ("intersectSeptember", -4.28411692517192),
-                                    ("minuteday", -2.9989186809233987),
+                                     -5.681309618804143),
+                                    ("dayminute", -3.2535613828560908),
+                                    ("yyyy-mm-ddhh:mm", -5.681309618804143),
+                                    ("intersectfrom|since|after <time>", -5.681309618804143),
+                                    ("intersectSeptember", -4.214972550010716),
+                                    ("minuteday", -2.9297743057621934),
                                     ("absorption of , after named dayintersect",
-                                     -6.155919102073512),
-                                    ("intersectyear (latent)", -6.155919102073512),
-                                    ("Februaryin|during the <part-of-day>", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("intersectyear (latent)", -6.0867747269123065),
+                                    ("Februaryin|during the <part-of-day>", -6.0867747269123065),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.155919102073512),
-                                    ("time-of-day (latent)July", -5.462771921513567),
-                                    ("Saturdayyear (latent)", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("time-of-day (latent)July", -5.393627546352362),
+                                    ("Saturdayyear (latent)", -6.0867747269123065),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)Monday", -4.903156133578144),
-                                    ("at <time-of-day>on <day>", -5.239628370199357),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)Monday", -4.834011758416939),
+                                    ("at <time-of-day>on <day>", -5.170483995038151),
                                     ("absorption of , after named daySeptember",
-                                     -4.903156133578144),
-                                    ("Naraka Chaturdashiyear (latent)", -6.155919102073512),
-                                    ("from|since|after <time>on <day>", -5.239628370199357),
-                                    ("dayweek", -6.155919102073512),
-                                    ("Easter Sundayyear (latent)", -5.750453993965348),
-                                    ("Thursday<time-of-day> am|pm", -4.903156133578144),
-                                    ("weekyear", -5.750453993965348),
-                                    ("time-of-day (latent)Thursday", -5.750453993965348),
+                                     -4.834011758416939),
+                                    ("Naraka Chaturdashiyear (latent)", -6.0867747269123065),
+                                    ("from|since|after <time>on <day>", -5.170483995038151),
+                                    ("dayweek", -6.0867747269123065),
+                                    ("Easter Sundayyear (latent)", -5.681309618804143),
+                                    ("Thursday<time-of-day> am|pm", -4.834011758416939),
+                                    ("weekyear", -5.681309618804143),
+                                    ("time-of-day (latent)Thursday", -5.681309618804143),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.155919102073512),
-                                    ("<day-of-month> (ordinal)April", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("<day-of-month> (ordinal)April", -6.0867747269123065),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.750453993965348),
+                                     -5.681309618804143),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.462771921513567),
-                                    ("Sundayfrom|since|after <time>", -6.155919102073512),
-                                    ("absorption of , after named dayFebruary", -5.239628370199357),
+                                     -5.393627546352362),
+                                    ("Sundayfrom|since|after <time>", -6.0867747269123065),
+                                    ("absorption of , after named dayFebruary", -5.170483995038151),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.750453993965348),
+                                     -5.681309618804143),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.155919102073512),
-                                    ("tomorrowat <time-of-day>", -6.155919102073512),
-                                    ("daynograin", -5.750453993965348),
-                                    ("Fridayin|during <named-month>|year", -6.155919102073512),
+                                     -6.0867747269123065),
+                                    ("tomorrowat <time-of-day>", -6.0867747269123065),
+                                    ("daynograin", -5.681309618804143),
+                                    ("Fridayin|during <named-month>|year", -6.0867747269123065),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.750453993965348),
-                                    ("last <cycle> of <time>year (latent)", -5.750453993965348),
-                                    ("tomorrow<time-of-day> am|pm", -6.155919102073512),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.462771921513567),
-                                    ("Diwaliyear (latent)", -5.750453993965348),
+                                     -5.681309618804143),
+                                    ("last <cycle> of <time>year (latent)", -5.681309618804143),
+                                    ("tomorrow<time-of-day> am|pm", -6.0867747269123065),
+                                    ("Diwaliyear (latent)", -5.681309618804143),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.155919102073512),
-                                    ("this <part-of-day>at <time-of-day>", -5.239628370199357),
-                                    ("Fridayyear (latent)", -5.239628370199357),
-                                    ("time-of-day (latent)April", -6.155919102073512),
-                                    ("minuteyear", -3.9586945247372927)],
-                               n = 320}}),
+                                     -6.0867747269123065),
+                                    ("this <part-of-day>at <time-of-day>", -5.170483995038151),
+                                    ("Fridayyear (latent)", -5.170483995038151),
+                                    ("time-of-day (latent)April", -6.0867747269123065)],
+                               n = 291}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1742,22 +1730,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.14681486833704485,
-                               unseen = -5.393627546352362,
+                     ClassData{prior = -4.546237407675729e-2,
+                               unseen = -5.389071729816501,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.7779564107075706e-2),
-                                    ("intersect 2 numbers", -4.00277736869661)],
+                                   [("integer (numeric)", -2.320289707966387e-2),
+                                    ("intersect 2 numbers", -3.9982007016691985)],
                                n = 215},
                    koData =
-                     ClassData{prior = -1.9910923718485463,
-                               unseen = -3.6635616461296463,
+                     ClassData{prior = -3.1135153092103742, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.55814461804655),
-                                    ("negative numbers", -0.41871033485818493),
-                                    ("compose by multiplication", -2.2512917986064953)],
-                               n = 34}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.15415067982725836,

Duckling/Ranking/Classifiers/HU_XX.hs

@@ -23,17 +23,17 @@ classifiers
   = HashMap.fromList
       [("Thursday",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -1.2205021062771466, unseen = -2.995732273553991,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 18},
+                     ClassData{prior = -0.6817184847363225, unseen = -3.828641396489095,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 44},
                    koData =
-                     ClassData{prior = -0.3496737484797488,
+                     ClassData{prior = -0.7047080029610213,
                                unseen = -3.8066624897703196,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 43}}),
        ("pm <time-of-day>",
@@ -49,16 +49,17 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.5108256237659907, unseen = -2.995732273553991,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -3.1780538303479458,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -0.9985288301111273),
-                                    ("todaypart of days", -1.3350010667323402),
-                                    ("tomorrowpart of days", -2.2512917986064953),
-                                    ("yesterdaypart of days", -2.2512917986064953)],
-                               n = 6},
+                                   [("dayhour", -0.9382696385929302),
+                                    ("todaypart of days", -1.1895840668738362),
+                                    ("tomorrowpart of days", -2.4423470353692043),
+                                    ("yesterdaypart of days", -2.4423470353692043)],
+                               n = 8},
                    koData =
-                     ClassData{prior = -0.916290731874155, unseen = -2.772588722239781,
+                     ClassData{prior = -1.0986122886681098, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
                                    [("dayhour", -1.0986122886681098),
@@ -68,8 +69,29 @@ classifiers
                                n = 4}}),
        ("today",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     ClassData{prior = 0.0, unseen = -2.833213344056216,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 15},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("December",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("September",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("October",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -82,12 +104,33 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("January",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Wednesday",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.70805020110221,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 13},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("November",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("July",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("May",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 6},
@@ -96,22 +139,22 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.713572066704308,
+                     ClassData{prior = -0.3629054936893685,
+                               unseen = -3.8066624897703196,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -1.0498221244986778),
-                                    ("yyyy.mm.ddhh:mm", -2.995732273553991),
-                                    ("Wednesdaypm <time-of-day>", -2.3025850929940455),
-                                    ("todaypart of days", -2.0794415416798357),
-                                    ("yyyy.mm.ddpm <time-of-day>", -2.995732273553991),
-                                    ("dayminute", -2.995732273553991),
-                                    ("tomorrowpart of days", -2.995732273553991),
-                                    ("next <day-of-week>pm <time-of-day>", -2.3025850929940455),
-                                    ("yesterdaypart of days", -2.995732273553991)],
-                               n = 14},
+                                   [("dayhour", -1.0116009116784799),
+                                    ("yyyy.mm.ddhh:mm", -3.0910424533583156),
+                                    ("Wednesdaypm <time-of-day>", -2.3978952727983707),
+                                    ("todaypart of days", -1.8382794848629478),
+                                    ("yyyy.mm.ddpm <time-of-day>", -3.0910424533583156),
+                                    ("dayminute", -3.0910424533583156),
+                                    ("tomorrowpart of days", -3.0910424533583156),
+                                    ("next <day-of-week>pm <time-of-day>", -2.3978952727983707),
+                                    ("yesterdaypart of days", -3.0910424533583156)],
+                               n = 16},
                    koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -3.295836866004329,
+                     ClassData{prior = -1.1895840668738362, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
                                    [("dayhour", -1.1786549963416462),
@@ -127,24 +170,31 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("day before yesterday",
+       ("Saturday",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("Monday",
+       ("day before yesterday",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("Monday",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("yesterday",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                     ClassData{prior = 0.0, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -155,6 +205,13 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("April",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("am <time-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.1972245773362196,
@@ -168,15 +225,22 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("end of month",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("Friday",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("tomorrow",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                     ClassData{prior = 0.0, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -206,8 +270,22 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Sunday",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("June",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("February",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -228,8 +306,8 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("March",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.4849066497880004,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 10},
+                     ClassData{prior = 0.0, unseen = -3.713572066704308,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 39},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -249,33 +327,35 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("Tuesday",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<named-month> <day-of-month> (non ordinal)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
+                     ClassData{prior = 0.0, unseen = -4.74493212836325,
                                likelihoods =
                                  HashMap.fromList
                                    [("Marchinteger (numeric)", -0.6931471805599453),
                                     ("month", -0.6931471805599453)],
-                               n = 5},
+                               n = 56},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("ordinal (digits)",
         Classifier{okData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0},
+                     ClassData{prior = -2.0794415416798357,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
                    koData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                     ClassData{prior = -0.13353139262452263,
+                               unseen = -2.1972245773362196,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 7}}),
        ("seasons",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -2.890371757896165,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 16},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -288,31 +368,48 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("right now",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                     ClassData{prior = 0.0, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("end of year",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("day after tomorrow",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("part of days",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -2.4849066497880004,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 10},
+                     ClassData{prior = -0.17589066646366416,
+                               unseen = -3.332204510175204,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 26},
                    koData =
-                     ClassData{prior = -1.0986122886681098,
-                               unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5}})]
+                     ClassData{prior = -1.824549292051046, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5}}),
+       ("<named-month> <day-of-month> (ordinal)",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("month", -0.6931471805599453),
+                                    ("Marchordinal (digits)", -0.6931471805599453)],
+                               n = 1},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("August",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}})]

Duckling/Ranking/Classifiers/NB_XX.hs

@@ -78,24 +78,18 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.45198512374305727,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = 0.0, unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -0.9650808960435872),
-                                    ("tomorrowevening", -1.9459101490553135),
-                                    ("tomorrowlunch", -1.9459101490553135),
-                                    ("yesterdayevening", -2.3513752571634776),
-                                    ("Mandagmorning", -1.9459101490553135)],
+                                   [("dayhour", -0.8649974374866046),
+                                    ("tomorrowevening", -1.845826690498331),
+                                    ("tomorrowlunch", -1.845826690498331),
+                                    ("yesterdayevening", -2.2512917986064953),
+                                    ("Mandagmorning", -1.845826690498331)],
                                n = 7},
                    koData =
-                     ClassData{prior = -1.0116009116784799, unseen = -2.772588722239781,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("yearhour", -1.0986122886681098),
-                                    ("year (latent)in|during the <part-of-day>",
-                                     -1.0986122886681098)],
-                               n = 4}}),
+                     ClassData{prior = -infinity, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("dd/mm",
         Classifier{okData =
                      ClassData{prior = -0.5108256237659907, unseen = -2.639057329615259,
@@ -558,9 +552,9 @@ classifiers
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 5}}),
+                               n = 1}}),
        ("Mandag",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.70805020110221,

Duckling/Ranking/Classifiers/PT_XX.hs

@@ -217,7 +217,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by `da` or `de`",
         Classifier{okData =
-                     ClassData{prior = -1.9209712007080613, unseen = -4.912654885736052,
+                     ClassData{prior = -1.9108188292440431, unseen = -4.912654885736052,
                                likelihoods =
                                  HashMap.fromList
                                    [("daymonth", -2.959364629383116),
@@ -253,87 +253,86 @@ classifiers
                                      -4.212127597878484)],
                                n = 29},
                    koData =
-                     ClassData{prior = -0.15836831577146182,
-                               unseen = -6.030685260261263,
+                     ClassData{prior = -0.16012084681376212,
+                               unseen = -6.021023349349527,
                                likelihoods =
                                  HashMap.fromList
                                    [("time-of-day (latent)<datetime> - <datetime> (interval)",
-                                     -4.929666231562589),
-                                    ("hourday", -3.195065176174482),
-                                    ("year (latent)Abril", -4.929666231562589),
-                                    ("year (latent)Julho", -3.3892211906154395),
-                                    ("dayhour", -5.3351313396707525),
-                                    ("time-of-day (latent)Fevereiro", -3.948836978550862),
-                                    ("monthday", -4.641984159110808),
-                                    ("monthyear", -3.6303832474323277),
-                                    ("yearhour", -3.8310539428944788),
+                                     -4.919980925828125),
+                                    ("hourday", -3.1853798704400185),
+                                    ("year (latent)Abril", -4.919980925828125),
+                                    ("year (latent)Julho", -3.5336865647082343),
+                                    ("dayhour", -5.32544603393629),
+                                    ("time-of-day (latent)Fevereiro", -3.9391516728163984),
+                                    ("monthday", -4.632298853376344),
+                                    ("monthyear", -3.620697941697864),
+                                    ("yearhour", -3.821368637160015),
                                     ("entre <datetime> e <datetime> (interval)Julho",
-                                     -3.7256934272366524),
-                                    ("houryear", -3.3892211906154395),
-                                    ("year (latent)Maio", -4.236519051002643),
+                                     -3.7160081215021887),
+                                    ("houryear", -3.379535884880976),
+                                    ("year (latent)Maio", -4.22683374526818),
                                     ("time-of-day (latent)two time tokens separated by \",\"2",
-                                     -4.929666231562589),
-                                    ("Setembroyear", -4.236519051002643),
-                                    ("time-of-day (latent)Setembro", -4.236519051002643),
-                                    ("time-of-day (latent)intersect", -3.3202283191284883),
-                                    ("year (latent)<time-of-day> <part-of-day>",
-                                     -5.3351313396707525),
-                                    ("\224s <time-of-day>Julho", -4.641984159110808),
-                                    ("year (latent)intersect", -4.236519051002643),
-                                    ("Setembrointersect", -5.3351313396707525),
+                                     -4.919980925828125),
+                                    ("Setembroyear", -4.22683374526818),
+                                    ("time-of-day (latent)Setembro", -4.22683374526818),
+                                    ("time-of-day (latent)intersect", -3.3105430133940246),
+                                    ("year (latent)<time-of-day> <part-of-day>", -5.32544603393629),
+                                    ("\224s <time-of-day>Julho", -4.632298853376344),
+                                    ("year (latent)intersect", -4.22683374526818),
+                                    ("Setembrointersect", -5.32544603393629),
                                     ("intersect by `da` or `de`two time tokens separated by \",\"",
-                                     -5.3351313396707525),
+                                     -5.32544603393629),
                                     ("year (latent)amanh\227 pela <part-of-day>",
-                                     -5.3351313396707525),
-                                    ("hourmonth", -1.7797832781813394),
+                                     -5.32544603393629),
+                                    ("hourmonth", -1.7700979724468757),
                                     ("time-of-day (latent)intersect by `da` or `de`",
-                                     -3.543371870442698),
-                                    ("monthmonth", -5.3351313396707525),
+                                     -3.5336865647082343),
+                                    ("monthmonth", -5.32544603393629),
                                     ("Setembrotwo time tokens separated by \",\"2",
-                                     -5.3351313396707525),
-                                    ("year (latent)Fevereiro", -3.948836978550862),
-                                    ("time-of-day (latent)Dezembro", -5.3351313396707525),
-                                    ("dayyear", -5.3351313396707525),
-                                    ("time-of-day (latent)Julho", -3.543371870442698),
-                                    ("time-of-day (latent)Abril", -4.929666231562589),
-                                    ("passado <cycle>year", -5.3351313396707525),
-                                    ("year (latent)<dim time> da manha", -5.3351313396707525),
+                                     -5.32544603393629),
+                                    ("year (latent)Fevereiro", -3.9391516728163984),
+                                    ("time-of-day (latent)Dezembro", -5.32544603393629),
+                                    ("dayyear", -5.32544603393629),
+                                    ("time-of-day (latent)Julho", -3.5336865647082343),
+                                    ("time-of-day (latent)Abril", -4.919980925828125),
+                                    ("passado <cycle>year", -5.32544603393629),
+                                    ("year (latent)<dim time> da manha", -5.32544603393629),
                                     ("<day-of-month> (ordinal or number) de <named-month>year",
-                                     -5.3351313396707525),
-                                    ("time-of-day (latent)Mar\231o", -4.236519051002643),
-                                    ("year (latent)Janeiro", -5.3351313396707525),
-                                    ("year (latent)Dezembro", -5.3351313396707525),
+                                     -5.32544603393629),
+                                    ("time-of-day (latent)Mar\231o", -4.22683374526818),
+                                    ("year (latent)Janeiro", -5.32544603393629),
+                                    ("year (latent)Dezembro", -5.32544603393629),
                                     ("entre <datetime> e <datetime> (interval)Janeiro",
-                                     -5.3351313396707525),
-                                    ("yearmonth", -2.1996371237416033),
-                                    ("two time tokens separated by \",\"2year", -4.929666231562589),
+                                     -5.32544603393629),
+                                    ("yearmonth", -2.2344035805779736),
+                                    ("two time tokens separated by \",\"2year", -4.919980925828125),
                                     ("Setembrotwo time tokens separated by \",\"",
-                                     -5.3351313396707525),
-                                    ("intersect by `da` or `de`intersect", -5.3351313396707525),
-                                    ("intersectyear", -5.3351313396707525),
+                                     -5.32544603393629),
+                                    ("intersect by `da` or `de`intersect", -5.32544603393629),
+                                    ("intersectyear", -5.32544603393629),
                                     ("intersect by `da` or `de`two time tokens separated by \",\"2",
-                                     -5.3351313396707525),
-                                    ("time-of-day (latent)Maio", -4.236519051002643),
-                                    ("antes das <time-of-day>Julho", -4.082368371175385),
-                                    ("Maioyear", -4.641984159110808),
-                                    ("year (latent)Setembro", -4.236519051002643),
-                                    ("\224s <time-of-day>Janeiro", -5.3351313396707525),
-                                    ("two time tokens separated by \",\"year", -4.929666231562589),
+                                     -5.32544603393629),
+                                    ("time-of-day (latent)Maio", -4.22683374526818),
+                                    ("antes das <time-of-day>Julho", -4.072683065440922),
+                                    ("Maioyear", -4.632298853376344),
+                                    ("year (latent)Setembro", -4.22683374526818),
+                                    ("\224s <time-of-day>Janeiro", -5.32544603393629),
+                                    ("two time tokens separated by \",\"year", -4.919980925828125),
                                     ("time-of-day (latent)two time tokens separated by \",\"",
-                                     -4.929666231562589),
-                                    ("intersect by `da` or `de`year", -3.8310539428944788),
+                                     -4.919980925828125),
+                                    ("intersect by `da` or `de`year", -3.821368637160015),
                                     ("year (latent)<datetime> - <datetime> (interval)",
-                                     -4.929666231562589),
-                                    ("yearday", -5.3351313396707525),
-                                    ("time-of-day (latent)Janeiro", -5.3351313396707525),
+                                     -4.919980925828125),
+                                    ("yearday", -5.32544603393629),
+                                    ("time-of-day (latent)Janeiro", -5.32544603393629),
                                     ("dia <day-of-month> (non ordinal)intersect",
-                                     -5.3351313396707525),
-                                    ("Julhoyear", -5.3351313396707525),
+                                     -5.32544603393629),
+                                    ("Julhoyear", -5.32544603393629),
                                     ("de <datetime> - <datetime> (interval)Julho",
-                                     -5.3351313396707525),
-                                    ("year (latent)Mar\231o", -4.236519051002643),
-                                    ("yearminute", -5.3351313396707525)],
-                               n = 169}}),
+                                     -5.32544603393629),
+                                    ("year (latent)Mar\231o", -4.22683374526818),
+                                    ("yearminute", -5.32544603393629)],
+                               n = 167}}),
        ("<hour-of-day> and half",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1354942159291497,
@@ -779,17 +778,16 @@ classifiers
                                n = 20}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -4.204692619390966,
+                     ClassData{prior = 0.0, unseen = -4.1588830833596715,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.40546510810816444),
-                                    ("integer (0..19)", -1.3564413979702095),
-                                    ("negative numbers", -3.0910424533583156),
-                                    ("tens (20..90)", -3.4965075614664802)],
-                               n = 62}}),
+                                   [("integer (numeric)", -0.35894509247327155),
+                                    ("integer (0..19)", -1.3099213823353166),
+                                    ("tens (20..90)", -3.4499875458315876)],
+                               n = 60}}),
        ("n[ao] <date>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3025850929940455,

Duckling/Time/AR/Rules.hs

@@ -356,8 +356,7 @@ ruleYearPastLatent :: Rule
 ruleYearPastLatent = Rule
  { name = "past year (latent)"
  , pattern =
-   [ Predicate $
-       or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 999]
+   [ Predicate $ isIntegerBetween 25 999
    ]
  , prod = \tokens -> case tokens of
      (token:_) -> do

Duckling/Time/BG/Rules.hs

@@ -324,8 +324,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-      [ Predicate $
-        or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 10000]
+      [ Predicate $ isIntegerBetween 25 10000
       ]
   , prod = \case
       (token:_) -> do
@@ -338,7 +337,7 @@ ruleYearADBC :: Rule
 ruleYearADBC = Rule
   { name = "<year> (bc|ad)"
   , pattern =
-    [ Predicate $ isIntegerBetween (-10000) 10000
+    [ Predicate $ isIntegerBetween 1 10000
     , regex "(пр|сл)\\.?\\s+(Хр\\.?|н\\.?\\e.?)"
     ]
   , prod = \case

Duckling/Time/CA/Rules.hs

@@ -1105,7 +1105,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-      [ Predicate $ or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 10000]
+      [ Predicate $ isIntegerBetween 25 10000
       ]
   , prod = \case
       (t:_) -> do

Duckling/Time/DA/Rules.hs

@@ -1300,7 +1300,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $ isIntegerBetween (- 10000) 999
+    [ Predicate $ isIntegerBetween 1 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do

Duckling/Time/DE/Rules.hs

@@ -1440,8 +1440,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $
-        or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 999]
+    [ Predicate $ isIntegerBetween 25 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do

Duckling/Time/EL/Rules.hs

@@ -1161,8 +1161,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $
-        or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 999]
+    [ Predicate $ isIntegerBetween 25 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do

Duckling/Time/EN/Rules.hs

@@ -386,8 +386,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-      [ Predicate $
-        or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 10000]
+      [ Predicate $ isIntegerBetween 25 10000
       ]
   , prod = \case
       (token:_) -> do
@@ -400,7 +399,7 @@ ruleYearADBC :: Rule
 ruleYearADBC = Rule
   { name = "<year> (bc|ad)"
   , pattern =
-    [ Predicate $ isIntegerBetween (-10000) 10000
+    [ Predicate $ isIntegerBetween 1 10000
     , regex "(a\\.?d\\.?|b\\.?c\\.?)"
     ]
   , prod = \case

Duckling/Time/ES/Rules.hs

@@ -994,8 +994,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-      [ Predicate $
-        or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 10000]
+      [ Predicate $ isIntegerBetween 25 10000
       ]
   , prod = \tokens -> case tokens of
       (token:_) -> do

Duckling/Time/FR/Rules.hs

@@ -1498,7 +1498,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $ isIntegerBetween (- 10000) 999
+    [ Predicate $ isIntegerBetween 1 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do

Duckling/Time/GA/Rules.hs

@@ -440,7 +440,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $ isIntegerBetween (- 10000) 999
+    [ Predicate $ isIntegerBetween 1 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do

Duckling/Time/HR/Rules.hs

@@ -1134,8 +1134,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $
-       or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 999]
+    [ Predicate $ isIntegerBetween 25 999
     ]
   , prod = \tokens -> case tokens of
      (token:_) -> do

Duckling/Time/IT/Rules.hs

@@ -1060,8 +1060,8 @@ ruleSeason4 = Rule
       in Token Time <$> interval TTime.Open from to
   }
 
-ruleYearLatent2 :: Rule
-ruleYearLatent2 = Rule
+ruleYearLatent :: Rule
+ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
     [ Predicate $ isIntegerBetween 2101 10000
@@ -2062,19 +2062,6 @@ ruleTimeofdayCirca = Rule
       _ -> Nothing
   }
 
-ruleYearLatent :: Rule
-ruleYearLatent = Rule
-  { name = "year (latent)"
-  , pattern =
-    [ Predicate $ isIntegerBetween (- 10000) (-1)
-    ]
-  , prod = \tokens -> case tokens of
-      (token:_) -> do
-        n <- getIntValue token
-        tt . mkLatent $ year n
-      _ -> Nothing
-  }
-
 ruleYesterday :: Rule
 ruleYesterday = Rule
   { name = "yesterday"
@@ -2533,7 +2520,6 @@ rules =
   , ruleValentinesDay
   , ruleWeekend
   , ruleYearLatent
-  , ruleYearLatent2
   , ruleYearNotLatent
   , ruleYesterday
   , ruleYyyymmdd

Duckling/Time/JA/Rules.hs

@@ -291,7 +291,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-      [ Predicate $ or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 10000]
+      [ Predicate $ isIntegerBetween 25 10000
       , regex "年"
       ]
   , prod = \tokens -> case tokens of

Duckling/Time/KO/Rules.hs

@@ -841,7 +841,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $ isIntegerBetween (- 10000) 999
+    [ Predicate $ isIntegerBetween 1 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do

Duckling/Time/NB/Rules.hs

@@ -1260,8 +1260,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $
-       or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 999]
+    [ Predicate $ isIntegerBetween 25 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do

Duckling/Time/NL/Rules.hs

@@ -1109,8 +1109,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $
-        or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 999]
+    [ Predicate $ isIntegerBetween 25 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do

Duckling/Time/PL/Rules.hs

@@ -1138,7 +1138,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $ isIntegerBetween (- 10000) 999
+    [ Predicate $ isIntegerBetween 1 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do

Duckling/Time/PT/Rules.hs

@@ -1143,7 +1143,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $ isIntegerBetween (- 10000) 999
+    [ Predicate $ isIntegerBetween 1 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do

Duckling/Time/RO/Rules.hs

@@ -905,7 +905,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $ isIntegerBetween (- 10000) 999
+    [ Predicate $ isIntegerBetween 1 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do

Duckling/Time/RU/Corpus.hs

@@ -45,24 +45,43 @@ allExamples = concat
   , examples (datetime (2013, 2, 11, 0, 0, 0) Day)
              [ "вчера"
              ]
+  , examples (datetime (2013, 2, 10, 0, 0, 0) Day)
+             [ "позавчера"
+             ]
+  , examples (datetime (2013, 2, 9, 0, 0, 0) Day)
+             [ "позапозавчера"
+             ]
   , examples (datetime (2013, 2, 13, 0, 0, 0) Day)
              [ "завтра"
              ]
+  , examples (datetime (2013, 2, 14, 0, 0, 0) Day)
+             [ "послезавтра"
+             ]
+  , examples (datetime (2013, 2, 15, 0, 0, 0) Day)
+             [ "послепослезавтра"
+             ]
   , examples (datetime (2013, 2, 18, 0, 0, 0) Day)
              [ "понедельник"
+             , "в понедельник"
              ]
   , examples (datetime (2013, 2, 18, 0, 0, 0) Day)
              [ "понедельник, 18 февраля"
              , "18 февраля"
+             , "18-е февраля"
+             , "18-го февраля"
+             , "восемнадцатое февраля"
+             , "восемнадцатого февраля"
              ]
   , examples (datetime (2013, 2, 19, 0, 0, 0) Day)
              [ "вторник"
+             , "во вторник"
              ]
   , examples (datetime (2013, 2, 14, 0, 0, 0) Day)
              [ "четверг"
              ]
   , examples (datetime (2013, 2, 15, 0, 0, 0) Day)
              [ "пятница"
+             , "в пятницу"
              ]
   , examples (datetime (2013, 2, 16, 0, 0, 0) Day)
              [ "суббота"
@@ -70,20 +89,32 @@ allExamples = concat
   , examples (datetime (2013, 3, 1, 0, 0, 0) Day)
              [ "1 марта"
              , "первое марта"
-             , "1 мар."
+             , "1-е мар."
              ]
   , examples (datetime (2015, 3, 3, 0, 0, 0) Day)
              [ "3 марта 2015"
+             , "3-его марта 2015"
              , "3 мар. 2015"
+             , "третьего марта 2015"
+             , "третье марта 2015"
+             , "к третьему марта 2015"
              ]
   , examples (datetime (2013, 2, 15, 0, 0, 0) Day)
              [ "15 февраля"
              , "15.2"
              , "15 Фев"
+             , "15-го Фев"
+             , "15.02"
+             , "пятнадцатое февраля"
+             , "пятнадцатого фев"
              ]
   , examples (datetime (2013, 8, 8, 0, 0, 0) Day)
              [ "8 августа"
              , "8 Авг"
+             , "восьмое августа"
+             ]
+  , examples (datetime (2013, 3, 0, 0, 0, 0) Month)
+             [ "март"
              ]
   , examples (datetime (2014, 10, 0, 0, 0, 0) Month)
              [ "Октябрь 2014"
@@ -94,40 +125,102 @@ allExamples = concat
   , examples (datetime (1974, 10, 31, 0, 0, 0) Day)
              [ "31.10.1974"
              , "31.10.74"
+             , "тридцать первое октября 1974"
+             , "31-ое октября 1974"
              ]
   , examples (datetime (2015, 4, 14, 0, 0, 0) Day)
              [ "14 апреля 2015"
+             , "четырнадцатое апреля 2015"
              ]
   , examples (datetime (2013, 2, 10, 0, 0, 0) Day)
              [ "Воскресенье, 10 фев."
              ]
   , examples (datetime (2013, 2, 13, 0, 0, 0) Day)
              [ "Среда, 13 февраля"
+             , "Среда, 13-е февраля"
+             , "13-е февраля"
              ]
   , examples (datetime (2013, 2, 18, 0, 0, 0) Day)
              [ "Понедельник, 18 фев"
              ]
+  , examples (datetime (2013, 2, 24, 0, 0, 0) Day)
+             [ "двадцать четвертое фев"
+             , "двадцать четвёртое февраля"
+             , "двадцать четвертого февраля"
+             , "24-ого февраля"
+             , "24-е февраля"
+             , "к двадцать четвёртому февраля"
+             ]
+  , examples (datetime (2015, 5, 31, 0, 0, 0) Day)
+             [ "тридцать первое мая 2015"
+             ]
   , examples (datetimeInterval ((2013, 2, 11, 0, 0, 0), (2013, 2, 17, 0, 0, 0)) Day)
              [ "эта неделя"
              ]
+  , examples (datetime (2013, 2, 1, 0, 0, 0) Month)
+             [ "этот месяц"
+             ]
+  , examples (datetime (2013, 1, 1, 0, 0, 0) Year)
+             [ "этот год"
+             ]
+  , examples (datetime (2013, 2, 18, 0, 0, 0) Week)
+             [ "следующая неделя"
+             ]
+  , examples (datetime (2013, 2, 18, 0, 0, 0) Week)
+             [ "на следующей неделе"
+             ]
   , examples (datetime (2013, 1, 0, 0, 0, 0) Month)
              [ "прошлый месяц"
+             , "в прошлом месяце"
+             ]
+  , examples (datetime (2012, 12, 0, 0, 0, 0) Month)
+             [ "позапрошлый месяц"
+             , "в позапрошлом месяце"
              ]
   , examples (datetime (2013, 3, 0, 0, 0, 0) Month)
              [ "следующий месяц"
+             , "в следующем месяце"
              ]
   , examples (datetime (2014, 0, 0, 0, 0, 0) Year)
              [ "следующий год"
+             , "в следующем году"
+             ]
+  , examples (datetime (2013, 1, 1, 0, 0, 0) Quarter)
+             [ "этот квартал"
+             ]
+  , examples (datetime (2013, 4, 1, 0, 0, 0) Quarter)
+             [ "следующий квартал"
+             , "в следующем квартале"
+             ]
+  , examples (datetime (2013, 7, 1, 0, 0, 0) Quarter)
+             [ "третий квартал"
+             , "в третьем квартале"
+             ]
+  , examples (datetime (2018, 10, 1, 0, 0, 0) Quarter)
+             [ "четвертый квартал 2018"
+             , "четвёртый квартал 2018"
              ]
   , examples (datetime (2013, 2, 5, 0, 0, 0) Day)
              [ "в прошлый вторник"
              ]
   , examples (datetime (2013, 2, 19, 0, 0, 0) Day)
              [ "следующий вторник"
+             , "вторник на следующей неделе"
+             ]
+  , examples (datetime (2013, 2, 13, 0, 0, 0) Day)
+             [ "следующая среда"
+             , "в следующую среду"
+             , "в след среду"
              ]
   , examples (datetime (2013, 2, 12, 4, 0, 0) Hour)
              [ "в 4 утра"
              ]
+  , examples (datetime (2013, 2, 13, 0, 0, 0) Hour)
+             [ "в полночь"
+             ]
+  , examples (datetime (2013, 2, 12, 12, 0, 0) Hour)
+             [ "в полдень"
+             ]
   , examples (datetime (2013, 2, 12, 15, 0, 0) Hour)
              [ "в 3"
              , "3 часа"
@@ -136,15 +229,15 @@ allExamples = concat
   , examples (datetime (2013, 2, 12, 3, 18, 0) Minute)
              [ "3:18 утра"
              ]
-  , examples (datetime (2013, 2, 13, 3, 18, 0) Minute)
-             [ "3:18"
-             ]
   , examples (datetime (2013, 2, 12, 15, 0, 0) Hour)
              [ "в 3 часа дня"
              , "в 15"
              , "в 15 часов"
              , "15 часов"
              , "в 15ч"
+             , "в пятнадцать часов"
+             , "в 3 часа пополудни"
+             , "в 3 часа после полудня"
              ]
   , examples (datetime (2013, 4, 1, 18, 0, 0) Hour)
              [ "01.04. в 18 часов"
@@ -153,7 +246,7 @@ allExamples = concat
              [ "в 17 часов завтра"
              ]
   , examples (datetime (2013, 2, 12, 15, 15, 0) Minute)
-             ["15:15"
+             [ "15:15"
              ]
   , examples (datetime (2013, 2, 12, 20, 0, 0) Hour)
              [ "8 часов вечера"
@@ -164,6 +257,7 @@ allExamples = concat
              ]
   , examples (datetime (2013, 2, 16, 9, 0, 0) Hour)
              [ "в субботу в 9 часов"
+             , "в субботу в девять"
              ]
   , examples (datetime (2014, 7, 18, 19, 0, 0) Hour)
              [ "пятница, 18 июля 2014 7 часов вечера"
@@ -174,6 +268,7 @@ allExamples = concat
              ]
   , examples (datetime (2013, 2, 12, 4, 30, 1) Second)
              [ "через 1 секунду"
+             , "через секунду"
              ]
   , examples (datetime (2013, 2, 12, 4, 31, 0) Second)
              [ "через 1 минуту"
@@ -189,6 +284,8 @@ allExamples = concat
              ]
   , examples (datetime (2013, 2, 12, 5, 30, 0) Minute)
              [ "через 1 час"
+             , "через один час"
+             , "через час"
              ]
   , examples (datetime (2013, 2, 12, 6, 30, 0) Minute)
              [ "через два часа"
@@ -196,9 +293,6 @@ allExamples = concat
   , examples (datetime (2013, 2, 13, 4, 30, 0) Minute)
              [ "через 24 часа"
              ]
-  , examples (datetime (2013, 2, 13, 0, 0, 0) Day)
-             [ "завтра"
-             ]
   , examples (datetime (2016, 2, 0, 0, 0, 0) Month)
              [ "через 3 года"
              ]
@@ -207,9 +301,11 @@ allExamples = concat
              ]
   , examples (datetime (2013, 2, 19, 0, 0, 0) Day)
              [ "через 1 неделю"
+             , "через неделю"
              ]
   , examples (datetime (2013, 2, 5, 4, 0, 0) Hour)
              [ "7 дней назад"
+             , "7 дней тому назад"
              ]
   , examples (datetime (2013, 1, 29, 4, 0, 0) Hour)
              [ "14 дней назад"
@@ -219,6 +315,7 @@ allExamples = concat
              ]
   , examples (datetime (2013, 2, 5, 0, 0, 0) Day)
              [ "1 неделю назад"
+             , "неделю тому назад"
              ]
   , examples (datetime (2013, 1, 22, 0, 0, 0) Day)
              [ "три недели назад"
@@ -368,6 +465,7 @@ allExamples = concat
              ]
   , examples (datetimeInterval ((2013, 2, 12, 12, 0, 0), (2013, 2, 12, 19, 0, 0)) Hour)
              [ "сегодня днем"
+             , "сегодня днём"
              ]
   , examples (datetime (2013, 2, 12, 13, 30, 0) Minute)
              [ "в 13:30 дня"
@@ -406,10 +504,10 @@ allExamples = concat
              , "с 14.10. по 15.10.2018"
              ]
   , examples (datetime (2013, 10, 10, 0, 0, 0) Day)
-             ["10.10.2013"
+             [ "10.10.2013"
              ]
   , examples (datetime (2013, 2, 12, 10, 10, 0) Minute)
-             [ "в 10.10"
+             [ "в 10:10"
              ]
   , examples (datetime (2013, 2, 12, 17, 10, 0) Minute)
              [ "17ч10"

Duckling/Time/RU/Rules.hs

@@ -36,7 +36,9 @@ ruleInstants = mkRuleInstants
   , ( "завтра"       , TG.Day    ,  1, "завтра"               )
   , ( "вчера"        , TG.Day    , -1, "вчера"                )
   , ( "послезавтра"  , TG.Day    ,  2, "послезавтра"          )
+  , ( "послепослезавтра", TG.Day ,  3, "послепослезавтра"     )
   , ( "позавчера"    , TG.Day    , -2, "позавчера"            )
+  , ( "позапозавчера", TG.Day    , -3, "позапозавчера"        )
   , ( "Конец месяца" , TG.Month  ,  1, "(конец|конца) месяца" )
   , ( "Конец года"   , TG.Year   ,  1, "(конец|конца) года"   )
   ]
@@ -93,7 +95,7 @@ ruleLastTime :: Rule
 ruleLastTime = Rule
   { name = "last <time>"
   , pattern =
-    [ regex "(в )?прошл(ый|ого|ому|ом|ые|ых|ым|ыми|ая)"
+    [ regex "(на |в )?прошл(ый|ого|ому|ом|ое|ые|ых|ыми|ым|ая|ой|ую)"
     , Predicate isOkWithThisNext
     ]
   , prod = \case
@@ -264,11 +266,20 @@ ruleNoon = Rule
   , prod = \_ -> tt $ hour False 12
   }
 
+ruleMidnight :: Rule
+ruleMidnight = Rule
+  { name = "midnight"
+  , pattern =
+    [ regex "полночь"
+    ]
+  , prod = \_ -> tt $ hour False 0
+  }
+
 ruleThisnextDayofweek :: Rule
 ruleThisnextDayofweek = Rule
   { name = "this|next <day-of-week>"
   , pattern =
-    [ regex "следующ(ий|ая|ее)"
+    [ regex "след(ующ(ий|ая|ее|ую))?"
     , Predicate isADayOfWeek
     ]
   , prod = \case
@@ -296,7 +307,7 @@ ruleNextCycle :: Rule
 ruleNextCycle = Rule
   { name = "next <cycle>"
   , pattern =
-    [ regex "(в |на )?следующ(ий|его|ему|им|ем|ие|их|ими)"
+    [ regex "(на |в |к )?след(ующ(ий|его|ему|ими|ем|ие|их|им|ей|ая|ую))?"
     , dimension TimeGrain
     ]
   , prod = \case
@@ -309,7 +320,7 @@ ruleOnDate :: Rule
 ruleOnDate = Rule
   { name = "on <date>"
   , pattern =
-    [ regex "в"
+    [ regex "во|в|к"
     , dimension Time
     ]
   , prod = \case
@@ -321,7 +332,7 @@ ruleLastCycle :: Rule
 ruleLastCycle = Rule
   { name = "last <cycle>"
   , pattern =
-    [ regex "(в )?прошл(ый|ого|ому|ым|ом|ые|ых|ыми)"
+    [ regex "(на |в )?прошл(ый|ого|ому|ом|ое|ые|ых|ыми|ым|ая|ой|ую)"
     , dimension TimeGrain
     ]
   , prod = \case
@@ -330,11 +341,24 @@ ruleLastCycle = Rule
       _ -> Nothing
   }
 
+ruleBeforeLastCycle :: Rule
+ruleBeforeLastCycle = Rule
+  { name = "one <cycle> before last"
+  , pattern =
+    [ regex "(на |в )?позапрошл(ый|ого|ому|ыми|ом|ое|ые|ых|ым|ая|ой|ую)"
+    , dimension TimeGrain
+    ]
+  , prod = \case
+      (_:Token TimeGrain grain:_) ->
+        tt . cycleNth grain $ - 2
+      _ -> Nothing
+  }
+
 ruleLastCycle2 :: Rule
 ruleLastCycle2 = Rule
   { name = "last <cycle>"
   , pattern =
-    [ regex "(в )?прошедш(ий|его|ему|им|ем|их|ие|ими)"
+    [ regex "(в )?прошедш(ий|его|ему|ими|ем|их|ие|им)"
     , dimension TimeGrain
     ]
   , prod = \case
@@ -360,7 +384,7 @@ ruleAfternoon :: Rule
 ruleAfternoon = Rule
   { name = "afternoon"
   , pattern =
-    [ regex "дня|днем"
+    [ regex "(дня|дн[её]м)|пополудни|после полудня"
     ]
   , prod = \_ ->
       let from = hour False 12
@@ -394,7 +418,6 @@ ruleNamedmonthDayofmonthOrdinal = Rule
       _ -> Nothing
   }
 
-
 ruleHourofdayIntegerAsRelativeMinutes :: Rule
 ruleHourofdayIntegerAsRelativeMinutes = Rule
   { name = "<hour-of-day> <integer> (as relative minutes)"
@@ -487,7 +510,7 @@ ruleDurationAgo = Rule
   { name = "<duration> ago"
   , pattern =
     [ dimension Duration
-    , regex "назад"
+    , regex "(тому )?назад"
     ]
   , prod = \case
       (Token Duration dd:_:_) ->
@@ -640,8 +663,6 @@ ruleWeek = Rule
        let match = Text.strip $ Text.toLower m
        period <- case match of
          "эта" -> interval TTime.Closed (cycleNth TG.Week 0) end
-         "rest of the" -> interval TTime.Open today end
-         -- no prefix, implicit 'the'
          "неделя" -> interval TTime.Open today end
          _ -> Nothing
        let l = case match of { "неделя" -> mkLatent; _ -> id; }
@@ -720,7 +741,7 @@ ruleMorning :: Rule
 ruleMorning = Rule
   { name = "morning"
   , pattern =
-    [ regex "утро|утром|утра"
+    [ regex "утром|утро|утра"
     ]
   , prod = \_ ->
       let from = hour False 3
@@ -733,7 +754,7 @@ ruleThisPartofday :: Rule
 ruleThisPartofday = Rule
   { name = "this <part-of-day>"
   , pattern =
-    [ regex "(в )?(это|эту|этот|этого|этому|эти)"
+    [ regex "(в )?(эту|этот|этого|этому|эти|это)"
     , Predicate isAPartOfDay
     ]
   , prod = \case
@@ -745,7 +766,7 @@ ruleThisCycle :: Rule
 ruleThisCycle = Rule
   { name = "this <cycle>"
   , pattern =
-    [ regex "(в )?(это|эту|этот|этого|этому|эти)"
+    [ regex "(в )?(эту|этот|этого|этому|эти)"
     , dimension TimeGrain
     ]
   , prod = \case
@@ -758,7 +779,7 @@ ruleThisTime :: Rule
 ruleThisTime = Rule
   { name = "this <time>"
   , pattern =
-    [ regex "(в )?(это|эту|этот|этого|этому|эти)"
+    [ regex "(в )?(эту|этот|этого|этому|эти|это)"
     , Predicate isOkWithThisNext
     ]
   , prod = \case
@@ -771,8 +792,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $
-        or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 999]
+    [ Predicate $ isIntegerBetween 25 999
     ]
   , prod = \case
       (token:_) -> do
@@ -797,7 +817,7 @@ ruleNight :: Rule
 ruleNight = Rule
   { name = "night"
   , pattern =
-    [ regex "ночь|ночи|ночью"
+    [ regex "ночью|ночи|ночь"
     ]
   , prod = \_ ->
       let from = hour False 0
@@ -838,7 +858,7 @@ ruleHhmm :: Rule
 ruleHhmm = Rule
   { name = "hh:mm"
   , pattern =
-    [ regex "((?:[01]?\\d)|(?:2[0-3]))[:.ч]([0-5]\\d)(?:час(ов|а|у)?|ч)?"
+    [ regex "((?:[01]?\\d)|(?:2[0-3]))[:ч]([0-5]\\d)(?:час(ов|а|у)?|ч)?"
     ]
   , prod = \case
       (Token RegexMatch (GroupMatch (m1:m2:_)):_) -> do
@@ -1082,6 +1102,7 @@ rules =
   , ruleIntersectBy
   , ruleIntersectByOfFromS
   , ruleLastCycle
+  , ruleBeforeLastCycle
   , ruleLastCycle2
   , ruleLastCycleOfTime
   , ruleLastCycleOfTime2
@@ -1100,6 +1121,7 @@ rules =
   , ruleNextNCycle
   , ruleNight
   , ruleNoon
+  , ruleMidnight
   , ruleNthTimeAfterTime
   , ruleNthTimeOfTime
   , ruleNthTimeOfTime2

Duckling/Time/SV/Rules.hs

@@ -1258,7 +1258,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $ isIntegerBetween (- 10000) 999
+    [ Predicate $ isIntegerBetween 1 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do

Duckling/Time/TR/Corpus.hs

@@ -294,7 +294,9 @@ allExamples = concat
              ]
   , examples (datetime (2013, 1, 29, 4, 0, 0) Hour)
              [ "14 gün önce"
-             , "iki hafta önce"
+             ]
+  , examples (datetime (2013, 1, 29, 0, 0, 0) Day)
+             [ "iki hafta önce"
              ]
   , examples (datetime (2013, 2, 5, 0, 0, 0) Day)
              [ "bir hafta önce"
@@ -314,7 +316,9 @@ allExamples = concat
              ]
   , examples (datetime (2013, 2, 26, 4, 0, 0) Hour)
              [ "14 gün sonra"
-             , "iki hafta sonra"
+             ]
+  , examples (datetime (2013, 2, 26, 0, 0, 0) Day)
+             [ "iki hafta sonra"
              ]
   , examples (datetime (2013, 2, 19, 0, 0, 0) Day)
              [ "bir hafta sonra"
@@ -437,9 +441,11 @@ allExamples = concat
              [ "perşembe 9:30 - 11:00"
              ]
   , examples (datetimeInterval ((2013, 2, 12, 15, 0, 0), (2013, 2, 12, 17, 0, 0)) Hour)
-             [ "saat 15-16"]
+             [ "saat 15-16"
+             ]
   , examples (datetimeInterval ((2013, 2, 12, 15, 30, 0), (2013, 2, 12, 18, 1, 0)) Minute)
-             [ "saat 15:30 - 18"]
+             [ "saat 15:30 - 18"
+             ]
   , examples (datetimeInterval ((2013, 2, 14, 9, 0, 0), (2013, 2, 14, 12, 0, 0)) Hour)
              [ "perşembe saat 9-11"
              ]

Duckling/Time/TR/Rules.hs

@@ -98,19 +98,21 @@ rulePartOfDays :: Rule
 rulePartOfDays = Rule
   { name = "part of days"
   , pattern =
-    [ regex "(sabahı?|öğlen?|akşam|gece|öğle\\syemeği)"
+    [ regex "(sabah(ı|a|tan)?|öğlen?|akşam|gece|öğle\\syemeği)"
     ]
   , prod = \case
       (Token RegexMatch (GroupMatch (match:_)):_) -> do
         let (start, end) = case Text.toLower match of
               "sabah"          -> (hour False 0, hour False 12 )
               "sabahı"         -> (hour False 0, hour False 12 )
+              "sabaha"         -> (hour False 0, hour False 12 )
+              "sabahtan"       -> (hour False 0, hour False 12 )
               "akşam"          -> (hour False 18, hour False 0 )
               "gece"           -> (hour False 18, hour False 0 )
               "öğlen"          -> (hour False 12, hour False 14)
               "öğle"           -> (hour False 12, hour False 14)
               "öğle yemeği"    -> (hour False 12, hour False 14)
-              _          -> (hour False 12, hour False 19)
+              _                -> (hour False 12, hour False 19)
         td <- interval TTime.Open start end
         tt $ partOfDay $ mkLatent td
       _ -> Nothing
@@ -233,7 +235,7 @@ ruleDurationFromNow = Rule
   { name = "<duration> from now"
   , pattern =
     [ regex "(bugünden\\s)?sonra(ki)?"
-    ,  dimension Duration
+    , dimension Duration
     ]
   , prod = \case
       (_:Token Duration dd:_) ->
@@ -269,19 +271,6 @@ ruleYearLatent2 = Rule
       _ -> Nothing
   }
 
-ruleTimeAfterNext :: Rule
-ruleTimeAfterNext = Rule
-  { name = "<time> after next"
-  , pattern =
-    [ regex "sonraki|önümüzdeki"
-    , dimension Time
-    ]
-  , prod = \case
-      (_:Token Time td:_) ->
-        tt $ predNth 1 True td
-      _ -> Nothing
-  }
-
 ruleNoon :: Rule
 ruleNoon = Rule
   { name = "noon"
@@ -456,8 +445,8 @@ ruleNthTimeAfterTime = Rule
       _ -> Nothing
   }
 
-ruleMmdd :: Rule
-ruleMmdd = Rule
+ruleMMDD :: Rule
+ruleMMDD = Rule
   { name = "mm/dd"
   , pattern =
     [ regex "([012]?[1-9]|10|20|30|31)\\.(10|11|12|0?[1-9])\\.?"
@@ -470,6 +459,21 @@ ruleMmdd = Rule
       _ -> Nothing
   }
 
+ruleMMDDYYYY :: Rule
+ruleMMDDYYYY = Rule
+  { name = "mm/dd/yyyy"
+  , pattern =
+    [ regex "(1[0-2]|0?[1-9])[-/\\s](3[01]|[12]\\d|0?[1-9])[-/\\s](\\d{2,4})"
+    ]
+  , prod = \case
+      (Token RegexMatch (GroupMatch (mm:dd:yy:_)):_) -> do
+        y <- parseInt yy
+        m <- parseInt mm
+        d <- parseInt dd
+        tt $ yearMonthDay y m d
+      _ -> Nothing
+  }
+
 ruleTimeofdayLatent :: Rule
 ruleTimeofdayLatent = Rule
   { name = "time-of-day (latent)"
@@ -669,8 +673,8 @@ ruleOrdinalQuarterYear = Rule
       _ -> Nothing
   }
 
-ruleYyyymmdd :: Rule
-ruleYyyymmdd = Rule
+ruleYYYYMMDD :: Rule
+ruleYYYYMMDD = Rule
   { name = "yyyy-mm-dd"
   , pattern =
     [ regex "(\\d{2,4})-(0?[1-9]|10|11|12)-([012]?[1-9]|10|20|30|31)"
@@ -699,19 +703,6 @@ ruleNextNCycle = Rule
       _ -> Nothing
   }
 
-ruleMorning :: Rule
-ruleMorning = Rule
-  { name = "morning"
-  , pattern =
-    [ regex "sabah(ı|a|tan)?"
-    ]
-  , prod = \_ ->
-      let from = hour False 3
-          to = hour False 12
-      in Token Time . mkLatent . partOfDay <$>
-           interval TTime.Open from to
-  }
-
 ruleThisPartofday :: Rule
 ruleThisPartofday = Rule
   { name = "this <part-of-day>"
@@ -736,6 +727,7 @@ ruleThisCycle = Rule
         tt $ cycleNth grain 0
       _ -> Nothing
   }
+
 ruleThisTime :: Rule
 ruleThisTime = Rule
   { name = "this <time>"
@@ -776,8 +768,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $
-        or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 999]
+    [ Predicate $ isIntegerBetween 25 999
     ]
   , prod = \case
       (token:_) -> do
@@ -791,7 +782,7 @@ ruleAfterTimeofday = Rule
   { name = "after <time-of-day>"
   , pattern =
     [ regex "sonraki|önümüzdeki"
-    , dimension Time
+    , Predicate isATimeOfDay
     ]
   , prod = \case
       (_:Token Time td:_) -> tt $ withDirection TTime.After td
@@ -1030,21 +1021,6 @@ rulePartofdayOfTime = Rule
       _ -> Nothing
   }
 
-ruleMmddyyyy :: Rule
-ruleMmddyyyy = Rule
-  { name = "mm/dd/yyyy"
-  , pattern =
-    [ regex "([012]?[1-9]|10|20|30|31)\\.(0?[1-9]|10|11|12)\\.(\\d{2,4})"
-    ]
-  , prod = \case
-      (Token RegexMatch (GroupMatch (m1:m2:m3:_)):_) -> do
-        y <- parseInt m3
-        m <- parseInt m2
-        d <- parseInt m1
-        tt $ yearMonthDay y m d
-      _ -> Nothing
-  }
-
 ruleTimezone :: Rule
 ruleTimezone = Rule
   { name = "<time> timezone"
@@ -1061,7 +1037,7 @@ ruleTimezone = Rule
 
 rules :: [Rule]
 rules =
-  [ruleAbsorptionOfAfterNamedDay
+  [ ruleAbsorptionOfAfterNamedDay
   , ruleAfterTimeofday
   , ruleAfternoon
   , ruleAtTimeofday
@@ -1097,9 +1073,9 @@ rules =
   , ruleNextTime
   , ruleLunch
   , ruleMidnighteodendOfDay
-  , ruleMmdd
-  , ruleMmddyyyy
-  , ruleMorning
+  , ruleMMDD
+  , ruleMMDDYYYY
+  , ruleYYYYMMDD
   , ruleNamedmonthDayofmonthNonOrdinal
   , ruleNextCycle
   , ruleNextNCycle
@@ -1118,7 +1094,6 @@ rules =
   , ruleThisPartofday
   , ruleThisTime
   , ruleThisnextDayofweek
-  , ruleTimeAfterNext
   , ruleTimePartofday
   , ruleTimeofdayLatent
   , ruleTimeofdayTimeofdayInterval
@@ -1129,7 +1104,6 @@ rules =
   , ruleYear
   , ruleYearLatent
   , ruleYearLatent2
-  , ruleYyyymmdd
   , ruleTimezone
   ]
   ++ ruleInstants

Duckling/Time/UK/Rules.hs

@@ -746,8 +746,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $
-        or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 999]
+    [ Predicate $ isIntegerBetween 25 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do

Duckling/TimeGrain/RU/Rules.hs

@@ -24,10 +24,10 @@ grains = [ ("second (grain) ", "сек(унд(а|у|ы)?)?",   Second)
          , ("minute (grain)" , "мин(ут(а|у|ы)?)?",    Minute)
          , ("hour (grain)"   , "ч(ас(а|ов)?)?",       Hour)
          , ("day (grain)"    , "день|дня|дней",       Day)
-         , ("week (grain)"   , "недел(ь|я|и|ю)?",     Week)
-         , ("month (grain)"  , "месяц(а|ев)?",        Month)
-         , ("quarter (grain)", "квартал(а)?",         Quarter)
-         , ("year (grain)"   , "года?|лет",           Year)
+         , ("week (grain)"   , "недел(ь|я|и|ю|е)?",   Week)
+         , ("month (grain)"  , "месяц(а|ев|е)?",      Month)
+         , ("quarter (grain)", "квартал(а|е)?",       Quarter)
+         , ("year (grain)"   , "год(а|у)?|лет",       Year)
          ]
 
 rules :: [Rule]

README.md

@@ -1,40 +1,50 @@
-![Duckling Logo](https://github.com/facebook/duckling/raw/master/logo.png)
+![Duckling Logo](https://github.com/facebook/duckling/raw/main/logo.png)
 
 # Duckling [![Build Status](https://travis-ci.org/facebook/duckling.svg?branch=master)](https://travis-ci.org/facebook/duckling)
+
 Duckling is a Haskell library that parses text into structured data.
 
-```
+```bash
 "the first Tuesday of October"
 => {"value":"2017-10-03T00:00:00.000-07:00","grain":"day"}
 ```
 
 ## Requirements
+
 A Haskell environment is required. We recommend using
 [stack](https://haskell-lang.org/get-started).
 
 On Linux and MacOS you'll need to install PCRE development headers.
 On Linux, use your package manager to install them.
 On MacOS, the easiest way to install them is with [Homebrew](https://brew.sh/):
-```
+
+```bash
 brew install pcre
 ```
+
 If that doesn't help, try running `brew doctor` and fix
 the issues it finds.
 
 ## Quickstart
+
 To compile and run the binary:
+
+```bash
+stack build
+stack exec duckling-example-exe
 ```
-$ stack build
-$ stack exec duckling-example-exe
-```
+
 The first time you run it, it will download all required packages.
 
 This runs a basic HTTP server. Example request:
+
+```bash
+curl -XPOST http://0.0.0.0:8000/parse --data 'locale=en_GB&text=tomorrow at eight'
 ```
-$ curl -XPOST http://0.0.0.0:8000/parse --data 'locale=en_GB&text=tomorrow at eight'
-```
+
 In the example application, all dimensions are enabled by default. Provide the parameter `dims` to specify which ones you want. Examples:
-```
+
+```bash
 Identify credit card numbers only:
 $ curl -XPOST http://0.0.0.0:8000/parse --data 'locale=en_US&text="4111-1111-1111-1111"&dims="["credit-card-number"]"'
 If you want multiple dimensions, comma-separate them in the array:
@@ -46,6 +56,7 @@ project.
 If your backend doesn't run Haskell or if you don't want to spin your own Duckling server, you can directly use [wit.ai](https://wit.ai)'s built-in entities.
 
 ## Supported dimensions
+
 Duckling supports many languages, but most don't support all dimensions yet
 (**we need your help!**).
 Please look into [this directory](https://github.com/facebook/duckling/blob/master/Duckling/Dimensions) for language-specific support.
@@ -69,9 +80,11 @@ Please look into [this directory](https://github.com/facebook/duckling/blob/mast
 [Custom dimensions](https://github.com/facebook/duckling/blob/master/exe/CustomDimensionExample.hs) are also supported.
 
 ## Extending Duckling
+
 To regenerate the classifiers and run the test suite:
-```
-$ stack build :duckling-regen-exe && stack exec duckling-regen-exe && stack test
+
+```bash
+stack build :duckling-regen-exe && stack exec duckling-regen-exe && stack test
 ```
 
 It's important to regenerate the classifiers after updating the code and before
@@ -79,17 +92,23 @@ running the test suite.
 
 To extend Duckling's support for a dimension in a given language, typically 4
 files need to be updated:
+
 * `Duckling/<Dimension>/<Lang>/Rules.hs`
+
 * `Duckling/<Dimension>/<Lang>/Corpus.hs`
+
 * `Duckling/Dimensions/<Lang>.hs` (if not already present in `Duckling/Dimensions/Common.hs`)
+
 * `Duckling/Rules/<Lang>.hs`
 
 To add a new language:
+
 * Make sure that the language code used follows the [ISO-639-1 standard](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes).
 * The first dimension to implement is `Numeral`.
 * Follow [this example](https://github.com/facebook/duckling/commit/24d3f199768be970149412c95b1c1bf5d76f8240).
 
 To add a new locale:
+
 * There should be a need for diverging rules between the locale and the language.
 * Make sure that the locale code is a valid [ISO3166 alpha2 country code](https://www.iso.org/obp/ui/#search/code/).
 * Follow [this example](https://github.com/facebook/duckling/commit/1ab5f447d2635fe6d48887a501d333a52adff5b9).
@@ -105,7 +124,8 @@ shouldn't) parse. The reference time for the corpus is Tuesday Feb 12, 2013 at
 4:30am.
 
 `Duckling.Debug` provides a few debugging tools:
-```
+
+```bash
 $ stack repl --no-load
 > :l Duckling.Debug
 > debug (makeLocale EN $ Just US) "in two minutes" [Seal Time]
@@ -120,4 +140,5 @@ in|within|after <duration> (in two minutes)
 ```
 
 ## License
-Duckling is BSD-licensed.
+
+Duckling is [BSD-licensed](LICENSE).

duckling.cabal

@@ -1161,6 +1161,7 @@ test-suite duckling-test
                      , Duckling.Time.RO.Tests
                      , Duckling.Time.RU.Tests
                      , Duckling.Time.SV.Tests
+                     , Duckling.Time.TR.Tests
                      , Duckling.Time.UK.Tests
                      , Duckling.Time.VI.Tests
                      , Duckling.Time.ZH.Tests

exe/Duckling/Ranking/Generate.hs

@@ -55,6 +55,7 @@ import qualified Duckling.Time.PT.Corpus as PTTime
 import qualified Duckling.Time.RO.Corpus as ROTime
 import qualified Duckling.Time.RU.Corpus as RUTime
 import qualified Duckling.Time.SV.Corpus as SVTime
+import qualified Duckling.Time.TR.Corpus as TRTime
 import qualified Duckling.Time.UK.Corpus as UKTime
 import qualified Duckling.Time.VI.Corpus as VITime
 import qualified Duckling.Time.ZH.Corpus as ZHTime
@@ -221,7 +222,7 @@ getCorpusForLang = \case
   TA -> (testContext, testOptions, [])
   TE -> (testContext, testOptions, [])
   TH -> (testContext, testOptions, [])
-  TR -> (testContext, testOptions, [])
+  TR -> TRTime.corpus
   UK -> UKTime.corpus
   VI -> VITime.corpus
   ZH -> ZHTime.corpus

tests/Duckling/Duration/EN/Tests.hs

@@ -12,13 +12,24 @@ module Duckling.Duration.EN.Tests
 import Prelude
 import Data.String
 import Test.Tasty
+import Test.Tasty.HUnit
 
 import Duckling.Dimensions.Types
 import Duckling.Duration.EN.Corpus
 import Duckling.Testing.Asserts
+import Duckling.Testing.Types hiding (examples)
+import Duckling.Types (Range(..))
 
 tests :: TestTree
 tests = testGroup "EN Tests"
   [ makeCorpusTest [Seal Duration] corpus
   , makeNegativeCorpusTest [Seal Duration] negativeCorpus
+  , rangeTests
   ]
+
+rangeTests :: TestTree
+rangeTests = testCase "Range Test" $
+  mapM_ (analyzedRangeTest testContext testOptions . withTargets [Seal Duration]) xs
+  where
+    xs = [ ("1 hour 111565513", Range 0 6) -- ruleDurationHoursAndMinutes to accept valid minutes
+         ]

tests/Duckling/Time/EN/Tests.hs

@@ -180,4 +180,5 @@ rangeTests = testCase "Range Test" $
          , ("at 6pm (PDT) GMT", Range 0 12) -- ruleTimezoneBracket
          , ("6pm GMT - 8pm GMT PDT", Range 0 17)
            -- ruleTimezone will not match because TimeData hasTimezone.
+         , ("Monday - 1", Range 0 6) -- ruleYearLatent to not accept negative years.
          ]

tests/Duckling/Time/Tests.hs

@@ -47,6 +47,7 @@ import qualified Duckling.Time.PT.Tests as PT
 import qualified Duckling.Time.RO.Tests as RO
 import qualified Duckling.Time.RU.Tests as RU
 import qualified Duckling.Time.SV.Tests as SV
+import qualified Duckling.Time.TR.Tests as TR
 import qualified Duckling.Time.UK.Tests as UK
 import qualified Duckling.Time.VI.Tests as VI
 import qualified Duckling.Time.ZH.Tests as ZH
@@ -77,6 +78,7 @@ tests = testGroup "Time Tests"
   , RO.tests
   , RU.tests
   , SV.tests
+  , TR.tests
   , UK.tests
   , VI.tests
   , ZH.tests