@enervance/insight-cim-model 0.0.350 → 0.0.351

package/dist/converter/integral7/converter.integral7.js

@@ -154,6 +154,7 @@ const SvPowerFlow_1 = require("../../model/statevariables/SvPowerFlow.js");
 const SvVoltage_1 = require("../../model/statevariables/SvVoltage.js");
 const SvInjection_1 = require("../../model/statevariables/SvInjection.js");
 const SvTapStep_1 = require("../../model/statevariables/SvTapStep.js");
+const DCTopologicalNode_1 = require("../../model/dc/DCTopologicalNode.js");
 class ConverterIntegral7 {
     set configurableDLConvertOptions(arg) {
         tslib_1.__classPrivateFieldSet(this, _ConverterIntegral7_configurableDLConvertOptions, arg, "f");
@@ -570,10 +571,12 @@ class ConverterIntegral7 {
             startTime = perf_hooks.performance.now();
             yield this.assignTerminalSequenceNumber(cimModel);
             logExecutionTime(this.logger, startTime, `assignment of sequence number`);
-            /** TopologicalNodes */
             startTime = perf_hooks.performance.now();
             yield this.createTopologicalNodes(cimModel);
-            logExecutionTime(this.logger, startTime, `createTopologicalNodes()`);
+            /** DCTopologicalNodes */
+            startTime = perf_hooks.performance.now();
+            this.createDCTopologicalNodes(cimModel);
+            logExecutionTime(this.logger, startTime, `createDCTopologicalNodes()`);
             /** TopologicalNodes From- und To-Attribute setzen*/
             /** Suche alle Terminals mit nicht ausgeprägten ConnectivityNode
              * Siche das ConnectivityNode in BoundaryFrames */
@@ -935,33 +938,31 @@ class ConverterIntegral7 {
         });
     }
     createDCTopologicalNodes(cimModel) {
-        var _a, _b, _c;
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const precessedConnectivityNodes = new Set();
-            for (const connectivityNode of cimModel.dcNodes.values()) {
+            const precessedDCNodes = new Set();
+            for (const dcNode of cimModel.dcNodes.values()) {
                 /** bereits verbeitete Knoten überspringen */
-                if (precessedConnectivityNodes.has(connectivityNode.getUUID()))
+                if (precessedDCNodes.has(dcNode.getUUID()))
                     continue;
                 /** Zusammengeschaltete CNs bestimmen */
-                const tpNodes = i7_graph_utils_1.I7GraphUtils.determineTopologicalNodes(cimModel, connectivityNode);
+                const tpNodes = i7_graph_utils_1.I7GraphUtils.determineDcTopologicalNodes(cimModel, dcNode);
                 /** zusammengefasst CNs zwischenspeichern */
-                tpNodes.forEach(it => precessedConnectivityNodes.add(it.getUUID()));
+                tpNodes.forEach(it => precessedDCNodes.add(it.getUUID()));
                 /** create TopologicalNode */
-                const baseVoltage = (_a = tpNodes.find(it => it.getBaseVoltage())) === null || _a === void 0 ? void 0 : _a.getBaseVoltage();
-                const connectivityNodeContainer = (_b = tpNodes.find(it => it.getVoltageLevel())) === null || _b === void 0 ? void 0 : _b.getVoltageLevel();
+                const dcEquipmentContainer = (_a = tpNodes.find(it => it.dcEquipmentContainer)) === null || _a === void 0 ? void 0 : _a.dcEquipmentContainer;
                 const uuidV5Key = tpNodes.map(it => it.getUUID()).join();
                 const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.TopologicalNode, this.configUuid, uuidV5Key);
-                const topologicalNode = new TopologicalNode_1.TopologicalNode(uuid, `TP ${connectivityNodeContainer === null || connectivityNodeContainer === void 0 ? void 0 : connectivityNodeContainer.name} ${(_c = baseVoltage === null || baseVoltage === void 0 ? void 0 : baseVoltage.nominalVoltage) === null || _c === void 0 ? void 0 : _c.value}`, 'TP');
-                topologicalNode.setBaseVoltageUUID(baseVoltage === null || baseVoltage === void 0 ? void 0 : baseVoltage.mrid);
-                topologicalNode.setConnectivityNodeContainerUUID(connectivityNodeContainer === null || connectivityNodeContainer === void 0 ? void 0 : connectivityNodeContainer.mrid);
-                cimModel.addTopologicalNode(topologicalNode);
-                tpNodes.forEach(connectivityNode => {
-                    connectivityNode.setTopologicalNodeUUID(topologicalNode === null || topologicalNode === void 0 ? void 0 : topologicalNode.mrid);
+                const dcTopologicalNode = new DCTopologicalNode_1.DCTopologicalNode(uuid, `TP ${dcEquipmentContainer === null || dcEquipmentContainer === void 0 ? void 0 : dcEquipmentContainer.name}`, 'TP');
+                dcTopologicalNode.setDCEquipmentContainerUUID(dcEquipmentContainer === null || dcEquipmentContainer === void 0 ? void 0 : dcEquipmentContainer.mrid);
+                cimModel.addDCTopologicalNode(dcTopologicalNode);
+                for (const node of tpNodes) {
+                    node.setDcTopologicalNodeUUID(dcTopologicalNode === null || dcTopologicalNode === void 0 ? void 0 : dcTopologicalNode.mrid);
                     /** Terminal-Instanzen assoziieren */
-                    for (const terminal of connectivityNode.terminals.values()) {
-                        terminal.setTopologicalNodeUUID(topologicalNode === null || topologicalNode === void 0 ? void 0 : topologicalNode.mrid);
+                    for (const terminal of node.dcTerminals.values()) {
+                        terminal.setDcTopologicalNodeUUID(dcTopologicalNode === null || dcTopologicalNode === void 0 ? void 0 : dcTopologicalNode.mrid);
                     }
-                });
+                }
             }
         });
     }
@@ -4654,9 +4655,6 @@ class ConverterIntegral7 {
                     let dcLineNeutral = undefined;
                     const i7Schluessel = integral_prefix_1.HGUELEITUNG_PRAEFIX +
                         (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
-                    if (dcLine.getUUID() === 'f125f0f3-a621-43e7-8af7-9873d52239a0') {
-                        const stop = true;
-                    }
                     /** operationMode der Anfangs- und Zielkopfstation setzen */
                     let converterStart = false;
                     let converterStartNeg = false;