From 01e39fac7e52688ed13db6ce3b4152a8cca64447 Mon Sep 17 00:00:00 2001
From: Alexis Hope <alexis@cvofhope.com>
Date: Thu, 19 May 2022 16:19:39 +1000
Subject: [PATCH 1/3] feat: add dimension for kelvin

---
 Duckling/Ranking/Classifiers/NB_XX.hs | 425 ++++++++++++++------------
 Duckling/Ranking/Classifiers/TE_XX.hs |   2 +-
 Duckling/Temperature/EN/Corpus.hs     |  12 +-
 Duckling/Temperature/EN/Rules.hs      |  14 +
 Duckling/Temperature/Types.hs         |   2 +-
 5 files changed, 255 insertions(+), 200 deletions(-)

diff --git a/Duckling/Ranking/Classifiers/NB_XX.hs b/Duckling/Ranking/Classifiers/NB_XX.hs
index 3dd0e906d..83e8e28b7 100644
--- a/Duckling/Ranking/Classifiers/NB_XX.hs
+++ b/Duckling/Ranking/Classifiers/NB_XX.hs
@@ -43,11 +43,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.7378640193417415, unseen = -5.111987788356543,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 164},
+                     ClassData{prior = -0.8446970786871463, unseen = -5.117993812416755,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 165},
                    koData =
