ekms 8.0.0 → 8.1.0

package/common/formulas.js

@@ -1,4 +1,4 @@
-const { Config, knowledgeModule, where, Digraph } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where, Digraph } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const dialogues = require('./dialogues.js')
 const pos = require('./pos.js')
@@ -91,7 +91,7 @@ class API {
 }
 */
 
-let configStruct = {
+let config = {
   name: 'formulas',
   operators: [
     // TODO notations like (([arg1:]) [op] ([arg2:nameOfArg2}|word1])) -> just make the bridge + operators. put this in the bridge def / also calculate generators
@@ -102,16 +102,16 @@ let configStruct = {
     "(([expression]) [equals] ([expression]))",
   ],
   priorities: [
-    { "context": [['mathematicalOperator', 0], ['number', 0], ], "choose": [0] },
+    { "context": [['mathematical_operator', 0], ['number', 0], ], "choose": [0] },
   ],
   semantics: [
     {
       where: where(),
       match: ({context, api}) => context.evaluate && api.get(context),
-      apply: ({context, api, e}) => {
+      apply: async ({context, api, e}) => {
         const { formula } = api.get(context)
         // console.log('greg24 -----------', JSON.stringify(formula, null, 2))
-        context.evalue = e(formula) 
+        context.evalue = await e(formula) 
       }    
     },
   ],
@@ -122,7 +122,7 @@ let configStruct = {
       isA: ['preposition', 'queryable'],
       convolution: true,
       bridge: "{ number: before[0].number, ...next(operator), what: before[0], equality: after[0], variable: after[1] }",
-      generatorp: ({context, g}) => `${g(context.what)} ${g(context.equality)} ${g(context.variable)}`,
+      generatorp: async ({context, g}) => `${await g(context.what)} ${await g(context.equality)} ${await g(context.variable)}`,
       evaluator: ({context, api, objects}) => {
         const formulas = api.gets(context.variable).map((f) => { return { ...f.equality, paraphrase: true } })
         context.evalue = { marker: 'list', value: formulas }
@@ -132,7 +132,7 @@ let configStruct = {
       where: where(),
       id: 'solve', 
       bridge: "{ ...next(operator), equality: after[0], variable: after[2] }",
-      generatorp: ({context, gp}) => `${context.word} ${gp(context.equality)} for ${gp(context.variable)}`,
+      generatorp: async ({context, gp}) => `${context.word} ${await gp(context.equality)} for ${await gp(context.variable)}`,
       semantic: ({context}) => {
         context.response = solveFor(context.equality, context.variable)
         context.isResponse = true
@@ -153,17 +153,17 @@ let configStruct = {
     {
       id: 'expression',
       children: ['mathematicalExpression', 'number'],
-      before: ['verby'],
+      before: ['verb'],
     },
     {
       where: where(),
       id: 'calculate',
-      isA: ['verby'],
+      isA: ['verb'],
       bridge: "{ ...next(operator), expression: after[0] }",
-      generatorp: ({context, g}) => `${context.word} ${g(context.expression)}`,
+      generatorp: async ({context, g}) => `${context.word} ${await g(context.expression)}`,
       localHierarchy: [ ['unknown', 'expression'] ],
-      semantic: ({context, e}) => {
-        context.evalue = e(context.expression)
+      semantic: async ({context, e}) => {
+        context.evalue = await e(context.expression)
         context.isResponse = true
       } 
     },
@@ -172,10 +172,10 @@ let configStruct = {
       id: 'equals',
       bridge: "{ ...next(operator), left: before[0], right: after[0] }",
       words: ['='],
-      after: ['mathematicalOperator'],
+      after: ['mathematical_operator'],
       // TODO have this be per argument then 'is' can map to equals where this only applied to before[0] and not after[0]
       localHierarchy: [ ['unknown', 'expression'] ],
-      generatorp: ({context, gp}) => `${gp(context.left)} ${context.word} ${gp(context.right)}`,
+      generatorp: async ({context, gp}) => `${await gp(context.left)} ${context.word} ${await gp(context.right)}`,
       semantic: ({context, api}) => {
         // TODO make sure left is a single name
         // TODO calculate invertable formulas?
@@ -188,31 +188,24 @@ let configStruct = {
 const template = {
   configs: [
     "formulas are concepts",
-    configStruct,
+    config,
   ]
 }
 
-const createConfig = () => {
-  const api = new API()
-  config = new Config({ name: 'formulas' }, module)
-  config.stop_auto_rebuild()
-  config.add(dialogues(), pos(), math(), hierarchy(), comparable(), countable())
-  config.api = api
-  config.restart_auto_rebuild()
-  return config
-}
-
 knowledgeModule({ 
+  config: { name: 'formulas' },
+  includes: [dialogues, pos, math, hierarchy, comparable, countable],
+  api: () => new API(),
+
   module,
   description: 'Formulas using math',
-  createConfig,
   template: { template, instance },
   test: {
     name: './formulas.test.json',
     contents: tests,
     checks: {
       objects: ['formulas'],
-      context: defaultContextCheck,
+      context: defaultContextCheck(),
     }
   },
 })