tpmkms 9.6.1 → 9.6.2

package/common/gdefaults.js

@@ -364,7 +364,11 @@ function initializer({config}) {
                     value = { ...value, ...element.context }
                   }
                   strings.push(separator)
-                  strings.push(await args.gp(value))
+                  if (Array.isArray(value)) {
+                    strings.push(await args.gsp(value))
+                  } else {
+                    strings.push(await args.gp(value))
+                  }
                   separator = ' '
                 }
               } else if (element.context) {

package/common/helpers/conjunction.js

@@ -1,6 +1,6 @@
 const { propertyToArray } = require('../helpers.js')
 
-function asList(context) {
+function asList(context, maybe=false) {
   if (Array.isArray(context)) {
     return {
       marker: 'list',
@@ -10,10 +10,14 @@ function asList(context) {
   } else if (context.marker === 'list') {
     return context
   }
-  return {
-    marker: 'list',
-    types: [context.marker],
-    value: [context]
+  if (maybe) {
+    return context
+  } else {
+    return {
+      marker: 'list',
+      types: [context.marker],
+      value: [context]
+    }
   }
 }
 

package/common/helpers/drone.js

@@ -32,8 +32,19 @@ function radiansToDegrees(radians) {
   return (radians * 180) / Math.PI;
 }
 
+function smallestRotate(angle) {
+  angle = angle % (Math.PI*2)
+  if (angle > 0 && angle > Math.PI) {
+    angle = -(Math.PI*2 - angle)
+  }
+  if (angle < 0 && angle < -Math.PI) {
+    angle = Math.PI*2 + angle
+  }
+  return angle
+}
+
 function rotateDelta(currentRadians, targetRadians) {
-  return (((targetRadians - currentRadians + Math.PI) % (2 * Math.PI)) - Math.PI)
+  return smallestRotate(((targetRadians - currentRadians + Math.PI) % (2 * Math.PI)) - Math.PI)
 }
 
 module.exports = {
@@ -41,4 +52,5 @@ module.exports = {
   degreesToRadians,
   radiansToDegrees,
   rotateDelta,
+  smallestRotate,
 }

package/common/length.instance.json

@@ -366,6 +366,11 @@
           "expression",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -2568,6 +2573,11 @@
           "expression",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -6641,6 +6651,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -9781,6 +9796,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -12498,6 +12518,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -15244,6 +15269,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -17990,6 +18020,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -20736,6 +20771,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -23482,6 +23522,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -26228,6 +26273,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -28974,6 +29024,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -31720,6 +31775,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -34466,6 +34526,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -37212,6 +37277,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -39958,6 +40028,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -42704,6 +42779,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -45450,6 +45530,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -48573,6 +48658,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -51696,6 +51786,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -54819,6 +54914,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -57565,6 +57665,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -60555,6 +60660,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -63652,6 +63762,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -66398,6 +66513,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -69144,6 +69264,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -71890,6 +72015,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -74636,6 +74766,11 @@
           "unit_length",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",

package/common/nameable.js

@@ -1,6 +1,7 @@
-const { knowledgeModule, where } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where, debug } = require('./runtime').theprogrammablemind
 const { defaultContextCheck, defaultContextCheckProperties } = require('./helpers')
 const helpers = require('./helpers')
+const englishHelpers = require('./english_helpers')
 const stm = require('./stm')
 const nameable_tests = require('./nameable.test.json')
 
@@ -14,18 +15,20 @@ class API {
 
   // report is a context
   setName(context, name) {
-    context.stm ??= {}
-    context.stm.names ??= []
-    context.stm.names.push(name)
+    context.namespaced ??= {}
+    context.namespaced.nameable ??= {}
+    context.namespaced.nameable.names ??= []
+    context.namespaced.nameable.names.push(name)
     this.args.config.addWord(name, { id: context.marker, initial: `{ value: "${name}", pullFromContext: true, nameable_named: true }` })
   }
 
+  // used by mongo km
   get(type, name) {
     return this.args.kms.stm.api.mentions({ 
       context: type, 
       condition: (context) => {
-        if (context.stm && context.stm.names) {
-          return context.stm.names.includes(name)
+        if (context.namespaced?.nameable && context.namespaced.nameable.names) {
+          return context.namespaced.nameable.names.includes(name)
         }
       }
     })
@@ -35,8 +38,8 @@ class API {
     const contexts = this.args.kms.stm.api.getByType(type)
     const names = new Set()
     for (const context of contexts) {
-      if (context.stm.names) {
-        for (const name of context.stm.names) {
+      if (context.namespaced?.nameable?.names) {
+        for (const name of context.namespaced.nameable.names) {
           names.add(name)
         }
       }
@@ -45,20 +48,9 @@ class API {
   }
 
   getNames(nameable) {
-    return (nameable.stm && nameable.stm.names) || []
+    return (nameable.namespaced?.nameable && nameable.namespaced.nameable.names) || []
   }
 
-  /*
-  getNames() {
-    const current = this.current()
-    console.log('getReportNames current', JSON.stringify(current, null, 2))
-    return Object.keys(this.objects.namedReports).map( (name) => {
-      const selected = (current.names || []).includes(name)
-      return { name, selected, id: name }
-    })
-  }
-  */
-
   setCurrent(name) {
     const context = this.objects.named[name]
     if (context) {
@@ -83,7 +75,8 @@ const config = {
   name: 'nameable',
   operators: [
     // "([call] ([nameable]) (name))",
-    "([call] ([nameable]) (!@<=endOfSentence)*)",
+    "([call|] ([nameable]) (!@<=endOfSentence)*)",
+    "((nameable) [isCalled|is] (call) (!@<=endOfSentence)*)",
     { pattern: "([getNamesByType] (type))", scope: "testing" },
     { pattern: "([m1])", scope: "testing" },
   ],
@@ -103,11 +96,33 @@ const config = {
         context.isResponse = true
       }
     },
+    {
+      id: 'isCalled',
+      before: ['verb'],
+      bridge: [
+        { "apply": true, "bridge": "{ ...after[0], isCalled: operator }", "set": "operator" },
+        {
+          "rewire": [
+            { "from": 'before[0]', "to": 'after[0]' },
+            { "from": 'after[1]', "to": 'after[1]' },
+          ]
+        },
+        { "apply": true, "operator": "operator", "set": "context" },
+        { "apply": true, bridge: "{ ...context, interpolate: [{ property: 'nameable' }, { property: 'isCalled' }, { property: 'operator' }, { property: 'name' }] }" },
+      ],
+    },
     {
       id: 'call',
       isA: ['verb'],
-      bridge: "{ ...next(operator), nameable: after[0], name: after[1:][0] }",
-      generatorp: async ({context, g, gs}) => `call ${await g(context.nameable)} ${await gs(context.name)}`,
+      words: englishHelpers.conjugateVerb('call'),
+      bridge: `{ 
+        ...next(operator), 
+        nameable: after[0], 
+        name: after[1:][0], 
+        operator: operator, 
+        interpolate: [ { property: 'operator' }, { property: 'nameable' }, { property: 'name' } ] }
+      `,
+      // generatorp: async ({context, g, gs}) => `call ${await g(context.nameable)} ${await gs(context.name)}`,
       semantic: async ({config, context, api, e, verbatim, g}) => {
         // TODO find report being referred to
         // debugger
@@ -133,7 +148,31 @@ const config = {
       { context: [['call', 0], ['that', 0]], choose: 0 },
     ],
   },
-
+  generators: [
+    {
+      where: where(),
+      match: ({context}) => context.namespaced?.nameable?.names,
+      apply: ({context}) => context.namespaced.nameable.names[0],
+    }
+  ],
+  semantics: [
+    {
+      where: where(),
+      match: ({context}) => context.marker == 'mentions' && context.evaluate && context.args.context.nameable_named,
+      apply: async ({callId, _continue, toList, context, kms, e, log, retry}) => {
+        context.args.condition ??= () => true
+        const oldCondition = context.args.condition
+        const name = context.args.context.value
+        context.args.condition = (context) => {
+          if (!context.namespaced?.nameable?.names?.includes(name)) {
+            return
+          }
+          return oldCondition(context)
+        }
+        _continue()
+      }
+    },
+  ],
 }
 
 knowledgeModule( {