-                     ClassData{prior = -0.650344641325185, unseen = -5.198497031265826,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 179}}),
+                     ClassData{prior = -0.561570822771226, unseen = -5.3981627015177525,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 219}}),
        ("the day before yesterday",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -98,12 +98,11 @@ classifiers
                                n = 4}}),
        ("dd/mm",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -2.3025850929940455,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
+                     ClassData{prior = -0.5108256237659907, unseen = -2.639057329615259,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
+                     ClassData{prior = -0.916290731874155, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8}}),
        ("today",
         Classifier{okData =
                      ClassData{prior = -0.2231435513142097, unseen = -1.791759469228055,
@@ -163,29 +162,28 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("on <date>",
         Classifier{okData =
-                     ClassData{prior = -0.32158362412746233,
-                               unseen = -4.248495242049359,
+                     ClassData{prior = -0.3272129112084162, unseen = -4.330733340286331,
                                likelihoods =
                                  HashMap.fromList
-                                   [("L\248rdag", -3.1354942159291497),
-                                    ("on <date>", -3.5409593240373143),
-                                    ("Mandag", -3.5409593240373143),
-                                    ("Torsdag", -2.1546649629174235),
-                                    ("the <day-of-month> (non ordinal)", -3.1354942159291497),
-                                    ("<day-of-month>(ordinal) <named-month>", -2.2881963555419462),
-                                    ("day", -0.832909122935104),
-                                    ("the <day-of-month> (ordinal)", -3.5409593240373143),
-                                    ("<day-of-month> (ordinal)", -1.9315214116032136)],
-                               n = 29},
+                                   [("L\248rdag", -3.2188758248682006),
+                                    ("on <date>", -3.624340932976365),
+                                    ("Mandag", -3.624340932976365),
+                                    ("Torsdag", -2.2380465718564744),
+                                    ("the <day-of-month> (non ordinal)", -3.2188758248682006),
+                                    ("<day-of-month>(ordinal) <named-month>", -2.2380465718564744),
+                                    ("day", -0.8517522107365838),
+                                    ("the <day-of-month> (ordinal)", -3.624340932976365),
+                                    ("<day-of-month> (ordinal)", -1.91959284073794)],
+                               n = 31},
                    koData =
-                     ClassData{prior = -1.2909841813155656,
-                               unseen = -3.5263605246161616,
+                     ClassData{prior = -1.276293465905562, unseen = -3.6375861597263857,
                                likelihoods =
                                  HashMap.fromList
-                                   [("on <date>", -2.3978952727983707),
-                                    ("time-of-day (latent)", -1.1939224684724346),
-                                    ("hour", -1.0116009116784799)],
-                               n = 11}}),
+                                   [("on <date>", -2.512305623976115),
+                                    ("year (latent)", -2.917770732084279),
+                                    ("time-of-day (latent)", -1.3083328196501787),
+                                    ("year", -2.917770732084279), ("hour", -1.126011262856224)],
+                               n = 12}}),
        ("integer (0..19)",
         Classifier{okData =
                      ClassData{prior = -0.13005312824819779,
@@ -271,6 +269,13 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("November",
+        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}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -0.10536051565782628,
@@ -280,6 +285,13 @@ classifiers
                      ClassData{prior = -2.3025850929940455,
                                unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
+       ("dd/m",
+        Classifier{okData =
+                     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}}),
        ("<ordinal> quarter",
         Classifier{okData =
                      ClassData{prior = -0.6931471805599453,
@@ -308,131 +320,135 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.32423966818557853,
-                               unseen = -6.124683390894205,
+                     ClassData{prior = -0.3305637999350466, unseen = -6.156978985585555,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Onsdagthis <cycle>", -5.429345628954441),
-                                    ("Torsdag<time> timezone", -3.925268232178167),
+                                   [("Onsdagthis <cycle>", -5.461710913456472),
+                                    ("Torsdag<time> timezone", -3.9576335166801986),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.330733340286331),
+                                     -4.363098624788362),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.330733340286331),
-                                    ("hourday", -5.0238805208462765),
-                                    ("dayhour", -2.2512917986064953),
-                                    ("daymonth", -3.1780538303479458),
-                                    ("monthyear", -3.349904087274605),
+                                     -4.363098624788362),
+                                    ("hourday", -5.056245805348308),
+                                    ("dayhour", -2.2836570831085266),
+                                    ("daymonth", -3.1103356562929947),
+                                    ("monthyear", -3.3822693717766366),
                                     ("Torsdagbetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.0238805208462765),
-                                    ("Mandagon <date>", -5.0238805208462765),
-                                    ("intersecthh:mm", -5.429345628954441),
+                                     -5.056245805348308),
+                                    ("Mandagon <date>", -5.056245805348308),
+                                    ("intersecthh:mm", -5.461710913456472),
                                     ("Torsdagbetween <datetime> and <datetime> (interval)",
-                                     -5.0238805208462765),
-                                    ("Torsdagat <time-of-day>", -4.176582660459073),
-                                    ("on <date>Februar", -5.0238805208462765),
-                                    ("Marsyear", -5.0238805208462765),
+                                     -5.056245805348308),
+                                    ("Torsdagat <time-of-day>", -4.208947944961104),
+                                    ("on <date>Februar", -5.056245805348308),
+                                    ("Marsyear", -5.056245805348308),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -5.0238805208462765),
-                                    ("Oktoberyear", -3.8199077165203406),
+                                     -5.056245805348308),
+                                    ("Oktoberyear", -3.8522730010223722),
+                                    ("on <date>November", -5.461710913456472),
                                     ("Torsdagfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.736198448394496),
+                                     -4.768563732896527),
                                     ("Torsdagfrom <datetime> - <datetime> (interval)",
-                                     -4.736198448394496),
-                                    ("Mandagintersect", -5.0238805208462765),
-                                    ("last <day-of-week> of <time>year", -5.0238805208462765),
-                                    ("intersectFebruar", -5.0238805208462765),
-                                    ("todayat <time-of-day>", -4.736198448394496),
-                                    ("dayday", -3.28927946545817),
-                                    ("dd/mmat <time-of-day>", -4.176582660459073),
-                                    ("intersect by \",\"hh:mm", -4.513054897080286),
-                                    ("dayyear", -3.724597536716016),
-                                    ("tomorrow<time-of-day> sharp", -4.176582660459073),
+                                     -4.768563732896527),
+                                    ("Mandagintersect", -5.056245805348308),
+                                    ("dd/mat <time-of-day>", -4.545420181582317),
+                                    ("last <day-of-week> of <time>year", -5.056245805348308),
+                                    ("intersectFebruar", -5.056245805348308),
+                                    ("todayat <time-of-day>", -4.768563732896527),
+                                    ("dayday", -3.3216447499602015),
+                                    ("dd/mmat <time-of-day>", -4.208947944961104),
+                                    ("intersect by \",\"hh:mm", -4.545420181582317),
+                                    ("dayyear", -3.7569628212180475),
+                                    ("tomorrow<time-of-day> sharp", -4.208947944961104),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -5.0238805208462765),
+                                     -5.056245805348308),
+                                    ("the <day-of-month> (ordinal)November", -5.461710913456472),
                                     ("Onsdag<named-month> <day-of-month> (non ordinal)",
-                                     -5.429345628954441),
-                                    ("Onsdagthis <time>", -4.736198448394496),
+                                     -5.461710913456472),
+                                    ("Onsdagthis <time>", -4.768563732896527),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.330733340286331),
-                                    ("tomorrowuntil <time-of-day>", -4.176582660459073),
+                                     -4.363098624788362),
+                                    ("tomorrowuntil <time-of-day>", -4.208947944961104),
                                     ("S\248ndag<day-of-month> (non ordinal) <named-month>",
-                                     -5.429345628954441),
+                                     -5.461710913456472),
                                     ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -4.736198448394496),
