topConcept 和 bottomConcept

TODO.md

@@ -1,4 +1,4 @@
-修复 `generateConcepts`
+修复 `generateConcepts` -- `topConcept` 和 `bottomConcept` 是特殊的
 
 `concept-graph/` -- 从 `generateConcepts` 生成有向图
 

src/concept/bottomConcept.ts

@@ -0,0 +1,10 @@
+import type { Context } from "../context/Context.js"
+import type { Concept } from "./Concept.js"
+
+export function bottomConcept(context: Context): Concept {
+  return {
+    context,
+    extent: new Set(),
+    intent: context.attributes,
+  }
+}

src/concept/index.ts

@@ -1,4 +1,5 @@
 export * from "./assertSameContext.js"
+export * from "./bottomConcept.js"
 export * from "./closureAttributes.js"
 export * from "./closureEntities.js"
 export * from "./Concept.js"
@@ -10,3 +11,4 @@ export * from "./conceptMeet.js"
 export * from "./createConceptSet.js"
 export * from "./isExtent.js"
 export * from "./isIntent.js"
+export * from "./topConcept.js"

src/concept/topConcept.ts

@@ -0,0 +1,10 @@
+import type { Context } from "../context/Context.js"
+import type { Concept } from "./Concept.js"
+
+export function topConcept(context: Context): Concept {
+  return {
+    context,
+    extent: context.entities,
+    intent: new Set(),
+  }
+}

src/context/commonEntities.ts

@@ -1,17 +1,21 @@
-import { setIsSupersetOf } from "../utils/Set.js"
-import type { Attribute, Context, Entity } from "./index.js"
+import { setIntersection } from "../utils/Set.js"
+import {
+  entitiesOf,
+  type Attribute,
+  type Context,
+  type Entity,
+} from "./index.js"
 
 export function commonEntities(
   context: Context,
   inputAttributes: ReadonlySet<Attribute> | ReadonlyArray<Attribute>,
 ): ReadonlySet<Entity> {
-  inputAttributes = new Set(inputAttributes)
-
-  const resultEntities = new Set<Entity>()
-  for (const [keyEntity, foundAttributes] of context.entityAttributeIndex) {
-    if (setIsSupersetOf(foundAttributes, inputAttributes)) {
-      resultEntities.add(keyEntity)
-    }
+  let resultEntities = context.entities
+  for (const inputAttribute of inputAttributes) {
+    resultEntities = setIntersection(
+      resultEntities,
+      entitiesOf(context, inputAttribute),
+    )
   }
 
   return resultEntities