You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by se...@apache.org on 2021/04/23 15:32:17 UTC

[incubator-nlpcraft] branch NLPCRAFT-91-MODULES updated (95baa7f -> f0174be)

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

sergeykamov pushed a change to branch NLPCRAFT-91-MODULES
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.


    from 95baa7f  WIP.
     add 117c64f  Update NCIdlCompilerBase.scala
     add d908e30  Update LightSwitchKotlinModel.kt
     add 4019f1b  Update nlpcraft.conf
     add ad2c416  Update nlpcraft.conf
     new f0174be  Merge branch 'master' into NLPCRAFT-91-MODULES

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/nlpcraft/examples/lightswitch/LightSwitchKotlinModel.kt   | 5 ++---
 nlpcraft/src/main/resources/nlpcraft.conf                            | 2 +-
 .../apache/nlpcraft/model/intent/compiler/NCIdlCompilerBase.scala    | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

[incubator-nlpcraft] 01/01: Merge branch 'master' into NLPCRAFT-91-MODULES

Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit f0174be78d03201682563976188afeb7dbb00019
Merge: 95baa7f ad2c416
Author: Sergey Kamov <sk...@gmail.com>
AuthorDate: Fri Apr 23 18:31:50 2021 +0300

    Merge branch 'master' into NLPCRAFT-91-MODULES
    
    # Conflicts:
    #	nlpcraft/src/main/resources/nlpcraft.conf

 .../apache/nlpcraft/examples/lightswitch/LightSwitchKotlinModel.kt   | 5 ++---
 nlpcraft/src/main/resources/nlpcraft.conf                            | 2 +-
 .../apache/nlpcraft/model/intent/compiler/NCIdlCompilerBase.scala    | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --cc nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchKotlinModel.kt
index 8aa28c9,a1ffc19..13a12e5
--- a/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchKotlinModel.kt
+++ b/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchKotlinModel.kt
@@@ -30,10 -30,9 +30,9 @@@ import java.util.stream.Collector
   * You can easily modify intent callbacks to perform the actual light switching using
   * HomeKit or Arduino-based controllers.
   *
-  *
   * See 'README.md' file in the same folder for running and testing instructions.
   */
 -class LightSwitchKotlinModel : NCModelFileAdapter("org/apache/nlpcraft/examples/lightswitch/lightswitch_model.yaml") {
 +class LightSwitchKotlinModel : NCModelFileAdapter("lightswitch_model.yaml") {
      /**
       * Intent and its on-match callback.
       *