-                                    ("the <day-of-month> (ordinal)Februar", -5.0238805208462765),
-                                    ("after <time-of-day>at <time-of-day>", -4.176582660459073),
-                                    ("the <day-of-month> (ordinal)Mars", -4.513054897080286),
+                                     -4.768563732896527),
+                                    ("the <day-of-month> (ordinal)Februar", -5.056245805348308),
+                                    ("after <time-of-day>at <time-of-day>", -4.208947944961104),
+                                    ("the <day-of-month> (ordinal)Mars", -4.545420181582317),
                                     ("intersect by \",\"<day-of-month> (non ordinal) <named-month>",
-                                     -5.0238805208462765),
-                                    ("Mandagthe <day-of-month> (ordinal)", -5.429345628954441),
-                                    ("Mandagthis <cycle>", -5.429345628954441),
-                                    ("Tirsdagthis <time>", -5.0238805208462765),
-                                    ("tomorrowafter <time-of-day>", -4.176582660459073),
-                                    ("Tirsdagthis <cycle>", -5.429345628954441),
+                                     -5.056245805348308),
+                                    ("Mandagthe <day-of-month> (ordinal)", -5.461710913456472),
+                                    ("Mandagthis <cycle>", -5.461710913456472),
+                                    ("Tirsdagthis <time>", -5.056245805348308),
+                                    ("tomorrowafter <time-of-day>", -4.208947944961104),
+                                    ("Tirsdagthis <cycle>", -5.461710913456472),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.513054897080286),
-                                    ("dayminute", -2.538973871058276),
+                                     -4.545420181582317),
+                                    ("dayminute", -2.4659786399024815),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -4.736198448394496),
-                                    ("on <date>Mars", -4.513054897080286),
-                                    ("<ordinal> <cycle> of <time>year", -5.0238805208462765),
-                                    ("minuteday", -2.538973871058276),
+                                     -4.768563732896527),
+                                    ("on <date>Mars", -4.545420181582317),
+                                    ("<ordinal> <cycle> of <time>year", -5.056245805348308),
+                                    ("minuteday", -2.571339155560308),
                                     ("absorption of , after named dayintersect",
-                                     -5.429345628954441),
-                                    ("yearhh:mm", -5.429345628954441),
-                                    ("Onsdagnext <cycle>", -5.429345628954441),
+                                     -5.461710913456472),
+                                    ("yearhh:mm", -5.461710913456472),
+                                    ("Onsdagnext <cycle>", -5.461710913456472),
                                     ("absorption of , after named dayintersect by \",\"",
-                                     -5.0238805208462765),
-                                    ("Septemberyear", -4.513054897080286),
-                                    ("at <time-of-day>on <date>", -5.0238805208462765),
+                                     -5.056245805348308),
+                                    ("Septemberyear", -4.545420181582317),
+                                    ("at <time-of-day>on <date>", -5.056245805348308),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -5.429345628954441),
+                                     -5.461710913456472),
                                     ("between <datetime> and <datetime> (interval)on <date>",
-                                     -5.429345628954441),
-                                    ("dayweek", -4.330733340286331),
-                                    ("weekyear", -4.513054897080286),
-                                    ("hh:mmtomorrow", -3.925268232178167),
-                                    ("tomorrowat <time-of-day>", -3.1780538303479458),
-                                    ("at <time-of-day>tomorrow", -4.176582660459073),
-                                    ("last <cycle> of <time>year", -4.513054897080286),
+                                     -5.461710913456472),
+                                    ("dayweek", -4.363098624788362),
+                                    ("weekyear", -4.545420181582317),
+                                    ("hh:mmtomorrow", -3.9576335166801986),
+                                    ("tomorrowat <time-of-day>", -3.2104191148499774),
+                                    ("at <time-of-day>tomorrow", -4.208947944961104),
+                                    ("last <cycle> of <time>year", -4.545420181582317),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -5.0238805208462765),
-                                    ("yearminute", -5.429345628954441)],
-                               n = 188},
+                                     -5.056245805348308),
+                                    ("yearminute", -5.461710913456472)],
+                               n = 194},
                    koData =
