tpmkms_4wp 8.9.1-beta.2 → 8.9.1-beta.20

package/common/math.instance.json

@@ -211,7 +211,7 @@
       "hierarchy": [
         [
           "a",
-          "articlePOS",
+          "article",
           false
         ],
         [
@@ -225,8 +225,8 @@
           false
         ],
         [
-          "articlePOS",
-          "articlePOS",
+          "article",
+          "article",
           false
         ],
         [
@@ -344,11 +344,21 @@
           "theAble",
           false
         ],
+        [
+          "distributable",
+          "queryable",
+          false
+        ],
         [
           "doubleQuote",
           "queryable",
           false
         ],
+        [
+          "each",
+          "article",
+          false
+        ],
         [
           "evaluate",
           "verb",
@@ -356,7 +366,7 @@
         ],
         [
           "every",
-          "quantifier",
+          "article",
           false
         ],
         [
@@ -701,7 +711,7 @@
         ],
         [
           "the",
-          "articlePOS",
+          "article",
           false
         ],
         [
@@ -892,6 +902,7 @@
             "level": 1
           },
           "level": 1,
+          "context_index": 1,
           "topLevel": true,
           "touchedBy": [
             "math#call2"

package/common/math.js

@@ -69,7 +69,7 @@ const mathematicalOperator = (name, words, apply, before = []) => [
   }
 ]
     
-let config = {
+const config = {
   name: 'math',
   operators: [
     "([mathematicalExpression])",

package/common/meta.js

@@ -17,7 +17,7 @@ const template = {
 };
 
 // TODO -> if a car's top speed is over 200 mph then the car is fast
-let config = {
+const config = {
   name: 'meta',
   operators: [
     "((phrase) [means] (phrase))",
@@ -208,7 +208,7 @@ let config = {
               //const mappings = mappingss[0]
               let toPrimes = []
               for (const [TO, mappings] of zip(DEFINITIONs, mappingss)) {
-                for (let { from, to } of invertMappings(mappings)) {
+                for (const { from, to } of invertMappings(mappings)) {
                   hashIndexesSet(TO, to, hashIndexesGet(context, from))
                 }
                 // next move add debug arg to s and g
@@ -236,7 +236,7 @@ let config = {
                   for (const [relations, mappings] of toPrimes) {
                     for (const relation of relations.evalue.value) {
                       valuePrime = _.cloneDeep(DERIVED)
-                      for (let { from, to } of mappings) {
+                      for (const { from, to } of mappings) {
                         hashIndexesSet(valuePrime, to, hashIndexesGet(relation, from))
                       }
                       valuePrime.paraphrase = true
@@ -303,7 +303,7 @@ let config = {
           const matchByValue = (defContext) => ({context}) => context.evalue == defContext.from.value && !context.query && !context.objects
           const apply = (mappings, TO) => async ({context, s}) => {
             TO = _.cloneDeep(TO)
-            for (let { from, to } of mappings) {
+            for (const { from, to } of mappings) {
               hashIndexesSet(TO, to, hashIndexesGet(context, from))
             }
             toPrime = await s(TO)
@@ -330,7 +330,7 @@ let config = {
           const matchByValue = (defContext) => ({context, uuid}) => context.value == defContext.from.value && (context.query || context.evaluate) && !context[`disable${uuid}`]
           const apply = (mappings, TO) => async ({uuid, context, s, g, config}) => {
             TO = _.cloneDeep(TO)
-            for (let { from, to } of mappings) {
+            for (const { from, to } of mappings) {
               hashIndexesSet(TO, to, hashIndexesGet(context, from))
             }
             // next move add debug arg to s and g

package/common/negation.js

@@ -4,7 +4,7 @@ const gdefaults = require('./gdefaults')
 const pos = require('./pos')
 const negation_tests = require('./negation.test.json')
 
-let config = {
+const config = {
   name: 'negation',
   operators: [
     "([negatable])",

package/common/numbers.js

@@ -10,7 +10,7 @@ const sdefaults = require('./sdefaults')
     10 million 300 hundred and fifty
 */
 
-let config = {
+const config = {
   name: 'numbers',
   operators: [
     "([number])",

package/common/ordering.instance.json

@@ -8,7 +8,7 @@
       "hierarchy": [
         [
           "a",
-          "articlePOS",
+          "article",
           false
         ],
         [
@@ -17,8 +17,8 @@
           false
         ],
         [
-          "articlePOS",
-          "articlePOS",
+          "article",
+          "article",
           false
         ],
         [
@@ -66,16 +66,31 @@
           "orAble",
           false
         ],
+        [
+          "distributable",
+          "queryable",
+          false
+        ],
         [
           "doubleQuote",
           "queryable",
           false
         ],
+        [
+          "each",
+          "article",
+          false
+        ],
         [
           "evaluate",
           "verb",
           false
         ],
+        [
+          "every",
+          "article",
+          false
+        ],
         [
           "hate",
           "canBeDoQuestion",
@@ -293,7 +308,7 @@
         ],
         [
           "the",
-          "articlePOS",
+          "article",
           false
         ],
         [
@@ -650,7 +665,7 @@
               },
               "types": [
                 "list",
-                "queryable"
+                "unknown"
               ],
               "listable": true,
               "isList": true,
@@ -666,7 +681,6 @@
                     "end": 26
                   },
                   "types": [
-                    "queryable",
                     "unknown"
                   ],
                   "dead": true,
@@ -683,7 +697,6 @@
                     "end": 37
                   },
                   "types": [
-                    "queryable",
                     "unknown"
                   ],
                   "dead": true,
@@ -696,6 +709,7 @@
           },
           "dead": true,
           "level": 2,
+          "context_index": 1,
           "topLevel": true,
           "touchedBy": [
             "ordering#call2"
@@ -740,32 +754,6 @@
             0
           ]
         ],
-        [
-          [
-            "between",
-            0
-          ],
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "unknown",
-            1
-          ],
-          [
-            "xfx",
-            0
-          ]
-        ],
         [
           [
             "between",
@@ -885,7 +873,7 @@
       "hierarchy": [
         [
           "a",
-          "articlePOS",
+          "article",
           false
         ],
         [
@@ -894,8 +882,8 @@
           false
         ],
         [
-          "articlePOS",
-          "articlePOS",
+          "article",
+          "article",
           false
         ],
         [
@@ -943,16 +931,31 @@
           "orAble",
           false
         ],
+        [
+          "distributable",
+          "queryable",
+          false
+        ],
         [
           "doubleQuote",
           "queryable",
           false
         ],
+        [
+          "each",
+          "article",
+          false
+        ],
         [
           "evaluate",
           "verb",
           false
         ],
+        [
+          "every",
+          "article",
+          false
+        ],
         [
           "hate",
           "canBeDoQuestion",
@@ -1170,7 +1173,7 @@
         ],
         [
           "the",
-          "articlePOS",
+          "article",
           false
         ],
         [
@@ -2014,6 +2017,7 @@
             "level": 1
           },
           "level": 1,
+          "context_index": 1,
           "topLevel": true,
           "touchedBy": [
             "ordering#call2"
@@ -2299,32 +2303,6 @@
         0
       ]
     ],
-    [
-      [
-        "between",
-        0
-      ],
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ],
-      [
-        "unknown",
-        1
-      ],
-      [
-        "xfx",
-        0
-      ]
-    ],
     [
       [
         "between",

package/common/ordinals.js

@@ -1,10 +1,11 @@
 const { knowledgeModule, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const ordinals_tests = require('./ordinals.test.json')
+const articles = require('./articles')
 const numbers = require('./numbers')
 const pos = require('./pos')
 
-let config = {
+const config = {
   name: 'ordinals',
   operators: [
     "([ordinal])",
@@ -18,12 +19,14 @@ let config = {
     },
     { 
       id: "orderable", 
-      bridge: "{ ...next(operator) }" 
+      bridge: "{ ...next(operator) }",
+      isA: ['queryable'],
     },
     { 
       id: "ordinalOnOrdered", 
       isA: ['adjective'],
       convolution: true,
+      // bridge: "{ ...after[0], ordinal: before[0], modifiers: append(['ordinal'], after[0].modifiers), generate: append(['ordinal'], or(after[0].generate, after)) }" 
       bridge: "{ ...after[0], ordinal: before[0], modifiers: append(['ordinal'], after[0].modifiers) }" 
     },
   ],
@@ -39,13 +42,16 @@ let config = {
     },
     patterns: [
       { "pattern": [{ type: 'digit' }, { repeat: true }, 'th'], defs: [{id: "ordinal", uuid: '1', initial: "{ value: int(substr(text, -2)), ordinal: true, instance: true }" }]},
+      { "pattern": [{ type: 'digit' }, { repeat: true }, '1st'], defs: [{id: "ordinal", uuid: '1', initial: "{ value: int(substr(text, -2)), ordinal: true, instance: true }" }]},
+      { "pattern": [{ type: 'digit' }, { repeat: true }, '2nd'], defs: [{id: "ordinal", uuid: '1', initial: "{ value: int(substr(text, -2)), ordinal: true, instance: true }" }]},
+      { "pattern": [{ type: 'digit' }, { repeat: true }, '3rd'], defs: [{id: "ordinal", uuid: '1', initial: "{ value: int(substr(text, -2)), ordinal: true, instance: true }" }]},
     ],
   },
 };
 
 knowledgeModule( { 
   config,
-  includes: [pos, numbers],
+  includes: [pos, numbers, articles],
 
   module,
   description: 'talking about ordinals',