move functions about belief from belief-system/ to belief/

TODO.md

@@ -2,11 +2,10 @@
 
 > https://github.com/cicada-lang/propagator/issues/4
 
-恢复之前实现时忽略的 check-consistent! 和 process-nogood!
+`nogood/` -- global map about about nogood
+`nogood/` -- `processNogood` -- should be called by `checkConsistent`
 
-- belief-system/checkConsistent.ts
-
-global map about about nogood
+`checkConsistent` -- 恢复之前实现时忽略的 check-consistent!
 
 propagators/binaryAmb
 propagators/oneOf

src/belief-system/assimilateBelief.ts

@@ -1,7 +1,7 @@
-import type { Belief } from "../belief/Belief.js"
-import { type Nothing, isNothing } from "../nothing/Nothing.js"
+import type { Belief } from "../belief/index.js"
+import { isStrongerBelief } from "../belief/index.js"
+import { type Nothing, isNothing } from "../nothing/index.js"
 import { BeliefSystem } from "./BeliefSystem.js"
-import { isStrongerBelief } from "./isStrongerBelief.js"
 
 export function assimilateBelief<A>(
   base: BeliefSystem<A>,

src/belief-system/beliefSystemMerge.ts

@@ -1,7 +1,10 @@
+import {
+  beliefMergeManyStillBelieved,
+  checkConsistent,
+} from "../belief/index.js"
 import { type Contradiction } from "../contradiction/index.js"
 import { assimilateBelief } from "./assimilateBelief.js"
 import { assimilateBeliefSystem } from "./assimilateBeliefSystem.js"
-import { beliefMergeManyStillBelieved } from "./beliefMergeManyStillBelieved.js"
 import { BeliefSystem } from "./BeliefSystem.js"
 
 // Asking the belief system to deduce all the consequences of all its
@@ -16,6 +19,6 @@ export function beliefSystemMerge<A>(
 ): BeliefSystem<A> | Contradiction {
   const candidate = assimilateBeliefSystem(content, increment)
   const consequence = beliefMergeManyStillBelieved(candidate.beliefs)
-  // checkConsistent(consequence)
+  checkConsistent(consequence)
   return assimilateBelief(candidate, consequence)
 }

src/belief-system/beliefSystemQuery.ts

@@ -1,8 +1,11 @@
-import { type Belief } from "../belief/index.js"
+import {
+  beliefMergeManyStillBelieved,
+  checkConsistent,
+  type Belief,
+} from "../belief/index.js"
 import type { Nothing } from "../nothing/Nothing.js"
 import type { BeliefSystem } from "./BeliefSystem.js"
 import { assimilateBelief } from "./assimilateBelief.js"
-import { beliefMergeManyStillBelieved } from "./beliefMergeManyStillBelieved.js"
 
 export function beliefSystemQuery<A>(
   beliefSystem: BeliefSystem<A>,
@@ -13,5 +16,6 @@ export function beliefSystemQuery<A>(
     beliefSystem.beliefs = betterBeliefSystem.beliefs
   }
 
+  checkConsistent(answer)
   return answer
 }

src/belief-system/index.ts

@@ -2,5 +2,3 @@ export * from "./BeliefSystem.js"
 export * from "./beliefSystemEqual.js"
 export * from "./beliefSystemMerge.js"
 export * from "./beliefSystemQuery.js"
-export * from "./checkConsistent.js"
-export * from "./isStillBelieved.js"

src/belief/checkConsistent.ts

@@ -0,0 +1,6 @@
+import type { Nothing } from "../nothing/index.js"
+import type { Belief } from "./Belief.js"
+
+export function checkConsistent(belief: Nothing | Belief<any>): void {
+  //
+}

src/belief/index.ts

@@ -2,3 +2,7 @@ export * from "./Belief.js"
 export * from "./beliefEqual.js"
 export * from "./beliefMerge.js"
 export * from "./beliefMergeMany.js"
+export * from "./beliefMergeManyStillBelieved.js"
+export * from "./checkConsistent.js"
+export * from "./isStillBelieved.js"
+export * from "./isStrongerBelief.js"

src/examples/barometer-belief-system.test.ts

@@ -4,10 +4,8 @@ import {
   BeliefSystem,
   beliefSystemEqual,
   beliefSystemQuery,
-  bringIn,
-  kickOut,
 } from "../belief-system/index.js"
-import { Belief, beliefEqual } from "../belief/index.js"
+import { Belief, beliefEqual, bringIn, kickOut } from "../belief/index.js"
 import { Cell, patch } from "../cell/index.js"
 import { theContradiction } from "../contradiction/index.js"
 import { Interval, intervalAlmostEqual, isInterval } from "../interval/index.js"