[incubator-nlpcraft] branch master-model updated: WIP.

[sergeykamov]

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

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


The following commit(s) were added to refs/heads/master-model by this push:
     new be0c069  WIP.
be0c069 is described below

commit be0c069dbb9df5f5854e761506c1764d09bee2cd
Author: Sergey Kamov <skhdlem...@gmail.com>
AuthorDate: Thu Oct 7 22:17:59 2021 +0300

    WIP.
---
 .../src/main/scala/org/apache/nlpcraft/model/NCModelConfig.java    | 3 ++-
 .../scala/org/apache/nlpcraft/model/builders/NCIntentsBuilder.java | 7 ++++++-
 .../org/apache/nlpcraft/model/builders/NCModelConfigBuilder.java   | 3 ++-
 nlpcraft/src/test/java/org/apache/nlpcraft/model/NCSpec.java       | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModelConfig.java 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModelConfig.java
index c516ceb..1505a0d 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModelConfig.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModelConfig.java
@@ -19,6 +19,7 @@ package org.apache.nlpcraft.model;
 
 import org.apache.nlpcraft.model.builders.NCModelBuilder;
 
+import java.lang.reflect.Method;
 import java.time.Duration;
 import java.util.*;
 
@@ -214,7 +215,7 @@ public interface NCModelConfig extends NCMetadata {
 
     List<NCElement> getElements();
 
-    default Map<String, String> getIntents() {
+    default Map<String, Method> getIntents() {
         return null;
     }
 
diff --git 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCIntentsBuilder.java
 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCIntentsBuilder.java
index e302a76..2179e85 100644
--- 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCIntentsBuilder.java
+++ 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCIntentsBuilder.java
@@ -1,9 +1,11 @@
 package org.apache.nlpcraft.model.builders;
 
 import java.io.File;
+import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 public class NCIntentsBuilder {
     public NCIntentsBuilder withFiles(File... files) {
@@ -15,8 +17,11 @@ public class NCIntentsBuilder {
     public NCIntentsBuilder withClasses(Class<?> ... classes) {
         return null;
     }
+    public NCIntentsBuilder witObjects(Objects... objs) {
+        return null;
+    }
 
-    public Map<String, String> getIntents() {
+    public Map<String, Method> getIntents() {
         // TODO: implement.
         return null;
     }
diff --git 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCModelConfigBuilder.java
 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCModelConfigBuilder.java
index 371933f..e0727bc 100644
--- 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCModelConfigBuilder.java
+++ 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCModelConfigBuilder.java
@@ -11,6 +11,7 @@ import org.apache.nlpcraft.model.NCValueLoader;
 import org.apache.nlpcraft.model.NCModelConfig;
 import org.apache.nlpcraft.model.NCVariant;
 
+import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -116,7 +117,7 @@ public class NCModelConfigBuilder {
         return null;
     }
 
-    public NCModelConfigBuilder withIntents(Map<String, String> intentsDsl) {
+    public NCModelConfigBuilder withIntents(Map<String, Method> intents) {
         return null;
     }
 
diff --git a/nlpcraft/src/test/java/org/apache/nlpcraft/model/NCSpec.java 
b/nlpcraft/src/test/java/org/apache/nlpcraft/model/NCSpec.java
index 22e3ad9..85f0285 100644
--- a/nlpcraft/src/test/java/org/apache/nlpcraft/model/NCSpec.java
+++ b/nlpcraft/src/test/java/org/apache/nlpcraft/model/NCSpec.java
@@ -120,7 +120,7 @@ public class NCSpec {
                                     getElement()
                             )
                         ).
-                        withIntents(asMap("req", "intent=req term(date)~{# == 
'opennlp:date'}?")).
+                        withIntents(asMap("req", null)). // TODO: "intent=req 
term(date)~{# == 'opennlp:date'}?")).
                         getModelConfig()
                 ).getModel();