This is an automated email from the ASF dual-hosted git repository. sergeykamov pushed a commit to branch NLPCRAFT-70_NEW in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 3d2f865fe9af6f81bf80c41b8e16518782ac2742 Merge: dc626d4 81058f6 Author: Sergey Kamov <[email protected]> AuthorDate: Tue Aug 10 23:22:59 2021 +0300 Merge branch 'master' into NLPCRAFT-70_NEW # Conflicts: # nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala .../scala/org/apache/nlpcraft/common/package.scala | 1 - .../org/apache/nlpcraft/common/util/NCUtils.scala | 21 +- .../scala/org/apache/nlpcraft/model/NCIntent.java | 2 + .../org/apache/nlpcraft/model/NCIntentMatch.java | 2 + .../org/apache/nlpcraft/model/NCIntentRef.java | 2 + .../org/apache/nlpcraft/model/NCIntentSample.java | 2 + .../apache/nlpcraft/model/NCIntentSampleRef.java | 2 + .../org/apache/nlpcraft/model/NCIntentTerm.java | 2 + .../apache/nlpcraft/model/NCModelAddClasses.java | 55 ++++++ .../apache/nlpcraft/model/NCModelAddPackage.java | 55 ++++++ .../probe/mgrs/deploy/NCDeployManager.scala | 217 +++++++++++++++------ .../apache/nlpcraft/model/NCIntentSampleSpec.scala | 2 +- .../mgrs/deploy/NCModelNestedSamplesSpec.scala | 64 ++++++ .../probe/mgrs/deploy/NCModelReferencesSpec.scala | 123 ++++++++++++ .../deploy/javatest/NCModelClassesWrapper.java | 28 +++ .../deploy/javatest/NCModelDeploySpecAdapter.java | 40 ++++ .../deploy/javatest/NCModelPackagesWrapper.java | 28 +++ .../probe/mgrs/deploy/javatest/NCNestedClass.java | 31 +++ .../probe/mgrs/deploy/javatest/NCNestedStatic.java | 31 +++ .../deploy/scalatest/NCModelClassesWrapper.scala | 26 +++ .../scalatest/NCModelDeploySpecAdapter.scala | 31 +++ .../deploy/scalatest/NCModelPackagesWrapper.scala | 26 +++ .../mgrs/deploy/scalatest/NCNestedClass.scala | 31 +++ .../mgrs/deploy/scalatest/NCNestedStatic.scala | 32 +++ 24 files changed, 776 insertions(+), 78 deletions(-) diff --cc nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala index 0514f70,8d89477..bc7c5ed --- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala +++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala @@@ -81,12 -90,8 +90,11 @@@ object NCDeployManager extends NCServic type Sample = (String/* Intent ID */, Seq[Seq[String]] /* List of list of input samples for that intent. */) private final val SEPARATORS = Seq('?', ',', '.', '-', '!') - private final val SUSP_SYNS_CHARS = Seq("?", "*", "+") + private final val MAX_CTXWORD_VALS_CNT = 10000 + private final val MAX_CTXWORD_SAMPLES_CNT = 1000 + @volatile private var data: mutable.ArrayBuffer[NCProbeModel] = _ @volatile private var mdlFactory: NCModelFactory = _
