This is an automated email from the ASF dual-hosted git repository.

aradzinski pushed a commit to branch NLPCRAFT-384
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git


The following commit(s) were added to refs/heads/NLPCRAFT-384 by this push:
     new c4a675d  WIP
c4a675d is described below

commit c4a675d45666086d01cc48964a6311bd46574088
Author: Aaron Radzinski <[email protected]>
AuthorDate: Tue Sep 28 20:39:10 2021 -0700

    WIP
---
 nlpcraft-examples/cargps/src/main/resources/cargps_intents.idl       | 2 --
 nlpcraft-examples/cargps/src/main/resources/cargps_model.yaml        | 5 +++--
 .../src/main/resources/samples/cargps_add_waypoint_samples.txt       | 2 ++
 .../cargps/src/main/resources/samples/cargps_navigate_samples.txt    | 1 +
 .../src/main/resources/samples/cargps_remove_waypoint_samples.txt    | 2 ++
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nlpcraft-examples/cargps/src/main/resources/cargps_intents.idl 
b/nlpcraft-examples/cargps/src/main/resources/cargps_intents.idl
index b0608bf..3eae285 100644
--- a/nlpcraft-examples/cargps/src/main/resources/cargps_intents.idl
+++ b/nlpcraft-examples/cargps/src/main/resources/cargps_intents.idl
@@ -24,8 +24,6 @@ fragment=hey term={# == "x:hey" && tok_is_first()}
 
 // Cancel intent.
 intent=cancel
-    // Ignore any other user or system tokens if we found 'cancel' token.
-    options={'unused_usr_toks': true, 'unused_sys_toks': true}
     fragment(hey) // Always, salutation 1st.
     term={# == "x:cancel"}
 
diff --git a/nlpcraft-examples/cargps/src/main/resources/cargps_model.yaml 
b/nlpcraft-examples/cargps/src/main/resources/cargps_model.yaml
index d443d69..9cc08fb 100644
--- a/nlpcraft-examples/cargps/src/main/resources/cargps_model.yaml
+++ b/nlpcraft-examples/cargps/src/main/resources/cargps_model.yaml
@@ -29,7 +29,7 @@ macros:
   - name: "<HEY>"
     macro: "{hey|hi|howdy}"
   - name: "<NAVIGATE>"
-    macro: 
"{navigate|pilot|plot|drive|route|plan|find|head|ride|direct|steer|operate|sail}
 {out|_} {course|route|destination|drive|_} {to|_}"
+    macro: 
"{navigate|pilot|journey|plot|drive|route|plan|find|head|ride|direct|steer|operate|sail}
 {out|_} {course|route|destination|drive|_} {to|_}"
   - name: "<CANCEL>"
     macro: "{cancel|stop|abort|finish|cease|quit} {off|_}"
   - name: "<WAYPOINT>"
@@ -81,7 +81,7 @@ elements:
   - id: "x:cancel"
     description: "Cancel action."
     synonyms:
-      - "<CANCEL>"
+      - "<CANCEL> <NAVIGATE>"
 
   - id: "x:navigate"
     description: "Start 'navigate' action."
@@ -99,6 +99,7 @@ elements:
     synonyms:
       # NOTE: assumes the LAST waypoint, if any.
       - "{skip|remove} {over|_} {last|latest|current|_} <WAYPOINT>"
+      - "<CANCEL> {last|latest|current|_} <WAYPOINT>"
       - "<NAVIGATE> without {stopping|<WAYPOINT>}"
 
 intents:
diff --git 
a/nlpcraft-examples/cargps/src/main/resources/samples/cargps_add_waypoint_samples.txt
 
b/nlpcraft-examples/cargps/src/main/resources/samples/cargps_add_waypoint_samples.txt
index 4c3f520..4b0c809 100644
--- 
a/nlpcraft-examples/cargps/src/main/resources/samples/cargps_add_waypoint_samples.txt
+++ 
b/nlpcraft-examples/cargps/src/main/resources/samples/cargps_add_waypoint_samples.txt
@@ -19,3 +19,5 @@
 # Set of samples (corpus) for automatic unit and regression testing.
 #
 
+hey car, add a stopover at 21 table rock drive
+howdy, truck - add a waypoint for 2121 5th avenue please
diff --git 
a/nlpcraft-examples/cargps/src/main/resources/samples/cargps_navigate_samples.txt
 
b/nlpcraft-examples/cargps/src/main/resources/samples/cargps_navigate_samples.txt
index 24aab32..3665ee2 100644
--- 
a/nlpcraft-examples/cargps/src/main/resources/samples/cargps_navigate_samples.txt
+++ 
b/nlpcraft-examples/cargps/src/main/resources/samples/cargps_navigate_samples.txt
@@ -18,6 +18,7 @@
 #
 # Set of samples (corpus) for automatic unit and regression testing.
 #
+
 hey car, navigate to 21 table rock drive
 howdy, truck - drive to 2121 5th avenue please
 hey truck, drive to 21 x x drive
diff --git 
a/nlpcraft-examples/cargps/src/main/resources/samples/cargps_remove_waypoint_samples.txt
 
b/nlpcraft-examples/cargps/src/main/resources/samples/cargps_remove_waypoint_samples.txt
index de31ca0..ac13b37 100644
--- 
a/nlpcraft-examples/cargps/src/main/resources/samples/cargps_remove_waypoint_samples.txt
+++ 
b/nlpcraft-examples/cargps/src/main/resources/samples/cargps_remove_waypoint_samples.txt
@@ -18,6 +18,8 @@
 #
 # Set of samples (corpus) for automatic unit and regression testing.
 #
+
 hey truck, cancel the last waypoint
 hey truck, cancel the stopover location
+Hi truck - drive without stopping at the last checkpoint
 

Reply via email to