-                     ClassData{prior = -1.2840155119994723, unseen = -5.41610040220442,
+                     ClassData{prior = -1.2676886187120435,
+                               unseen = -5.4638318050256105,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -2.639057329615259),
-                                    ("daymonth", -2.2761518359258903),
-                                    ("monthyear", -3.8022081394209395),
-                                    ("Mandagon <date>", -4.718498871295094),
-                                    ("Torsdagat <time-of-day>", -2.8466966943935033),
-                                    ("absorption of , after named dayFebruar", -4.02535169073515),
-                                    ("Marsyear", -4.02535169073515),
+                                   [("dayhour", -2.463853240590168),
+                                    ("daymonth", -2.3240912982150093),
+                                    ("monthyear", -3.8501476017100584),
+                                    ("Mandagon <date>", -4.7664383335842135),
+                                    ("Torsdagat <time-of-day>", -2.894636156682622),
+                                    ("absorption of , after named dayFebruar", -4.073291153024268),
+                                    ("Marsyear", -4.073291153024268),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -3.4657359027997265),
-                                    ("OnsdagFebruar", -4.718498871295094),
-                                    ("absorption of , after named dayJuli", -4.31303376318693),
-                                    ("dd/mmat <time-of-day>", -3.4657359027997265),
-                                    ("hourhour", -3.109060958860994),
-                                    ("dayyear", -3.4657359027997265),
-                                    ("Onsdagthis <time>", -3.4657359027997265),
+                                     -3.5136753650888455),
+                                    ("OnsdagFebruar", -4.7664383335842135),
+                                    ("dd/mat <time-of-day>", -3.8501476017100584),
+                                    ("absorption of , after named dayJuli", -4.360973225476049),
+                                    ("dd/mmat <time-of-day>", -3.5136753650888455),
+                                    ("hourhour", -3.1570004211501135),
+                                    ("dayyear", -3.5136753650888455),
+                                    ("Onsdagthis <time>", -3.5136753650888455),
                                     ("in|during the <part-of-day>until <time-of-day>",
-                                     -4.02535169073515),
-                                    ("Aprilyear", -4.718498871295094),
-                                    ("Tirsdagthis <time>", -3.8022081394209395),
-                                    ("until <time-of-day>on <date>", -4.718498871295094),
-                                    ("Torsdaghh:mm", -4.31303376318693),
-                                    ("dayminute", -3.2144214745188204),
-                                    ("minuteday", -3.2144214745188204),
-                                    ("hh:mmon <date>", -3.332204510175204),
-                                    ("this <part-of-day>until <time-of-day>", -4.02535169073515),
-                                    ("S\248ndagthis <time>", -3.8022081394209395),
-                                    ("tomorrownoon", -4.31303376318693),
-                                    ("this <time>until <time-of-day>", -4.02535169073515),
-                                    ("Mandagthis <time>", -4.31303376318693)],
-                               n = 72}}),
+                                     -4.073291153024268),
+                                    ("Aprilyear", -4.7664383335842135),
+                                    ("Tirsdagthis <time>", -3.8501476017100584),
+                                    ("until <time-of-day>on <date>", -4.7664383335842135),
+                                    ("Torsdaghh:mm", -4.360973225476049),
+                                    ("dayminute", -3.2623609368079394),
+                                    ("minuteday", -3.2623609368079394),
+                                    ("hh:mmon <date>", -3.380143972464323),
+                                    ("this <part-of-day>until <time-of-day>", -4.073291153024268),
+                                    ("S\248ndagthis <time>", -3.8501476017100584),
+                                    ("tomorrownoon", -4.360973225476049),
+                                    ("this <time>until <time-of-day>", -4.073291153024268),
+                                    ("Mandagthis <time>", -4.360973225476049)],
+                               n = 76}}),
        ("<ordinal> <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.890371757896165,
@@ -532,8 +548,8 @@ classifiers
                                n = 4}}),
        ("yyyy-mm-dd",
         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}}),
