tpmkms 7.12.8 → 8.0.0

package/common/math.js

@@ -3,8 +3,11 @@ const { defaultContextCheck } = require('./helpers')
 const dialogues = require('./dialogues')
 const numbers = require('./numbers')
 const punctuation = require('./punctuation')
-const mathTemplate = require('./mathTemplate')
-const math_tests = require('./math.test.json')
+const countable = require('./countable')
+const comparable = require('./comparable')
+const tests = require('./math.test.json')
+const instance = require('./math.instance.json')
+
 
 // TODO 10 dollars times 20
 /*
@@ -102,9 +105,17 @@ let configStruct = {
   ],
 };
 
+const template = {
+  configs: [
+    "mathematical modifies operator",
+    "* + / and - are mathematical operators",
+    configStruct,
+  ]
+}
+
 const createConfig = () => {
-  const config = new Config(configStruct, module)
-  config.add(numbers(), dialogues(), punctuation(), mathTemplate());
+  const config = new Config({ name: 'math' }, module)
+  config.add(numbers(), dialogues(), punctuation(), countable(), comparable())
   return config
 }
 
@@ -112,9 +123,10 @@ knowledgeModule( {
   module,
   createConfig,
   description: 'talking about math',
+  template: { template, instance },
   test: {
     name: './math.test.json',
-    contents: math_tests,
+    contents: tests,
     checks: {
             context: defaultContextCheck,
           },

package/common/meta.instance.json

@@ -1,5 +1,5 @@
 {
-  "queries": [],
+  "configs": [],
   "resultss": [],
   "fragments": [],
   "semantics": [],

package/common/meta.js

@@ -1,15 +1,16 @@
 const { Config, knowledgeModule, ensureTestFile, where, unflatten, flattens } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const _ = require('lodash')
+const gdefaults = require('./gdefaults.js')
 ensureTestFile(module, 'meta', 'test')
 ensureTestFile(module, 'meta', 'instance')
 const meta_tests = require('./meta.test.json')
 const meta_instance = require('./meta.instance.json')
 const { hashIndexesGet, hashIndexesSet, translationMapping, translationMappings } = require('./helpers/meta.js')
-const { zip } = require('./helpers.js')
+const { zip, words } = require('./helpers.js')
 
 const template = {
-    queries: [
+    configs: [
 //      "if f then g",
       //"if e or f then g",
     ]
@@ -59,6 +60,23 @@ let configStruct = {
     { child: 'orAble', parent: 'ifAble' },
   ],
   bridges: [
+  /*
+    {
+      id: "synonym",
+      // implicit words in singular/plural
+      words: words('synonym'),
+      operator: "([synonym])",
+    },
+    {
+      id: 'synonymOfWord',
+      operator: "((synonym/*) [synonymOfWord|of] (word))",
+      bridge: "{ ...next(operator), word: after[0] }",
+      evaluator: ({context}) => {
+        debugger
+        debugger
+      }
+    },
+    */
     {id: "orList", level: 0, selector: {left: [{ marker: 'orAble' }], right: [{ marker: 'orAble' }], passthrough: true}, bridge: "{ ...next(operator), value: append(before, after) }"},
     {id: "orList", level: 1, selector: {left: [{ marker: 'orAble' }], passthrough: true}, bridge: "{ ...operator, value: append(before, operator.value) }"},
 
