barometer -- 的测试带上 promises

Author: xieyuheng

TODO.md

@@ -2,7 +2,7 @@
 >
 > - https://github.com/cicada-lang/propagator/issues/2
 
-`barometer` -- 的测试带上 `promises` -- 用论文中讲故事的方式来写测试
+`coercing`
 
 fix `isContradiction` for `Supported`
 

src/dependency/supportedMerge.ts

@@ -6,15 +6,15 @@ export function supportedMerge<A, B>(
   content: Supported<A>,
   increment: Supported<B>,
 ): Supported<A | B> | Contradiction {
-  const mergedContent = merge(content.value, increment.value)
+  const mergedValue = merge(content.value, increment.value)
 
   // 这里的 cases 可以写成更对称的样子，
   // 但是这里为了效率（少调用 merge 的次数），
   // 写的不是那么对称了。
 
-  if (mergedContent === content.value) {
+  if (mergedValue === content.value) {
     // 正向和反向的 implies 代表等价。
-    if (implies(increment, mergedContent)) {
+    if (implies(increment.value, mergedValue)) {
       // 倾向于 content，除非 increment 真的有更多信息。
       if (setIsSubsetOf(content.supports, increment.supports)) {
         return content
@@ -26,10 +26,10 @@ export function supportedMerge<A, B>(
     return content
   }
 
-  if (mergedContent === increment.value) {
+  if (mergedValue === increment.value) {
     return increment
   }
 
   const mergedSupports = setUnion(content.supports, increment.supports)
-  return Supported(mergedContent, mergedSupports)
+  return Supported(mergedValue, mergedSupports)
 }

src/examples/barometer.test.ts

@@ -81,7 +81,68 @@ test("examples / barometer / with supported value", async () => {
   put(barometerHeight, Supported(Interval(0.3, 0.32), new Set(["shadows"])))
   put(barometerShadow, Supported(Interval(0.36, 0.37), new Set(["shadows"])))
 
-  // await run()
+  await run()
+
+  assert.deepStrictEqual(buildingHeight.content.supports, new Set(["shadows"]))
+  assert(
+    intervalAlmostEqual(
+      buildingHeight.content.value,
+      Interval(44.514, 48.978),
+      0.001,
+    ),
+  )
+
+  const fallTime = Cell()
+  fallDuration(fallTime, buildingHeight)
+  put(fallTime, Supported(Interval(2.9, 3.3), new Set(["lousy-fall-time"])))
+
+  await run()
+
+  assert.deepStrictEqual(buildingHeight.content.supports, new Set(["shadows"]))
+  assert(
+    intervalAlmostEqual(
+      buildingHeight.content.value,
+      Interval(44.514, 48.978),
+      0.001,
+    ),
+  )
+
+  put(fallTime, Supported(Interval(2.9, 3.1), new Set(["better-fall-time"])))
+
+  await run()
+
+  assert.deepStrictEqual(
+    buildingHeight.content.supports,
+    new Set(["shadows", "better-fall-time"]),
+  )
+  assert(
+    intervalAlmostEqual(
+      buildingHeight.content.value,
+      Interval(44.514, 47.243),
+      0.001,
+    ),
+  )
+
+  put(buildingHeight, Supported(45, new Set(["superintendent"])))
+
+  await run()
+
+  assert.deepStrictEqual(
+    buildingHeight.content.supports,
+    new Set(["superintendent"]),
+  )
+  assert.deepStrictEqual(buildingHeight.content.value, 45)
+
+  console.log(barometerHeight.content)
+  console.log(barometerShadow.content)
+  console.log(buildingShadow.content)
+  console.log(fallTime.content)
+
+  {
+    const [t, h] = fallDuration()
+    put(h, 45)
 
-  // console.log(buildingHeight)
+    await run()
+    console.log(t.content)
+  }
 })

src/merge/merge.ts

@@ -1,5 +1,5 @@
 import { isNothing } from "../cell/index.js"
-import { isSupported, supportedMerge } from "../dependency/index.js"
+import { Supported, isSupported, supportedMerge } from "../dependency/index.js"
 import { defineGeneric, defineHandler } from "../generic/index.js"
 import {
   intervalContainsNumber,
@@ -36,11 +36,15 @@ import { theContradiction } from "./Contradiction.js"
 export const merge = defineGeneric({
   default(...args) {
     // no default, be explicit.
-    console.error({
-      who: "merge",
-      message: "Unhandled args.",
-      args,
-    })
+    console.dir(
+      {
+        who: "merge",
+        message: "Unhandled args.",
+        args,
+        this: this,
+      },
+      { depth: null },
+    )
 
     throw new Error(`[merge] Unhandled args.`)
   },
@@ -78,4 +82,14 @@ defineHandler(merge, [isNumber, isInterval], (content, increment) =>
   intervalContainsNumber(increment, content) ? content : theContradiction,
 )
 
+function isSimple(x: any): boolean {
+  return isNumber(x) || isInterval(x)
+}
+
 defineHandler(merge, [isSupported, isSupported], supportedMerge)
+defineHandler(merge, [isSimple, isSupported], (v, m) =>
+  supportedMerge(Supported(v, new Set()), m),
+)
+defineHandler(merge, [isSupported, isSimple], (m, v) =>
+  supportedMerge(m, Supported(v, new Set())),
+)