@@ -542,9 +558,9 @@ classifiers
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 4}}),
+                               n = 5}}),
        ("Mandag",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.70805020110221,
@@ -554,8 +570,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("dd/mm/yyyy",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
+                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 11},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -713,31 +729,32 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month>(ordinal) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -9.53101798043249e-2,
-                               unseen = -3.258096538021482,
+                     ClassData{prior = -8.004270767353637e-2,
+                               unseen = -3.4339872044851463,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinals (first..31st)Mars", -1.8325814637483102),
-                                    ("month", -0.8209805520698302),
-                                    ("ordinal (digits)Mars", -1.6094379124341003),
-                                    ("ordinal (digits)Februar", -1.8325814637483102)],
-                               n = 10},
+                                   [("ordinal (digits)November", -2.3025850929940455),
+                                    ("ordinals (first..31st)Mars", -2.0149030205422647),
+                                    ("month", -0.8362480242006186),
+                                    ("ordinal (digits)Mars", -1.791759469228055),
+                                    ("ordinal (digits)Februar", -2.0149030205422647)],
+                               n = 12},
                    koData =
-                     ClassData{prior = -2.3978952727983707,
-                               unseen = -2.0794415416798357,
+                     ClassData{prior = -2.5649493574615367,
+                               unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinals (first..31st)April", -1.252762968495368),
-                                    ("month", -1.252762968495368)],
+                                   [("ordinals (first..31st)April", -1.3862943611198906),
+                                    ("month", -1.3862943611198906)],
                                n = 1}}),
        ("numbers prefix with -, negative or minus",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -3.258096538021482,
+                     ClassData{prior = 0.0, unseen = -3.4011973816621555,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 24}}),
+                               n = 28}}),
        ("in|during the <part-of-day>",
         Classifier{okData =
                      ClassData{prior = -2.1972245773362196,
@@ -809,12 +826,12 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("the <day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.4849066497880004,
+                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinals (first..31st)", -1.0116009116784799),
-                                    ("ordinal (digits)", -0.45198512374305727)],
-                               n = 9},
+                                   [("ordinals (first..31st)", -1.0986122886681098),
+                                    ("ordinal (digits)", -0.40546510810816444)],
+                               n = 10},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -823,8 +840,8 @@ classifiers
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 8}}),
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 12}}),
        ("afternoon",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -916,14 +933,14 @@ classifiers
                                n = 64}}),
        ("year",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097, unseen = -3.258096538021482,
+                     ClassData{prior = -0.43286408229627876,
+                               unseen = -3.258096538021482,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
                                n = 24},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
-                               unseen = -2.0794415416798357,
+                     ClassData{prior = -1.0459685551826876, unseen = -2.70805020110221,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 6}}),
+                               n = 13}}),
        ("last <day-of-week> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.833213344056216,
@@ -1093,12 +1110,12 @@ classifiers
                                n = 5}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -1.7094433359300068e-2,
