ekms 9.6.0-beta.5 → 9.6.0-beta.7

package/common/dimension.instance.json

@@ -128,7 +128,7 @@
             ]
           ],
           "generatorp": "async ({context, g}) => `${await g(context.from)} ${context.word} ${await g(context.to)}`",
-          "evaluator": "async ({context, kms, e, error, toArray, gp, gr, toList}) => {\n        const from = context.from;\n        const tos = toArray(context.to);\n        let evalue;\n        let efrom = from\n        if (!from.unit) {\n          efrom = (await e(from)).evalue\n        }\n        async function convert(to) {\n          if (to.value == efrom.unit.value) {\n            evalue = efrom.amount\n            evalue.evalue = efrom.amount.value\n          } else {\n            const formula = kms.formulas.api.get(to, [efrom.unit])\n            if (!formula) {\n              const reason = { marker: 'reason', focusableForPhrase: true, evalue: { marker: 'noconversion', from: efrom.unit, to } }\n              kms.stm.api.mentioned({ context: reason })\n              error(reason)\n            }\n            kms.stm.api.setVariable(efrom.unit.value, efrom.amount)\n            evalue = await e(formula)\n          }\n          return evalue\n        }\n\n        let evalues = []\n        for (const to of tos) {\n          evalues.push({ value: await convert(to), to: structuredClone(to) })\n        }\n        evalues.sort((a, b) => a.evalue - b.evalue )\n\n        let fractionalPart = 0\n        let scale = 1\n        for (const evalue of evalues) {\n          const value = evalue.value.evalue * scale\n          const integerPart = Math.trunc(value)\n          fractionalPart = Math.abs(value - integerPart)\n          evalue.value.evalue = integerPart\n          scale = fractionalPart / value * scale\n        }\n        // evalues[evalues.length-1].value.evalue = Number((integerPart * (1+scale)).toFixed(4))\n        evalues[evalues.length-1].value.evalue += fractionalPart\n        evalues[evalues.length-1].value.evalue = Number(evalues[evalues.length-1].value.evalue.toFixed(4))\n\n        // remove the zeros\n        evalues = evalues.filter( (evalue) => evalue.value.evalue )\n\n        /*\n        '{\n            \"marker\":\"dimension\",\n            \"unit\":{\"marker\":\"unit\",\"range\":{\"start\":19,\"end\":25},\"word\":\"celcius\",\"text\":\"celcius\",\"value\":\"celcius\",\"unknown\":true,\"types\":[\"unit\",\"unknown\"]},\n            \"value\":10,\n            \"amount\":{\"word\":\"degrees\",\"number\":\"many\",\"text\":\"10 degrees\",\"marker\":\"degree\",\"range\":{\"start\":8,\"end\":17},\"value\":10,\"amount\":{\"value\":10,\"text\":\"10\",\"marker\":\"number\",\"word\":\"10\",\"range\":{\"start\":8,\"end\":9},\"types\":[\"number\"]}},\n              \"text\":\"10 degrees celcius\",\"range\":{\"start\":8,\"end\":25}}'\n        */\n        evalues = evalues.map((evalue) => {\n          const number = evalue.value.evalue == 1 ? 'one' : 'many'\n          evalue.to.number = number\n          return { \n            paraphrase: true,\n            marker: 'quantity',\n            level: 1,\n            unit: evalue.to,\n            amount: { evalue: evalue.value, paraphrase: undefined }\n          }\n        })\n        if (evalues.length > 1) {\n          context.evalue = toList(evalues)\n        } else {\n          context.evalue = evalues[0]\n        }\n      }"
+          "evaluator": "async ({context, kms, e, error, toArray, gp, gr, toList}) => {\n        const from = context.from;\n        const tos = toArray(context.to);\n        let evalue;\n        let efrom = from\n        if (!from.unit) {\n          efrom = (await e(from)).evalue\n        }\n        async function convert(to) {\n          if (to.value == efrom.unit.value) {\n            evalue = efrom.amount\n            evalue.evalue = efrom.amount.value\n          } else {\n            const formula = kms.formulas.api.get(to, [efrom.unit])\n            if (!formula) {\n              const reason = { marker: 'reason', focusableForPhrase: true, evalue: { marker: 'noconversion', from: efrom.unit, to } }\n              kms.stm.api.mentioned({ context: reason })\n              error(reason)\n            }\n            kms.stm.api.setVariable(efrom.unit.value, efrom.amount)\n            evalue = await e(formula)\n          }\n          return evalue\n        }\n\n        let evalues = []\n        for (const to of tos) {\n          evalues.push({ value: await convert(to), to: structuredClone(to) })\n        }\n        evalues.sort((a, b) => a.evalue - b.evalue )\n\n        let fractionalPart = 0\n        let scale = 1\n        for (const evalue of evalues) {\n          const value = toFinalValue(evalue) * scale\n          const integerPart = Math.trunc(value)\n          fractionalPart = Math.abs(value - integerPart)\n          evalue.value.evalue = integerPart\n          scale = fractionalPart / value * scale\n        }\n        // evalues[evalues.length-1].value.evalue = Number((integerPart * (1+scale)).toFixed(4))\n        evalues[evalues.length-1].value.evalue += fractionalPart\n        evalues[evalues.length-1].value.evalue = Number(evalues[evalues.length-1].value.evalue.toFixed(4))\n\n        // remove the zeros\n        evalues = evalues.filter( (evalue) => evalue.value.evalue )\n\n        /*\n        '{\n            \"marker\":\"dimension\",\n            \"unit\":{\"marker\":\"unit\",\"range\":{\"start\":19,\"end\":25},\"word\":\"celcius\",\"text\":\"celcius\",\"value\":\"celcius\",\"unknown\":true,\"types\":[\"unit\",\"unknown\"]},\n            \"value\":10,\n            \"amount\":{\"word\":\"degrees\",\"number\":\"many\",\"text\":\"10 degrees\",\"marker\":\"degree\",\"range\":{\"start\":8,\"end\":17},\"value\":10,\"amount\":{\"value\":10,\"text\":\"10\",\"marker\":\"number\",\"word\":\"10\",\"range\":{\"start\":8,\"end\":9},\"types\":[\"number\"]}},\n              \"text\":\"10 degrees celcius\",\"range\":{\"start\":8,\"end\":25}}'\n        */\n        evalues = evalues.map((evalue) => {\n          const number = evalue.value.evalue == 1 ? 'one' : 'many'\n          evalue.to.number = number\n          return { \n            paraphrase: true,\n            marker: 'quantity',\n            level: 1,\n            unit: evalue.to,\n            amount: { evalue: evalue.value, paraphrase: undefined }\n          }\n        })\n        if (evalues.length > 1) {\n          context.evalue = toList(evalues)\n        } else {\n          context.evalue = evalues[0]\n        }\n      }"
         },
         {
           "id": "unit",

package/common/dimension.js

@@ -1,5 +1,5 @@
 const { debug, knowledgeModule, where, Digraph } = require('./runtime').theprogrammablemind
-const { defaultObjectCheck, defaultContextCheck, defaultContextCheckProperties } = require('./helpers')
+const { toFinalValue, defaultObjectCheck, defaultContextCheck, defaultContextCheckProperties } = require('./helpers')
 const hierarchy = require('./hierarchy.js')
 const formulas = require('./formulas.js')
 const testing = require('./testing.js')
@@ -174,7 +174,7 @@ const config = {
         let fractionalPart = 0
         let scale = 1
         for (const evalue of evalues) {
-          const value = evalue.value.evalue * scale
+          const value = toFinalValue(evalue) * scale
           const integerPart = Math.trunc(value)
           fractionalPart = Math.abs(value - integerPart)
           evalue.value.evalue = integerPart

package/common/drone.instance.json

@@ -6,11 +6,10 @@
     "point is a concept",
     "points are nameable orderable and memorable",
     {
-      "apply": "(args) => {\n      expectDirection(args)\n      expectDistanceForMove(args)\n\n      args.config.addSemantic({\n        match: ({context, isA}) => isA(context.marker, 'quantity') && isA(context.unit.marker, 'unitPerUnit'),\n        apply: async ({context, objects, api, gr, fragments, e, say}) => {\n          // send a command to the drone\n          const instantiation = await fragments(\"quantity in meters per second\", { quantity: context })\n          const result = await e(instantiation)\n          const desired_speed = result.evalue.amount.evalue.evalue\n          const desired_power = objects.current.power * (desired_speed / objects.calibration.speedForward)\n          objects.runCommand = true\n          objects.current.power = desired_power \n          objects.current.speedUnitsOfUser = context.unit\n        }\n      })\n\n      args.config.addSemantic({\n        match: ({context, objects, isA}) => objects.current.direction && objects.calibration.isCalibrated && context.marker == 'controlStart',\n        apply: ({context, objects, api}) => {\n          objects.runCommand = false  \n        }\n      })\n\n      args.config.addSemantic({\n        // match: ({context, objects, isA}) => objects.current.direction && objects.calibration.isCalibrated && (context.marker == 'controlEnd' || context.marker == 'controlBetween'),\n        match: ({context, objects, isA}) => objects.current.direction && objects.calibration.isCalibrated && context.marker == 'controlEnd',\n        apply: async ({context, objects, api}) => {\n          // send a command to the drone\n          if (objects.runCommand) {\n            await api.sendCommand()\n          }\n        }\n      })\n    }"
+      "apply": "(args) => {\n      expectDirection(args)\n      expectDistanceForMove(args)\n\n      args.config.addSemantic({\n        match: ({context, isA}) => isA(context.marker, 'quantity') && isA(context.unit.marker, 'unitPerUnit'),\n        apply: async ({context, objects, api, gr, fragments, e, say}) => {\n          // send a command to the drone\n          const instantiation = await fragments(\"quantity in meters per second\", { quantity: context })\n          const result = await e(instantiation)\n          const desired_speed = result.evalue.amount.evalue.evalue\n          objects.runCommand = true\n          objects.current.speed = desired_speed\n          objects.current.speedUnitsOfUser = context.unit\n        }\n      })\n\n      args.config.addSemantic({\n        match: ({context, objects, isA}) => objects.current.direction && context.marker == 'controlStart',\n        apply: ({context, objects, api}) => {\n          objects.runCommand = false  \n        }\n      })\n\n      args.config.addSemantic({\n        match: ({context, objects, isA}) => objects.current.direction && context.marker == 'controlEnd',\n        apply: async ({context, objects, api}) => {\n          // send a command to the drone\n          if (objects.runCommand) {\n            await api.sendCommand()\n          }\n        }\n      })\n    }"
     },
     {
       "operators": [
-        "([calibrate])",
         "([back])",
         "([turn] (direction))",
         "([pause] ([number]))",
@@ -24,7 +23,7 @@
           "isA": [
             "noun"
           ],
-          "semantic": "async ({objects, mentions, api, e, context}) => {\n            if (api.isCalibrated()) {\n              objects.runCommand = true\n              const ordinal = objects.current.ordinal - 1\n              const lastPoint = mentions({ context: { marker: 'point' }, condition: (context) => context.ordinal == ordinal })\n              objects.current.destination = lastPoint\n            }\n          }"
+          "semantic": "async ({objects, mentions, api, e, context}) => {\n            objects.runCommand = true\n            const ordinal = api.currentOrdinal() - 1\n            const lastPoint = mentions({ context: { marker: 'point' }, condition: (context) => context.ordinal == ordinal })\n            objects.current.destination = lastPoint\n          }"
         },
         {
           "id": "toPoint",
@@ -32,7 +31,7 @@
             "preposition"
           ],
           "bridge": "{ ...next(operator), operator: operator, point: after[0], interpolate: [{ property: 'operator' }, { property: 'point' }] }",
-          "semantic": "async ({objects, api, e, context}) => {\n            if (api.isCalibrated()) {\n              objects.runCommand = true\n              const point = await e(context.point)\n              objects.current.destination = point.evalue\n            }\n          }"
+          "semantic": "async ({objects, api, e, context}) => {\n            objects.runCommand = true\n            const point = await e(context.point)\n            objects.current.destination = point.evalue\n          }"
         },
         {
           "id": "go"
@@ -45,17 +44,6 @@
           "bridge": "{ ...next(operator), direction: after[0], interpolate: [{ context: operator }, { property: 'direction' }] }",
           "semantic": "({context, objects, api}) => {\n            objects.runCommand = true\n            objects.current.direction = context.direction.marker\n          }"
         },
-        {
-          "id": "calibrate",
-          "words": [
-            "configure"
-          ],
-          "isA": [
-            "verb"
-          ],
-          "bridge": "{ ...next(operator), interpolate: [{ context: operator }] }",
-          "semantic": "async ({context, objects, api, mentioned}) => {\n            let power = 20\n            const moveTimeInSeconds = 0.5\n            let distanceInCM = 0\n            let startBackward\n            for (; power < 30; ++power) {\n              const start = await api.sonic();\n              await api.forward(power, { batched: true })\n              await api.pause(moveTimeInSeconds, { batched: true })\n              await api.stop()\n              const end = await api.sonic();\n              if (end !== start) {\n                distanceInCM = start - end\n                startBackward = end\n                break;\n              }\n            }\n\n            const metersPerSecondForward = (distanceInCM/100)/moveTimeInSeconds\n\n            // reset\n\n            await api.backward(power, { batched: true })\n            await api.pause(moveTimeInSeconds, { batched: true })\n            await api.stop()\n            const endBackward = await api.sonic();\n\n            const metersPerSecondBackward = ((endBackward-startBackward)/100)/moveTimeInSeconds\n    \n            // console.log(`Distance ${distance} cm`)\n            // console.log(`Time ${moveTime} ms`)\n            // console.log(`M/S ${metersPerSecond}`)\n\n            objects.calibration.minPower = power\n            objects.calibration.power = power\n            objects.current.power = power\n            objects.calibration.speedForward = metersPerSecondForward\n            objects.calibration.speedBackward = metersPerSecondBackward\n            objects.calibration.isCalibrated = true\n\n            const ordinal = api.nextOrdinal()\n            mentioned({ marker: 'point', ordinal, point: { x: 0, y: 0 }, description: \"start\" })\n            objects.current.ordinal = ordinal\n\n            api.saveCalibration(objects.calibration)\n          }"
-        },
         {
           "id": "pause",
           "isA": [
@@ -73,7 +61,7 @@
             "1": "{ marker: 'drone' }"
           },
           "bridge": "{ ...next(operator), object: after[0], interpolate: [{ context: operator }, { property: 'object' }] }",
-          "semantic": "async ({mentioned, context, objects, api, say}) => {\n            if (!objects.calibration.isCalibrated) {\n              return // ignore\n            }\n            if (objects.calibration.speedForward) {\n              await api.stop()\n              api.markCurrentPoint()\n            } else {\n              const stopTime = await api.stop()\n              objects.calibration.endTime = stopTime\n              objects.calibration.duration = (objects.calibration.endTime - objects.calibration.startTime)/1000\n            }\n          }"
+          "semantic": "async ({mentioned, context, objects, api, say}) => {\n            await api.stop()\n            api.markCurrentPoint()\n          }"
         }
       ],
       "generators": [
@@ -15683,12 +15671,11 @@
       }
     },
     {
-      "apply": "(args) => {\n      expectDirection(args)\n      expectDistanceForMove(args)\n\n      args.config.addSemantic({\n        match: ({context, isA}) => isA(context.marker, 'quantity') && isA(context.unit.marker, 'unitPerUnit'),\n        apply: async ({context, objects, api, gr, fragments, e, say}) => {\n          // send a command to the drone\n          const instantiation = await fragments(\"quantity in meters per second\", { quantity: context })\n          const result = await e(instantiation)\n          const desired_speed = result.evalue.amount.evalue.evalue\n          const desired_power = objects.current.power * (desired_speed / objects.calibration.speedForward)\n          objects.runCommand = true\n          objects.current.power = desired_power \n          objects.current.speedUnitsOfUser = context.unit\n        }\n      })\n\n      args.config.addSemantic({\n        match: ({context, objects, isA}) => objects.current.direction && objects.calibration.isCalibrated && context.marker == 'controlStart',\n        apply: ({context, objects, api}) => {\n          objects.runCommand = false  \n        }\n      })\n\n      args.config.addSemantic({\n        // match: ({context, objects, isA}) => objects.current.direction && objects.calibration.isCalibrated && (context.marker == 'controlEnd' || context.marker == 'controlBetween'),\n        match: ({context, objects, isA}) => objects.current.direction && objects.calibration.isCalibrated && context.marker == 'controlEnd',\n        apply: async ({context, objects, api}) => {\n          // send a command to the drone\n          if (objects.runCommand) {\n            await api.sendCommand()\n          }\n        }\n      })\n    }"
+      "apply": "(args) => {\n      expectDirection(args)\n      expectDistanceForMove(args)\n\n      args.config.addSemantic({\n        match: ({context, isA}) => isA(context.marker, 'quantity') && isA(context.unit.marker, 'unitPerUnit'),\n        apply: async ({context, objects, api, gr, fragments, e, say}) => {\n          // send a command to the drone\n          const instantiation = await fragments(\"quantity in meters per second\", { quantity: context })\n          const result = await e(instantiation)\n          const desired_speed = result.evalue.amount.evalue.evalue\n          objects.runCommand = true\n          objects.current.speed = desired_speed\n          objects.current.speedUnitsOfUser = context.unit\n        }\n      })\n\n      args.config.addSemantic({\n        match: ({context, objects, isA}) => objects.current.direction && context.marker == 'controlStart',\n        apply: ({context, objects, api}) => {\n          objects.runCommand = false  \n        }\n      })\n\n      args.config.addSemantic({\n        match: ({context, objects, isA}) => objects.current.direction && context.marker == 'controlEnd',\n        apply: async ({context, objects, api}) => {\n          // send a command to the drone\n          if (objects.runCommand) {\n            await api.sendCommand()\n          }\n        }\n      })\n    }"
     },
     {
       "extraConfig": true,
       "operators": [
-        "([calibrate])",
         "([back])",
         "([turn] (direction))",
         "([pause] ([number]))",
@@ -15720,16 +15707,6 @@
           ],
           "bridge": "{ ...next(operator), direction: after[0], interpolate: [{ context: operator }, { property: 'direction' }] }"
         },
-        {
-          "id": "calibrate",
-          "words": [
-            "configure"
-          ],
-          "isA": [
-            "verb"
-          ],
-          "bridge": "{ ...next(operator), interpolate: [{ context: operator }] }"
-        },
         {
           "id": "pause",
           "isA": [
@@ -15927,11 +15904,6 @@
           "verb",
           false
         ],
-        [
-          "calibrate",
-          "verb",
-          false
-        ],
         [
           "call",
           "verb",
@@ -18718,11 +18690,6 @@
           "verb",
           false
         ],
-        [
-          "calibrate",
-          "verb",
-          false
-        ],
         [
           "call",
           "verb",
@@ -21780,11 +21747,6 @@
           "verb",
           false
         ],
-        [
-          "calibrate",
-          "verb",
-          false
-        ],
         [
           "call",
           "verb",
@@ -24762,11 +24724,6 @@
           "verb",
           false
         ],
-        [
-          "calibrate",
-          "verb",
-          false
-        ],
         [
           "call",
           "verb",