Skip to content

Commit 34b1dda

Browse files
RajanMehtaClincRajanMehtaClinc
authored
feat: added new Time rules (#6)
1 parent 690c33b commit 34b1dda

File tree

16 files changed

+532
-487
lines changed

16 files changed

+532
-487
lines changed

‎Duckling/Ranking/Classifiers/EN_AU.hs

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ classifiers
8383
likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
8484
("integer (numeric)",
8585
Classifier{okData =
86-
ClassData{prior = -0.5266362297926329, unseen = -6.222576268071369,
87-
likelihoods = HashMap.fromList [("", 0.0)], n = 502},
86+
ClassData{prior = -0.5233945245011044, unseen = -6.230481447578482,
87+
likelihoods = HashMap.fromList [("", 0.0)], n = 506},
8888
koData =
89-
ClassData{prior = -0.8930338697098877, unseen = -5.857933154483459,
89+
ClassData{prior = -0.8977287140140955, unseen = -5.857933154483459,
9090
likelihoods = HashMap.fromList [("", 0.0)], n = 348}}),
9191
("<year> (bc|ad)",
9292
Classifier{okData =
@@ -569,18 +569,17 @@ classifiers
569569
likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
570570
("in|during <named-month>|year",
571571
Classifier{okData =
572-
ClassData{prior = -0.2744368457017603,
573-
unseen = -3.8066624897703196,
572+
ClassData{prior = -0.21511137961694557, unseen = -4.04305126783455,
574573
likelihoods =
575574
HashMap.fromList
576-
[("<year> (bc|ad)", -1.9924301646902063),
577-
("October", -3.0910424533583156),
578-
("year (latent)", -1.2992829841302609),
579-
("year", -0.9509762898620451), ("March", -2.6855773452501515),
580-
("month", -2.3978952727983707)],
581-
n = 19},
575+
[("<year> (bc|ad)", -2.2335922215070942),
576+
("October", -3.332204510175204),
577+
("year (latent)", -1.252762968495368),
578+
("year", -0.9808292530117262), ("March", -2.4159137783010487),
579+
("month", -2.2335922215070942)],
580+
n = 25},
582581
koData =
583-
ClassData{prior = -1.4271163556401458,
582+
ClassData{prior = -1.6422277352570913,
584583
unseen = -2.9444389791664407,
585584
likelihoods =
586585
HashMap.fromList
@@ -685,8 +684,8 @@ classifiers
685684
likelihoods = HashMap.fromList [], n = 0}}),
686685
("month (grain)",
687686
Classifier{okData =
688-
ClassData{prior = 0.0, unseen = -3.6888794541139363,
689-
likelihoods = HashMap.fromList [("", 0.0)], n = 38},
687+
ClassData{prior = 0.0, unseen = -3.713572066704308,
688+
likelihoods = HashMap.fromList [("", 0.0)], n = 39},
690689
koData =
691690
ClassData{prior = -infinity, unseen = -0.6931471805599453,
692691
likelihoods = HashMap.fromList [], n = 0}}),
@@ -1426,8 +1425,8 @@ classifiers
14261425
likelihoods = HashMap.fromList [], n = 0}}),
14271426
("year (grain)",
14281427
Classifier{okData =
1429-
ClassData{prior = 0.0, unseen = -3.6635616461296463,
1430-
likelihoods = HashMap.fromList [("", 0.0)], n = 37},
1428+
ClassData{prior = 0.0, unseen = -3.6888794541139363,
1429+
likelihoods = HashMap.fromList [("", 0.0)], n = 38},
14311430
koData =
14321431
ClassData{prior = -infinity, unseen = -0.6931471805599453,
14331432
likelihoods = HashMap.fromList [], n = 0}}),
@@ -1565,25 +1564,29 @@ classifiers
15651564
likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
15661565
("the <cycle> of <time>",
15671566
Classifier{okData =
1568-
ClassData{prior = -0.40546510810816444,
1569-
unseen = -3.044522437723423,
1567+
ClassData{prior = -0.3184537311185346, unseen = -3.367295829986474,
15701568
likelihoods =
15711569
HashMap.fromList
1572-
[("week (grain)<named-month>|<named-day> <day-of-month> (ordinal)",
1573-
-1.8971199848858813),
1574-
("weekmonth", -1.8971199848858813),
1575-
("week (grain)October", -1.8971199848858813),
1570+
[("yearyear", -2.639057329615259),
1571+
("monthmonth", -2.639057329615259),
1572+
("week (grain)<named-month>|<named-day> <day-of-month> (ordinal)",
1573+
-2.2335922215070942),
1574+
("weekmonth", -2.2335922215070942),
1575+
("week (grain)October", -2.2335922215070942),
1576+
("month (grain)March", -2.639057329615259),
1577+
("year (grain)year (latent)", -2.639057329615259),
15761578
("week (grain)<named-month> <day-of-month> (non ordinal)",
1577-
-1.8971199848858813),
1578-
("weekday", -1.3862943611198906)],
1579-
n = 6},
1579+
-2.2335922215070942),
1580+
("weekday", -1.7227665977411035)],
1581+
n = 8},
15801582
koData =
1581-
ClassData{prior = -1.0986122886681098, unseen = -2.70805020110221,
1583+
ClassData{prior = -1.2992829841302609,
1584+
unseen = -2.9444389791664407,
15821585
likelihoods =
15831586
HashMap.fromList
1584-
[("second (grain) March", -1.9459101490553135),
1585-
("secondmonth", -1.252762968495368),
1586-
("second (grain) this|last|next <cycle>", -1.540445040947149)],
1587+
[("second (grain) March", -2.1972245773362196),
1588+
("secondmonth", -1.5040773967762742),
1589+
("second (grain) this|last|next <cycle>", -1.791759469228055)],
15871590
n = 3}}),
15881591
("number.number hours",
15891592
Classifier{okData =
@@ -1668,14 +1671,14 @@ classifiers
16681671
likelihoods = HashMap.fromList [], n = 0}}),
16691672
("year (latent)",
16701673
Classifier{okData =
1671-
ClassData{prior = -0.13743003304017992, unseen = -5.43372200355424,
1674+
ClassData{prior = -0.1351747783682526, unseen = -5.4510384535657,
16721675
likelihoods =
16731676
HashMap.fromList
1674-
[("integer (numeric)", -2.6668247082161294e-2),
1675-
("intersect 2 numbers", -4.04305126783455)],
1676-
n = 224},
1677+
[("integer (numeric)", -2.6202372394024072e-2),
1678+
("intersect 2 numbers", -4.060443010546419)],
1679+
n = 228},
16771680
koData =
1678-
ClassData{prior = -2.05256852342874, unseen = -3.6375861597263857,
1681+
ClassData{prior = -2.068012845856213, unseen = -3.6375861597263857,
16791682
likelihoods =
16801683
HashMap.fromList
16811684
[("integer (numeric)", -1.5314763709643884),
@@ -3212,8 +3215,8 @@ classifiers
32123215
n = 9}}),
32133216
("March",
32143217
Classifier{okData =
3215-
ClassData{prior = 0.0, unseen = -3.4011973816621555,
3216-
likelihoods = HashMap.fromList [("", 0.0)], n = 28},
3218+
ClassData{prior = 0.0, unseen = -3.4657359027997265,
3219+
likelihoods = HashMap.fromList [("", 0.0)], n = 30},
32173220
koData =
32183221
ClassData{prior = -infinity, unseen = -0.6931471805599453,
32193222
likelihoods = HashMap.fromList [], n = 0}}),

‎Duckling/Ranking/Classifiers/EN_BZ.hs

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ classifiers
8383
likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
8484
("integer (numeric)",
8585
Classifier{okData =
86-
ClassData{prior = -0.5266362297926329, unseen = -6.222576268071369,
87-
likelihoods = HashMap.fromList [("", 0.0)], n = 502},
86+
ClassData{prior = -0.5233945245011044, unseen = -6.230481447578482,
87+
likelihoods = HashMap.fromList [("", 0.0)], n = 506},
8888
koData =
89-
ClassData{prior = -0.8930338697098877, unseen = -5.857933154483459,
89+
ClassData{prior = -0.8977287140140955, unseen = -5.857933154483459,
9090
likelihoods = HashMap.fromList [("", 0.0)], n = 348}}),
9191
("<year> (bc|ad)",
9292
Classifier{okData =
@@ -569,18 +569,17 @@ classifiers
569569
likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
570570
("in|during <named-month>|year",
571571
Classifier{okData =
572-
ClassData{prior = -0.2744368457017603,
573-
unseen = -3.8066624897703196,
572+
ClassData{prior = -0.21511137961694557, unseen = -4.04305126783455,
574573
likelihoods =
575574
HashMap.fromList
576-
[("<year> (bc|ad)", -1.9924301646902063),
577-
("October", -3.0910424533583156),
578-
("year (latent)", -1.2992829841302609),
579-
("year", -0.9509762898620451), ("March", -2.6855773452501515),
580-
("month", -2.3978952727983707)],
581-
n = 19},
575+
[("<year> (bc|ad)", -2.2335922215070942),
576+
("October", -3.332204510175204),
577+
("year (latent)", -1.252762968495368),
578+
("year", -0.9808292530117262), ("March", -2.4159137783010487),
579+
("month", -2.2335922215070942)],
580+
n = 25},
582581
koData =
583-
ClassData{prior = -1.4271163556401458,
582+
ClassData{prior = -1.6422277352570913,
584583
unseen = -2.9444389791664407,
585584
likelihoods =
586585
HashMap.fromList
@@ -685,8 +684,8 @@ classifiers
685684
likelihoods = HashMap.fromList [], n = 0}}),
686685
("month (grain)",
687686
Classifier{okData =
688-
ClassData{prior = 0.0, unseen = -3.6888794541139363,
689-
likelihoods = HashMap.fromList [("", 0.0)], n = 38},
687+
ClassData{prior = 0.0, unseen = -3.713572066704308,
688+
likelihoods = HashMap.fromList [("", 0.0)], n = 39},
690689
koData =
691690
ClassData{prior = -infinity, unseen = -0.6931471805599453,
692691
likelihoods = HashMap.fromList [], n = 0}}),
@@ -1426,8 +1425,8 @@ classifiers
14261425
likelihoods = HashMap.fromList [], n = 0}}),
14271426
("year (grain)",
14281427
Classifier{okData =
1429-
ClassData{prior = 0.0, unseen = -3.6635616461296463,
1430-
likelihoods = HashMap.fromList [("", 0.0)], n = 37},
1428+
ClassData{prior = 0.0, unseen = -3.6888794541139363,
1429+
likelihoods = HashMap.fromList [("", 0.0)], n = 38},
14311430
koData =
14321431
ClassData{prior = -infinity, unseen = -0.6931471805599453,
14331432
likelihoods = HashMap.fromList [], n = 0}}),
@@ -1565,25 +1564,29 @@ classifiers
15651564
likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
15661565
("the <cycle> of <time>",
15671566
Classifier{okData =
1568-
ClassData{prior = -0.40546510810816444,
1569-
unseen = -3.044522437723423,
1567+
ClassData{prior = -0.3184537311185346, unseen = -3.367295829986474,
15701568
likelihoods =
15711569
HashMap.fromList
1572-
[("week (grain)<named-month>|<named-day> <day-of-month> (ordinal)",
1573-
-1.8971199848858813),
1574-
("weekmonth", -1.8971199848858813),
1575-
("week (grain)October", -1.8971199848858813),
1570+
[("yearyear", -2.639057329615259),
1571+
("monthmonth", -2.639057329615259),
1572+
("week (grain)<named-month>|<named-day> <day-of-month> (ordinal)",
1573+
-2.2335922215070942),
1574+
("weekmonth", -2.2335922215070942),
1575+
("week (grain)October", -2.2335922215070942),
1576+
("month (grain)March", -2.639057329615259),
1577+
("year (grain)year (latent)", -2.639057329615259),
15761578
("week (grain)<named-month> <day-of-month> (non ordinal)",
1577-
-1.8971199848858813),
1578-
("weekday", -1.3862943611198906)],
1579-
n = 6},
1579+
-2.2335922215070942),
1580+
("weekday", -1.7227665977411035)],
1581+
n = 8},
15801582
koData =
1581-
ClassData{prior = -1.0986122886681098, unseen = -2.70805020110221,
1583+
ClassData{prior = -1.2992829841302609,
1584+
unseen = -2.9444389791664407,
15821585
likelihoods =
15831586
HashMap.fromList
1584-
[("second (grain) March", -1.9459101490553135),
1585-
("secondmonth", -1.252762968495368),
1586-
("second (grain) this|last|next <cycle>", -1.540445040947149)],
1587+
[("second (grain) March", -2.1972245773362196),
1588+
("secondmonth", -1.5040773967762742),
1589+
("second (grain) this|last|next <cycle>", -1.791759469228055)],
15871590
n = 3}}),
15881591
("number.number hours",
15891592
Classifier{okData =
@@ -1668,14 +1671,14 @@ classifiers
16681671
likelihoods = HashMap.fromList [], n = 0}}),
16691672
("year (latent)",
16701673
Classifier{okData =
1671-
ClassData{prior = -0.13743003304017992, unseen = -5.43372200355424,
1674+
ClassData{prior = -0.1351747783682526, unseen = -5.4510384535657,
16721675
likelihoods =
16731676
HashMap.fromList
1674-
[("integer (numeric)", -2.6668247082161294e-2),
1675-
("intersect 2 numbers", -4.04305126783455)],
1676-
n = 224},
1677+
[("integer (numeric)", -2.6202372394024072e-2),
1678+
("intersect 2 numbers", -4.060443010546419)],
1679+
n = 228},
16771680
koData =
1678-
ClassData{prior = -2.05256852342874, unseen = -3.6375861597263857,
1681+
ClassData{prior = -2.068012845856213, unseen = -3.6375861597263857,
16791682
likelihoods =
16801683
HashMap.fromList
16811684
[("integer (numeric)", -1.5314763709643884),
@@ -3212,8 +3215,8 @@ classifiers
32123215
n = 9}}),
32133216
("March",
32143217
Classifier{okData =
3215-
ClassData{prior = 0.0, unseen = -3.4011973816621555,
3216-
likelihoods = HashMap.fromList [("", 0.0)], n = 28},
3218+
ClassData{prior = 0.0, unseen = -3.4657359027997265,
3219+
likelihoods = HashMap.fromList [("", 0.0)], n = 30},
32173220
koData =
32183221
ClassData{prior = -infinity, unseen = -0.6931471805599453,
32193222
likelihoods = HashMap.fromList [], n = 0}}),

0 commit comments

Comments
 (0)