-                               unseen = -4.0943445622221,
+                     ClassData{prior = -3.390155167568134e-2, unseen = -4.0943445622221,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 58},
                    koData =
-                     ClassData{prior = -4.07753744390572, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
+                     ClassData{prior = -3.4011973816621555,
+                               unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("quarter after|past <integer> (hour-of-day)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -1206,12 +1223,12 @@ classifiers
                                n = 26}}),
        ("<day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.4849066497880004,
+                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinals (first..31st)", -1.0116009116784799),
-                                    ("ordinal (digits)", -0.45198512374305727)],
-                               n = 9},
+                                   [("ordinals (first..31st)", -1.0986122886681098),
+                                    ("ordinal (digits)", -0.40546510810816444)],
+                               n = 10},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1399,32 +1416,40 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<datetime> - <datetime> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.6931471805599453,
-                               unseen = -3.6109179126442243,
+                     ClassData{prior = -0.7308875085427924,
+                               unseen = -3.6375861597263857,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.3862943611198906),
-                                    ("hh:mmhh:mm", -1.3862943611198906),
-                                    ("dayday", -1.791759469228055),
+                                   [("minuteminute", -1.413693335308005),
+                                    ("hh:mmhh:mm", -1.413693335308005),
+                                    ("dayday", -1.8191584434161694),
                                     ("<day-of-month> (non ordinal) <named-month><day-of-month> (non ordinal) <named-month>",
-                                     -1.791759469228055)],
+                                     -1.8191584434161694)],
                                n = 13},
                    koData =
