WIP
diff --git a/nlpcraft-examples/cargps/src/main/resources/cargps_intents.idl b/nlpcraft-examples/cargps/src/main/resources/cargps_intents.idl
index a736cc9..e90b7b5 100644
--- a/nlpcraft-examples/cargps/src/main/resources/cargps_intents.idl
+++ b/nlpcraft-examples/cargps/src/main/resources/cargps_intents.idl
@@ -29,6 +29,6 @@
fragment(hey)
term={# == "x:cancel"}
-intent=int:navigate fragment(hey) term={# == "x:navigate"} term={# == "x:addr"}
+intent=int:navigate options={'ordered': true} fragment(hey) term={# == "x:navigate"} term={# == "x:addr"}
intent=int:add:waypoint fragment(hey) term={# == "x:add-waypoint"}
intent=int:remove:waypoint fragment(hey) term={# == "x:remove-waypoint"}
\ No newline at end of file
diff --git a/nlpcraft-examples/cargps/src/main/resources/cargps_model.yaml b/nlpcraft-examples/cargps/src/main/resources/cargps_model.yaml
index e0616f1..0833ea0 100644
--- a/nlpcraft-examples/cargps/src/main/resources/cargps_model.yaml
+++ b/nlpcraft-examples/cargps/src/main/resources/cargps_model.yaml
@@ -43,12 +43,10 @@
elements:
#
# Address definition.
- # ===================
- #
+ # -------------------
- id: "x:addr:kind"
# Short list from https://pe.usps.com/text/pub28/28apc_002.htm
synonyms:
- # street[0,2] => {_|street|street street}
- "{street|drive|court|plaza|avenue|alley|anex|beach|bend|boulevard|bridge|canyon|causeway|way|circle|corner|creek|fork|harbor|highway|expressway|island|lane|lake|loop|motorway|park|path|point|ramp|route|rue|row|skyway|square|station|summit|trail|tunnel|walk|road}"
- "{st|str|dr|crt|plz|ave|blvd|hwy|rd}"
@@ -66,10 +64,8 @@
- "^^[num]{# == 'x:addr:num'}^^ ^^[name]{# == 'x:addr:st'}^^ ^^[kind]{# == 'x:addr:kind'}^^"
#
- # Address definition.
- # -------------------
- #
-
+ # Salutation.
+ # -----------
- id: "x:hey"
description: "NLI prompt"
synonyms:
@@ -94,7 +90,8 @@
- id: "x:remove-waypoint"
description: "Remove 'waypoint' action."
synonyms:
- - "{skip|remove} {over|_} {last|latest|_} <WAYPOINT>"
+ - "{skip|remove} {over|_} {last|latest|current|_} <WAYPOINT>"
+ - "<NAVIGATE> without {stopping|<WAYPOINT>}"
intents:
- "import('cargps_intents.idl')"
\ No newline at end of file
