beliefEqual & beliefSystemEqual take optional valueEqual

cicada-lang · Sep 6, 2024 · 6824936 · 6824936
1 parent 3e9e572
commit 6824936
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 17 deletions.
diff --git a/TODO.md b/TODO.md
@@ -1,5 +1,3 @@
-`beliefEqual` take optional `valueEqual`
-
 # 4.4 Dependencies Improve Search
 
 > https://github.com/cicada-lang/propagator/issues/4

diff --git a/src/belief-system/beliefSystemEqual.ts b/src/belief-system/beliefSystemEqual.ts
@@ -5,11 +5,11 @@ import type { BeliefSystem } from "./BeliefSystem.js"
 export function beliefSystemEqual<A>(
   x: BeliefSystem<A>,
   y: BeliefSystem<A>,
-  options: {
-    valueEqual: (x: A, y: A) => boolean
+  options?: {
+    valueEqual?: (x: A, y: A) => boolean
   },
 ): boolean {
-  const { valueEqual } = options
+  const valueEqual = options?.valueEqual || ((x, y) => x === y)
 
   const equal = (x: Belief<A>, y: Belief<A>) =>
     beliefEqual(x, y, { valueEqual })

diff --git a/src/belief/beliefEqual.ts b/src/belief/beliefEqual.ts
@@ -4,9 +4,11 @@ import { type Belief } from "./index.js"
 export function beliefEqual<A>(
   x: Belief<A>,
   y: Belief<A>,
-  options: {
-    valueEqual: (x: A, y: A) => boolean
+  options?: {
+    valueEqual?: (x: A, y: A) => boolean
   },
 ): boolean {
-  return options.valueEqual(x.value, y.value) && setEqual(x.reasons, y.reasons)
+  const valueEqual = options?.valueEqual || ((x, y) => x === y)
+
+  return valueEqual(x.value, y.value) && setEqual(x.reasons, y.reasons)
 }
diff --git a/src/examples/barometer-belief-system.test.ts b/src/examples/barometer-belief-system.test.ts
@@ -277,9 +277,6 @@ test("examples / barometer-belief-system", async () => {
       beliefEqual(
         beliefSystemQuery(buildingHeight.content) as Belief<any>,
         Belief(45, ["superintendent"]),
-        {
-          valueEqual: (x, y) => x === y,
-        },
       ),
   )
 
@@ -295,9 +292,6 @@ test("examples / barometer-belief-system", async () => {
       beliefEqual(
         beliefSystemQuery(buildingHeight.content) as Belief<any>,
         Belief(45, ["superintendent"]),
-        {
-          valueEqual: (x, y) => x === y,
-        },
       ),
   )
 
@@ -437,9 +431,6 @@ test("examples / barometer-belief-system", async () => {
       beliefEqual(
         beliefSystemQuery(buildingHeight.content) as Belief<any>,
         Belief(theMergeConflict, ["pressure", "superintendent"]),
-        {
-          valueEqual: (x, y) => x === y,
-        },
       ),
   )