-                     ClassData{prior = -0.6931471805599453,
-                               unseen = -3.6109179126442243,
+                     ClassData{prior = -0.6567795363890705,
+                               unseen = -3.6888794541139363,
                                likelihoods =
                                  HashMap.fromList
                                    [("Juli<day-of-month> (non ordinal) <named-month>",
-                                     -2.890371757896165),
-                                    ("monthday", -1.791759469228055),
-                                    ("minuteminute", -1.6376087894007967),
-                                    ("hh:mmhh:mm", -2.890371757896165),
-                                    ("dayyear", -2.4849066497880004),
-                                    ("hh:mmintersect", -1.791759469228055),
+                                     -2.9704144655697013),
+                                    ("d/mmyear", -2.9704144655697013),
+                                    ("monthday", -1.8718021769015913),
+                                    ("minuteminute", -1.717651497074333),
+                                    ("hh:mmhh:mm", -2.9704144655697013),
+                                    ("dayyear", -2.277267285009756),
+                                    ("hh:mmintersect", -1.8718021769015913),
                                     ("August<day-of-month> (non ordinal) <named-month>",
-                                     -1.9740810260220096),
-                                    ("dd/mmyear", -2.4849066497880004)],
-                               n = 13}}),
+                                     -2.0541237336955462),
+                                    ("dd/mmyear", -2.5649493574615367)],
+                               n = 14}}),
+       ("d/mm",
+        Classifier{okData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0},
+                   koData =
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("<time-of-day> - <time-of-day> (interval)",
         Classifier{okData =
                      ClassData{prior = -0.587786664902119, unseen = -3.2188758248682006,
@@ -1473,22 +1498,23 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<named-month> <day-of-month> (non ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -9.53101798043249e-2,
+                               unseen = -3.258096538021482,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Februarinteger (numeric)", -1.2992829841302609),
-                                    ("Aprilinteger (numeric)", -2.3978952727983707),
-                                    ("month", -0.7884573603642702),
-                                    ("Juliinteger (numeric)", -1.7047480922384253)],
-                               n = 9},
+                                   [("Februarinteger (numeric)", -1.4271163556401458),
+                                    ("Aprilinteger (numeric)", -2.5257286443082556),
+                                    ("month", -0.8209805520698302),
+                                    ("Juliinteger (numeric)", -1.8325814637483102),
+                                    ("Novemberinteger (numeric)", -2.5257286443082556)],
+                               n = 10},
                    koData =
-                     ClassData{prior = -2.3025850929940455,
-                               unseen = -1.9459101490553135,
+                     ClassData{prior = -2.3978952727983707,
+                               unseen = -2.0794415416798357,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Aprilinteger (numeric)", -1.0986122886681098),
-                                    ("month", -1.0986122886681098)],
+                                   [("Aprilinteger (numeric)", -1.252762968495368),
+                                    ("month", -1.252762968495368)],
                                n = 1}}),
        ("<day-of-month> (non ordinal) <named-month>",
         Classifier{okData =
@@ -1543,13 +1569,11 @@ classifiers
                                n = 7}}),
        ("ordinal (digits)",
         Classifier{okData =
-                     ClassData{prior = -8.701137698962981e-2,
-                               unseen = -2.5649493574615367,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 11},
+                     ClassData{prior = -0.7308875085427924, unseen = -2.70805020110221,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 13},
                    koData =
-                     ClassData{prior = -2.4849066497880004,
-                               unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
+                     ClassData{prior = -0.6567795363890705, unseen = -2.772588722239781,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 14}}),
        ("quarter (grain)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -1636,6 +1660,15 @@ classifiers
                    koData =
                      ClassData{prior = -3.044522437723423, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
+       ("dd.mm",
+        Classifier{okData =
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("<month> dd-dd (interval)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.1972245773362196,
diff --git a/Duckling/Ranking/Classifiers/TE_XX.hs b/Duckling/Ranking/Classifiers/TE_XX.hs
index 9bc1d51d0..3ba54db70 100644
--- a/Duckling/Ranking/Classifiers/TE_XX.hs
+++ b/Duckling/Ranking/Classifiers/TE_XX.hs
@@ -19,4 +19,4 @@ import qualified Data.HashMap.Strict as HashMap
 import Duckling.Ranking.Types
 
 classifiers :: Classifiers
-classifiers = HashMap.fromList []
+classifiers = HashMap.fromList []
\ No newline at end of file
diff --git a/Duckling/Temperature/EN/Corpus.hs b/Duckling/Temperature/EN/Corpus.hs
index 0e9107c7f..9058ff7f9 100644
--- a/Duckling/Temperature/EN/Corpus.hs
+++ b/Duckling/Temperature/EN/Corpus.hs
@@ -25,16 +25,17 @@ allExamples = concat
   [ examples (simple Celsius 37)
              [ "37°C"
              , "37 ° celsius"
+             , "37 degrees C"
              , "37 degrees Celsius"
              , "thirty seven celsius"
-             , "37 degrees Celsius"
-             , "thirty seven celsius"
+             , "thirty seven Celsius"
              ]
   , examples (simple Fahrenheit 70)
              [ "70°F"
              , "70 ° Fahrenheit"
              , "70 degrees F"
              , "seventy Fahrenheit"
+             , "seventy fahrenheit"
              ]
   , examples (simple Fahrenheit 98.6)
              [ "98.6°F"
@@ -52,6 +53,13 @@ allExamples = concat
              , "2 degrees below zero"
              , "2 below zero"
              ]
+  , examples (simple Kelvin 44)
+             [ "44°K"
+             , "44 kelvin"
+             , "44 kelvins"
+             , "fourty four kelvins"
+             , "44 kelvins"
+             ]
   , examples (between Degree (30, 40))
              [ "between 30 and 40 degrees"
              , "from 30 degrees to 40 degrees"
diff --git a/Duckling/Temperature/EN/Rules.hs b/Duckling/Temperature/EN/Rules.hs
index 08653c2bb..ed9a020ac 100644
--- a/Duckling/Temperature/EN/Rules.hs
+++ b/Duckling/Temperature/EN/Rules.hs
@@ -62,6 +62,19 @@ ruleTemperatureFahrenheit = Rule
       _ -> Nothing
   }
 
+ruleTemperatureKelvin :: Rule
+ruleTemperatureKelvin = Rule
+  { name = "<temp> Kelvin"
+  , pattern =
+    [ Predicate $ isValueOnly True
+    , regex "k(el?vi?n?s?)?\\.?"
+    ]
+  , prod = \case
+      (Token Temperature td:_) -> Just . Token Temperature $
+        withUnit TTemperature.Kelvin td
+      _ -> Nothing
+  }
+
 ruleTemperatureBelowZero :: Rule
 ruleTemperatureBelowZero = Rule
   { name = "<temp> below zero"
@@ -153,6 +166,7 @@ rules =
   [ ruleTemperatureDegrees
   , ruleTemperatureCelsius
   , ruleTemperatureFahrenheit
+  , ruleTemperatureKelvin
   , ruleTemperatureBelowZero
   , ruleIntervalBetween
   , ruleIntervalDash
diff --git a/Duckling/Temperature/Types.hs b/Duckling/Temperature/Types.hs
index 43ec337d8..2ded53660 100644
--- a/Duckling/Temperature/Types.hs
+++ b/Duckling/Temperature/Types.hs
@@ -26,7 +26,7 @@ import qualified Data.Text as Text
 import Duckling.Resolve (Resolve(..))
 
 data TemperatureUnit =
-  Degree | Celsius | Fahrenheit
+  Degree | Celsius | Fahrenheit | Kelvin
   deriving (Eq, Generic, Hashable, Show, Ord, NFData)
 
 instance ToJSON TemperatureUnit where

From 881da10238c4b6c1a85b6572be4fab30bb8503e3 Mon Sep 17 00:00:00 2001
From: Alexis Hope <alexis@cvofhope.com>
Date: Fri, 20 May 2022 16:39:29 +1000
Subject: [PATCH 2/3] refactor: terse kelvin regex

---
 Duckling/Temperature/EN/Rules.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Duckling/Temperature/EN/Rules.hs b/Duckling/Temperature/EN/Rules.hs
index ed9a020ac..175526a4c 100644
--- a/Duckling/Temperature/EN/Rules.hs
+++ b/Duckling/Temperature/EN/Rules.hs
@@ -67,7 +67,7 @@ ruleTemperatureKelvin = Rule
   { name = "<temp> Kelvin"
   , pattern =
     [ Predicate $ isValueOnly True
-    , regex "k(el?vi?n?s?)?\\.?"
+    , regex "k(elvin)?s?\\.?"
     ]
   , prod = \case
       (Token Temperature td:_) -> Just . Token Temperature $

From 24a740f425c5fc02c9960a31919be5531e795cec Mon Sep 17 00:00:00 2001
From: Alexis Hope <alexis@cvofhope.com>
Date: Fri, 20 May 2022 16:43:15 +1000
Subject: [PATCH 3/3] fix: regen classifier

---
 Duckling/Ranking/Classifiers/IT_XX.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Duckling/Ranking/Classifiers/IT_XX.hs b/Duckling/Ranking/Classifiers/IT_XX.hs
index b9981cbb7..a3408b084 100644
--- a/Duckling/Ranking/Classifiers/IT_XX.hs
+++ b/Duckling/Ranking/Classifiers/IT_XX.hs
@@ -327,10 +327,10 @@ classifiers
                                unseen = -4.31748811353631,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> (latent time-of-day)", -0.9718605830289658),
+                                   [("<integer> (latent time-of-day)", -0.9718605830289657),
                                     ("intersect by \"di\", \"della\", \"del\"", -3.20545280453606),
                                     ("day", -2.3581549441488563), ("Lunedi", -3.6109179126442243),
-                                    ("hour", -0.9718605830289658),
+                                    ("hour", -0.9718605830289657),
                                     ("two time tokens separated by `di`", -3.20545280453606),
                                     ("Domenica", -3.6109179126442243)],
                                n = 33}}),