[master] Change sameas predicate

wojciechteclaw · Jan 30, 2024 · bbddf0c · bbddf0c
1 parent e6e59ac
commit bbddf0c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/src/enums/connection.ts b/src/enums/connection.ts
@@ -1,5 +1,5 @@
 enum Connection {
-    SAME_AS,
+    GEOMETRICALLY_EQUIVALENT,
     CONNECTED_PORT,
     HAS_FLUID_SUPPLIED_BY,
     CONNECTED_WITH,

diff --git a/src/helpers/semantic_operations.ts b/src/helpers/semantic_operations.ts
@@ -13,12 +13,12 @@ class SemanticOperations {
     ): void {
         let connectionSpecificTriples: oxigraph.Quad[] = [];
         switch (connection.relation) {
-            case Connection.SAME_AS:
+            case Connection.GEOMETRICALLY_EQUIVALENT:
                 connectionSpecificTriples = this.generateTriplesForSameAsConnection(connection);
                 break;
             case Connection.CONNECTED_PORT:
                 connectionSpecificTriples = this.generateTriplesForMepElements(connection);
-                console.log(connectionSpecificTriples)
+                console.log(connectionSpecificTriples);
                 break;
             default:
                 break;
@@ -101,8 +101,8 @@ class SemanticOperations {
 
     private static getPredicateFromConnection(connection: Connection): oxigraph.NamedNode {
         switch (connection) {
-            case Connection.SAME_AS:
-                return oxigraph.namedNode("http://www.w3.org/2002/07/owl#sameAs");
+            case Connection.GEOMETRICALLY_EQUIVALENT:
+                return oxigraph.namedNode("https://example.com/ex#geometricallyEquivalent");
             case Connection.CONNECTED_PORT:
                 return oxigraph.namedNode("https://w3id.org/fso#connectedPort");
             case Connection.CONNECTED_WITH:

diff --git a/src/services/connectors_manager.ts b/src/services/connectors_manager.ts
@@ -37,6 +37,7 @@ class ConnectorsManager {
         await Promise.all(promises).then((elements) => {
             this.connectors.push(...elements);
         });
+        console.log(this.connectors);
     }
 
     public getAllUnconnectedElements(): IfcElement[] {

diff --git a/src/services/files_service.ts b/src/services/files_service.ts
@@ -95,6 +95,7 @@ class FilesService {
     }
 
     private async discoverModelsConnections(): Promise<void> {
+        console.time("Model federation took:");
         const modelIDs = Array.from(this.models.keys());
         const modelIDpairs = FilesService.getModelIdForComparison(modelIDs);
         const connectedElements: ConnectedElements[] = [];
@@ -110,6 +111,7 @@ class FilesService {
         let connectionTriples = [];
         SemanticOperations.getTriplesFromConnectedElements(connectedElements, connectionTriples);
         await dbDataController.addQuadsToStore(connectionTriples);
+        console.timeEnd("Model federation took:");
     }
 
     private static getModelIdForComparison(modelIDs: number[]): Array<Array<number>> {

diff --git a/src/services/ifc_controller_service.ts b/src/services/ifc_controller_service.ts
@@ -12,7 +12,6 @@ import { ConnectorsManager } from "@services/connectors_manager";
 import { ElementPlacementService } from "@services/element-placement.service";
 
 class IfcControllerService {
-
     private ifcAPI: IfcAPI = new IfcAPI();
     constructor() {
         this.ifcAPI.SetWasmPath("./assets/");
@@ -29,7 +28,7 @@ class IfcControllerService {
         const connectorManager = new ConnectorsManager(this.ifcAPI);
         await connectorManager.addUnconnectedConnectors(modelID);
         const elementPlacementService = new ElementPlacementService(this.ifcAPI);
-        await elementPlacementService.getElementsCoordinates(modelID)
+        await elementPlacementService.getElementsCoordinates(modelID);
         return connectorManager.getAllUnconnectedElements();
     }
 
@@ -83,15 +82,15 @@ class IfcControllerService {
                 connections,
                 Representation.LEVEL,
                 ElementsComparison.compareStringRepresentations,
-                Connection.SAME_AS
+                Connection.GEOMETRICALLY_EQUIVALENT
             ),
             ElementsComparison.compareElements(
                 model1Elements,
                 model2Elements,
                 connections,
                 Representation.SPACE,
                 ElementsComparison.compareGeometryRepresentations,
-                Connection.SAME_AS
+                Connection.GEOMETRICALLY_EQUIVALENT
             ),
             ElementsComparison.compareConnectors(model1Elements, model2Elements, connections, Representation.CONNECTOR),
         ]);