Remove faulty training examples (#205)

adrienball · web-flow · commit 48e23a869406 · 2020-01-23T15:25:02.000+01:00
* Remove faulty ES rule

* Remove faulty ZH training examples

* Remove faulty ZH training examples

* Remove faulty ZH training examples

* Update Cargo.toml files

* Update Changelog
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [Unreleased]
+### Fixed
+- Remove Chinese training examples causing issues on raspbian and windows [#205](https://github.com/snipsco/rustling-ontology/pull/205)
+- Fix float parsing for all languages [#203](https://github.com/snipsco/rustling-ontology/pull/203)
+- Add various improvements in all languages [#203](https://github.com/snipsco/rustling-ontology/pull/203)
+
 ## [0.19.2]
 ### Fixed
 - Fix chrono issue and move to rust edition 2018 [#194](https://github.com/snipsco/rustling-ontology/pull/194)
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,27 +6,41 @@ build = "build.rs"
 edition = "2018"
 
 [workspace]
-members=["values", "cli", "cli-debug", "moment", "json-utils",
-        "grammar", "grammar/de", "grammar/en", "grammar/es", "grammar/pt", "grammar/fr", "grammar/ko", "grammar/zh", "grammar/ja", "grammar/it"]
+members=[
+    "cli",
+    "cli-debug",
+    "grammar",
+    "grammar/de",
+    "grammar/en",
+    "grammar/es",
+    "grammar/fr",
+    "grammar/it",
+    "grammar/ja",
+    "grammar/ko",
+    "grammar/pt",
+    "grammar/zh",
+    "json-utils",
+    "moment",
+    "values",
+]
 
 [dependencies]
 rmp-serde = "0.14"
-serde = { version = "1.0", features = ["derive"] }
-rustling = { git = "https://github.com/snipsco/rustling", tag="0.9.1" }
+serde = { version = "1", features = ["derive"] }
+rustling = { git = "https://github.com/snipsco/rustling", tag = "0.9.1" }
 rustling-ontology-moment = { path = "moment" }
 rustling-ontology-values = { path = "values" }
 rustling-ontology-grammar = { path = "grammar" }
 
 [dev-dependencies]
 bencher = { git = "https://github.com/snipsco/bencher", rev="63910ace" }
 rustling-ontology-json-utils = { path = "json-utils" }
-serde_json = "1.0"
-
+serde_json = "1"
 
 [build-dependencies]
 rmp-serde = "0.14"
-serde = { version = "1.0", features = ["derive"] }
-rustling = { git = "https://github.com/snipsco/rustling", tag="0.9.1" }
+serde = { version = "1", features = ["derive"] }
+rustling = { git = "https://github.com/snipsco/rustling", tag = "0.9.1" }
 rustling-ontology-values = { path = "values" }
 rustling-ontology-moment = { path = "moment" }
 rustling-ontology-grammar = { path = "grammar" }
diff --git a/cli-debug/Cargo.toml b/cli-debug/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["hdlj <hubert.delajonquiere@snips.net>", "Mathieu Poumeyrol <kali@zoy
 edition = "2018"
 
 [dependencies]
-rustling = { git = "https://github.com/snipsco/rustling", tag="0.9.1" }
+rustling = { git = "https://github.com/snipsco/rustling", tag = "0.9.1" }
 rustling-ontology-grammar = { path = "../grammar" }
 rustling-ontology-moment = { path = "../moment" }
 rustling-ontology-values = { path = "../values" }
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -10,4 +10,4 @@ prettytable-rs = "0.6"
 rustling-ontology = { path = ".." }
 rustling-ontology-json-utils = { path = "../json-utils" }
 rustling-ontology-moment = { path = "../moment" }
-serde_json = "1.0"
+serde_json = "1"
diff --git a/grammar/Cargo.toml b/grammar/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["hdlj <hubert.delajonquiere@snips.net>"]
 edition = "2018"
 
 [dependencies]
-rustling = { git = "https://github.com/snipsco/rustling", tag="0.9.1" }
+rustling = { git = "https://github.com/snipsco/rustling", tag = "0.9.1" }
 rustling-ontology-de = { path = "de" }
 rustling-ontology-en = { path = "en" }
 rustling-ontology-es = { path = "es" }
diff --git a/grammar/de/Cargo.toml b/grammar/de/Cargo.toml
@@ -5,6 +5,6 @@ authors = ["hdlj <hubert.delajonquiere@snips.net>"]
 edition = "2018"
 
 [dependencies]
-rustling = { git = "https://github.com/snipsco/rustling", tag="0.9.1" }
+rustling = { git = "https://github.com/snipsco/rustling", tag = "0.9.1" }
 rustling-ontology-moment = { path = "../../moment" }
 rustling-ontology-values = { path = "../../values" }
diff --git a/grammar/en/Cargo.toml b/grammar/en/Cargo.toml
@@ -5,6 +5,6 @@ authors = ["hdlj <hubert.delajonquiere@snips.net>"]
 edition = "2018"
 
 [dependencies]
-rustling = { git = "https://github.com/snipsco/rustling", tag="0.9.1" }
+rustling = { git = "https://github.com/snipsco/rustling", tag = "0.9.1" }
 rustling-ontology-moment = { path = "../../moment" }
 rustling-ontology-values = { path = "../../values" }
diff --git a/grammar/es/Cargo.toml b/grammar/es/Cargo.toml
@@ -5,6 +5,6 @@ authors = ["hdlj <hubert.delajonquiere@snips.net>"]
 edition = "2018"
 
 [dependencies]
-rustling = { git = "https://github.com/snipsco/rustling", tag="0.9.1" }
+rustling = { git = "https://github.com/snipsco/rustling", tag = "0.9.1" }
 rustling-ontology-moment = { path = "../../moment" }
 rustling-ontology-values = { path = "../../values" }
diff --git a/grammar/es/src/training.rs b/grammar/es/src/training.rs
@@ -149,7 +149,6 @@ pub fn examples_datetime(v: &mut Vec<::rustling::train::Example<Dimension>>) {
     example!(v, check_moment_span!(c, [2013, 2, 12, 15], [2013, 2, 12, 17]), "a media tarde", "en plena tarde", "a plena tarde");
     example!(v, check_moment_span!(c, [2013, 2, 12, 4], [2013, 2, 12, 9]), "pronto por la mañana", "a primera hora de la mañana", "por la mañana a primera hora", "a primera hora por la mañana");
     example!(v, check_moment_span!(c, [2013, 2, 12, 11], [2013, 2, 12, 16]), "en mitad del día", "a medio día", "a mediodia");
-    example!(v, check_moment_span!(c, [2013, 2, 12, 10], [2013, 2, 12, 12]), "a última hora de la mañana", "por la mañana a última hora");
     example!(v, check_moment_span!(c, [2013, 2, 12, 13], [2013, 2, 12, 17]), "después de comer", "después de la hora de comer");
     example!(v, check_moment_span!(c, [2013, 2, 12, 10], [2013, 2, 12, 12]), "antes de comer");
     example!(v, check_moment_span!(c, [2013, 2, 12, 12], [2013, 2, 12, 14]), "durante la comida", "a la hora de comer" );
diff --git a/grammar/fr/Cargo.toml b/grammar/fr/Cargo.toml
@@ -5,6 +5,6 @@ authors = ["hdlj <hubert.delajonquiere@snips.net>"]
 edition = "2018"
 
 [dependencies]
-rustling = { git = "https://github.com/snipsco/rustling", tag="0.9.1" }
+rustling = { git = "https://github.com/snipsco/rustling", tag = "0.9.1" }
 rustling-ontology-moment = { path = "../../moment" }
 rustling-ontology-values = { path = "../../values" }
diff --git a/grammar/it/Cargo.toml b/grammar/it/Cargo.toml
@@ -5,6 +5,6 @@ authors = ["hdlj <hubert.delajonquiere@snips.net>"]
 edition = "2018"
 
 [dependencies]
-rustling = { git = "https://github.com/snipsco/rustling", tag="0.9.1" }
+rustling = { git = "https://github.com/snipsco/rustling", tag = "0.9.1" }
 rustling-ontology-moment = { path = "../../moment" }
 rustling-ontology-values = { path = "../../values" }
diff --git a/grammar/ja/Cargo.toml b/grammar/ja/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Anaïs <anais@chanclu.fr>"]
 edition = "2018"
 
 [dependencies]
-regex = "1.0"
-rustling = { git = "https://github.com/snipsco/rustling", tag="0.9.1" }
+regex = "1"
+rustling = { git = "https://github.com/snipsco/rustling", tag = "0.9.1" }
 rustling-ontology-moment = { path = "../../moment" }
 rustling-ontology-values = { path = "../../values" }
diff --git a/grammar/ko/Cargo.toml b/grammar/ko/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 failure = "0.1"
-regex = "1.0"
-rustling = { git = "https://github.com/snipsco/rustling", tag="0.9.1" }
+regex = "1"
+rustling = { git = "https://github.com/snipsco/rustling", tag = "0.9.1" }
 rustling-ontology-moment = { path = "../../moment" }
 rustling-ontology-values = { path = "../../values" }
diff --git a/grammar/pt/Cargo.toml b/grammar/pt/Cargo.toml
@@ -5,6 +5,6 @@ authors = ["hdlj <rosa.stern@snips.ai>"]
 edition = "2018"
 
 [dependencies]
-rustling = { git = "https://github.com/snipsco/rustling", tag="0.9.1" }
+rustling = { git = "https://github.com/snipsco/rustling", tag = "0.9.1" }
 rustling-ontology-moment = { path = "../../moment" }
 rustling-ontology-values = { path = "../../values" }
diff --git a/grammar/zh/Cargo.toml b/grammar/zh/Cargo.toml
@@ -5,6 +5,6 @@ authors = ["hdlj <hubert.delajonquiere@snips.net>"]
 edition = "2018"
 
 [dependencies]
-rustling = { git = "https://github.com/snipsco/rustling", tag="0.9.1" }
+rustling = { git = "https://github.com/snipsco/rustling", tag = "0.9.1" }
 rustling-ontology-moment = { path = "../../moment" }
 rustling-ontology-values = { path = "../../values" }
diff --git a/grammar/zh/src/training.rs b/grammar/zh/src/training.rs
@@ -103,50 +103,8 @@ pub fn examples_datetime(v: &mut Vec<::rustling::train::Example<Dimension>>) {
 pub fn examples_temperature(v: &mut Vec<::rustling::train::Example<Dimension>>) {
     example!(v, check_temperature(45.0, Some("degree")), "45°", "+45°", "45度");
     example!(v, check_temperature(45.0, Some("degree")), "45°", "45度");
-    example!(v,
-             check_temperature(50.0, Some("fahrenheit")),
-             "50°F",
-             "华氏50°",
-             "華氏50°",
-             "华氏50度",
-             "華氏50度",
-             "50华氏°",
-             "50華氏°",
-             "50华氏度",
-             "50華氏度");
-    example!(v,
-             check_temperature(70.0, Some("fahrenheit")),
-             "70°F",
-             "华氏70°",
-             "華氏70°",
-             "华氏70度",
-             "華氏70度",
-             "70华氏°",
-             "70華氏°",
-             "70华氏度",
-             "70華氏度");
-    example!(v,
-             check_temperature(23.0, Some("celsius")),
-             "23°C",
-             "摄氏23°",
-             "攝氏23°",
-             "摄氏23度",
-             "攝氏23度",
-             "23摄氏°",
-             "23攝氏°",
-             "23摄氏度",
-             "23攝氏度");
-    example!(v,
-             check_temperature(37.0, Some("celsius")),
-             "37°C",
-             "摄氏37°",
-             "攝氏37°",
-             "摄氏37度",
-             "攝氏37度",
-             "37摄氏°",
-             "37攝氏°",
-             "37摄氏度",
-             "37攝氏度");
+    example!(v, check_temperature(50.0, Some("fahrenheit")), "50°F");
+    example!(v, check_temperature(23.0, Some("celsius")), "23°C");
 }
 
 
diff --git a/json-utils/Cargo.toml b/json-utils/Cargo.toml
@@ -7,5 +7,5 @@ edition = "2018"
 [dependencies]
 rustling-ontology-moment = { path = "../moment" }
 rustling-ontology = { path =".." }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
diff --git a/values/Cargo.toml b/values/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2018"
 [dependencies]
 log = "0.4"
 failure = "0.1"
-regex = "1.0"
-rustling = { git = "https://github.com/snipsco/rustling", tag="0.9.1" }
+regex = "1"
+rustling = { git = "https://github.com/snipsco/rustling", tag = "0.9.1" }
 rustling-ontology-moment = { path = "../moment" }
