You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by ar...@apache.org on 2021/09/12 18:51:39 UTC

[incubator-nlpcraft] branch NLPCRAFT-384 updated: WIP

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 d1961d4  WIP
d1961d4 is described below

commit d1961d40976eb02a19fa19127e70b20d1567d934
Author: Aaron Radzinski <ar...@datalingvo.com>
AuthorDate: Sun Sep 12 11:51:33 2021 -0700

    WIP
---
 .../cargps/src/main/resources/cargps_intents.idl            |  2 +-
 .../cargps/src/main/resources/cargps_model.yaml             | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

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 @@ intent=int:cancel
     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 @@ abstractTokens:
 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 @@ elements:
       - "^^[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 @@ elements:
   - 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