tpmkms_4wp 7.12.8-beta.6 → 7.12.8-beta.8

package/common/formulas.instance.json

@@ -756,15 +756,15 @@
           },
           "one": {
             "number": "many",
-            "marker": "unknown",
             "value": "formulas",
-            "word": "formulas",
+            "unknown": true,
             "text": "formulas",
+            "marker": "unknown",
+            "word": "formulas",
             "range": {
               "start": 0,
               "end": 20
             },
-            "unknown": true,
             "dead": true,
             "types": [
               "unknown"
@@ -772,15 +772,15 @@
             "level": 1
           },
           "two": {
-            "marker": "unknown",
             "value": "concepts",
-            "word": "concepts",
+            "unknown": true,
             "text": "concepts",
+            "marker": "unknown",
+            "word": "concepts",
             "range": {
               "start": 13,
               "end": 20
             },
-            "unknown": true,
             "dead": true,
             "types": [
               "unknown"

package/common/gdefaults.js

@@ -1,6 +1,7 @@
 const pluralize = require('pluralize')
 const { defaultContextCheck } = require('./helpers')
 const { Config, knowledgeModule, where } = require('./runtime').theprogrammablemind
+const tokenize = require('./tokenize.js')
 const gdefaults_tests = require('./gdefaults.test.json')
 const { isMany } = require('./helpers.js')
 
@@ -182,6 +183,7 @@ let configStruct = {
 
 const createConfig = () => {
   const config = new Config(configStruct, module)
+  config.add(tokenize())
   config.initializer( ({config}) => {
     config.addArgs((args) => {
       return {

package/common/help.js

@@ -7,6 +7,9 @@ const helpers = require('./helpers')
 const getHelp = (config, indent=2) => {
   indent = ' '.repeat(indent)
   let help = ''
+  if (config.tests.length == 0) {
+    return ''
+  }
   help += `${indent}NAME: ${config.name}\n`
   help += `${indent}DESCRIPTION: ${config.description}\n\n`
   help += `${indent}SAMPLE SENTENCES\n\n`

package/common/help.test.json

@@ -356,8 +356,9 @@
         "word": "help"
       }
     ],
+    "developerTest": false,
     "generatedParenthesized": [
-      "(  NAME: help\n  DESCRIPTION: Help the user with the current knowledge modules\n\n  SAMPLE SENTENCES\n\n    help with help and dialogues\n    help\n\n  NAME: dialogues\n  DESCRIPTION: framework for dialogues\n\n  SAMPLE SENTENCES\n\n    1 2 and 3\n    be brief\n    be brief greg\n    is x y\n    no\n    what is it\n    x is y?\n    yes\n    x is 3 what is x\n    x is 3 what is x what is it\n    be brief x is 3 what is x what is it\n    to it\n    why\n    nevermindTestSetup accept nevermind hi\n    nevermindTestSetup reject nevermind hi\n\n  NAME: sdefaults\n  DESCRIPTION: defaults for semantics\n\n  SAMPLE SENTENCES\n\n\n  NAME: pos\n  DESCRIPTION: parts of speech\n\n  SAMPLE SENTENCES\n\n\n  NAME: stm\n  DESCRIPTION: short term memory\n\n  SAMPLE SENTENCES\n\n\n  NAME: meta\n  DESCRIPTION: Ways of defining new language elements\n\n  SAMPLE SENTENCES\n\n    a means b\n    a means x\n    if f then g gq\n    undefined means defined\n\n  NAME: punctuation\n  DESCRIPTION: punctuation\n\n  SAMPLE SENTENCES\n\n    (a)\n    :\n\n  NAME: gdefaults\n  DESCRIPTION: defaults for generators\n\n  SAMPLE SENTENCES\n\n)"
+      "(  NAME: help\n  DESCRIPTION: Help the user with the current knowledge modules\n\n  SAMPLE SENTENCES\n\n    help with help and dialogues\n    help\n\n  NAME: dialogues\n  DESCRIPTION: framework for dialogues\n\n  SAMPLE SENTENCES\n\n    1 2 and 3\n    be brief\n    be brief greg\n    is x y\n    no\n    what is it\n    x is y?\n    yes\n    x is 3 what is x\n    x is 3 what is x what is it\n    be brief x is 3 what is x what is it\n    to it\n    why\n    nevermindTestSetup accept nevermind hi\n    nevermindTestSetup reject nevermind hi\n\n\n\n\n  NAME: meta\n  DESCRIPTION: Ways of defining new language elements\n\n  SAMPLE SENTENCES\n\n    a means b\n    a means x\n    if f then g gq\n    undefined means defined\n\n  NAME: punctuation\n  DESCRIPTION: punctuation\n\n  SAMPLE SENTENCES\n\n    (a)\n    :\n\n\n)"
     ],
     "metadata": {
       "opChoices": [
@@ -385,7 +386,8 @@
         "pos": "pos2",
         "punctuation": "punctuation2",
         "sdefaults": "sdefaults2",
-        "stm": "stm2"
+        "stm": "stm2",
+        "tokenize": "tokenize2"
       },
       "namespaced": {
         "dialogues2": {
@@ -411,6 +413,8 @@
           ],
           "variables": {
           }
+        },
+        "tokenize2": {
         }
       },
       "processed": [
@@ -432,11 +436,11 @@
             "value": "help",
             "word": "help"
           },
-          "generatedParenthesized": "(  NAME: help\n  DESCRIPTION: Help the user with the current knowledge modules\n\n  SAMPLE SENTENCES\n\n    help with help and dialogues\n    help\n\n  NAME: dialogues\n  DESCRIPTION: framework for dialogues\n\n  SAMPLE SENTENCES\n\n    1 2 and 3\n    be brief\n    be brief greg\n    is x y\n    no\n    what is it\n    x is y?\n    yes\n    x is 3 what is x\n    x is 3 what is x what is it\n    be brief x is 3 what is x what is it\n    to it\n    why\n    nevermindTestSetup accept nevermind hi\n    nevermindTestSetup reject nevermind hi\n\n  NAME: sdefaults\n  DESCRIPTION: defaults for semantics\n\n  SAMPLE SENTENCES\n\n\n  NAME: pos\n  DESCRIPTION: parts of speech\n\n  SAMPLE SENTENCES\n\n\n  NAME: stm\n  DESCRIPTION: short term memory\n\n  SAMPLE SENTENCES\n\n\n  NAME: meta\n  DESCRIPTION: Ways of defining new language elements\n\n  SAMPLE SENTENCES\n\n    a means b\n    a means x\n    if f then g gq\n    undefined means defined\n\n  NAME: punctuation\n  DESCRIPTION: punctuation\n\n  SAMPLE SENTENCES\n\n    (a)\n    :\n\n  NAME: gdefaults\n  DESCRIPTION: defaults for generators\n\n  SAMPLE SENTENCES\n\n)",
+          "generatedParenthesized": "(  NAME: help\n  DESCRIPTION: Help the user with the current knowledge modules\n\n  SAMPLE SENTENCES\n\n    help with help and dialogues\n    help\n\n  NAME: dialogues\n  DESCRIPTION: framework for dialogues\n\n  SAMPLE SENTENCES\n\n    1 2 and 3\n    be brief\n    be brief greg\n    is x y\n    no\n    what is it\n    x is y?\n    yes\n    x is 3 what is x\n    x is 3 what is x what is it\n    be brief x is 3 what is x what is it\n    to it\n    why\n    nevermindTestSetup accept nevermind hi\n    nevermindTestSetup reject nevermind hi\n\n\n\n\n  NAME: meta\n  DESCRIPTION: Ways of defining new language elements\n\n  SAMPLE SENTENCES\n\n    a means b\n    a means x\n    if f then g gq\n    undefined means defined\n\n  NAME: punctuation\n  DESCRIPTION: punctuation\n\n  SAMPLE SENTENCES\n\n    (a)\n    :\n\n\n)",
           "paraphrases": "help",
           "paraphrasesParenthesized": "(help)",
           "responses": [
-            "  NAME: help\n  DESCRIPTION: Help the user with the current knowledge modules\n\n  SAMPLE SENTENCES\n\n    help with help and dialogues\n    help\n\n  NAME: dialogues\n  DESCRIPTION: framework for dialogues\n\n  SAMPLE SENTENCES\n\n    1 2 and 3\n    be brief\n    be brief greg\n    is x y\n    no\n    what is it\n    x is y?\n    yes\n    x is 3 what is x\n    x is 3 what is x what is it\n    be brief x is 3 what is x what is it\n    to it\n    why\n    nevermindTestSetup accept nevermind hi\n    nevermindTestSetup reject nevermind hi\n\n  NAME: sdefaults\n  DESCRIPTION: defaults for semantics\n\n  SAMPLE SENTENCES\n\n\n  NAME: pos\n  DESCRIPTION: parts of speech\n\n  SAMPLE SENTENCES\n\n\n  NAME: stm\n  DESCRIPTION: short term memory\n\n  SAMPLE SENTENCES\n\n\n  NAME: meta\n  DESCRIPTION: Ways of defining new language elements\n\n  SAMPLE SENTENCES\n\n    a means b\n    a means x\n    if f then g gq\n    undefined means defined\n\n  NAME: punctuation\n  DESCRIPTION: punctuation\n\n  SAMPLE SENTENCES\n\n    (a)\n    :\n\n  NAME: gdefaults\n  DESCRIPTION: defaults for generators\n\n  SAMPLE SENTENCES\n\n"
+            "  NAME: help\n  DESCRIPTION: Help the user with the current knowledge modules\n\n  SAMPLE SENTENCES\n\n    help with help and dialogues\n    help\n\n  NAME: dialogues\n  DESCRIPTION: framework for dialogues\n\n  SAMPLE SENTENCES\n\n    1 2 and 3\n    be brief\n    be brief greg\n    is x y\n    no\n    what is it\n    x is y?\n    yes\n    x is 3 what is x\n    x is 3 what is x what is it\n    be brief x is 3 what is x what is it\n    to it\n    why\n    nevermindTestSetup accept nevermind hi\n    nevermindTestSetup reject nevermind hi\n\n\n\n\n  NAME: meta\n  DESCRIPTION: Ways of defining new language elements\n\n  SAMPLE SENTENCES\n\n    a means b\n    a means x\n    if f then g gq\n    undefined means defined\n\n  NAME: punctuation\n  DESCRIPTION: punctuation\n\n  SAMPLE SENTENCES\n\n    (a)\n    :\n\n\n"
           ]
         }
       ]
@@ -449,7 +453,7 @@
     ],
     "query": "help",
     "responses": [
-      "  NAME: help\n  DESCRIPTION: Help the user with the current knowledge modules\n\n  SAMPLE SENTENCES\n\n    help with help and dialogues\n    help\n\n  NAME: dialogues\n  DESCRIPTION: framework for dialogues\n\n  SAMPLE SENTENCES\n\n    1 2 and 3\n    be brief\n    be brief greg\n    is x y\n    no\n    what is it\n    x is y?\n    yes\n    x is 3 what is x\n    x is 3 what is x what is it\n    be brief x is 3 what is x what is it\n    to it\n    why\n    nevermindTestSetup accept nevermind hi\n    nevermindTestSetup reject nevermind hi\n\n  NAME: sdefaults\n  DESCRIPTION: defaults for semantics\n\n  SAMPLE SENTENCES\n\n\n  NAME: pos\n  DESCRIPTION: parts of speech\n\n  SAMPLE SENTENCES\n\n\n  NAME: stm\n  DESCRIPTION: short term memory\n\n  SAMPLE SENTENCES\n\n\n  NAME: meta\n  DESCRIPTION: Ways of defining new language elements\n\n  SAMPLE SENTENCES\n\n    a means b\n    a means x\n    if f then g gq\n    undefined means defined\n\n  NAME: punctuation\n  DESCRIPTION: punctuation\n\n  SAMPLE SENTENCES\n\n    (a)\n    :\n\n  NAME: gdefaults\n  DESCRIPTION: defaults for generators\n\n  SAMPLE SENTENCES\n\n"
+      "  NAME: help\n  DESCRIPTION: Help the user with the current knowledge modules\n\n  SAMPLE SENTENCES\n\n    help with help and dialogues\n    help\n\n  NAME: dialogues\n  DESCRIPTION: framework for dialogues\n\n  SAMPLE SENTENCES\n\n    1 2 and 3\n    be brief\n    be brief greg\n    is x y\n    no\n    what is it\n    x is y?\n    yes\n    x is 3 what is x\n    x is 3 what is x what is it\n    be brief x is 3 what is x what is it\n    to it\n    why\n    nevermindTestSetup accept nevermind hi\n    nevermindTestSetup reject nevermind hi\n\n\n\n\n  NAME: meta\n  DESCRIPTION: Ways of defining new language elements\n\n  SAMPLE SENTENCES\n\n    a means b\n    a means x\n    if f then g gq\n    undefined means defined\n\n  NAME: punctuation\n  DESCRIPTION: punctuation\n\n  SAMPLE SENTENCES\n\n    (a)\n    :\n\n\n"
     ]
   }
 ]

package/common/length.instance.json

@@ -2073,54 +2073,54 @@
             "listable": true,
             "value": [
               {
-                "marker": "unknown",
                 "value": "meter",
-                "word": "meter",
+                "unknown": true,
                 "text": "meter",
+                "marker": "unknown",
+                "word": "meter",
                 "range": {
                   "start": 0,
                   "end": 4
                 },
-                "unknown": true,
                 "dead": true,
                 "level": 1
               },
               {
-                "marker": "unknown",
                 "value": "centimeter",
-                "word": "centimeter",
+                "unknown": true,
                 "text": "centimeter",
+                "marker": "unknown",
+                "word": "centimeter",
                 "range": {
                   "start": 6,
                   "end": 15
                 },
-                "unknown": true,
                 "dead": true,
                 "level": 1
               },
               {
-                "marker": "unknown",
                 "value": "foot",
-                "word": "foot",
+                "unknown": true,
                 "text": "foot",
+                "marker": "unknown",
+                "word": "foot",
                 "range": {
                   "start": 17,
                   "end": 20
                 },
-                "unknown": true,
                 "dead": true,
                 "level": 2
               },
               {
-                "marker": "unknown",
                 "value": "inch",
-                "word": "inch",
+                "unknown": true,
                 "text": "inch",
+                "marker": "unknown",
+                "word": "inch",
                 "range": {
                   "start": 26,
                   "end": 29
                 },
-                "unknown": true,
                 "dead": true,
                 "level": 2
               }
@@ -5658,15 +5658,15 @@
               "number"
             ],
             "x": {
-              "marker": "unknown",
               "value": "millimeters",
-              "word": "millimeters",
+              "unknown": true,
               "text": "millimeters",
+              "marker": "unknown",
+              "word": "millimeters",
               "range": {
                 "start": 14,
                 "end": 24
               },
-              "unknown": true,
               "dead": true,
               "types": [
                 "number",
@@ -6762,15 +6762,15 @@
           },
           "dead": true,
           "left": {
-            "marker": "unknown",
             "value": "millimeters",
-            "word": "millimeters",
+            "unknown": true,
             "text": "millimeters",
+            "marker": "unknown",
+            "word": "millimeters",
             "range": {
               "start": 0,
               "end": 10
             },
-            "unknown": true,
             "dead": true,
             "types": [
               "expression",
@@ -7907,15 +7907,15 @@
           },
           "dead": true,
           "left": {
-            "marker": "unknown",
             "value": "millimeters",
-            "word": "millimeters",
+            "unknown": true,
             "text": "millimeters",
+            "marker": "unknown",
+            "word": "millimeters",
             "range": {
               "start": 0,
               "end": 10
             },
-            "unknown": true,
             "dead": true,
             "types": [
               "expression",
@@ -9083,15 +9083,15 @@
               "number"
             ],
             "x": {
-              "marker": "unknown",
               "value": "millimeters",
-              "word": "millimeters",
+              "unknown": true,
               "text": "millimeters",
+              "marker": "unknown",
+              "word": "millimeters",
               "range": {
                 "start": 9,
                 "end": 19
               },
-              "unknown": true,
               "dead": true,
               "types": [
                 "number",
@@ -13539,15 +13539,15 @@
           },
           "dead": true,
           "left": {
-            "marker": "unknown",
             "value": "miles",
-            "word": "miles",
+            "unknown": true,
             "text": "miles",
+            "marker": "unknown",
+            "word": "miles",
             "range": {
               "start": 0,
               "end": 4
             },
-            "unknown": true,
             "dead": true,
             "types": [
               "expression",
@@ -14700,15 +14700,15 @@
               "number"
             ],
             "x": {
-              "marker": "unknown",
               "value": "miles",
-              "word": "miles",
+              "unknown": true,
               "text": "miles",
+              "marker": "unknown",
+              "word": "miles",
               "range": {
                 "start": 7,
                 "end": 11
               },
-              "unknown": true,
               "dead": true,
               "types": [
                 "number",
@@ -15804,15 +15804,15 @@
           },
           "dead": true,
           "left": {
-            "marker": "unknown",
             "value": "kilometers",
-            "word": "kilometers",
+            "unknown": true,
             "text": "kilometers",
+            "marker": "unknown",
+            "word": "kilometers",
             "range": {
               "start": 0,
               "end": 9
             },
-            "unknown": true,
             "dead": true,
             "types": [
               "expression",
@@ -16980,15 +16980,15 @@
               "timesExpression"
             ],
             "x": {
-              "marker": "unknown",
               "value": "kilometers",
-              "word": "kilometers",
+              "unknown": true,
               "text": "kilometers",
+              "marker": "unknown",
+              "word": "kilometers",
               "range": {
                 "start": 9,
                 "end": 18
               },
-              "unknown": true,
               "dead": true,
               "types": [
                 "number",

package/common/math.instance.json

@@ -541,29 +541,29 @@
           "dead": true,
           "modifiers": [
             {
-              "marker": "unknown",
               "value": "mathematical",
-              "word": "mathematical",
+              "unknown": true,
               "text": "mathematical",
+              "marker": "unknown",
+              "word": "mathematical",
               "range": {
                 "start": 0,
                 "end": 11
               },
-              "unknown": true,
               "dead": true,
               "level": 1
             }
           ],
           "concept": {
-            "marker": "unknown",
             "value": "operator",
-            "word": "operator",
+            "unknown": true,
             "text": "operator",
+            "marker": "unknown",
+            "word": "operator",
             "range": {
               "start": 22,
               "end": 29
             },
-            "unknown": true,
             "dead": true,
             "level": 1
           },

package/common/meta.js

@@ -1,6 +1,7 @@
 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')
@@ -381,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({
@@ -390,6 +394,8 @@ const createConfig = () => {
       })
     }
   })
+  
+  config.restart_auto_rebuild()
   return config
 }
 

package/common/numbers.js

@@ -22,9 +22,6 @@ let configStruct = {
   words: {
     "literals": {
       // 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}" }],

package/common/ordering.instance.json

@@ -517,15 +517,15 @@
           },
           "one": {
             "number": "one",
-            "marker": "unknown",
             "value": "wants",
-            "word": "wants",
+            "unknown": true,
             "text": "wants",
+            "marker": "unknown",
+            "word": "wants",
             "range": {
               "start": 0,
               "end": 37
             },
-            "unknown": true,
             "dead": true,
             "types": [
               "unknown"
@@ -563,28 +563,28 @@
               "isList": true,
               "value": [
                 {
-                  "marker": "type",
                   "value": "wanter",
-                  "word": "wanter",
+                  "unknown": true,
                   "text": "wanter",
+                  "marker": "type",
+                  "word": "wanter",
                   "range": {
                     "start": 21,
                     "end": 26
                   },
-                  "unknown": true,
                   "dead": true,
                   "level": 1
                 },
                 {
-                  "marker": "type",
                   "value": "wantee",
-                  "word": "wantee",
+                  "unknown": true,
                   "text": "wantee",
+                  "marker": "type",
+                  "word": "wantee",
                   "range": {
                     "start": 32,
                     "end": 37
                   },
-                  "unknown": true,
                   "dead": true,
                   "level": 1
                 }
@@ -1606,15 +1606,15 @@
                   "text": "ikes y"
                 },
                 "liker": {
-                  "marker": "unknown",
                   "value": "x",
-                  "word": "x",
+                  "unknown": true,
                   "text": "x",
+                  "marker": "unknown",
+                  "word": "x",
                   "range": {
                     "start": 3,
                     "end": 3
                   },
-                  "unknown": true,
                   "dead": true,
                   "types": [
                     "unknown"
@@ -1622,15 +1622,15 @@
                   "level": 1
                 },
                 "likee": {
-                  "marker": "unknown",
                   "value": "y",
-                  "word": "y",
+                  "unknown": true,
                   "text": "y",
+                  "marker": "unknown",
+                  "word": "y",
                   "range": {
                     "start": 11,
                     "end": 11
                   },
-                  "unknown": true,
                   "dead": true,
                   "types": [
                     "unknown"
@@ -1671,15 +1671,15 @@
                   "text": ""
                 },
                 "lover": {
-                  "marker": "unknown",
                   "value": "x",
-                  "word": "x",
+                  "unknown": true,
                   "text": "x",
+                  "marker": "unknown",
+                  "word": "x",
                   "range": {
                     "start": 16,
                     "end": 16
                   },
-                  "unknown": true,
                   "dead": true,
                   "types": [
                     "unknown"
@@ -1687,15 +1687,15 @@
                   "level": 1
                 },
                 "lovee": {
-                  "marker": "unknown",
                   "value": "y",
-                  "word": "y",
+                  "unknown": true,
                   "text": "y",
+                  "marker": "unknown",
+                  "word": "y",
                   "range": {
                     "start": 24,
                     "end": 24
                   },
-                  "unknown": true,
                   "dead": true,
                   "types": [
                     "unknown"
@@ -1742,15 +1742,15 @@
               "text": ""
             },
             "wanter": {
-              "marker": "unknown",
               "value": "x",
-              "word": "x",
+              "unknown": true,
               "text": "x",
+              "marker": "unknown",
+              "word": "x",
               "range": {
                 "start": 31,
                 "end": 31
               },
-              "unknown": true,
               "dead": true,
               "types": [
                 "unknown"
@@ -1758,15 +1758,15 @@
               "level": 1
             },
             "wantee": {
-              "marker": "unknown",
               "value": "y",
-              "word": "y",
+              "unknown": true,
               "text": "y",
+              "marker": "unknown",
+              "word": "y",
               "range": {
                 "start": 39,
                 "end": 39
               },
-              "unknown": true,
               "dead": true,
               "types": [
                 "unknown"
@@ -1839,40 +1839,6 @@
             0
           ]
         ],
-        [
-          [
-            "if",
-            0
-          ],
-          [
-            "like",
-            0
-          ],
-          [
-            "love",
-            0
-          ],
-          [
-            "orList",
-            0
-          ],
-          [
-            "then",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "unknown",
-            1
-          ],
-          [
-            "want",
-            0
-          ]
-        ],
         [
           [
             "if",
@@ -2234,40 +2200,6 @@
         0
       ]
     ],
-    [
-      [
-        "if",
-        0
-      ],
-      [
-        "like",
-        0
-      ],
-      [
-        "love",
-        0
-      ],
-      [
-        "orList",
-        0
-      ],
-      [
-        "then",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ],
-      [
-        "unknown",
-        1
-      ],
-      [
-        "want",
-        0
-      ]
-    ],
     [
       [
         "if",