@@ -81,14 +99,16 @@ let configStruct = {
   ],
   version: '3',
   words: {
-    //  'testWord2': [{"id": "testWord2", "initial": "{ value: 'testWord2Value' }" }],
-    // TODO make this development and select out for module
-    // 'x': [{id: "x", initial: "{ value: 'x' }", development: true }],
-    // 'f': [{id: "ifAble", initial: "{ word: 'f' }", development: true }],
-    // 'g': [{id: "ifAble", initial: "{ word: 'g' }", development: true }],
-    'f': [{id: "f", initial: "{ value: 'f', word: 'f' }", development: true }],
-    'x': [{id: "x", initial: "{ value: 'x', word: 'x' }", development: true }],
-    'gq': [{id: "g", initial: "{ word: 'gq', query: true }", development: true }],
+    "literals": {
+      //  'testWord2': [{"id": "testWord2", "initial": "{ value: 'testWord2Value' }" }],
+      // TODO make this development and select out for module
+      // 'x': [{id: "x", initial: "{ value: 'x' }", development: true }],
+      // 'f': [{id: "ifAble", initial: "{ word: 'f' }", development: true }],
+      // 'g': [{id: "ifAble", initial: "{ word: 'g' }", development: true }],
+      'f': [{id: "f", initial: "{ value: 'f', word: 'f' }", development: true }],
+      'x': [{id: "x", initial: "{ value: 'x', word: 'x' }", development: true }],
+      'gq': [{id: "g", initial: "{ word: 'gq', query: true }", development: true }],
+    }
   },
   generators: [
     {
@@ -362,6 +382,9 @@ let configStruct = {
 
 const createConfig = () => {
   const config = new Config(configStruct, module)
+  config.stop_auto_rebuild()
+  config.add(gdefaults())
+
   config.initializer( ({config, addGenerator, isModule}) => {
     if (!isModule) {
       addGenerator({
@@ -371,6 +394,8 @@ const createConfig = () => {
       })
     }
   })
+  
+  config.restart_auto_rebuild()
   return config
 }
 

package/common/numbers.js

@@ -20,30 +20,34 @@ let configStruct = {
   debug: false,
   version: '3',
   words: {
-    // start with a space for regular expressions
-    " ([0-9]+$)": [{"id": "number", "initial": "{ value: int(group[0]), instance: true }" }],
-    " ([0-9]+[.][0-9]+$)": [{"id": "number", "initial": "{ value: float(group[0]), instance: true }" }],
-    " ([.][0-9]+$)": [{"id": "number", "initial": "{ value: float(group[0]), instance: true }" }],
-    "one": [{"id": "number", "initial": "{ value: 1, instance:true }" }],
-    "ones": [{"id": "number", "initial": "{ value: 1, number: 'many', instance:true }" }],
-    "two": [{"id": "number", "initial": "{ value: 2 , instance:true}" }],
-    "twos": [{"id": "number", "initial": "{ value: 2 , number: 'many', instance:true}" }],
-    "three": [{"id": "number", "initial": "{ value: 3, instance:true }" }],
-    "threes": [{"id": "number", "initial": "{ value: 3, number: 'many', instance:true }" }],
-    "four": [{"id": "number", "initial": "{ value: 4, instance:true }" }],
-    "fours": [{"id": "number", "initial": "{ value: 4, number: 'many', instance:true }" }],
-    "five": [{"id": "number", "initial": "{ value: 5, instance:true }" }],
-    "fives": [{"id": "number", "initial": "{ value: 5, number: 'many', instance:true }" }],
-    "six": [{"id": "number", "initial": "{ value: 6, instance:true }" }],
-    "sixes": [{"id": "number", "initial": "{ value: 6, number: 'many', instance:true }" }],
-    "seven": [{"id": "number", "initial": "{ value: 7, instance:true }" }],
-    "sevens": [{"id": "number", "initial": "{ value: 7, number: 'many', instance:true }" }],
-    "eight": [{"id": "number", "initial": "{ value: 8, instance:true }" }],
-    "eights": [{"id": "number", "initial": "{ value: 8, number: 'many', instance:true }" }],
-    "nine": [{"id": "number", "initial": "{ value: 9, instance:true }" }],
-    "nines": [{"id": "number", "initial": "{ value: 9, number: 'many', instance:true }" }],
-    "ten": [{"id": "number", "initial": "{ value: 10, instance:true }" }],
-    "tens": [{"id": "number", "initial": "{ value: 10, number: 'many', instance:true }" }],
+    "literals": {
+      // start with a space for regular expressions
+      "one": [{"id": "number", "initial": "{ value: 1, instance:true }" }],
+      "ones": [{"id": "number", "initial": "{ value: 1, number: 'many', instance:true }" }],
+      "two": [{"id": "number", "initial": "{ value: 2 , instance:true}" }],
+      "twos": [{"id": "number", "initial": "{ value: 2 , number: 'many', instance:true}" }],
+      "three": [{"id": "number", "initial": "{ value: 3, instance:true }" }],
+      "threes": [{"id": "number", "initial": "{ value: 3, number: 'many', instance:true }" }],
+      "four": [{"id": "number", "initial": "{ value: 4, instance:true }" }],
+      "fours": [{"id": "number", "initial": "{ value: 4, number: 'many', instance:true }" }],
+      "five": [{"id": "number", "initial": "{ value: 5, instance:true }" }],
+      "fives": [{"id": "number", "initial": "{ value: 5, number: 'many', instance:true }" }],
+      "six": [{"id": "number", "initial": "{ value: 6, instance:true }" }],
+      "sixes": [{"id": "number", "initial": "{ value: 6, number: 'many', instance:true }" }],
+      "seven": [{"id": "number", "initial": "{ value: 7, instance:true }" }],
+      "sevens": [{"id": "number", "initial": "{ value: 7, number: 'many', instance:true }" }],
+      "eight": [{"id": "number", "initial": "{ value: 8, instance:true }" }],
+      "eights": [{"id": "number", "initial": "{ value: 8, number: 'many', instance:true }" }],
+      "nine": [{"id": "number", "initial": "{ value: 9, instance:true }" }],
+      "nines": [{"id": "number", "initial": "{ value: 9, number: 'many', instance:true }" }],
+      "ten": [{"id": "number", "initial": "{ value: 10, instance:true }" }],
+      "tens": [{"id": "number", "initial": "{ value: 10, number: 'many', instance:true }" }],
+    },
+    patterns: [
+      { "pattern": [{ type: 'digit' }, { repeat: true }], defs: [{id: "number", uuid: '1', initial: "{ value: int(text), instance: true }" }]},
+      { "pattern": [{ type: 'digit' }, { repeat: true }, '.', { type: 'digit' }, { repeat: true }], defs: [{id: "number", uuid: '1', initial: "{ value: float(text), instance: true }" }]},
+      { "pattern": ['.', { type: 'digit' }, { repeat: true }], defs: [{id: "number", uuid: '1', initial: "{ value: float(text), instance: true }" }]},
+    ],
   },
 
   hierarchy: [

package/common/ordering.instance.json

@@ -1,5 +1,5 @@
 {
-  "queries": [
+  "configs": [
     "wants is xfx between wanter and wantee",
     "if x likes y or x loves y then x wants y"
   ],
@@ -517,15 +517,15 @@
           },
           "one": {
             "number": "one",
+            "value": "wants",
+            "unknown": true,
+            "text": "wants",
             "marker": "unknown",
+            "word": "wants",
             "range": {
               "start": 0,
               "end": 37
             },
-            "word": "wants",
-            "text": "wants",
-            "value": "wants",
-            "unknown": true,
             "dead": true,
             "types": [
               "unknown"
@@ -563,28 +563,28 @@
               "isList": true,
               "value": [
                 {
+                  "value": "wanter",
+                  "unknown": true,
+                  "text": "wanter",
                   "marker": "type",
+                  "word": "wanter",
                   "range": {
                     "start": 21,
                     "end": 26
                   },
-                  "word": "wanter",
-                  "text": "wanter",
-                  "value": "wanter",
-                  "unknown": true,
                   "dead": true,
                   "level": 1
                 },
                 {
+                  "value": "wantee",
+                  "unknown": true,
+                  "text": "wantee",
                   "marker": "type",
+                  "word": "wantee",
                   "range": {
                     "start": 32,
                     "end": 37
                   },
-                  "word": "wantee",
-                  "text": "wantee",
-                  "value": "wantee",
-                  "unknown": true,
                   "dead": true,
                   "level": 1
                 }
@@ -639,32 +639,6 @@
             0
           ]
         ],
-        [
-          [
-            "between",
-            0
-          ],
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "unknown",
-            1
-          ],
-          [
-            "xfx",
-            0
-          ]
-        ],
         [
           [
             "between",
@@ -745,24 +719,6 @@
             1
           ]
         ],
-        [
-          [
-            "between",
-            0
-          ],
-          [
-            "is",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "xfx",
-            0
-          ]
-        ],
         [
           [
             "between",
@@ -1650,15 +1606,15 @@
                   "text": "ikes y"
                 },
                 "liker": {
+                  "value": "x",
+                  "unknown": true,
+                  "text": "x",
                   "marker": "unknown",
+                  "word": "x",
                   "range": {
                     "start": 3,
                     "end": 3
                   },
-                  "word": "x",
-                  "text": "x",
-                  "value": "x",
-                  "unknown": true,
                   "dead": true,
                   "types": [
                     "unknown"
@@ -1666,15 +1622,15 @@
                   "level": 1
                 },
                 "likee": {
+                  "value": "y",
+                  "unknown": true,
+                  "text": "y",
                   "marker": "unknown",
+                  "word": "y",
                   "range": {
                     "start": 11,
                     "end": 11
                   },
-                  "word": "y",
-                  "text": "y",
-                  "value": "y",
-                  "unknown": true,
                   "dead": true,
                   "types": [
                     "unknown"
@@ -1715,15 +1671,15 @@
                   "text": ""
                 },
                 "lover": {
+                  "value": "x",
+                  "unknown": true,
+                  "text": "x",
                   "marker": "unknown",
+                  "word": "x",
                   "range": {
                     "start": 16,
                     "end": 16
                   },
-                  "word": "x",
-                  "text": "x",
-                  "value": "x",
-                  "unknown": true,
                   "dead": true,
                   "types": [
                     "unknown"
@@ -1731,15 +1687,15 @@
                   "level": 1
                 },
                 "lovee": {
+                  "value": "y",
+                  "unknown": true,
+                  "text": "y",
                   "marker": "unknown",
+                  "word": "y",
                   "range": {
                     "start": 24,
                     "end": 24
                   },
-                  "word": "y",
-                  "text": "y",
-                  "value": "y",
-                  "unknown": true,
                   "dead": true,
                   "types": [
                     "unknown"
@@ -1786,15 +1742,15 @@
               "text": ""
             },
             "wanter": {
+              "value": "x",
+              "unknown": true,
+              "text": "x",
               "marker": "unknown",
+              "word": "x",
               "range": {
                 "start": 31,
                 "end": 31
               },
-              "word": "x",
-              "text": "x",
-              "value": "x",
-              "unknown": true,
               "dead": true,
               "types": [
                 "unknown"
@@ -1802,15 +1758,15 @@
               "level": 1
             },
             "wantee": {
+              "value": "y",
+              "unknown": true,
+              "text": "y",
               "marker": "unknown",
+              "word": "y",
               "range": {
                 "start": 39,
                 "end": 39
               },
-              "word": "y",
-              "text": "y",
-              "value": "y",
-              "unknown": true,
               "dead": true,
               "types": [
                 "unknown"
@@ -2078,20 +2034,6 @@
             "want",
             1
           ]
-        ],
-        [
-          [
-            "if",
-            0
-          ],
-          [
-            "then",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
         ]
       ],
       "learned_contextual_priorities": [],
@@ -2130,32 +2072,6 @@
         0
       ]
     ],
-    [
-      [
-        "between",
-        0
-      ],
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ],
-      [
-        "unknown",
-        1
-      ],
-      [
-        "xfx",
-        0
-      ]
-    ],
     [
       [
         "between",
@@ -2236,24 +2152,6 @@
         1
       ]
     ],
-    [
-      [
-        "between",
-        0
-      ],
-      [
-        "is",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ],
-      [
-        "xfx",
-        0
-      ]
-    ],
     [
       [
         "between",
@@ -2498,20 +2396,6 @@
         1
       ]
     ],
-    [
-      [
-        "if",
-        0
-      ],
-      [
-        "then",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "is",

package/common/ordering.js

@@ -6,7 +6,7 @@ const ordering_instance = require('./ordering.instance.json')
 const { API } = require('./helpers/ordering')
 
 const template ={
-  "queries": [
+  configs: [
     "wants is xfx between wanter and wantee",
     // "if a likes or loves b then a wants b",
     "if x likes y or x loves y then x wants y",