ekms 9.6.0-beta.14 → 9.6.0-beta.15

package/common/comparable.instance.json

@@ -57,7 +57,7 @@
             "verb",
             "article"
           ],
-          "bridge": "{ ...next(before[0]), property: after, postModifiers: append([after[0].marker], before[0].modifiers), [after[0].marker.id]: after[0] }"
+          "bridge": "{ ...after, condition: before[0], property: after[0], interpolate: [{ property: 'condition' }, { property: 'property' }] }"
         },
         {
           "id": "comparable",
@@ -5364,7 +5364,7 @@
             "verb",
             "article"
           ],
-          "bridge": "{ ...next(before[0]), property: after, postModifiers: append([after[0].marker], before[0].modifiers), [after[0].marker.id]: after[0] }"
+          "bridge": "{ ...after, condition: before[0], property: after[0], interpolate: [{ property: 'condition' }, { property: 'property' }] }"
         },
         {
           "id": "comparable",

package/common/dimension.instance.json

@@ -24,6 +24,8 @@
         "(([amount]) [unit])",
         "((@<=quantity || context.possession == true) [convertToUnits|in] (unit))",
         "(([number]) [degree])",
+        "([useUnits|use] (unit))",
+        "([preferredUnits] (quantity))",
         {
           "pattern": "([length])",
           "scope": "testing"
@@ -61,11 +63,29 @@
       ],
       "bridges": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:104",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:198",
+          "id": "preferredUnits",
+          "isA": [
+            "verb"
+          ],
+          "bridge": "{ ...next(operator), quantity: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'quantity' }] }",
+          "semantic": "async ({context, e, api, toArray, resolveResponse}) => {\n        const preferredUnits = api.getPreferredUnits(context.quantity)\n        if (!preferredUnits) {\n          return\n        }\n        const from = context.quantity;\n        const value = await e({ marker: 'convertToUnits', from, to: preferredUnits })\n        resolveResponse(context, value.evalue)\n      }"
+        },
+        {
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:213",
+          "id": "useUnits",
+          "isA": [
+            "verb"
+          ],
+          "bridge": "{ ...next(operator), units: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'units' }] }",
+          "semantic": "({context, api}) => {\n        api.setPreferredUnits(context.units)\n      }"
+        },
+        {
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:222",
           "id": "dimension"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:108",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:226",
           "id": "quantity",
           "isA": [
             "noun"
@@ -86,7 +106,7 @@
           "id": "amount"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:123",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:241",
           "id": "degree",
           "words": [
             {
@@ -106,7 +126,7 @@
           "bridge": "{ marker: next(operator('quantity')), dead: true, unit: after[0], amount: before[0] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:137",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:255",
           "id": "convertToUnits",
           "bridge": "{ ...next(operator), from: before[0], to: after[0] }",
           "isA": [
@@ -130,7 +150,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 = 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      }"
+          "evaluator": "async ({context, api, toArray, resolveEvaluate}) => {\n        const from = context.from;\n        const tos = toArray(context.to);\n        resolveEvaluate(context, await api.convertToUnits(context, from, tos))\n      }"
         },
         {
           "id": "unit",
@@ -22678,6 +22698,8 @@
         "(([amount]) [unit])",
         "((@<=quantity || context.possession == true) [convertToUnits|in] (unit))",
         "(([number]) [degree])",
+        "([useUnits|use] (unit))",
+        "([preferredUnits] (quantity))",
         {
           "pattern": "([length])",
           "scope": "testing"
@@ -22709,16 +22731,32 @@
       ],
       "generators": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:97"
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:191"
         }
       ],
       "bridges": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:104",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:198",
+          "id": "preferredUnits",
+          "isA": [
+            "verb"
+          ],
+          "bridge": "{ ...next(operator), quantity: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'quantity' }] }"
+        },
+        {
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:213",
+          "id": "useUnits",
+          "isA": [
+            "verb"
+          ],
+          "bridge": "{ ...next(operator), units: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'units' }] }"
+        },
+        {
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:222",
           "id": "dimension"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:108",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:226",
           "id": "quantity",
           "isA": [
             "noun"
@@ -22737,7 +22775,7 @@
           "id": "amount"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:123",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:241",
           "id": "degree",
           "words": [
             {
@@ -22756,7 +22794,7 @@
           "bridge": "{ marker: next(operator('quantity')), dead: true, unit: after[0], amount: before[0] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:137",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:255",
           "id": "convertToUnits",
           "bridge": "{ ...next(operator), from: before[0], to: after[0] }",
           "isA": [

package/common/dimension.js

@@ -35,6 +35,26 @@ class API {
   initialize({ config, objects }) {
     this._config = config
     this._objects = objects
+    objects.preferredUnits = []
+  }
+
+  getPreferredUnits(quantity) {
+    for (const unit of this._objects.preferredUnits) {
+      if (quantity.unit.marker == 'unitPerUnit') {
+        if (quantity.unit.numerator.dimension == unit.numerator.dimension &&
+            quantity.unit.denominator.dimension == unit.denominator.dimension) {
+          return unit
+        }
+      } else if (unit.dimension) {
+        if (unit.dimension == quantity.unit.dimension) {
+          return unit
+        }
+      }
+    }
+  }
+
+  setPreferredUnits(units) {
+    this._objects.preferredUnits.unshift(units)
   }
 
   setMeasurementSystem(measurementSystem) {
@@ -69,6 +89,78 @@ class API {
       })
     }
   }
+
+  async convertToUnits(context, from, tos) {
+    const {kms, e, error, toArray, gp, gr, toList} = this.args
+    let evalue;
+    let efrom = from
+    if (!from.unit) {
+      efrom = (await e(from)).evalue
+    }
+    async function convert(to) {
+      if (to.value == efrom.unit.value) {
+        evalue = efrom.amount
+        evalue.evalue = efrom.amount.value
+      } else {
+        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 })
+          error(reason)
+        }
+        kms.stm.api.setVariable(efrom.unit.value, efrom.amount)
+        evalue = await e(formula)
+      }
+      return evalue
+    }
+
+    let evalues = []
+    for (const to of tos) {
+      evalues.push({ value: await convert(to), to: structuredClone(to) })
+    }
+    evalues.sort((a, b) => a.evalue - b.evalue )
+
+    let fractionalPart = 0
+    let scale = 1
+    for (const evalue of evalues) {
+      const value = toFinalValue(evalue) * scale
+      const integerPart = Math.trunc(value)
+      fractionalPart = Math.abs(value - integerPart)
+      evalue.value.evalue = integerPart
+      scale = fractionalPart / value * scale
+    }
+    // evalues[evalues.length-1].value.evalue = Number((integerPart * (1+scale)).toFixed(4))
+    evalues[evalues.length-1].value.evalue += fractionalPart
+    evalues[evalues.length-1].value.evalue = Number(evalues[evalues.length-1].value.evalue.toFixed(4))
+
+    // remove the zeros
+    evalues = evalues.filter( (evalue) => evalue.value.evalue )
+
+    /*
+    '{
+        "marker":"dimension",
+        "unit":{"marker":"unit","range":{"start":19,"end":25},"word":"celcius","text":"celcius","value":"celcius","unknown":true,"types":["unit","unknown"]},
+        "value":10,
+        "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"]}},
+          "text":"10 degrees celcius","range":{"start":8,"end":25}}'
+    */
+    evalues = evalues.map((evalue) => {
+      const number = evalue.value.evalue == 1 ? 'one' : 'many'
+      evalue.to.number = number
+      return { 
+        paraphrase: true,
+        marker: 'quantity',
+        level: 1,
+        unit: evalue.to,
+        amount: { evalue: evalue.value, paraphrase: undefined }
+      }
+    })
+    if (evalues.length > 1) {
+      return toList(evalues)
+    } else {
+      return evalues[0]
+    }
+  }
 }
 
 // eg, dimension == length; meters == unit; 2 meters == quantity
@@ -83,6 +175,8 @@ const config = {
     "((@<=quantity || context.possession == true) [convertToUnits|in] (unit))",
 
     "(([number]) [degree])",
+    "([useUnits|use] (unit))",
+    "([preferredUnits] (quantity))",
     { pattern: "([length])", scope: "testing" },
   ],
   priorities: [
@@ -100,6 +194,30 @@ const config = {
     },
   ],
   bridges: [
+    { 
+      where: where(),
+      id: "preferredUnits",
+      isA: ['verb'],
+      bridge: "{ ...next(operator), quantity: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'quantity' }] }",
+      semantic: async ({context, e, api, toArray, resolveResponse}) => {
+        const preferredUnits = api.getPreferredUnits(context.quantity)
+        if (!preferredUnits) {
+          return
+        }
+        const from = context.quantity;
+        const value = await e({ marker: 'convertToUnits', from, to: preferredUnits })
+        resolveResponse(context, value.evalue)
+      }
+    },
+    { 
+      where: where(),
+      id: "useUnits",
+      isA: ['verb'],
+      bridge: "{ ...next(operator), units: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'units' }] }",
+      semantic: ({context, api}) => {
+        api.setPreferredUnits(context.units)
+      }
+    },
     { 
       where: where(),
       id: "dimension", 
@@ -142,77 +260,10 @@ const config = {
       after: [['possession', 0], ['possession', 1]],
       generatorp: async ({context, g}) => `${await g(context.from)} ${context.word} ${await g(context.to)}`,
       // evaluator: ({context, kms, error}) => {
-      evaluator: async ({context, kms, e, error, toArray, gp, gr, toList}) => {
+      evaluator: async ({context, api, toArray, resolveEvaluate}) => {
         const from = context.from;
         const tos = toArray(context.to);
-        let evalue;
-        let efrom = from
-        if (!from.unit) {
-          efrom = (await e(from)).evalue
-        }
-        async function convert(to) {
-          if (to.value == efrom.unit.value) {
-            evalue = efrom.amount
-            evalue.evalue = efrom.amount.value
-          } else {
-            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 })
-              error(reason)
-            }
-            kms.stm.api.setVariable(efrom.unit.value, efrom.amount)
-            evalue = await e(formula)
-          }
-          return evalue
-        }
-
-        let evalues = []
-        for (const to of tos) {
-          evalues.push({ value: await convert(to), to: structuredClone(to) })
-        }
-        evalues.sort((a, b) => a.evalue - b.evalue )
-
-        let fractionalPart = 0
-        let scale = 1
-        for (const evalue of evalues) {
-          const value = toFinalValue(evalue) * scale
-          const integerPart = Math.trunc(value)
-          fractionalPart = Math.abs(value - integerPart)
-          evalue.value.evalue = integerPart
-          scale = fractionalPart / value * scale
-        }
-        // evalues[evalues.length-1].value.evalue = Number((integerPart * (1+scale)).toFixed(4))
-        evalues[evalues.length-1].value.evalue += fractionalPart
-        evalues[evalues.length-1].value.evalue = Number(evalues[evalues.length-1].value.evalue.toFixed(4))
-
-        // remove the zeros
-        evalues = evalues.filter( (evalue) => evalue.value.evalue )
-
-        /*
-        '{
-            "marker":"dimension",
-            "unit":{"marker":"unit","range":{"start":19,"end":25},"word":"celcius","text":"celcius","value":"celcius","unknown":true,"types":["unit","unknown"]},
-            "value":10,
-            "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"]}},
-              "text":"10 degrees celcius","range":{"start":8,"end":25}}'
-        */
-        evalues = evalues.map((evalue) => {
-          const number = evalue.value.evalue == 1 ? 'one' : 'many'
-          evalue.to.number = number
-          return { 
-            paraphrase: true,
-            marker: 'quantity',
-            level: 1,
-            unit: evalue.to,
-            amount: { evalue: evalue.value, paraphrase: undefined }
-          }
-        })
-        if (evalues.length > 1) {
-          context.evalue = toList(evalues)
-        } else {
-          context.evalue = evalues[0]
-        }
+        resolveEvaluate(context, await api.convertToUnits(context, from, tos))
       },
     },
     { 
@@ -286,6 +337,7 @@ knowledgeModule({
       objects: [
         { km: 'properties' },
         { path: ['measurementSystem'] },
+        { path: ['preferredUnits'] },
       ],
       context: [
         defaultContextCheck({ marker: 'metric_system', exported: true }),