tpmkms 9.8.0 → 9.9.0

package/common/dimension.js

@@ -79,6 +79,7 @@ class API {
     config.addOperator(`([${dimension}])`)
     config.addBridge({ 
       id: dimension,
+      where: where(),
       isA: ['dimension'],
       generatorp: async ({context, g}) => context.amount ? `${await g(context.amount)} ${await g(context.unit)}` : context.word,
     })
@@ -98,7 +99,7 @@ class API {
     let evalue;
     let efrom = from
     if (!from.unit) {
-      efrom = (await e(from)).evalue
+      efrom = (await e(from, where())).evalue
     }
     async function convert(to) {
       if (to.value == efrom.unit.value) {
@@ -112,7 +113,7 @@ class API {
           error(reason)
         }
         kms.stm.api.setVariable(efrom.unit.value, efrom.amount)
-        evalue = await e(formula)
+        evalue = await e(formula, where())
       }
       return evalue
     }
@@ -201,14 +202,15 @@ const config = {
       id: "preferredUnits",
       isA: ['verb'],
       bridge: "{ ...next(operator), quantity: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'quantity' }] }",
-      semantic: async ({context, e, api, toArray, resolveResponse}) => {
+      check: defaultContextCheckProperties(['quantity']),
+      semantic: async ({context, e, api, toArray, resolveEvaluate}) => {
         const preferredUnits = await api.getPreferredUnits(context.quantity)
         if (!preferredUnits) {
           return
         }
         const from = context.quantity;
-        const value = await e({ marker: 'convertToUnits', from, to: preferredUnits })
-        resolveResponse(context, value.evalue)
+        const value = await e({ marker: 'convertToUnits', from, to: preferredUnits }, where())
+        resolveEvaluate(context, value.evalue)
       }
     },
     { 
@@ -216,6 +218,7 @@ const config = {
       id: "useUnits",
       isA: ['verb'],
       bridge: "{ ...next(operator), units: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'units' }] }",
+      check: defaultContextCheckProperties(['units']),
       semantic: ({context, api}) => {
         api.setPreferredUnits(context.units)
       }
@@ -253,18 +256,26 @@ const config = {
       before: ['preposition', 'propertyMarker'],
       after: ['mathematical_operator'],
       // bridge: "{ marker: next(operator('quantity')), dead: true, unit: after[0], value: before[0].value, amount: before[0] }" 
-      bridge: "{ marker: next(operator('quantity')), dead: true, unit: after[0], amount: before[0], interpolate: [ { property: 'amount' }, { property: 'unit' } ] }" 
+      bridge: `{ 
+        marker: next(operator('quantity')), 
+        dead: true, 
+        instance: true,
+        unit: after[0], 
+        amount: before[0], 
+        interpolate: [ { property: 'amount' }, { property: 'unit' } ] 
+      }`,
+      check: defaultContextCheckProperties(['unit', 'amount']),
     },
     { 
       where: where(),
       id: "convertToUnits", 
       bridge: "{ ...next(operator), from: before[0], to: after[0] }",
+      check: defaultContextCheckProperties(['from', 'to']),
       isA: ['expression', 'queryable'],
       localHierarchy: [['unknown', 'dimension']],
       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, api, toArray, resolveEvaluate}) => {
+      semantic: async ({context, api, toArray, callId, resolveEvaluate}) => {
         const from = context.from;
         const tos = toArray(context.to);
         resolveEvaluate(context, await api.convertToUnits(context, from, tos))
@@ -273,6 +284,7 @@ const config = {
     { 
       id: "unit", 
       isA: ['mathematicalExpression'],
+      before: ['mathematical_operator'],
     },
   ],
 };
@@ -282,7 +294,7 @@ const template = {
     "amount is a concept",
     "measurement modifies unit",
     "dimension and measurement unit are concepts",
-    "unit means measurement unit",
+    // "unit means measurement unit",
     ({apis}) => {
       apis('properties').addHierarchyWatcher({
         match: ({parentId, isA}) => isA(parentId, 'unit') && parentId.startsWith('unit_'),
@@ -313,6 +325,7 @@ const template = {
       bridges: [
         {
           id: 'useMeasurementSystem',
+          where: where(),
           isA: ['verb'],
           bridge: "{ ...next(operator), system: after[0], interpolate: [ { context: operator }, { property: 'system' } ] }",
           semantic: ({context, api}) => {
@@ -322,6 +335,34 @@ const template = {
         },
       ],
     },
+    {
+      semantics: [
+        {
+          match: ({context, isA, debug}) => {
+            return context.marker == 'unify' && 
+              context.terms.every((term) => isA(term, 'quantity')) &&
+              context.terms.every((term) => term.instance)
+          },
+          apply: async ({context, e, unify, toEValue}) => {
+            const t1 = context.terms[0]
+            const t2 = context.terms[1]
+            if (t1.propertyType !== t2.propertyType) {
+              return
+            }
+            if (t1[t1.propertyType].marker !== t2[t2.propertyType].marker) {
+              return
+            }
+            const convert = await e({ marker: 'convertToUnits', from: t2, to: t1.unit }, where())
+            const t2InT1Units = await toEValue(await toEValue(convert))
+            // debug.coxunter('greg29')
+            if (!await unify(t1.amount, await t2InT1Units.amount)) {
+              // debugger
+            }
+            // debugger
+          }
+        },
+      ],
+    },
   ],
 }
 
@@ -346,6 +387,7 @@ knowledgeModule({
       context: [
         defaultContextCheck({ marker: 'metric_system', exported: true }),
         defaultContextCheck({ marker: 'convertToUnits', exported: true, extra: ['from', 'to'] }),
+        defaultContextCheck({ marker: 'noconversion', exported: true, extra: ['from', 'to'] }),
         defaultContextCheck({ 
           match: ({context, isA}) => isA(context.marker, 'unit'), 
           exported: true,