introduced utterance fingerprints

failed so far to set them added also depth marker

Author: Orbiter

src/ai/susi/mind/SusiInference.java

@@ -126,6 +126,7 @@ public JSONObject getDefinition() {
  private final static SusiProcedures memoryProcedures = new SusiProcedures();
  private final static SusiProcedures javascriptProcedures = new SusiProcedures();
  private final static SusiProcedures prologProcedures = new SusiProcedures();
+ private final static Pattern CATCHALL_GROUP = Pattern.compile("(.*)");
  static {
  flowProcedures.put(Pattern.compile("SQUASH"), (flow, matcher) -> {
  // perform a full mindmeld
@@ -182,15 +183,15 @@ public JSONObject getDefinition() {
  });
  memoryProcedures.put(Pattern.compile("SET\\h+?([^=]*?)\\h+?=\\h+?([^=]*)\\h*?"), (flow, matcher) -> {
  String remember = flow.unify(matcher.group(1)), matching = flow.unify(matcher.group(2));
- return see(flow, "%1% AS " + remember, matching, Pattern.compile("(.*)"));
+ return see(flow, "%1% AS " + remember, matching, CATCHALL_GROUP);
  });
  memoryProcedures.put(Pattern.compile("SET\\h+?([^=]*?)\\h+?=\\h+?([^=]*?)\\h+?MATCHING\\h+?(.*)\\h*?"), (flow, matcher) -> {
  String remember = flow.unify(matcher.group(1)), matching = flow.unify(matcher.group(2)), pattern = flow.unify(matcher.group(3));
  return see(flow, remember, matching, Pattern.compile(pattern));
  });
  memoryProcedures.put(Pattern.compile("CLEAR\\h+?(.*)\\h*?"), (flow, matcher) -> {
  String clear = matcher.group(1);
- return see(flow, "%1% AS " + flow.unify(clear), "", Pattern.compile("(.*)"));
+ return see(flow, "%1% AS " + flow.unify(clear), "", CATCHALL_GROUP);
  });
  memoryProcedures.put(Pattern.compile("IF\\h+?([^=]*)\\h*?"), (flow, matcher) -> {
  String expect = flow.unify(matcher.group(1));
@@ -204,7 +205,7 @@ public JSONObject getDefinition() {
  return t;
  });
  memoryProcedures.put(Pattern.compile("NOT\\h*"), (flow, matcher) -> {
- //SusiThought t = see(flow, "%1% AS EXPECTED", "", Pattern.compile("(.*)"));
+ //SusiThought t = see(flow, "%1% AS EXPECTED", "", CATCHALL_GROUP);
  // This is a NOT of nothing. This represents therefore a success. Thus we return a non-empty thought.
  return new SusiThought().addObservation("REJECTED", "");
  });

src/ai/susi/mind/SusiSkill.java

@@ -53,15 +53,17 @@ public class SusiSkill {
  private final static Pattern pathseparator = Pattern.compile("/");
  private final static Pattern commaseparator = Pattern.compile(",");
  private final static Pattern pipeseparator = Pattern.compile("\\|");
- 
+
+ private final static int INDENT_STEP = 4; // like in python
+
  private String skillName, description, author, authorURL, authorEmail, image;
  private String termsOfUse, kickoff, developerPrivacyPolicy;
  private String[] on;
  private Boolean protectedSkill, dynamicContent;
  private Set<String> examples, tags;
  private List<SusiIntent> skillIntents = new ArrayList<>();
  private SusiSkill.ID id;
- 
+
  public static class ID implements Comparable<ID> {
  private String skillpath;
  private final String[] possible_path_prefixes = new String[] {
@@ -207,7 +209,6 @@ public SusiSkill(
  this.id = skillid;
  // read the text file and turn it into a intent json; then learn that
  boolean prior = false, dynamicContent = false, protectedSkill = false;
- int indentStep = 4; // like in python
  intentloop: for (IntentBlock block: skillFile) {
 
  // we have intents without any model; these are 'single lines' and may contain configuration settings
@@ -283,8 +284,9 @@ public SusiSkill(
 
  // parse model
  String bang_type = "", bang_answers = "";
- List<SusiIntent> fileIntents = new ArrayList<>();
- fileIntents.add(new SusiIntent(utterances, prior, 0, skillid));
+ List<SusiIntent> blockIntents = new ArrayList<>();
+ SusiIntent initialintent = new SusiIntent(utterances, prior, 0, skillid);
+ blockIntents.add(initialintent);
  StringBuilder bang_bag = new StringBuilder();
  int blockNr = 0;
  readloop: while (blockNr < block.model.size()) {
@@ -297,7 +299,11 @@ public SusiSkill(
  for (int i = 0; i < line.length(); i++) {
  if (line.charAt(i) == ' ') sc++; else break;
  }
- int indentLevel = sc % indentStep;
+ int indentLevel = sc % INDENT_STEP;
+ blockIntents.forEach(intent -> {
+ intent.setDepth(indentLevel);
+ //intent.addInference(new SusiInference("SET _node=" + block.getUtteranceFingerprint(), SusiInference.Type.memory, 0));
+ });
  line = line.trim();
 
  // parse bang types and answer lines
@@ -310,19 +316,19 @@ public SusiSkill(
  if (paramspace >= 0) head = head.substring(0, paramspace).trim();
  // test bang type
  if (head.equals("example")) {
- fileIntents.forEach(intent -> intent.setExample(tail));
+ blockIntents.forEach(intent -> intent.setExample(tail));
  } else if (head.equals("expect")) {
- fileIntents.forEach(intent -> intent.setExpect(tail));
+ blockIntents.forEach(intent -> intent.setExpect(tail));
  } else if (head.equals("label")) {
- fileIntents.forEach(intent -> intent.setLabel(tail));
+ blockIntents.forEach(intent -> intent.setLabel(tail));
  } else if (head.equals("implication")) {
- fileIntents.forEach(intent -> intent.setImplication(tail));
+ blockIntents.forEach(intent -> intent.setImplication(tail));
  } else if (head.equals("first")) {
- fileIntents.forEach(intent -> intent.addInference(new SusiInference("FIRST", SusiInference.Type.flow, lineNumber)));
+ blockIntents.forEach(intent -> intent.addInference(new SusiInference("FIRST", SusiInference.Type.flow, lineNumber)));
  } else if (head.equals("rest")) {
- fileIntents.forEach(intent -> intent.addInference(new SusiInference("REST", SusiInference.Type.flow, lineNumber)));
+ blockIntents.forEach(intent -> intent.addInference(new SusiInference("REST", SusiInference.Type.flow, lineNumber)));
  } else if (head.equals("plan")) {
- fileIntents.forEach(intent -> intent.addInference(new SusiInference("PLAN " + param + ":" + tail, SusiInference.Type.flow, lineNumber)));
+ blockIntents.forEach(intent -> intent.addInference(new SusiInference("PLAN " + param + ":" + tail, SusiInference.Type.flow, lineNumber)));
  } else {
  // start multi-line bang
  bang_type = head;
@@ -350,7 +356,7 @@ public SusiSkill(
  // answers; must contain $!$
  SusiAction action = new SusiAction(SusiAction.answerAction(lineNumber, this.id.language(), pipeseparator.split(bang_answers)));
 
- fileIntents.forEach(intent -> {
+ blockIntents.forEach(intent -> {
  intent.addInference(inference);
  intent.addAction(action);
  extendParentWithAnswer(this.skillIntents, intent);
@@ -369,15 +375,15 @@ public SusiSkill(
  } catch (JSONException e) {
  throw new JSONException(e.getMessage() + " \"" + bang_bag.toString() + "\"");
  }
- fileIntents.forEach(intent -> intent.addInference(inference));
+ blockIntents.forEach(intent -> intent.addInference(inference));
 
  // actions; we may have several actions here
 
  // verify actions
  if (definition.has("actions")) {
  JSONArray bo_actions = definition.getJSONArray("actions");
  bo_actions.forEach(action -> {
- fileIntents.forEach(intent -> {
+ blockIntents.forEach(intent -> {
  try {
  intent.addAction(new SusiAction((JSONObject) action));
  } catch (SusiActionException e) {
@@ -396,11 +402,11 @@ public SusiSkill(
  // answers; must contain names from the console result array
  if (bang_answers.length() > 0) try {
  SusiAction action = new SusiAction(SusiAction.answerAction(lineNumber, this.id.language(), pipeseparator.split(bang_answers)));
- fileIntents.forEach(intent -> intent.addAction(action));
+ blockIntents.forEach(intent -> intent.addAction(action));
  } catch (SusiActionException e) {
  DAO.severe(e.getMessage());
  }
- fileIntents.forEach(intent -> {
+ blockIntents.forEach(intent -> {
  extendParentWithAnswer(this.skillIntents, intent);
  this.skillIntents.add(intent);
  });
@@ -423,33 +429,33 @@ public SusiSkill(
  String ifsubstring = line.substring(thenpos + 1).trim();
  if (ifsubstring.length() > 0) {
  String[] answers = pipeseparator.split(ifsubstring);
- fileIntents.forEach(intent -> {
+ blockIntents.forEach(intent -> {
  try {
  intent.addAction(new SusiAction(SusiAction.answerAction(lineNumber, skillid.language(), answers)));
  } catch (SusiActionException e) {
  e.printStackTrace();
  }
  });
- fileIntents.forEach(intent -> intent.addInference(new SusiInference("IF " + condition, SusiInference.Type.memory, lineNumber)));
+ blockIntents.forEach(intent -> intent.addInference(new SusiInference("IF " + condition, SusiInference.Type.memory, lineNumber)));
  continue readloop;
  }
  } else {
  // here we must clone all current intents
  final List<SusiIntent> clonedIntents = new ArrayList<>();
- fileIntents.forEach(intent -> clonedIntents.add((SusiIntent) intent.clone()));
+ blockIntents.forEach(intent -> clonedIntents.add((SusiIntent) intent.clone()));
 
  // "? if : then : else"
  String ifsubstring = line.substring(thenpos + 1, elsepos).trim();
  if (ifsubstring.length() > 0) {
  String[] answers = pipeseparator.split(ifsubstring);
- fileIntents.forEach(intent -> {
+ blockIntents.forEach(intent -> {
  try {
  intent.addAction(new SusiAction(SusiAction.answerAction(lineNumber, skillid.language(), answers)));
  } catch (SusiActionException e) {
  e.printStackTrace();
  }
  });
- fileIntents.forEach(intent -> intent.addInference(new SusiInference("IF " + condition, SusiInference.Type.memory, lineNumber)));
+ blockIntents.forEach(intent -> intent.addInference(new SusiInference("IF " + condition, SusiInference.Type.memory, lineNumber)));
  }
  String elsesubstring = line.substring(elsepos + 1).trim();
  if (elsesubstring.length() > 0) {
@@ -463,13 +469,13 @@ public SusiSkill(
  });
  clonedIntents.forEach(intent -> intent.addInference(new SusiInference("NOT " + condition, SusiInference.Type.memory, lineNumber)));
  // attach the clones intents to the list of intents
- clonedIntents.forEach(intent -> fileIntents.add(intent));
+ clonedIntents.forEach(intent -> blockIntents.add(intent));
  }
  continue readloop;
  }
  } else {
  String[] answers = pipeseparator.split(line);
- fileIntents.forEach(intent -> {
+ blockIntents.forEach(intent -> {
  try {
  intent.addAction(new SusiAction(SusiAction.answerAction(lineNumber, skillid.language(), answers)));
  } catch (SusiActionException e) {
@@ -479,7 +485,7 @@ public SusiSkill(
  continue readloop;
  }
  }
- fileIntents.forEach(intent -> {
+ blockIntents.forEach(intent -> {
  extendParentWithAnswer(this.skillIntents, intent);
  this.skillIntents.add(intent);
  });
@@ -529,7 +535,7 @@ private static void extendParentWithAnswer(List<SusiIntent> preceding_intents, S
  int parent_id = parent_intent.hashCode();
 
  // - set an invisible assignment in parent for linking variable to ID
- parent_intent.addInferences(new SusiInference("SET ", SusiInference.Type.memory, 0));
+ parent_intent.addInferences(new SusiInference("SET ", SusiInference.Type.memory, 0)); // TODO: this SET is incomplete!
 
  // - add a check rule in child so a child fires only if linking ID is set correctly
 

src/ai/susi/mind/SusiSkillFile.java

@@ -115,6 +115,21 @@ public IntentBlock(final List<Line> numberedLines) {
  this.utterance = impl;
  }
 
+ public String getUtteranceFingerprint() {
+ String l = this.utterance.toLowerCase();
+ StringBuilder s = new StringBuilder();
+ for (int i = 0; i < l.length(); i++) {
+ char c = l.charAt(i);
+ if (c >= 'a' && c <= 'z') s.append(c);
+ if (s.length() > 21) break;
+ }
+ while (s.length() <= 21) s.append('x');
+ StringBuilder h = new StringBuilder(8);
+ h.append(s.charAt(0)); h.append(s.charAt(1)); h.append(s.charAt(2)); h.append(s.charAt(3));
+ h.append(s.charAt(5)); h.append(s.charAt(8)); h.append(s.charAt(13)); h.append(s.charAt(21));
+ return h.toString();
+ }
+
  public String toString() {
  StringBuilder sb = new StringBuilder();
  sb.append(utterance).append("\n");