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 2020/12/31 06:08:22 UTC
[incubator-nlpcraft] 01/01: Merge branch 'NLPCRAFT-203'
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit d01f1d650ecaf372bc11314af2c98c34ca04e387
Merge: 85b77c8 ce42c1a
Author: Aaron Radzinski <ar...@datalingvo.com>
AuthorDate: Wed Dec 30 22:08:01 2020 -0800
Merge branch 'NLPCRAFT-203'
.../org/apache/nlpcraft/common/util/NCUtils.scala | 2 +-
.../apache/nlpcraft/examples/alarm/AlarmModel.java | 1 +
.../model/intent/impl/NCIntentSolver.scala | 2 +-
.../model/intent/impl/NCIntentSolverEngine.scala | 389 ++++++++++++---------
.../model/intent/impl/NCIntentSolverVariant.scala | 2 +-
.../nlpcraft/model/tools/cmdline/NCCli.scala | 4 +-
.../org/apache/nlpcraft/probe/NCProbeBoot.scala | 2 -
.../nlpcraft/probe/mgrs/NCProbeVariants.scala | 9 +
.../probe/mgrs/deploy/NCDeployManager.scala | 10 +-
.../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 19 +-
.../nlpcraft/server/probe/NCProbeManager.scala | 2 +-
.../apache/nlpcraft/model/NCIntentDslSpec.scala | 20 +-
...CIntentDslSpec.scala => NCIntentDslSpec2.scala} | 42 ++-
.../nlpcraft/model/NCIntentPrioritiesSpec.scala | 63 ++++
.../nlpcraft/model/dialog/NCDialogSpec.scala | 2 +-
pom.xml | 2 +-
16 files changed, 362 insertions(+), 209 deletions(-)
diff --cc nlpcraft/src/test/scala/org/apache/nlpcraft/model/dialog/NCDialogSpec.scala
index a6647c9,79d2309..114e668
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/dialog/NCDialogSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/dialog/NCDialogSpec.scala
@@@ -83,24 -96,6 +83,24 @@@ class NCDialogSpec extends NCTestContex
cli.clearConversation()
cli.clearDialog()
- flow()
+ go()
}
+
+ @Test
+ @throws[Exception]
+ private[dialog] def test1(): Unit = f(
+ "a2" → null, "a1" → "onA1", "a2" → "onA2", "a1" → "onA1", "a1" → "onA1", "a2" -> null
+ )
+
+ @Test
+ @throws[Exception]
+ private[dialog] def test2(): Unit = f(
+ "a3" → null, "a1" → "onA1", "a3" → "onA3", "a1" → "onA1", "a1" → "onA1", "a3" -> null
+ )
+
+ @Test
+ @throws[Exception]
+ private[dialog] def test3(): Unit = f(
+ "a4" → null, "a1" → "onA1", "a1" → "onA1", "a4" → "onA4", "a4" → null
+ )
- }
+ }