tpmkms_4wp 7.12.2 → 7.12.3-beta.1

package/common/formulas.js

@@ -183,8 +183,10 @@ let configStruct = {
 const createConfig = () => {
   const api = new API()
   config = new Config(configStruct, module)
-  config.add(dialogues()).add(pos()).add(math()).add(formulasTemplate())
+  config.stop_auto_rebuild()
+  config.add(dialogues(), pos(), math(), formulasTemplate())
   config.api = api
+  config.restart_auto_rebuild()
   return config
 }
 

package/common/formulas.test.json

@@ -1112,7 +1112,7 @@
               "dead": true,
               "level": 1,
               "marker": "mathematical_operator",
-              "mathematical": {
+              "modifier_mathematical": {
                 "level": 0,
                 "marker": "mathematical",
                 "range": {
@@ -1127,7 +1127,7 @@
                 "word": "mathematical"
               },
               "modifiers": [
-                "mathematical"
+                "modifier_mathematical"
               ],
               "number": "many",
               "range": {
@@ -2091,7 +2091,7 @@
               "dead": true,
               "level": 1,
               "marker": "mathematical_operator",
-              "mathematical": {
+              "modifier_mathematical": {
                 "level": 0,
                 "marker": "mathematical",
                 "range": {
@@ -2106,7 +2106,7 @@
                 "word": "mathematical"
               },
               "modifiers": [
-                "mathematical"
+                "modifier_mathematical"
               ],
               "number": "many",
               "range": {
@@ -3298,7 +3298,7 @@
               "dead": true,
               "level": 1,
               "marker": "mathematical_operator",
-              "mathematical": {
+              "modifier_mathematical": {
                 "level": 0,
                 "marker": "mathematical",
                 "range": {
@@ -3313,7 +3313,7 @@
                 "word": "mathematical"
               },
               "modifiers": [
-                "mathematical"
+                "modifier_mathematical"
               ],
               "number": "many",
               "range": {
@@ -5221,7 +5221,7 @@
               "dead": true,
               "level": 1,
               "marker": "mathematical_operator",
-              "mathematical": {
+              "modifier_mathematical": {
                 "level": 0,
                 "marker": "mathematical",
                 "range": {
@@ -5236,7 +5236,7 @@
                 "word": "mathematical"
               },
               "modifiers": [
-                "mathematical"
+                "modifier_mathematical"
               ],
               "number": "many",
               "range": {
@@ -6424,7 +6424,7 @@
               "dead": true,
               "level": 1,
               "marker": "mathematical_operator",
-              "mathematical": {
+              "modifier_mathematical": {
                 "level": 0,
                 "marker": "mathematical",
                 "range": {
@@ -6439,7 +6439,7 @@
                 "word": "mathematical"
               },
               "modifiers": [
-                "mathematical"
+                "modifier_mathematical"
               ],
               "number": "many",
               "range": {
@@ -7621,7 +7621,7 @@
               "dead": true,
               "level": 1,
               "marker": "mathematical_operator",
-              "mathematical": {
+              "modifier_mathematical": {
                 "level": 0,
                 "marker": "mathematical",
                 "range": {
@@ -7636,7 +7636,7 @@
                 "word": "mathematical"
               },
               "modifiers": [
-                "mathematical"
+                "modifier_mathematical"
               ],
               "number": "many",
               "range": {
@@ -9088,7 +9088,7 @@
               "dead": true,
               "level": 1,
               "marker": "mathematical_operator",
-              "mathematical": {
+              "modifier_mathematical": {
                 "level": 0,
                 "marker": "mathematical",
                 "range": {
@@ -9103,7 +9103,7 @@
                 "word": "mathematical"
               },
               "modifiers": [
-                "mathematical"
+                "modifier_mathematical"
               ],
               "number": "many",
               "range": {
@@ -9250,36 +9250,6 @@
           0
         ]
       ],
-      [
-        [
-          "divideByOperator",
-          0
-        ],
-        [
-          "equals",
-          0
-        ],
-        [
-          "leftParenthesis",
-          0
-        ],
-        [
-          "number",
-          0
-        ],
-        [
-          "plusOperator",
-          0
-        ],
-        [
-          "rightParenthesis",
-          0
-        ],
-        [
-          "unknown",
-          0
-        ]
-      ],
       [
         [
           "equals",
@@ -10850,7 +10820,7 @@
               "dead": true,
               "level": 1,
               "marker": "mathematical_operator",
-              "mathematical": {
+              "modifier_mathematical": {
                 "level": 0,
                 "marker": "mathematical",
                 "range": {
@@ -10865,7 +10835,7 @@
                 "word": "mathematical"
               },
               "modifiers": [
-                "mathematical"
+                "modifier_mathematical"
               ],
               "number": "many",
               "range": {
@@ -11846,7 +11816,7 @@
               "dead": true,
               "level": 1,
               "marker": "mathematical_operator",
-              "mathematical": {
+              "modifier_mathematical": {
                 "level": 0,
                 "marker": "mathematical",
                 "range": {
@@ -11861,7 +11831,7 @@
                 "word": "mathematical"
               },
               "modifiers": [
-                "mathematical"
+                "modifier_mathematical"
               ],
               "number": "many",
               "range": {
@@ -12008,36 +11978,6 @@
           0
         ]
       ],
-      [
-        [
-          "divideByOperator",
-          0
-        ],
-        [
-          "equals",
-          0
-        ],
-        [
-          "leftParenthesis",
-          0
-        ],
-        [
-          "number",
-          0
-        ],
-        [
-          "plusOperator",
-          0
-        ],
-        [
-          "rightParenthesis",
-          0
-        ],
-        [
-          "unknown",
-          0
-        ]
-      ],
       [
         [
           "equals",
@@ -12908,7 +12848,7 @@
     ],
     "generatedParenthesized": [
       "",
-      "(((formulaForVariable) are ((((fahrenheit) = (((celcius) * ((((9) / (5))))) + (32)))))))"
+      "((((the (formulas)) (for) (fahrenheit)) are ((((fahrenheit) = (((celcius) * ((((9) / (5))))) + (32)))))))"
     ],
     "metadata": {
       "opChoices": [
@@ -14611,12 +14551,12 @@
             },
             "word": "are"
           },
-          "generatedParenthesized": "(((formulaForVariable) are ((((fahrenheit) = (((celcius) * ((((9) / (5))))) + (32)))))))",
+          "generatedParenthesized": "((((the (formulas)) (for) (fahrenheit)) are ((((fahrenheit) = (((celcius) * ((((9) / (5))))) + (32)))))))",
           "paraphrases": "what are the formulas for fahrenheit?",
           "paraphrasesParenthesized": "(((what) are ((the (formulas)) (for) (fahrenheit)))?)",
           "responses": [
             "",
-            "formulaForVariable are fahrenheit = celcius * (9 / 5) + 32"
+            "the formulas for fahrenheit are fahrenheit = celcius * (9 / 5) + 32"
           ]
         },
         {
@@ -14781,7 +14721,7 @@
           "paraphrasesParenthesized": "((fahrenheit) = (((celcius) * ((((9) / (5))))) + (32)))",
           "responses": [
             "",
-            "formulaForVariable are fahrenheit = celcius * (9 / 5) + 32"
+            "the formulas for fahrenheit are fahrenheit = celcius * (9 / 5) + 32"
           ]
         },
         {
@@ -14939,7 +14879,7 @@
               "dead": true,
               "level": 1,
               "marker": "mathematical_operator",
-              "mathematical": {
+              "modifier_mathematical": {
                 "level": 0,
                 "marker": "mathematical",
                 "range": {
@@ -14954,7 +14894,7 @@
                 "word": "mathematical"
               },
               "modifiers": [
-                "mathematical"
+                "modifier_mathematical"
               ],
               "number": "many",
               "range": {
@@ -15051,7 +14991,7 @@
     "query": "fahrenheit = celcius*(9/5) + 32 what are the formulas for fahrenheit",
     "responses": [
       "",
-      "formulaForVariable are fahrenheit = celcius * (9 / 5) + 32"
+      "the formulas for fahrenheit are fahrenheit = celcius * (9 / 5) + 32"
     ]
   }
 ]

package/common/formulasTemplate.js

@@ -12,7 +12,7 @@ const template = {
   ] 
 }
 
-const createConfig = () => new Config({ name: 'formulasTemplate' }, module).add(base_km()).add(countable()).add(comparable())
+const createConfig = () => new Config({ name: 'formulasTemplate' }, module).add(base_km(), countable(), comparable())
 
 knowledgeModule({ 
   module,

package/common/gdefaults.js

@@ -25,7 +25,8 @@ let configStruct = {
     {
       where: where(),
       //({context}) => context.paraphrase && context.modifiers,
-      match: ({context}) => context.paraphrase && (context.modifiers || context.postModifiers),
+      // match: ({context}) => context.paraphrase && (context.modifiers || context.postModifiers),
+      match: ({context}) => (context.modifiers || context.postModifiers),
       apply: ({context, g, gs, callId}) => {
         const text = []
         for (modifier of (context.modifiers || [])) {

package/common/help.js

@@ -79,6 +79,7 @@ const configStruct = {
 
 const createConfig = () => {
   const config = new Config(configStruct, module)
+  config.stop_auto_rebuild()
   config.add(dialogues())
 
   config.initializer( ({ config, addWord, kms }) => {
@@ -90,6 +91,7 @@ const createConfig = () => {
       addWord(name, {id: "km", initial: `{ value: '${name}', word: '${name}' }`})
     }
   })
+  config.restart_auto_rebuild()
   return config
 }
 

package/common/hierarchy.js

@@ -270,12 +270,12 @@ let configStruct = {
       notes: 'types of type', // what are the types of animals
       where: where(),
       match: ({context}) => context.marker == 'type' && context.evaluate && context.object,
-      apply: ({context, objects, gs, km}) => {
+      apply: ({context, objects, gs, km, isA}) => {
         const api = km('properties').api
         const conceptApi = km('concept').api
         const type = pluralize.singular(context.object.value);
         const children = api.children(type)
-        const values = children.map( (t) => conceptApi.getWordForValue(t, { number: 'many'}))
+        const values = children.map( (t) => conceptApi.getWordForValue(t, { number: isA(type, 'concept') ? 'one' : 'many'}))
         context.evalue = {
           marker: 'list',
           value: values,
@@ -290,12 +290,14 @@ let configStruct = {
 
 const createConfig = () => {
   const config = new Config(configStruct, module)
+  config.stop_auto_rebuild()
   config.add(properties())
   config.initializer( ({apis, hierarchy}) => {
     apis('stm').addIsA( (child, parent) => {
       return hierarchy.isA(child, parent) 
     })
   })
+  config.restart_auto_rebuild()
   return config
 }
 

package/common/javascript.js

@@ -60,11 +60,13 @@ let configStruct = {
 
 const createConfig = () => {
   const config = new Config(configStruct, module)
+  config.stop_auto_rebuild()
   config.add(dialogues())
 
   config.initializer( ({objects, uuid}) => {
     objects.variables = {}
   })
+  config.restart_auto_rebuild()
   return config
 }
 

package/common/math.js

@@ -47,10 +47,21 @@ const mathematicalOperator = (name, words, apply, before = []) => [
         const x = toValue(e(context.x)) 
         const y = toValue(e(context.y))
         if (!x || !y) {
-          context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }
+          // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }
+          context.isResponse = false
         } else {
           context.evalue = apply(x, y)
+          context.evalue.isResponse = true
+          context.evalue.paraphrase = false
+          // context.paraphrase = false
+          // context.isResponse = true
         }
+        /*
+        if (!context.value) {
+          context.isResponse = false
+          context.paraphrase = true
+        }
+        */
       }
   }
 ]
@@ -93,10 +104,7 @@ let configStruct = {
 
 const createConfig = () => {
   const config = new Config(configStruct, module)
-  config.add(numbers());
-  config.add(dialogues());
-  config.add(punctuation());
-  config.add(mathTemplate());
+  config.add(numbers(), dialogues(), punctuation(), mathTemplate());
   return config
 }