tpmkms 9.6.3-beta.2 → 9.6.3-beta.21

package/common/articles.js

@@ -1,4 +1,4 @@
-const { knowledgeModule, where, stableId } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where, stableId, debug } = require('./runtime').theprogrammablemind
 const gdefaults = require('./gdefaults.js')
 const pos = require('./pos.js')
 const { defaultContextCheck } = require('./helpers')
@@ -63,7 +63,6 @@ const config = {
       id: "theAble", 
       children: ['noun'],
     },
-
     { 
       id: "thisitthat", 
       isA: ['queryable'], 

package/common/compass.instance.json

@@ -782,11 +782,6 @@
           "expression",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -1764,7 +1759,7 @@
         ],
         [
           "unit",
-          "number",
+          "mathematicalExpression",
           false
         ],
         [
@@ -3022,11 +3017,6 @@
           "expression",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -4004,7 +3994,7 @@
         ],
         [
           "unit",
-          "number",
+          "mathematicalExpression",
           false
         ],
         [
@@ -6620,11 +6610,6 @@
           "expression",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -7782,7 +7767,7 @@
         ],
         [
           "unit",
-          "number",
+          "mathematicalExpression",
           false
         ],
         [

package/common/concept.js

@@ -91,7 +91,7 @@ config = {
         if ((context.value || []).length < 2) {
           return
         }
-        if (!context.value[0].word) {
+        if (!context?.value[0]?.word) {
           return
         }
         const word = context.value[0].word
@@ -110,6 +110,7 @@ config = {
         context.modifiers = ['modifier']
         context.modifier = {
           marker: 'list',
+          listable: true,
           paraphrase: true,
           value: modifiers
         }

package/common/conjunction.js

@@ -21,10 +21,8 @@ const config = {
       */
       selector: {
           match: "same", 
-          left: [ { pattern: '($type && context.instance == variables.instance)' } ], 
-          right: [ { pattern: '($type && context.instance == variables.instance)' } ], 
-          // left: [ { pattern: '($type)' } ], 
-          // right: [ { pattern: '($type)' } ], 
+          left: [ { pattern: '($type && context.instance == variables.instance && context.dead == variables.dead && !@<=$contexts[1].notConjunctableWith))' } ], 
+          right: [ { pattern: '($type && context.instance == variables.instance && context.dead == variables.dead && !@<=$contexts[-1].notConjunctableWith))' } ], 
           passthrough: true
       }, 
       bridge: "{ ...next(operator), listable: true, isList: true, value: append(before, after) }"
@@ -34,7 +32,7 @@ const config = {
       level: 1, 
       selector: {
           match: "same", 
-          left: [ { pattern: '($type && context.instance == variables.instance)' } ], 
+          left: [ { pattern: '($type && context.instance == variables.instance && context.dead == variables.dead)' } ], 
           passthrough: true
      }, 
       bridge: "{ ...operator, value: append(before, operator.value) }"
@@ -63,18 +61,6 @@ const config = {
         return `${await g(context.value[0])} ${await gs(context.value.slice(1), ', ', ' and ')}`
       }
     },
-
-    /*
-    {
-      where: where(),
-      notes: 'handle lists with truthValue set',
-      match: ({context, hierarchy}) => context.marker == 'list' && context.hasOwnProperty('truthValue'),
-      apply: async ({context, g, gs}) => {
-        return context.truthValue ? 'yes' : 'no'
-      }
-    },
-    */
-
     {
       where: where(),
       notes: 'handle lists',
@@ -87,6 +73,14 @@ const config = {
         }
       }
     },
+
+    {
+      where: where(),
+      match: ({context, callId}) => context.listable && context.value,
+      apply: ({context, gs}) => {
+        return gs(context.value, ' ', ' ' + context.word + ' ')
+      },
+    },
   ],
 };
 

package/common/dialogues.js

@@ -544,12 +544,12 @@ const config = {
           concept = two;
           value = one;
         }
-        // km('dialogues').api.mentioned(concept)
+        // km('dialogues').api.remember(concept)
         // TODO wtf is the next line?
         value = JSON.parse(JSON.stringify(value))
         const instance = await e(value)
         if (false && instance.evalue) {
-          km('stm').api.mentioned({ context: value })
+          km('stm').api.remember({ context: value })
         }
         if (instance.verbatim) {
           context.evalue = { verbatim: instance.verbatim }
@@ -647,7 +647,7 @@ const config = {
           for (const child of propertyToArray(one)) {
             await api.makeObject({ context: child, config, types: context.two.types || [] })
             kms.stm.api.setVariable(child.value, two)
-            kms.stm.api.mentioned({ context: child, value: two })
+            kms.stm.api.remember({ context: child, value: two })
           }
         }
       }

package/common/dimension.instance.json

@@ -21,7 +21,7 @@
       "operators": [
         "([quantity])",
         "([unit])",
-        "((amount/* || number/*) [amountOfCoordinate|] ([unit]))",
+        "((amount/* || number/* || mathematicalExpression/*) [amountOfCoordinate|] ([unit]))",
         "(([amount]) [unit])",
         "((@<=quantity || context.possession == true) [convertToUnits|in] (unit))",
         "([forQuantity|for] (@<= quantity && !context.unit.dimension == null))",
@@ -178,7 +178,7 @@
         {
           "id": "unit",
           "isA": [
-            "number"
+            "mathematicalExpression"
           ]
         }
       ]
@@ -727,11 +727,6 @@
           "expression",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -2290,11 +2285,6 @@
           "expression",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -3760,11 +3750,6 @@
           "expression",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -5786,11 +5771,6 @@
           "expression",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -7503,11 +7483,6 @@
           "expression",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -9153,11 +9128,6 @@
           "expression",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -11042,11 +11012,6 @@
           "expression",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -12931,11 +12896,6 @@
           "expression",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -15294,11 +15254,6 @@
           "expression",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -17667,11 +17622,6 @@
           "expression",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -19676,11 +19626,6 @@
           "expression",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -21685,11 +21630,6 @@
           "expression",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -23958,11 +23898,6 @@
           "expression",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -25485,7 +25420,7 @@
       "operators": [
         "([quantity])",
         "([unit])",
-        "((amount/* || number/*) [amountOfCoordinate|] ([unit]))",
+        "((amount/* || number/* || mathematicalExpression/*) [amountOfCoordinate|] ([unit]))",
         "(([amount]) [unit])",
         "((@<=quantity || context.possession == true) [convertToUnits|in] (unit))",
         "([forQuantity|for] (@<= quantity && !context.unit.dimension == null))",
@@ -25641,7 +25576,7 @@
         {
           "id": "unit",
           "isA": [
-            "number"
+            "mathematicalExpression"
           ]
         }
       ]

package/common/dimension.js

@@ -38,7 +38,7 @@ class API {
   }
 
   async getPreferredUnits(quantity) {
-    const preferredUnits = await this.args.mentions({
+    const preferredUnits = await this.args.recall({
       context: { marker: 'unit' },
       condition: (unit) => {
         if (quantity.unit.marker == 'unitPerUnit') {
@@ -57,7 +57,7 @@ class API {
   }
 
   setPreferredUnits(units) {
-    this.args.mentioned(units)
+    this.args.remember(units)
   }
 
   setMeasurementSystem(measurementSystem) {
@@ -108,7 +108,7 @@ class API {
         const formula = kms.formulas.api.get(to, [efrom.unit])
         if (!formula) {
           const reason = { marker: 'reason', focusableForPhrase: true, evalue: { marker: 'noconversion', from: efrom.unit, to } }
-          kms.stm.api.mentioned({ context: reason })
+          kms.stm.api.remember({ context: reason })
           error(reason)
         }
         kms.stm.api.setVariable(efrom.unit.value, efrom.amount)
@@ -165,7 +165,7 @@ const config = {
   operators: [
     "([quantity])",
     "([unit])",
-    "((amount/* || number/*) [amountOfCoordinate|] ([unit]))",
+    "((amount/* || number/* || mathematicalExpression/*) [amountOfCoordinate|] ([unit]))",
     "(([amount]) [unit])",
     "((@<=quantity || context.possession == true) [convertToUnits|in] (unit))",
     "([forQuantity|for] (@<= quantity && !context.unit.dimension == null))",
@@ -270,7 +270,7 @@ const config = {
     },
     { 
       id: "unit", 
-      isA: ['number'],
+      isA: ['mathematicalExpression'],
     },
   ],
 };