theprogrammablemind 7.5.0-beta.0 → 7.5.0-beta.2

package/package.json

@@ -61,6 +61,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.5.0-beta.0",
+  "version": "7.5.0-beta.2",
   "license": "ISC"
 }

package/src/config.js

@@ -593,18 +593,24 @@ class Config {
     }
   }
 
-  addHierarchyProperties (properties) {
-    if (typeof properties.child !== 'string') {
+  addHierarchyProperties (edge) {
+    const { child, parent } = edge
+    if (typeof child !== 'string') {
       throw `addHierarchy expected child property to be a string. got ${JSON.stringify(child)}`
     }
-    if (typeof properties.parent !== 'string') {
-      throw `addHierarchy expected parent properties to be a string. got ${JSON.stringify(parent)}`
+    if (typeof parent !== 'string') {
+      throw `addHierarchy expected parent property to be a string. got ${JSON.stringify(parent)}`
     }
     if (!this.config.hierarchy) {
       this.config.hierarchy = []
     }
-    // this.config.hierarchy.push([properties.child, properties.parent])
-    this.config.hierarchy.push(properties)
+    if (global.entodictonDebugHierarchy) {
+      if (deepEqual(global.entodictonDebugHierarchy, [child, parent])) {
+        debugger; // debug hierarchy hit
+      }
+    }
+    this.config.hierarchy.push(edge)
+    // TODO greg11 this.hierarchy.addEdge(edge)
     this._delta.json.hierarchy.push([child, parent])
   }
 
@@ -615,6 +621,7 @@ class Config {
     if (typeof parent !== 'string') {
       throw `addHierarchy expected parent to be a string. got ${JSON.stringify(parent)}`
     }
+
     if (!this.config.hierarchy) {
       this.config.hierarchy = []
     }
@@ -623,6 +630,7 @@ class Config {
         debugger; // debug hierarchy hit
       }
     }
+
     if (this.config.hierarchy.find( (element) => {
       const hc = hierarchyCanonical(element) 
       if (child == hc.child && parent == hc.parent) {
@@ -633,6 +641,7 @@ class Config {
     }
 
     this.config.hierarchy.push([child, parent])
+    // this.hierarchy.addEdge([child, parent])
     this._delta.json.hierarchy.push([child, parent])
   }
 
@@ -1006,6 +1015,15 @@ class Config {
         'flatten',
       ]
       helpers.validProps(valid, config, 'config')
+
+      config.operators = config.operators || []
+      config.bridges = config.bridges || []
+      config.words = config.words || {}
+      config.generators = config.generators || []
+      config.semantics = config.semantics || []
+      config.hierarchy = config.hierarchy || []
+      config.associations = config.associations || { negative: [], positive: [] }
+      config.priorities = config.priorities || []
     }
 
     this.allowDelta = false
@@ -1648,6 +1666,13 @@ class Config {
       return false
     }
 
+    /* TODO greg11
+    if (!this.hierarchy) {
+      debugBreak()
+      return false
+    }
+    */
+
     for (const key in this.config.words) {
       const values = this.config.words[key]
       if (values.some((word) => (Object.keys(word).includes('uuid') && !word.uuid))) {

package/src/digraph.js

@@ -9,21 +9,38 @@ const toA = (edge) => {
 class Digraph {
   // edges maybe either [child, parent] or { child, parent }
   constructor (edges = []) {
-    this.edges = edges
+    // dont make a copy of edges. this is shared and that breaks stuff. TODO fix this
+    this._edges = edges
   }
 
-  /*
-  edges () {
-    return this.edges
+  addEdges(edges) {
+    for (let edge of edges) {
+      this.addEdge(edge)
+    }
+  }
+
+  addEdge(edge) {
+    edge = toA(edge)
+    this._edges.push(edge)
+  }
+
+  get edges() {
+    return this._edges
+  }
+
+/*
+  set edges(edges) {
+    this._edges = edges.map( toA )
   }
 */
+
   acdcs (s, from, to) {
     const todo = [s]
     const seen = new Set([s])
     const acdcs = new Set([])
     while (todo.length > 0) {
       const n = todo.pop()
-      this.edges.forEach((e) => {
+      this._edges.forEach((e) => {
         e = toA(e)
         if (e[from] === n) {
           acdcs.add(e[to])
@@ -84,12 +101,12 @@ class Digraph {
   }
 
   add (child, parent) {
-    this.edges.push([child, parent])
+    this._edges.push([child, parent])
   }
 
   addList (l) {
     for (let i = 1; i < l.length; ++i) {
-      this.edges.push([l[i - 1], l[i]])
+      this._edges.push([l[i - 1], l[i]])
     }
   }