@enervance/insight-cim-model 0.0.59 → 0.0.61

package/dist/converter/integral7/converter-i7.d.ts

@@ -66,7 +66,7 @@ export declare class ConverterI7 {
     convertKnotenLk(cimModel: Model, laengskupplungIDs: number[]): Promise<void>;
     convertSchlaufen(cimModel: Model, integral7: Integral7Model, knotenSoIDs: number[]): Promise<void>;
     convertBelastungen(cimModel: INTEGRALModel, knotenSfIDs: number[], defaultValuesConfig: IDefaultValuesConfig, targetClass: string): Promise<any>;
-    convertEinspeisungen(cimModel: INTEGRALModel, knotenSfIDs: number[], targetClass: string): Promise<void>;
+    convertEinspeisungen(cimModel: INTEGRALModel, knotenSfIDs: number[], objectMappingConfig: IObjectMappingConfig): Promise<void>;
     convertErsatzQuerZweige(cimModel: INTEGRALModel, knotenSfIDs: number[], targetClass: string): Promise<void>;
     convertGeneratoren(cimModel: INTEGRALModel, knotenSfIDs: number[], energyTypesConfig: any): Promise<void>;
     convertAsynchronmotor(cimModel: INTEGRALModel, knotenSfIDs: number[], defaultValuesConfig: IDefaultValuesConfig): Promise<void>;

package/dist/converter/integral7/converter-i7.js

@@ -202,8 +202,11 @@ class ConverterI7 {
                     yield frame.closeXMLModel();
                     let endTime = perf_hooks_1.performance.now();
                     frame.cimModel.purgeData();
-                    console.log(`\nSerializeModel ${geoRegion.name} ${(endTime - startTime) / 1000} seconds\n`);
+                    console.log(`SerializeModel ${geoRegion.name} ${(endTime - startTime) / 1000} seconds\n`);
+                    let memoryUsed = process.memoryUsage();
+                    console.log(`heapUsed ${Math.round(memoryUsed['heapUsed'] / 1024 / 1024 * 100) / 100} MB`);
                 }
+                console.log('________________________________________________');
                 console.log('Serialize BD Profiles');
                 for (const entry of this.exportFramesBoundary.entries()) {
                     const geoRegionUUID = entry[0];
@@ -321,7 +324,7 @@ class ConverterI7 {
             }
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
                 startTime = perf_hooks_1.performance.now();
-                yield this.convertEinspeisungen(cimModel, soSfKnoten, objectMappingConfig.Einspeisung.class);
+                yield this.convertEinspeisungen(cimModel, soSfKnoten, objectMappingConfig);
                 logExecutionTime(this.logger, startTime, `convertEinspeisungen`);
             }
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
@@ -428,54 +431,20 @@ class ConverterI7 {
             logExecutionTime(this.logger, startTime, `assignment of sequence number`);
             startTime = perf_hooks_1.performance.now();
             yield this.convertNetzvarianten(cimModel, integral7Modell);
-            logExecutionTime(this.logger, startTime, `convertNetzvarianten`);
-            console.log(this.exportFramesBoundary);
             for (const key of integral7Modell.i7SchemaID2UUID.keys()) {
-                startTime = perf_hooks_1.performance.now();
                 yield this.convertSchemaStandorte(cimModel, integral7Modell, standortIDs, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaStandorte`);
-                startTime = perf_hooks_1.performance.now();
                 yield this.convertSchemaKnotenSo(cimModel, integral7Modell, knotenSoIDs, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaKnotenSo`);
-                startTime = perf_hooks_1.performance.now();
-                logExecutionTime(this.logger, startTime, `convertSchemaHgueKnotenSo`);
-                startTime = perf_hooks_1.performance.now();
                 yield this.convertSchemaSchaltanlage(cimModel, integral7Modell, schaltanlagenIDs, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaSchaltanlage`);
-                startTime = perf_hooks_1.performance.now();
                 yield this.convertSchemaSchaltanlagenAbschnitte(cimModel, integral7Modell, schaltanlagenAbschnittIDs, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaSchaltanlagenAbschnitte`);
-                startTime = perf_hooks_1.performance.now();
                 yield this.convertSchemaSammelschienenAbschnitte(cimModel, integral7Modell, schaltanlagenAbschnittIDs, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaSammelschienenAbschnitte`);
-                startTime = perf_hooks_1.performance.now();
                 yield this.convertSchemaSchaltfeldElemente(cimModel, integral7Modell, schaltfeldIDs, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaSchaltfeldElemente`);
-                startTime = perf_hooks_1.performance.now();
                 yield this.convertSchemaQuerkupplungen(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaQuerkupplungen`);
-                startTime = perf_hooks_1.performance.now();
                 yield this.convertSchemaLaengskupplungen(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaLaengskupplungen`);
-                startTime = perf_hooks_1.performance.now();
                 yield this.convertSchemaTransformatoren2W(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaTransformatoren2W`);
-                startTime = perf_hooks_1.performance.now();
                 yield this.convertSchemaTransformatoren3W(cimModel, integral7Modell, standortIDs, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaTransformatoren3W`);
-                startTime = perf_hooks_1.performance.now();
                 yield this.convertSchemaQuerzweige(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaQuerzweige`);
-                startTime = perf_hooks_1.performance.now();
-                logExecutionTime(this.logger, startTime, `convertSchemaSternpunktSchiene`);
-                startTime = perf_hooks_1.performance.now();
-                logExecutionTime(this.logger, startTime, `convertSchemaSternpunktKnoten`);
-                startTime = perf_hooks_1.performance.now();
                 yield this.convertSchemaLeitungen(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaLeitungen`);
-                startTime = perf_hooks_1.performance.now();
                 yield this.convertSchemaKnotenSo2(cimModel, integral7Modell, [...integral7Modell.integralAdditionalGrenzknotenIDs.values()], key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaKnotenSo`);
                 integral7Modell.integralLaengskupplungen.clear();
                 integral7Modell.integralHgueLeitungen.clear();
                 integral7Modell.integralNSGSchaltanlage.clear();
@@ -494,6 +463,7 @@ class ConverterI7 {
                     integral7Modell.placedCIMObjectsForDLProfil.clear();
                 }
             }
+            logExecutionTime(this.logger, startTime, `convertNetzvarianten`);
         });
     }
     assignTerminalSequenceNumber(cimModel) {
@@ -514,7 +484,6 @@ class ConverterI7 {
                         }
                     }
                     else {
-                        console.log(`Terminal without connection ${terminalUUID}`);
                     }
                 }
             }
@@ -533,7 +502,6 @@ class ConverterI7 {
                         }
                     }
                     else {
-                        console.log(`Terminal without connection ${terminalUUID}`);
                     }
                 }
             }
@@ -552,7 +520,6 @@ class ConverterI7 {
                         }
                     }
                     else {
-                        console.log(`Terminal without connection ${terminalUUID}`);
                     }
                 }
             }
@@ -876,6 +843,8 @@ class ConverterI7 {
                 const filteredResultsNsgSchaltfeld = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(resultsNsgSchaltfeld, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResultsNsgSchaltfeld) {
                     const nsgSaa = integral7.integralNSGSAAbschnitt.get(i7Data.nsgsaa);
+                    if (!nsgSaa)
+                        continue;
                     const nsgSa = integral7.integralNSGSchaltanlage.get(nsgSaa.nsgsaid);
                     if (nsgSa === undefined) {
                         continue;
@@ -996,6 +965,8 @@ class ConverterI7 {
                     ssabs.forEach(ssab => relevantSSabIDs.add(ssab.id));
                     util_functions_1.DLUtilFunctions.placeKupplung(kpFeldI7KnotenBeziehungen, uuidPointsMap, cimModel, relevantSSabIDs, integral7.integralNSGSsab, this.integralID2UUID, integral7.placedCIMObjectsForDLProfil, kpFeldDeltaausrichtung, kpFeldLeftOffset, false);
                     const nsgSaa = integral7.integralNSGSAAbschnitt.get(i7Data.nsgsaa);
+                    if (!nsgSaa)
+                        continue;
                     const nsgSa = integral7.integralNSGSchaltanlage.get(nsgSaa.nsgsaid);
                     uuidPointsMap.forEach((entryDiagramObject, key) => {
                         if (!(entryDiagramObject.identifiedObject instanceof Terminal_1.Terminal || entryDiagramObject.identifiedObject instanceof ConnectivityNode_1.ConnectivityNode)) {
@@ -1034,18 +1005,20 @@ class ConverterI7 {
                         util_functions_1.DLUtilFunctions.placeKupplung(lKupplungI7KnotenBeziehungen, uuidPointsMap, cimModel, relevantSSabIDs, integral7.integralNSGSsab, this.integralID2UUID, integral7.placedCIMObjectsForDLProfil, 0, 0, true);
                     }
                     const nsgSaa = integral7.integralNSGSAAbschnitt.get(i7Data.nsgsaa);
-                    const nsgSa = integral7.integralNSGSchaltanlage.get(nsgSaa.nsgsaid);
-                    uuidPointsMap.forEach((entryDiagramObject, key) => {
-                        if (!(entryDiagramObject.identifiedObject instanceof Terminal_1.Terminal || entryDiagramObject.identifiedObject instanceof ConnectivityNode_1.ConnectivityNode)) {
-                            if (entryDiagramObject.rotation === undefined) {
-                                entryDiagramObject.rotation = util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung);
-                            }
-                            else {
-                                entryDiagramObject.rotation += util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung);
+                    const nsgSa = integral7.integralNSGSchaltanlage.get(nsgSaa === null || nsgSaa === void 0 ? void 0 : nsgSaa.nsgsaid);
+                    if (!nsgSa) {
+                        uuidPointsMap.forEach((entryDiagramObject, key) => {
+                            if (!(entryDiagramObject.identifiedObject instanceof Terminal_1.Terminal || entryDiagramObject.identifiedObject instanceof ConnectivityNode_1.ConnectivityNode)) {
+                                if (entryDiagramObject.rotation === undefined) {
+                                    entryDiagramObject.rotation = util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung);
+                                }
+                                else {
+                                    entryDiagramObject.rotation += util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung);
+                                }
                             }
-                        }
-                    });
-                    util_functions_1.DLUtilFunctions.rotateShiftAddBasedOnNsgSAA(cimModel, integral7, variantenNr, i7Data.nsgsaa, uuidPointsMap);
+                        });
+                        util_functions_1.DLUtilFunctions.rotateShiftAddBasedOnNsgSAA(cimModel, integral7, variantenNr, i7Data.nsgsaa, uuidPointsMap);
+                    }
                 }
             }
         });
@@ -2011,8 +1984,11 @@ class ConverterI7 {
             }
         });
     }
-    convertEinspeisungen(cimModel, knotenSfIDs, targetClass) {
+    convertEinspeisungen(cimModel, knotenSfIDs, objectMappingConfig) {
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const targetConfig = objectMappingConfig.Einspeisung;
+            const targetClass = objectMappingConfig.Einspeisung.class;
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.EINSPEISUNG)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.EINSPEISUNG, knotenSfIDs));
                 switch (targetClass) {
@@ -2025,7 +2001,15 @@ class ConverterI7 {
                         break;
                     }
                     default: {
-                        yield this.convertEinspeisungen2EnergySource(cimModel, result);
+                        if ((_a = targetConfig.referencePriority) === null || _a === void 0 ? void 0 : _a.prio) {
+                            const i7SlacksResults = result.filter(it => it.spannungsgeregelt);
+                            const i7EnergySourceResults = result.filter(it => !it.spannungsgeregelt);
+                            yield this.convertEinspeisungen2EnergySource(cimModel, i7EnergySourceResults);
+                            yield this.convertEinspeisungen2ExternalNetworkInjection(cimModel, i7SlacksResults);
+                        }
+                        else {
+                            yield this.convertEinspeisungen2EnergySource(cimModel, result);
+                        }
                     }
                 }
             }
@@ -2990,7 +2974,6 @@ class ConverterI7 {
                             externalNetworkInjection.controlEnabled = inBetrieb;
                             regulatingControl.addRegulatingCondEq(externalNetworkInjection);
                             externalNetworkInjection.regulatingControl = regulatingControl;
-                            this.setTapChangerControl;
                             cimModel.addRegulatingControl(regulatingControl);
                             break;
                         }
@@ -3759,7 +3742,6 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_LEITUNG) && integral7.hgueAnschlussKnotenIDs.length > 0) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_LEITUNG, integral7.hgueAnschlussKnotenIDs));
                 for (const i7Data of result) {
-                    console.log(utils_1.getUUID(i7Data.guid_dcline));
                     if (utils_1.getUUID(i7Data.guid_dcline) === '6a5b7e1e-f8be-4165-9752-2e2359d9b4f8') {
                         let stop = true;
                     }