npm - @enervance/insight-cim-model - Versions diffs - 0.0.123 → 0.0.124 - Mend

@enervance/insight-cim-model 0.0.123 → 0.0.124

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1030) hide show

package/dist/converter/integral7/converter.integral7.js CHANGED Viewed

@@ -6,129 +6,129 @@ const fs = require("fs");
 const JSZip = require("jszip");
 const path = require("path");
 const perf_hooks = require("perf_hooks");
-const cim_class_names_1 = require("../../constants/cim-class-names.js");
-const rdf_xml_1 = require("../../constants/rdf-xml.js");
-const CoordinateSystem_1 = require("../../model/common/CoordinateSystem.js");
-const Location_1 = require("../../model/common/Location.js");
-const PositionPoint_1 = require("../../model/common/PositionPoint.js");
-const Bay_1 = require("../../model/core/Bay.js");
-const ConnectivityNode_1 = require("../../model/core/ConnectivityNode.js");
-const CurveData_1 = require("../../model/core/CurveData.js");
-const CurveStyle_1 = require("../../model/core/CurveStyle.js");
-const GeographicalRegion_1 = require("../../model/core/GeographicalRegion.js");
-const PhaseCode_1 = require("../../model/core/PhaseCode.js");
-const SubGeographicalRegion_1 = require("../../model/core/SubGeographicalRegion.js");
-const Substation_1 = require("../../model/core/Substation.js");
-const Terminal_1 = require("../../model/core/Terminal.js");
-const VoltageLevel_1 = require("../../model/core/VoltageLevel.js");
-const ACDCConverterDCTerminal_1 = require("../../model/dc/ACDCConverterDCTerminal.js");
-const CsConverter_1 = require("../../model/dc/CsConverter.js");
-const CsOperatingModeKind_1 = require("../../model/dc/CsOperatingModeKind.js");
-const DCConverterOperatingModeKind_1 = require("../../model/dc/DCConverterOperatingModeKind.js");
-const DCLine_1 = require("../../model/dc/DCLine.js");
-const DCLineSegment_1 = require("../../model/dc/DCLineSegment.js");
-const DCNode_1 = require("../../model/dc/DCNode.js");
-const DCTerminal_1 = require("../../model/dc/DCTerminal.js");
-const VsConverter_1 = require("../../model/dc/VsConverter.js");
-const VsPpccControlKind_1 = require("../../model/dc/VsPpccControlKind.js");
-const VsQpccControlKind_1 = require("../../model/dc/VsQpccControlKind.js");
-const ApparentPower_1 = require("../../model/domain/ApparentPower.js");
-const CurrentFlow_1 = require("../../model/domain/CurrentFlow.js");
-const UnitMultiplier_1 = require("../../model/domain/UnitMultiplier.js");
-const UnitSymbol_1 = require("../../model/domain/UnitSymbol.js");
-const Voltage_1 = require("../../model/domain/Voltage.js");
-const SynchronousMachineTimeConstantReactance_1 = require("../../model/dynamics/standard-models/synchronous-machine-dynamics/SynchronousMachineTimeConstantReactance.js");
-const EquivalentInjection_1 = require("../../model/equivalents/EquivalentInjection.js");
-const AMPRIONBay_1 = require("../../model/extensions/amprion/core/AMPRIONBay.js");
-const AMPRIONConnectivityNode_1 = require("../../model/extensions/amprion/core/AMPRIONConnectivityNode.js");
-const AMPRIONLine_1 = require("../../model/extensions/amprion/core/AMPRIONLine.js");
-const AMPRIONSubstation_1 = require("../../model/extensions/amprion/core/AMPRIONSubstation.js");
-const AMPRIONSeriesCompensator_1 = require("../../model/extensions/amprion/wires/AMPRIONSeriesCompensator.js");
-const EVPowerTransformerEndInfo_1 = require("../../model/extensions/enervance/assetinfo/EVPowerTransformerEndInfo.js");
-const EVPowerTransformerInfo_1 = require("../../model/extensions/enervance/assetinfo/EVPowerTransformerInfo.js");
-const EVTapChangerInfo_1 = require("../../model/extensions/enervance/assetinfo/EVTapChangerInfo.js");
-const EVWireInfo_1 = require("../../model/extensions/enervance/assetinfo/EVWireInfo.js");
-const GeneratingUnit_1 = require("../../model/generation/GeneratingUnit.js");
-const GeneratorControlSource_1 = require("../../model/generation/GeneratorControlSource.js");
-const HydroEnergyConversionKind_1 = require("../../model/generation/HydroEnergyConversionKind.js");
-const HydroGeneratingUnit_1 = require("../../model/generation/HydroGeneratingUnit.js");
-const NuclearGeneratingUnit_1 = require("../../model/generation/NuclearGeneratingUnit.js");
-const SolarGeneratingUnit_1 = require("../../model/generation/SolarGeneratingUnit.js");
-const ThermalGeneratingUnit_1 = require("../../model/generation/ThermalGeneratingUnit.js");
-const WindGeneratingUnit_1 = require("../../model/generation/WindGeneratingUnit.js");
-const WindGenUnitKind_1 = require("../../model/generation/WindGenUnitKind.js");
-const ConformLoadGroup_1 = require("../../model/loadmodel/ConformLoadGroup.js");
-const LoadArea_1 = require("../../model/loadmodel/LoadArea.js");
-const SubLoadArea_1 = require("../../model/loadmodel/SubLoadArea.js");
-const CurrentLimit_1 = require("../../model/operationallimits/CurrentLimit.js");
-const LimitTypeKind_1 = require("../../model/operationallimits/LimitTypeKind.js");
-const OperationalLimitDirectionKind_1 = require("../../model/operationallimits/OperationalLimitDirectionKind.js");
-const OperationalLimitSet_1 = require("../../model/operationallimits/OperationalLimitSet.js");
-const OperationalLimitType_1 = require("../../model/operationallimits/OperationalLimitType.js");
-const VoltageLimit_1 = require("../../model/operationallimits/VoltageLimit.js");
-const ControlArea_1 = require("../../model/operations/ControlArea.js");
-const Breaker_1 = require("../../model/wires/Breaker.js");
-const BusbarSection_1 = require("../../model/wires/BusbarSection.js");
-const Disconnector_1 = require("../../model/wires/Disconnector.js");
-const EnergyConsumer_1 = require("../../model/wires/EnergyConsumer.js");
-const EnergySource_1 = require("../../model/wires/EnergySource.js");
-const ExternalNetworkInjection_1 = require("../../model/wires/ExternalNetworkInjection.js");
-const GroundingImpedance_1 = require("../../model/wires/GroundingImpedance.js");
-const Junction_1 = require("../../model/wires/Junction.js");
-const Line_1 = require("../../model/wires/Line.js");
-const LinearShuntCompensator_1 = require("../../model/wires/LinearShuntCompensator.js");
-const PetersenCoil_1 = require("../../model/wires/PetersenCoil.js");
-const PhaseTapChangerAsymmetrical_1 = require("../../model/wires/PhaseTapChangerAsymmetrical.js");
-const PhaseTapChangerNonLinear_1 = require("../../model/wires/PhaseTapChangerNonLinear.js");
-const PhaseTapChangerSymmetrical_1 = require("../../model/wires/PhaseTapChangerSymmetrical.js");
-const PowerTransformer_1 = require("../../model/wires/PowerTransformer.js");
-const PowerTransformerEnd_1 = require("../../model/wires/PowerTransformerEnd.js");
-const RatioTapChanger_1 = require("../../model/wires/RatioTapChanger.js");
-const RatioTapChangerTable_1 = require("../../model/wires/RatioTapChangerTable.js");
-const ReactiveCapabilityCurve_1 = require("../../model/wires/ReactiveCapabilityCurve.js");
-const RegulatingControl_1 = require("../../model/wires/RegulatingControl.js");
-const RegulatingControlModeKind_1 = require("../../model/wires/RegulatingControlModeKind.js");
-const StaticVarCompensator_1 = require("../../model/wires/StaticVarCompensator.js");
-const SynchronousMachineKind_1 = require("../../model/wires/SynchronousMachineKind.js");
-const SynchronousMachineOperatingMode_1 = require("../../model/wires/SynchronousMachineOperatingMode.js");
-const TapChangerControl_1 = require("../../model/wires/TapChangerControl.js");
-const TransformerControlMode_1 = require("../../model/wires/TransformerControlMode.js");
-const mysql_controller_1 = require("../../util/database/mysql-controller.js");
-const INTEGRALMultiplierFactor_1 = require("../../model/extensions/integral/common/INTEGRALMultiplierFactor.js");
-const INTEGRALACLineSegment_1 = require("../../model/extensions/integral/wires/INTEGRALACLineSegment.js");
-const INTEGRALAsynchronousMachine_1 = require("../../model/extensions/integral/wires/INTEGRALAsynchronousMachine.js");
-const INTEGRALExternalNetworkInjection_1 = require("../../model/extensions/integral/wires/INTEGRALExternalNetworkInjection.js");
-const INTEGRALSynchronousMachine_1 = require("../../model/extensions/integral/wires/INTEGRALSynchronousMachine.js");
-const util_create_1 = require("../../util/util-create.js");
-const utils_1 = require("../../util/utils.js");
-const integral_prefix_1 = require("./config/integral-prefix.js");
-const data_structures_i7_1 = require("./interface-i7/data-structures-i7.js");
-const export_frame_i7_1 = require("./interface-i7/export-frame-i7.js");
-const KnotenSo_1 = require("./model/integral/KnotenSo.js");
-const Leitung_1 = require("./model/integral/Leitung.js");
-const Schaltanlage_1 = require("./model/integral/Schaltanlage.js");
-const Schaltanlagenabschnitt_1 = require("./model/integral/Schaltanlagenabschnitt.js");
-const Schaltfeld_1 = require("./model/integral/Schaltfeld.js");
-const Standort_1 = require("./model/integral/Standort.js");
-const integral_sql_1 = require("./sql/integral.sql.js");
-const utils_2 = require("./utils.js");
-const utils_trafo3w_1 = require("./utils-trafo3w.js");
-const INTEGRALModelContainer_1 = require("../../model-container/model/INTEGRALModelContainer.js");
-const Laengskupplung_1 = require("./model/integral/Laengskupplung.js");
-const INTEGRALConformLoad_1 = require("../../model/extensions/integral/loadmodel/INTEGRALConformLoad.js");
-const AngleDegrees_1 = require("../../model/domain/AngleDegrees.js");
-const AsynchronousMachineKind_1 = require("../../model/wires/AsynchronousMachineKind.js");
-const INTEGRALEquivalentInjection_1 = require("../../model/extensions/integral/equivalents/INTEGRALEquivalentInjection.js");
-const dl_converter_i7_1 = require("./dl-convert/dl-converter-i7.js");
-const util_graph2tree_1 = require("../../util/collection/util-graph2tree.js");
-const parser_utils_1 = require("../../utils2/parser.utils.js");
-const common_utils_1 = require("../../utils2/common.utils.js");
-const SVCControlMode_1 = require("../../model/wires/SVCControlMode.js");
-const DCGround_1 = require("../../model/dc/DCGround.js");
-const INTEGRALEquivalentBranch_1 = require("../../model/extensions/amprion/equivalents/INTEGRALEquivalentBranch.js");
-const PhaseTapChangerLinear_1 = require("../../model/wires/PhaseTapChangerLinear.js");
-const DCConverterUnit_1 = require("../../model/extensions/integral/dc/DCConverterUnit.js");
-const DCPolarityKind_1 = require("../../model/dc/DCPolarityKind.js");
+const cim_class_names_1 = require("../../constants/cim-class-names");
+const rdf_xml_1 = require("../../constants/rdf-xml");
+const CoordinateSystem_1 = require("../../model/common/CoordinateSystem");
+const Location_1 = require("../../model/common/Location");
+const PositionPoint_1 = require("../../model/common/PositionPoint");
+const Bay_1 = require("../../model/core/Bay");
+const ConnectivityNode_1 = require("../../model/core/ConnectivityNode");
+const CurveData_1 = require("../../model/core/CurveData");
+const CurveStyle_1 = require("../../model/core/CurveStyle");
+const GeographicalRegion_1 = require("../../model/core/GeographicalRegion");
+const PhaseCode_1 = require("../../model/core/PhaseCode");
+const SubGeographicalRegion_1 = require("../../model/core/SubGeographicalRegion");
+const Substation_1 = require("../../model/core/Substation");
+const Terminal_1 = require("../../model/core/Terminal");
+const VoltageLevel_1 = require("../../model/core/VoltageLevel");
+const ACDCConverterDCTerminal_1 = require("../../model/dc/ACDCConverterDCTerminal");
+const CsConverter_1 = require("../../model/dc/CsConverter");
+const CsOperatingModeKind_1 = require("../../model/dc/CsOperatingModeKind");
+const DCConverterOperatingModeKind_1 = require("../../model/dc/DCConverterOperatingModeKind");
+const DCLine_1 = require("../../model/dc/DCLine");
+const DCLineSegment_1 = require("../../model/dc/DCLineSegment");
+const DCNode_1 = require("../../model/dc/DCNode");
+const DCTerminal_1 = require("../../model/dc/DCTerminal");
+const VsConverter_1 = require("../../model/dc/VsConverter");
+const VsPpccControlKind_1 = require("../../model/dc/VsPpccControlKind");
+const VsQpccControlKind_1 = require("../../model/dc/VsQpccControlKind");
+const ApparentPower_1 = require("../../model/domain/ApparentPower");
+const CurrentFlow_1 = require("../../model/domain/CurrentFlow");
+const UnitMultiplier_1 = require("../../model/domain/UnitMultiplier");
+const UnitSymbol_1 = require("../../model/domain/UnitSymbol");
+const Voltage_1 = require("../../model/domain/Voltage");
+const SynchronousMachineTimeConstantReactance_1 = require("../../model/dynamics/standard-models/synchronous-machine-dynamics/SynchronousMachineTimeConstantReactance");
+const EquivalentInjection_1 = require("../../model/equivalents/EquivalentInjection");
+const AMPRIONBay_1 = require("../../model/extensions/amprion/core/AMPRIONBay");
+const AMPRIONConnectivityNode_1 = require("../../model/extensions/amprion/core/AMPRIONConnectivityNode");
+const AMPRIONLine_1 = require("../../model/extensions/amprion/core/AMPRIONLine");
+const AMPRIONSubstation_1 = require("../../model/extensions/amprion/core/AMPRIONSubstation");
+const AMPRIONSeriesCompensator_1 = require("../../model/extensions/amprion/wires/AMPRIONSeriesCompensator");
+const EVPowerTransformerEndInfo_1 = require("../../model/extensions/enervance/assetinfo/EVPowerTransformerEndInfo");
+const EVPowerTransformerInfo_1 = require("../../model/extensions/enervance/assetinfo/EVPowerTransformerInfo");
+const EVTapChangerInfo_1 = require("../../model/extensions/enervance/assetinfo/EVTapChangerInfo");
+const EVWireInfo_1 = require("../../model/extensions/enervance/assetinfo/EVWireInfo");
+const GeneratingUnit_1 = require("../../model/generation/GeneratingUnit");
+const GeneratorControlSource_1 = require("../../model/generation/GeneratorControlSource");
+const HydroEnergyConversionKind_1 = require("../../model/generation/HydroEnergyConversionKind");
+const HydroGeneratingUnit_1 = require("../../model/generation/HydroGeneratingUnit");
+const NuclearGeneratingUnit_1 = require("../../model/generation/NuclearGeneratingUnit");
+const SolarGeneratingUnit_1 = require("../../model/generation/SolarGeneratingUnit");
+const ThermalGeneratingUnit_1 = require("../../model/generation/ThermalGeneratingUnit");
+const WindGeneratingUnit_1 = require("../../model/generation/WindGeneratingUnit");
+const WindGenUnitKind_1 = require("../../model/generation/WindGenUnitKind");
+const ConformLoadGroup_1 = require("../../model/loadmodel/ConformLoadGroup");
+const LoadArea_1 = require("../../model/loadmodel/LoadArea");
+const SubLoadArea_1 = require("../../model/loadmodel/SubLoadArea");
+const CurrentLimit_1 = require("../../model/operationallimits/CurrentLimit");
+const LimitTypeKind_1 = require("../../model/operationallimits/LimitTypeKind");
+const OperationalLimitDirectionKind_1 = require("../../model/operationallimits/OperationalLimitDirectionKind");
+const OperationalLimitSet_1 = require("../../model/operationallimits/OperationalLimitSet");
+const OperationalLimitType_1 = require("../../model/operationallimits/OperationalLimitType");
+const VoltageLimit_1 = require("../../model/operationallimits/VoltageLimit");
+const ControlArea_1 = require("../../model/operations/ControlArea");
+const Breaker_1 = require("../../model/wires/Breaker");
+const BusbarSection_1 = require("../../model/wires/BusbarSection");
+const Disconnector_1 = require("../../model/wires/Disconnector");
+const EnergyConsumer_1 = require("../../model/wires/EnergyConsumer");
+const EnergySource_1 = require("../../model/wires/EnergySource");
+const ExternalNetworkInjection_1 = require("../../model/wires/ExternalNetworkInjection");
+const GroundingImpedance_1 = require("../../model/wires/GroundingImpedance");
+const Junction_1 = require("../../model/wires/Junction");
+const Line_1 = require("../../model/wires/Line");
+const LinearShuntCompensator_1 = require("../../model/wires/LinearShuntCompensator");
+const PetersenCoil_1 = require("../../model/wires/PetersenCoil");
+const PhaseTapChangerAsymmetrical_1 = require("../../model/wires/PhaseTapChangerAsymmetrical");
+const PhaseTapChangerNonLinear_1 = require("../../model/wires/PhaseTapChangerNonLinear");
+const PhaseTapChangerSymmetrical_1 = require("../../model/wires/PhaseTapChangerSymmetrical");
+const PowerTransformer_1 = require("../../model/wires/PowerTransformer");
+const PowerTransformerEnd_1 = require("../../model/wires/PowerTransformerEnd");
+const RatioTapChanger_1 = require("../../model/wires/RatioTapChanger");
+const RatioTapChangerTable_1 = require("../../model/wires/RatioTapChangerTable");
+const ReactiveCapabilityCurve_1 = require("../../model/wires/ReactiveCapabilityCurve");
+const RegulatingControl_1 = require("../../model/wires/RegulatingControl");
+const RegulatingControlModeKind_1 = require("../../model/wires/RegulatingControlModeKind");
+const StaticVarCompensator_1 = require("../../model/wires/StaticVarCompensator");
+const SynchronousMachineKind_1 = require("../../model/wires/SynchronousMachineKind");
+const SynchronousMachineOperatingMode_1 = require("../../model/wires/SynchronousMachineOperatingMode");
+const TapChangerControl_1 = require("../../model/wires/TapChangerControl");
+const TransformerControlMode_1 = require("../../model/wires/TransformerControlMode");
+const mysql_controller_1 = require("../../util/database/mysql-controller");
+const INTEGRALMultiplierFactor_1 = require("../../model/extensions/integral/common/INTEGRALMultiplierFactor");
+const INTEGRALACLineSegment_1 = require("../../model/extensions/integral/wires/INTEGRALACLineSegment");
+const INTEGRALAsynchronousMachine_1 = require("../../model/extensions/integral/wires/INTEGRALAsynchronousMachine");
+const INTEGRALExternalNetworkInjection_1 = require("../../model/extensions/integral/wires/INTEGRALExternalNetworkInjection");
+const INTEGRALSynchronousMachine_1 = require("../../model/extensions/integral/wires/INTEGRALSynchronousMachine");
+const util_create_1 = require("../../util/util-create");
+const utils_1 = require("../../util/utils");
+const integral_prefix_1 = require("./config/integral-prefix");
+const data_structures_i7_1 = require("./interface-i7/data-structures-i7");
+const export_frame_i7_1 = require("./interface-i7/export-frame-i7");
+const KnotenSo_1 = require("./model/integral/KnotenSo");
+const Leitung_1 = require("./model/integral/Leitung");
+const Schaltanlage_1 = require("./model/integral/Schaltanlage");
+const Schaltanlagenabschnitt_1 = require("./model/integral/Schaltanlagenabschnitt");
+const Schaltfeld_1 = require("./model/integral/Schaltfeld");
+const Standort_1 = require("./model/integral/Standort");
+const integral_sql_1 = require("./sql/integral.sql");
+const utils_2 = require("./utils");
+const utils_trafo3w_1 = require("./utils-trafo3w");
+const INTEGRALModelContainer_1 = require("../../model-container/model/INTEGRALModelContainer");
+const Laengskupplung_1 = require("./model/integral/Laengskupplung");
+const INTEGRALConformLoad_1 = require("../../model/extensions/integral/loadmodel/INTEGRALConformLoad");
+const AngleDegrees_1 = require("../../model/domain/AngleDegrees");
+const AsynchronousMachineKind_1 = require("../../model/wires/AsynchronousMachineKind");
+const INTEGRALEquivalentInjection_1 = require("../../model/extensions/integral/equivalents/INTEGRALEquivalentInjection");
+const dl_converter_i7_1 = require("./dl-convert/dl-converter-i7");
+const util_graph2tree_1 = require("../../util/collection/util-graph2tree");
+const parser_utils_1 = require("../../utils2/parser.utils");
+const common_utils_1 = require("../../utils2/common.utils");
+const SVCControlMode_1 = require("../../model/wires/SVCControlMode");
+const DCGround_1 = require("../../model/dc/DCGround");
+const INTEGRALEquivalentBranch_1 = require("../../model/extensions/amprion/equivalents/INTEGRALEquivalentBranch");
+const PhaseTapChangerLinear_1 = require("../../model/wires/PhaseTapChangerLinear");
+const DCConverterUnit_1 = require("../../model/extensions/integral/dc/DCConverterUnit");
+const DCPolarityKind_1 = require("../../model/dc/DCPolarityKind");
 class ConverterIntegral7 {
     constructor() {
         /** Exportnetze gemäß Konfiguration  */
@@ -254,7 +254,7 @@ class ConverterIntegral7 {
                         zip.file(`${xmlSerializer.fileName}`, readStreamEq);
                     }
                 }
-                return yield (0, utils_2.generateNodeStream)(zip);
+                return yield utils_2.generateNodeStream(zip);
             }
             catch (e) {
                 this.logger.error(e);
@@ -611,11 +611,11 @@ class ConverterIntegral7 {
             return new Promise((resolve) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 const regions = [];
                 if (this.isTableAvailable(integral_sql_1.Integral7TableNames.REGION)) {
-                    this.mysqlController.execQuery((0, integral_sql_1.getNetzQuery)(integral_sql_1.I7Objects.REGION, 0, 0, []))
+                    this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.REGION, 0, 0, []))
                         .then((result) => {
                         for (const i7Data of result) {
-                            const i7Schluessel = integral_prefix_1.GEOREGION_PRAEFIX + (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
-                            const region = new GeographicalRegion_1.GeographicalRegion((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner), '_GR']), (0, utils_2.ueberpruefeZeichenkette)(i7Data.kurzname), i7Schluessel);
+                            const i7Schluessel = integral_prefix_1.GEOREGION_PRAEFIX + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
+                            const region = new GeographicalRegion_1.GeographicalRegion(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), '_GR']), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluessel);
                             this.addIdMapping(i7Data.id, region.mrid, integral_sql_1.Integral7TableNames.REGION);
                             regions.push(region);
                         }
@@ -637,10 +637,10 @@ class ConverterIntegral7 {
     convertRegelzone(cimModel, defaultValuesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.REGELZONE)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getNetzQuery)(integral_sql_1.I7Objects.REGELZONE, 0, 0, []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.REGELZONE, 0, 0, []));
                 for (const i7Data of result) {
-                    const i7Schluessel = integral_prefix_1.REGELZONE_PRAEFIX + (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
-                    const ctrlarea = new ControlArea_1.ControlArea((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner), '_RZ']), (0, utils_2.ueberpruefeZeichenkette)(i7Data.kurzname), i7Schluessel);
+                    const i7Schluessel = integral_prefix_1.REGELZONE_PRAEFIX + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
+                    const ctrlarea = new ControlArea_1.ControlArea(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), '_RZ']), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluessel);
                     cimModel.addControlArea(ctrlarea);
                     this.addIdMapping(i7Data.id, ctrlarea.mrid, integral_sql_1.Integral7TableNames.REGELZONE);
                 }
@@ -655,15 +655,15 @@ class ConverterIntegral7 {
             return new Promise((resolve) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 const subRegions = [];
                 if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SUBREGION)) {
-                    this.mysqlController.execQuery((0, integral_sql_1.getNetzQuery)(integral_sql_1.I7Objects.SUBREGION, 0, 0, []))
+                    this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.SUBREGION, 0, 0, []))
                         .then((result) => {
                         for (const i7Data of result) {
-                            const i7Schluesel = integral_prefix_1.SUBGEOREGION_PRAEFIX + (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
-                            const subregion = new SubGeographicalRegion_1.SubGeographicalRegion((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner), '_SGR']), (0, utils_2.ueberpruefeZeichenkette)(i7Data.kurzname), i7Schluesel);
+                            const i7Schluesel = integral_prefix_1.SUBGEOREGION_PRAEFIX + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
+                            const subregion = new SubGeographicalRegion_1.SubGeographicalRegion(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), '_SGR']), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluesel);
                             const regionUUID = this.integralID2UUID.get(i7Data.georegion);
                             let region = regions.find(elem => elem.mrid === regionUUID);
                             if (!region) {
-                                region = (0, utils_1.createIfNotExitsGeoregionByName)(this.cimModelDefault, (0, util_create_1.createNotation)([defaultValuesConfig.GeographicalRegion.name, '_GR']));
+                                region = utils_1.createIfNotExitsGeoregionByName(this.cimModelDefault, util_create_1.createNotation([defaultValuesConfig.GeographicalRegion.name, '_GR']));
                                 this.logger.debug(`SubGeographicalRegion UUID ${subregion.mrid} I7-ID ${i7Data.id} Name ${i7Data.bezeichner} hat keine Region.`);
                             }
                             subregion.region = region;
@@ -689,14 +689,14 @@ class ConverterIntegral7 {
     convertStandorte(cimModel, integral7, whereID, defaultValuesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STANDORT)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STANDORT, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STANDORT), whereID));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STANDORT, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STANDORT), whereID));
                 for (const i7Data of result) {
-                    const i7name = (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', (0, utils_2.ueberpruefeZeichenkette)(i7Data.ukz), '_S'], 32);
-                    const substation = new AMPRIONSubstation_1.AMPRIONSubstation((0, parser_utils_1.getUUID)(i7Data.guid), i7name, i7Data.kurzname, i7Data.kommentar, i7Data.stationsnummer, i7Data.ukz);
+                    const i7name = util_create_1.createNotation([utils_2.getName(i7Data), '_', utils_2.ueberpruefeZeichenkette(i7Data.ukz), '_S'], 32);
+                    const substation = new AMPRIONSubstation_1.AMPRIONSubstation(parser_utils_1.getUUID(i7Data.guid), i7name, i7Data.kurzname, i7Data.kommentar, i7Data.stationsnummer, i7Data.ukz);
                     let subregion = cimModel.getSubGeographicalRegion(this.integralID2UUID.get(i7Data.subgeoregion));
                     if (!subregion) {
-                        const region = (0, utils_1.createIfNotExitsGeoregionByName)(cimModel, defaultValuesConfig.GeographicalRegion.name);
-                        subregion = (0, utils_1.createIfNotExitsSubGeoregionByName)(cimModel, defaultValuesConfig.SubGeographicalRegion.name, region);
+                        const region = utils_1.createIfNotExitsGeoregionByName(cimModel, defaultValuesConfig.GeographicalRegion.name);
+                        subregion = utils_1.createIfNotExitsSubGeoregionByName(cimModel, defaultValuesConfig.SubGeographicalRegion.name, region);
                     }
                     substation.subGeographicalRegion = subregion;
                     subregion.addSubstation(substation);
@@ -732,7 +732,7 @@ class ConverterIntegral7 {
     convertSchaltanlagen(cimModel, integral7, standortIDs, defaultValuesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SCHALTANLAGE)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.SCHALTANLAGE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SCHALTANLAGE), standortIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHALTANLAGE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SCHALTANLAGE), standortIDs));
                 for (const i7Data of result) {
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     const object = cimModel.getObject(this.integralID2UUID.get(i7Data.standort));
@@ -747,10 +747,10 @@ class ConverterIntegral7 {
                         integral_prefix_1.KNOTEN_STANDORT_PRAEFIX +
                         i7Data.un +
                         integral_prefix_1.MITTIGER_PUNKT +
-                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
-                    const vl = new VoltageLevel_1.VoltageLevel((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', i7Data.un.toString(), '_VL']), i7Data.kurzname, i7Schluessel);
-                    const un = (0, utils_2.getU)(i7Data.un);
-                    const baseVoltage = (0, util_create_1.createBaseVoltageIfNotExists)(cimModel, un, this.exportFramesBoundary);
+                        utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
+                    const vl = new VoltageLevel_1.VoltageLevel(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_', i7Data.un.toString(), '_VL']), i7Data.kurzname, i7Schluessel);
+                    const un = utils_2.getU(i7Data.un);
+                    const baseVoltage = util_create_1.createBaseVoltageIfNotExists(cimModel, un, this.exportFramesBoundary);
                     vl.baseVoltage = baseVoltage;
                     cimModel.addVoltageLevel(vl);
                     this.addIdMapping(i7Data.id, vl.mrid, integral_sql_1.Integral7TableNames.SCHALTANLAGE);
@@ -770,7 +770,7 @@ class ConverterIntegral7 {
     convertSchaltanlagenAbschnitte(cimModel, integral7, schaltanlagenIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SCHALTANLAGENABSCHNITT)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.SCHALTANLAGENABSCHNITT, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SCHALTANLAGENABSCHNITT), schaltanlagenIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHALTANLAGENABSCHNITT, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SCHALTANLAGENABSCHNITT), schaltanlagenIDs));
                 for (const i7Data of result) {
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
                     if (!voltageLevel) {
@@ -779,7 +779,7 @@ class ConverterIntegral7 {
                     }
                     else {
                         const tmp_vlname = voltageLevel.name.replace('_VL', '');
-                        voltageLevel.name = (0, util_create_1.createNotation)([tmp_vlname, '_', i7Data.pos.toString(), '_VL'], 32, true);
+                        voltageLevel.name = util_create_1.createNotation([tmp_vlname, '_', i7Data.pos.toString(), '_VL'], 32, true);
                     }
                     /** Integral 7 Modell erstellen zur Berechnung der Netzschema */
                     const schaltanlagenabschnitt = new Schaltanlagenabschnitt_1.SchaltanlagenabschnittImpl(i7Data);
@@ -796,7 +796,7 @@ class ConverterIntegral7 {
     convertSchaltfelder(cimModel, integral7, schaltanlagenAbschnittIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SCHALTFELD)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.SCHALTFELD, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SCHALTFELD), schaltanlagenAbschnittIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHALTFELD, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SCHALTFELD), schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.saabschnitt));
                     if (!voltageLevel) {
@@ -805,10 +805,10 @@ class ConverterIntegral7 {
                     }
                     const i7Schluessel = voltageLevel.description +
                         integral_prefix_1.SCHALTFELD_PRAEFIX +
-                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
-                    const cimrdfid = (0, parser_utils_1.getUUID)(i7Data.guid);
-                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_B'], 32, true), i7Data.kurzname, i7Schluessel);
-                    bay.number = (0, parser_utils_1.isNumericI7)(i7Data.feldnummer) ? (0, parser_utils_1.convertToNumberI7)(i7Data.feldnummer).toString() : undefined;
+                        utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
+                    const cimrdfid = parser_utils_1.getUUID(i7Data.guid);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_B'], 32, true), i7Data.kurzname, i7Schluessel);
+                    bay.number = parser_utils_1.isNumericI7(i7Data.feldnummer) ? parser_utils_1.convertToNumberI7(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
                     bay.voltageLevel = voltageLevel;
                     voltageLevel.addBay(bay);
@@ -831,20 +831,20 @@ class ConverterIntegral7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const cimModel = frame.cimModel;
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_SO)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.KNOTEN_SO, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_SO), standortIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_SO, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_SO), standortIDs));
                 for (const i7Data of result) {
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
-                    const vl = new VoltageLevel_1.VoltageLevel(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), i7Data.un.toString(), '_VL']), i7Data.kurzname);
-                    const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid);
-                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', rdfid.substring(0, 8), '_CN']), i7Data.kurzname, i7Data.kommentar);
+                    const vl = new VoltageLevel_1.VoltageLevel(common_utils_1.CommonUtils.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), i7Data.un.toString(), '_VL']), i7Data.kurzname);
+                    const rdfid = parser_utils_1.getUUID(i7Data.guid);
+                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', rdfid.substring(0, 8), '_CN']), i7Data.kurzname, i7Data.kommentar);
                     connectivityNode.setConnectivityNodeContainer(vl);
                     vl.addConnectivityNode(connectivityNode);
                     connectivityNode.nodeNumber = i7Data.id_psse_cape;
                     if (frame.boundary) {
                         connectivityNode.boundaryPoint = true;
                     }
-                    const un = (0, utils_2.getU)(i7Data.un);
-                    const baseVoltage = (0, util_create_1.createBaseVoltageIfNotExists)(cimModel, un, this.exportFramesBoundary);
+                    const un = utils_2.getU(i7Data.un);
+                    const baseVoltage = util_create_1.createBaseVoltageIfNotExists(cimModel, un, this.exportFramesBoundary);
                     /** Spannungsband */
                     integral7.targetVoltages.set(i7Data.id, { usoll: i7Data.usoll, umin: i7Data.umin, umax: i7Data.umax });
                     // TODO VoltageLimits?
@@ -856,7 +856,7 @@ class ConverterIntegral7 {
                             integral_prefix_1.KNOTEN_STANDORT_PRAEFIX +
                             i7Data.un +
                             integral_prefix_1.MITTIGER_PUNKT +
-                            (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
+                            utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
                         vl.description = i7Schluessel;
                         connectivityNode.description = i7Schluessel;
                     }
@@ -864,7 +864,7 @@ class ConverterIntegral7 {
                         this.logger.debug(`KnotenSo ${i7Data.id} ${vl.mrid} besitzt keine Substation.`);
                     }
                     //PSRType
-                    const psrType = (0, utils_2.getPSRType)(cimModel, 'Abzweigmast');
+                    const psrType = utils_2.getPSRType(cimModel, 'Abzweigmast');
                     vl.psrTypeUUID = psrType === null || psrType === void 0 ? void 0 : psrType.mrid;
                     // psrType.addPowerSystemResource(vl);
                     const object = new KnotenSo_1.KnotenSoImpl(i7Data);
@@ -885,10 +885,10 @@ class ConverterIntegral7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const cimModel = frame.cimModel;
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_KNOTEN)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.HGUE_KNOTEN, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_KNOTEN), standortIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_KNOTEN, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_KNOTEN), standortIDs));
                 for (const i7Data of result) {
-                    const cimrdfid = (0, parser_utils_1.getUUID)(i7Data.guid);
-                    const dcNode = new DCNode_1.DCNode(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_DCCN'], 32, true), i7Data.kurzname);
+                    const cimrdfid = parser_utils_1.getUUID(i7Data.guid);
+                    const dcNode = new DCNode_1.DCNode(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_DCCN'], 32, true), i7Data.kurzname);
                     cimModel.addDCNode(dcNode);
                     this.addIdMapping(i7Data.id, dcNode.mrid, integral_sql_1.Integral7TableNames.HGUE_KNOTEN);
                 }
@@ -901,15 +901,15 @@ class ConverterIntegral7 {
     convertSammelschienenAbschnitte(cimModel, integral7, schaltanlagenAbschnittIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SAMMELSCHIENE)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.SAMMELSCHIENE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SAMMELSCHIENE), schaltanlagenAbschnittIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SAMMELSCHIENE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SAMMELSCHIENE), schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
                     const i7Schaltanlagenabschnitt = integral7.integralSchaltanlagenAbschnitte.get(i7Data.saabschnitt);
-                    const busbarSection = new BusbarSection_1.BusbarSection(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Schaltanlagenabschnitt), '_BBS']), i7Schaltanlagenabschnitt.kurzname);
+                    const busbarSection = new BusbarSection_1.BusbarSection(common_utils_1.CommonUtils.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Schaltanlagenabschnitt), '_BBS']), i7Schaltanlagenabschnitt.kurzname);
                     busbarSection.ipMax = i7Data.limit_ip;
                     // die Sammelschienen sind nicht aggregiert.
                     busbarSection.aggregate = false;
-                    const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid);
-                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_' + i7Data.pos.toString(), '_' + rdfid.substring(0, 8), '_CN'], 32, true), i7Data.kurzname);
+                    const rdfid = parser_utils_1.getUUID(i7Data.guid);
+                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_' + i7Data.pos.toString(), '_' + rdfid.substring(0, 8), '_CN'], 32, true), i7Data.kurzname);
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Schaltanlagenabschnitt.id));
                     connectivityNode.nodeNumber = i7Data.id_psse_cape;
                     if (voltageLevel) {
@@ -923,7 +923,7 @@ class ConverterIntegral7 {
                         voltageLevel.lowVoltageLimit = i7Data.umin;
                         const i7Schluessel = voltageLevel.description +
                             integral_prefix_1.SAMMELSCHIENENABSCHNITT_PRAEFIX +
-                            (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
+                            utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
                         busbarSection.description = i7Schluessel;
                         connectivityNode.description = i7Schluessel;
                         /** Spannungsband */
@@ -955,7 +955,7 @@ class ConverterIntegral7 {
                 const result = yield this.queryDataInChuncks(integral_sql_1.I7Objects.KNOTEN_SF, schaltfeldIDs);
                 for (const i7Data of result) {
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.schaltfeld));
-                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode((0, parser_utils_1.getUUID)(i7Data.guid_cn), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_CN']), 'knotensf', `${bay.description}/${i7Data.bezeichner}`);
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(parser_utils_1.getUUID(i7Data.guid_cn), util_create_1.createNotation([utils_2.getName(i7Data), '_CN']), 'knotensf', `${bay.description}/${i7Data.bezeichner}`);
                     if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
                         bay.addConnectivityNode(connectivityNode);
@@ -977,9 +977,9 @@ class ConverterIntegral7 {
     convertKnotenKf(cimModel, querkupplungIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_KF)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.KNOTEN_KF, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_KF), querkupplungIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_KF, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_KF), querkupplungIDs));
                 for (const i7Data of result) {
-                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_CN']), 'knotenkf');
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_CN']), 'knotenkf');
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.kpfeld));
                     if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
@@ -1000,9 +1000,9 @@ class ConverterIntegral7 {
     convertKnotenLk(cimModel, laengskupplungIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_LK)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.KNOTEN_LK, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_LK), laengskupplungIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_LK, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_LK), laengskupplungIDs));
                 for (const i7Data of result) {
-                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_CN']), 'KnotenLk');
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(common_utils_1.CommonUtils.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_CN']), 'KnotenLk');
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.lkupplung));
                     if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
@@ -1024,10 +1024,10 @@ class ConverterIntegral7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             //Schlaufen
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SCHLAUFE)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.SCHLAUFE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SCHLAUFE), knotenSoIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHLAUFE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SCHLAUFE), knotenSoIDs));
                 for (const i7Data of result) {
-                    const terminal = new Terminal_1.Terminal(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_Schlaufe_T']), i7Data.kurzname, i7Data.kommentar);
-                    terminal.connected = (0, parser_utils_1.convertToBooleanI7)(i7Data.schaltzustand);
+                    const terminal = new Terminal_1.Terminal(common_utils_1.CommonUtils.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_Schlaufe_T']), i7Data.kurzname, i7Data.kommentar);
+                    terminal.connected = parser_utils_1.convertToBooleanI7(i7Data.schaltzustand);
                     terminal.phases = PhaseCode_1.PhaseCode.ABC;
                     this.addIdMapping(i7Data.id, terminal.mrid, integral_sql_1.Integral7TableNames.SCHLAUFE);
                     this.addIdMapping(i7Data.knotenzw, terminal.mrid, integral_sql_1.Integral7TableNames.SCHLAUFE);
@@ -1053,11 +1053,11 @@ class ConverterIntegral7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             /** Zuordnung von I7 QuerzweigIDs zu ErgebnisID */
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.BELASTUNG)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.BELASTUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.BELASTUNG), knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.BELASTUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.BELASTUNG), knotenSfIDs));
                 for (const i7Data of result) {
-                    const load = targetClass === cim_class_names_1.ClassNames.ConformLoad ? new INTEGRALConformLoad_1.INTEGRALConformLoad((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_CL']), i7Data.kurzname) : new EnergyConsumer_1.EnergyConsumer((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_EC']), i7Data.kurzname);
-                    const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
-                    const spannungslos = (0, parser_utils_1.isBooleanI7)(i7Data.spannungslos) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.spannungslos) : undefined;
+                    const load = targetClass === cim_class_names_1.ClassNames.ConformLoad ? new INTEGRALConformLoad_1.INTEGRALConformLoad(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_CL']), i7Data.kurzname) : new EnergyConsumer_1.EnergyConsumer(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_EC']), i7Data.kurzname);
+                    const inBetrieb = parser_utils_1.convertToBooleanI7(i7Data.betrieb);
+                    const spannungslos = parser_utils_1.isBooleanI7(i7Data.spannungslos) ? parser_utils_1.convertToBooleanI7(i7Data.spannungslos) : undefined;
                     this.setTopologyEnergySourceConsumerObject(cimModel, load, i7Data);
                     /** powerData 0 -> Wirkleistung
                      *            1 -> Blindleitung */
@@ -1067,7 +1067,7 @@ class ConverterIntegral7 {
                         load.multiplierFactorUUID = mf.getUUID();
                     }
                     /** SSH */
-                    const powerData = (0, utils_2.getActiveReactivePower)(i7Data, mf);
+                    const powerData = utils_2.getActiveReactivePower(i7Data, mf);
                     load.p = powerData[0];
                     load.q = powerData[1];
                     /** Extension */
@@ -1096,7 +1096,7 @@ class ConverterIntegral7 {
             const targetConfig = objectMappingConfig.Einspeisung;
             const targetClass = objectMappingConfig.Einspeisung.class;
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.EINSPEISUNG)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.EINSPEISUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.EINSPEISUNG), knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.EINSPEISUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.EINSPEISUNG), knotenSfIDs));
                 switch (targetClass) {
                     case cim_class_names_1.ClassNames.EquivalentInjection: {
                         yield this.convertEinspeisungen2EquivalentInjection(cimModel, result);
@@ -1128,7 +1128,7 @@ class ConverterIntegral7 {
     convertErsatzQuerZweige(cimModel, knotenSfIDs, targetClass) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.ERSATZQUERZWEIG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG), knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.ERSATZQUERZWEIG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG), knotenSfIDs));
                 switch (targetClass) {
                     case cim_class_names_1.ClassNames.EquivalentInjection: {
                         yield this.convertErsatzQuerZweige2EquivalentInjection(cimModel, result);
@@ -1153,18 +1153,18 @@ class ConverterIntegral7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             // Generatoren werden als GeneratingUnit und SynchronousMachine abgebildet
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.GENERATOR)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.GENERATOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.GENERATOR), knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.GENERATOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.GENERATOR), knotenSfIDs));
                 for (const i7Data of result) {
                     const genType = this.generatorTypen.get(i7Data.nametyp);
-                    const synchronousMachine = new INTEGRALSynchronousMachine_1.INTEGRALSynchronousMachine((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SM'], 32, true), i7Data.kurzname, i7Data.nameprimaertyp);
-                    const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
-                    const maxP = (0, parser_utils_1.isNumericI7)(i7Data.p_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_max) : undefined;
-                    const minP = (0, parser_utils_1.isNumericI7)(i7Data.p_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_min) : undefined;
+                    const synchronousMachine = new INTEGRALSynchronousMachine_1.INTEGRALSynchronousMachine(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_SM'], 32, true), i7Data.kurzname, i7Data.nameprimaertyp);
+                    const inBetrieb = parser_utils_1.convertToBooleanI7(i7Data.betrieb);
+                    const maxP = parser_utils_1.isNumericI7(i7Data.p_max) ? parser_utils_1.convertToNumberI7(i7Data.p_max) : undefined;
+                    const minP = parser_utils_1.isNumericI7(i7Data.p_min) ? parser_utils_1.convertToNumberI7(i7Data.p_min) : undefined;
                     const mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
-                    const powerData = (0, utils_2.getActiveReactivePower)(i7Data, mf);
+                    const powerData = utils_2.getActiveReactivePower(i7Data, mf);
                     const p = powerData[0];
                     const q = powerData[1];
-                    const flagCondenserOperationMode = (0, parser_utils_1.isBooleanI7)(i7Data.flag_phasenschieber) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_phasenschieber) : true;
+                    const flagCondenserOperationMode = parser_utils_1.isBooleanI7(i7Data.flag_phasenschieber) ? parser_utils_1.convertToBooleanI7(i7Data.flag_phasenschieber) : true;
                     const isRotatingPhaseShifter = (mf !== undefined && maxP === 0 && minP === 0) || flagCondenserOperationMode;
                     const isGenerator = (maxP > 0 || maxP === undefined);
                     const isMotor = (minP < 0 || minP === undefined);
@@ -1220,29 +1220,29 @@ class ConverterIntegral7 {
                         synchronousMachine.operatingMode = undefined;
                     }
                     /** Ermittle die Blocktransformatoren*/ //TODO: das Mapping per Abfrage in den convertTrafoXW-Methoden durchführen.
-                    if ((0, parser_utils_1.convertToNumberI7)(i7Data.blocktrafo_1)) {
-                        this.blocktransformatoren.push((0, parser_utils_1.convertToNumberI7)(i7Data.blocktrafo_1));
+                    if (parser_utils_1.convertToNumberI7(i7Data.blocktrafo_1)) {
+                        this.blocktransformatoren.push(parser_utils_1.convertToNumberI7(i7Data.blocktrafo_1));
                     }
-                    if ((0, parser_utils_1.convertToNumberI7)(i7Data.blocktrafo_2)) {
-                        this.blocktransformatoren.push((0, parser_utils_1.convertToNumberI7)(i7Data.blocktrafo_2));
+                    if (parser_utils_1.convertToNumberI7(i7Data.blocktrafo_2)) {
+                        this.blocktransformatoren.push(parser_utils_1.convertToNumberI7(i7Data.blocktrafo_2));
                     }
-                    if ((0, parser_utils_1.convertToNumberI7)(i7Data.blocktrafo_3)) {
-                        this.blocktransformatoren.push((0, parser_utils_1.convertToNumberI7)(i7Data.blocktrafo_3));
+                    if (parser_utils_1.convertToNumberI7(i7Data.blocktrafo_3)) {
+                        this.blocktransformatoren.push(parser_utils_1.convertToNumberI7(i7Data.blocktrafo_3));
                     }
-                    if ((0, parser_utils_1.convertToNumberI7)(i7Data.blocktrafo_4)) {
-                        this.blocktransformatoren.push((0, parser_utils_1.convertToNumberI7)(i7Data.blocktrafo_4));
+                    if (parser_utils_1.convertToNumberI7(i7Data.blocktrafo_4)) {
+                        this.blocktransformatoren.push(parser_utils_1.convertToNumberI7(i7Data.blocktrafo_4));
                     }
-                    if ((0, parser_utils_1.convertToNumberI7)(i7Data.blocktrafo_5)) {
-                        this.blocktransformatoren.push((0, parser_utils_1.convertToNumberI7)(i7Data.blocktrafo_5));
+                    if (parser_utils_1.convertToNumberI7(i7Data.blocktrafo_5)) {
+                        this.blocktransformatoren.push(parser_utils_1.convertToNumberI7(i7Data.blocktrafo_5));
                     }
-                    const prio = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio) : undefined;
+                    const prio = parser_utils_1.isNumericI7(i7Data.einspprio) ? parser_utils_1.convertToNumberI7(i7Data.einspprio) : undefined;
                     synchronousMachine.referencePriority = prio;
-                    const maxQ = (0, parser_utils_1.isNumericI7)(i7Data.q_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_max) : undefined;
-                    const minQ = (0, parser_utils_1.isNumericI7)(i7Data.q_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_min) : undefined;
-                    const maxQvonPmax = (0, parser_utils_1.isNumericI7)(i7Data.qmax_von_pmax) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qmax_von_pmax) : undefined;
-                    const minQvonPmax = (0, parser_utils_1.isNumericI7)(i7Data.qmin_von_pmax) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qmin_von_pmax) : undefined;
-                    const maxQvonPmin = (0, parser_utils_1.isNumericI7)(i7Data.qmax_von_pmin) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qmax_von_pmin) : undefined;
-                    const minQvonPmin = (0, parser_utils_1.isNumericI7)(i7Data.qmin_von_pmin) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qmin_von_pmin) : undefined;
+                    const maxQ = parser_utils_1.isNumericI7(i7Data.q_max) ? parser_utils_1.convertToNumberI7(i7Data.q_max) : undefined;
+                    const minQ = parser_utils_1.isNumericI7(i7Data.q_min) ? parser_utils_1.convertToNumberI7(i7Data.q_min) : undefined;
+                    const maxQvonPmax = parser_utils_1.isNumericI7(i7Data.qmax_von_pmax) ? parser_utils_1.convertToNumberI7(i7Data.qmax_von_pmax) : undefined;
+                    const minQvonPmax = parser_utils_1.isNumericI7(i7Data.qmin_von_pmax) ? parser_utils_1.convertToNumberI7(i7Data.qmin_von_pmax) : undefined;
+                    const maxQvonPmin = parser_utils_1.isNumericI7(i7Data.qmax_von_pmin) ? parser_utils_1.convertToNumberI7(i7Data.qmax_von_pmin) : undefined;
+                    const minQvonPmin = parser_utils_1.isNumericI7(i7Data.qmin_von_pmin) ? parser_utils_1.convertToNumberI7(i7Data.qmin_von_pmin) : undefined;
                     synchronousMachine.maxQ = maxQ ? maxQ : maxQvonPmax;
                     synchronousMachine.minQ = minQ ? minQ : minQvonPmin;
                     const pType = (genType === null || genType === void 0 ? void 0 : genType.sr) * (genType === null || genType === void 0 ? void 0 : genType.cosphir);
@@ -1254,16 +1254,16 @@ class ConverterIntegral7 {
                     synchronousMachine.q_mf = powerData[3] ? powerData[3] * -1 : undefined; //convert to load sign system
                     /** TODO Berechnung überprüfen => DONE */
                     /*          const s = Math.sqrt(Math.pow(maxP, 2) + Math.pow(maxQvonPmax, 2));*/
-                    const sr = (0, parser_utils_1.isNumericI7)(i7Data.sr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.sr) : ((0, parser_utils_1.isNumericI7)(genType === null || genType === void 0 ? void 0 : genType.sr) ? (0, parser_utils_1.convertToNumberI7)(genType.sr) : undefined);
+                    const sr = parser_utils_1.isNumericI7(i7Data.sr) ? parser_utils_1.convertToNumberI7(i7Data.sr) : (parser_utils_1.isNumericI7(genType === null || genType === void 0 ? void 0 : genType.sr) ? parser_utils_1.convertToNumberI7(genType.sr) : undefined);
                     if (sr && sr >= 0) {
                         synchronousMachine.ratedS = sr;
                     }
                     else {
                         synchronousMachine.ratedS = Math.sqrt(Math.pow(maxP, 2) + Math.pow(maxQvonPmax, 2));
                     }
-                    const ur = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur) : ((0, parser_utils_1.isNumericI7)(genType === null || genType === void 0 ? void 0 : genType.ur) ? genType.ur : undefined);
-                    const usoll = (0, parser_utils_1.isNumericI7)(i7Data.usoll) ? (0, parser_utils_1.convertToNumberI7)(i7Data.usoll) : ur;
-                    const cosphir = (0, parser_utils_1.isNumericI7)(i7Data.cosphir) ? (0, parser_utils_1.convertToNumberI7)(i7Data.cosphir) : ((0, parser_utils_1.isNumericI7)(genType === null || genType === void 0 ? void 0 : genType.cosphir) ? (0, parser_utils_1.convertToNumberI7)(genType.cosphir) : undefined);
+                    const ur = parser_utils_1.isNumericI7(i7Data.ur) ? parser_utils_1.convertToNumberI7(i7Data.ur) : (parser_utils_1.isNumericI7(genType === null || genType === void 0 ? void 0 : genType.ur) ? genType.ur : undefined);
+                    const usoll = parser_utils_1.isNumericI7(i7Data.usoll) ? parser_utils_1.convertToNumberI7(i7Data.usoll) : ur;
+                    const cosphir = parser_utils_1.isNumericI7(i7Data.cosphir) ? parser_utils_1.convertToNumberI7(i7Data.cosphir) : (parser_utils_1.isNumericI7(genType === null || genType === void 0 ? void 0 : genType.cosphir) ? parser_utils_1.convertToNumberI7(genType.cosphir) : undefined);
                     synchronousMachine.ratedU = ur !== undefined ? ur : usoll;
                     synchronousMachine.aggregate = false;
                     /** Percent of the coordinated reactive control that comes from this machine.*/
@@ -1272,15 +1272,15 @@ class ConverterIntegral7 {
                     synchronousMachine.ratedPowerFactor = cosphir ? cosphir : undefined;
                     /** EQ-SC */
                     synchronousMachine.earthing = ((_a = i7Data.erdung) === null || _a === void 0 ? void 0 : _a.length) > 0 && i7Data.erdung != 'isoliert' ? true : false;
-                    synchronousMachine.r = (0, parser_utils_1.isNumericI7)(i7Data.rg) ? (0, parser_utils_1.convertToNumberI7)(i7Data.rg) : ((0, parser_utils_1.isNumericI7)(genType === null || genType === void 0 ? void 0 : genType.rg) ? (0, parser_utils_1.convertToNumberI7)(genType.rg) : undefined);
-                    synchronousMachine.r0 = (0, parser_utils_1.isNumericI7)(i7Data.r0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r0) : undefined;
+                    synchronousMachine.r = parser_utils_1.isNumericI7(i7Data.rg) ? parser_utils_1.convertToNumberI7(i7Data.rg) : (parser_utils_1.isNumericI7(genType === null || genType === void 0 ? void 0 : genType.rg) ? parser_utils_1.convertToNumberI7(genType.rg) : undefined);
+                    synchronousMachine.r0 = parser_utils_1.isNumericI7(i7Data.r0) ? parser_utils_1.convertToNumberI7(i7Data.r0) : undefined;
                     synchronousMachine.r2 = 0;
-                    synchronousMachine.x0 = (0, parser_utils_1.isNumericI7)(i7Data.x0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x0) : undefined;
+                    synchronousMachine.x0 = parser_utils_1.isNumericI7(i7Data.x0) ? parser_utils_1.convertToNumberI7(i7Data.x0) : undefined;
                     synchronousMachine.x2 = 0;
-                    synchronousMachine.satDirectSubtransX = (0, parser_utils_1.isNumericI7)(i7Data.xd2s) ? (0, parser_utils_1.convertToNumberI7)(i7Data.xd2s) : ((0, parser_utils_1.isNumericI7)(genType === null || genType === void 0 ? void 0 : genType.xd2s) ? (0, parser_utils_1.convertToNumberI7)(genType.xd2s) : undefined);
+                    synchronousMachine.satDirectSubtransX = parser_utils_1.isNumericI7(i7Data.xd2s) ? parser_utils_1.convertToNumberI7(i7Data.xd2s) : (parser_utils_1.isNumericI7(genType === null || genType === void 0 ? void 0 : genType.xd2s) ? parser_utils_1.convertToNumberI7(genType.xd2s) : undefined);
                     // synchronousMachine.earthingStarPointR
                     // synchronousMachine.earthingStarPointX
-                    synchronousMachine.ikk = (0, parser_utils_1.isNumericI7)(i7Data.sk_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.sk_min) : ((0, parser_utils_1.isNumericI7)(i7Data.sk_akt) ? (0, parser_utils_1.convertToNumberI7)(i7Data.sk_akt) : ((0, parser_utils_1.isNumericI7)(i7Data.sk_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.sk_max) : undefined));
+                    synchronousMachine.ikk = parser_utils_1.isNumericI7(i7Data.sk_min) ? parser_utils_1.convertToNumberI7(i7Data.sk_min) : (parser_utils_1.isNumericI7(i7Data.sk_akt) ? parser_utils_1.convertToNumberI7(i7Data.sk_akt) : (parser_utils_1.isNumericI7(i7Data.sk_max) ? parser_utils_1.convertToNumberI7(i7Data.sk_max) : undefined));
                     // synchronousMachine.mu: number;
                     // synchronousMachine.satDirectSyncX: number;
                     // synchronousMachine.satDirectTransX: number;
@@ -1288,20 +1288,20 @@ class ConverterIntegral7 {
                     // synchronousMachine.voltageRegulationRange: number;
                     /** Create ReactiveCapabilityCurves */
                     if (minP && maxP && minQvonPmin && maxQvonPmax) {
-                        const reactiveCapabilityCurve = new ReactiveCapabilityCurve_1.ReactiveCapabilityCurve((0, parser_utils_1.getUUID)(i7Data.guid_rcc), (0, util_create_1.createNotation)(['CurveData', synchronousMachine.mrid, '_RCC']));
+                        const reactiveCapabilityCurve = new ReactiveCapabilityCurve_1.ReactiveCapabilityCurve(parser_utils_1.getUUID(i7Data.guid_rcc), util_create_1.createNotation(['CurveData', synchronousMachine.mrid, '_RCC']));
                         reactiveCapabilityCurve.curveStyle = CurveStyle_1.CurveStyle.straightLineYValues;
                         reactiveCapabilityCurve.xUnit = UnitSymbol_1.UnitSymbol.W;
                         reactiveCapabilityCurve.y1Unit = UnitSymbol_1.UnitSymbol.VAr;
                         reactiveCapabilityCurve.y2Unit = UnitSymbol_1.UnitSymbol.VAr;
                         //reactive capability curve data for pmin
-                        const curveData1 = new CurveData_1.CurveData((0, parser_utils_1.getUUID)(i7Data.guid_cd1));
+                        const curveData1 = new CurveData_1.CurveData(parser_utils_1.getUUID(i7Data.guid_cd1));
                         curveData1.curve = reactiveCapabilityCurve;
                         curveData1.xvalue = minP; //pMin
                         curveData1.y1value = minQvonPmin; //qMin pMin
                         curveData1.y2value = maxQvonPmin; //qMax pMin
                         cimModel.addCurveData(curveData1);
                         //reactive capability curve data for pmax
-                        const curveData2 = new CurveData_1.CurveData((0, parser_utils_1.getUUID)(i7Data.guid_cd2));
+                        const curveData2 = new CurveData_1.CurveData(parser_utils_1.getUUID(i7Data.guid_cd2));
                         curveData2.curve = reactiveCapabilityCurve;
                         curveData2.xvalue = maxP; //pMax
                         curveData2.y1value = minQvonPmax; //qMin pMax
@@ -1315,7 +1315,7 @@ class ConverterIntegral7 {
                     // TODO targetDeadband: ab welcher spannung soll reguliert werden.
                     switch (i7Data.spannungsgeregelt) {
                         case 1: {
-                            regulatingControl = new RegulatingControl_1.RegulatingControl((0, parser_utils_1.getUUID)(i7Data.guid_rc), (0, util_create_1.createNotation)(['GEN'], 32, true));
+                            regulatingControl = new RegulatingControl_1.RegulatingControl(parser_utils_1.getUUID(i7Data.guid_rc), util_create_1.createNotation(['GEN'], 32, true));
                             regulatingControl.targetValue = usoll !== undefined ? usoll : synchronousMachine.ratedU;
                             regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                             regulatingControl.discrete = false;
@@ -1338,18 +1338,18 @@ class ConverterIntegral7 {
                         if (generatingUnitConfig) {
                             switch (generatingUnitConfig.class) {
                                 case 'ThermalGeneratingUnit': {
-                                    generatingUnit = new ThermalGeneratingUnit_1.ThermalGeneratingUnit((0, parser_utils_1.getUUID)(i7Data.guid_gu), (0, util_create_1.createNotation)([i7Data.bezeichner, '_TGU']), i7Data.kurzname, i7Data.nameprimaertyp);
+                                    generatingUnit = new ThermalGeneratingUnit_1.ThermalGeneratingUnit(parser_utils_1.getUUID(i7Data.guid_gu), util_create_1.createNotation([i7Data.bezeichner, '_TGU']), i7Data.kurzname, i7Data.nameprimaertyp);
                                     if (generatingUnitConfig.fuelType) {
-                                        (0, utils_2.generateFuelType)(i7Data.nameprimaertyp, generatingUnitConfig.fuelType, generatingUnit, cimModel);
+                                        utils_2.generateFuelType(i7Data.nameprimaertyp, generatingUnitConfig.fuelType, generatingUnit, cimModel);
                                     }
                                     break;
                                 }
                                 case 'SolarGeneratingUnit': {
-                                    generatingUnit = new SolarGeneratingUnit_1.SolarGeneratingUnit((0, parser_utils_1.getUUID)(i7Data.guid_gu), (0, util_create_1.createNotation)([i7Data.bezeichner, '_SGU']), i7Data.kurzname, i7Data.nameprimaertyp);
+                                    generatingUnit = new SolarGeneratingUnit_1.SolarGeneratingUnit(parser_utils_1.getUUID(i7Data.guid_gu), util_create_1.createNotation([i7Data.bezeichner, '_SGU']), i7Data.kurzname, i7Data.nameprimaertyp);
                                     break;
                                 }
                                 case 'WindGeneratingUnit': {
-                                    generatingUnit = new WindGeneratingUnit_1.WindGeneratingUnit((0, parser_utils_1.getUUID)(i7Data.guid_gu), (0, util_create_1.createNotation)([i7Data.bezeichner, '_WGU']), i7Data.kurzname, i7Data.nameprimaertyp);
+                                    generatingUnit = new WindGeneratingUnit_1.WindGeneratingUnit(parser_utils_1.getUUID(i7Data.guid_gu), util_create_1.createNotation([i7Data.bezeichner, '_WGU']), i7Data.kurzname, i7Data.nameprimaertyp);
                                     switch (generatingUnitConfig.fuelType) {
                                         case 'onshore': {
                                             generatingUnit.windGenUnitType = WindGenUnitKind_1.WindGenUnitKind.onshore;
@@ -1368,17 +1368,17 @@ class ConverterIntegral7 {
                                     break;
                                 }
                                 case 'NuclearGeneratingUnit': {
-                                    generatingUnit = new NuclearGeneratingUnit_1.NuclearGeneratingUnit((0, parser_utils_1.getUUID)(i7Data.guid_gu), (0, util_create_1.createNotation)([i7Data.bezeichner, '_NGU']), i7Data.kurzname);
+                                    generatingUnit = new NuclearGeneratingUnit_1.NuclearGeneratingUnit(parser_utils_1.getUUID(i7Data.guid_gu), util_create_1.createNotation([i7Data.bezeichner, '_NGU']), i7Data.kurzname);
                                     break;
                                 }
                                 case 'HydroGeneratingUnit': {
-                                    generatingUnit = new HydroGeneratingUnit_1.HydroGeneratingUnit((0, parser_utils_1.getUUID)(i7Data.guid_gu), (0, util_create_1.createNotation)([i7Data.bezeichner, '_HGU']), i7Data.kurzname);
+                                    generatingUnit = new HydroGeneratingUnit_1.HydroGeneratingUnit(parser_utils_1.getUUID(i7Data.guid_gu), util_create_1.createNotation([i7Data.bezeichner, '_HGU']), i7Data.kurzname);
                                     /** Default pumpAndGenerator*/
                                     generatingUnit.energyConversionCapability = HydroEnergyConversionKind_1.HydroEnergyConversionKind.pumpAndGenerator;
                                     break;
                                 }
                                 default: {
-                                    generatingUnit = new GeneratingUnit_1.GeneratingUnit((0, parser_utils_1.getUUID)(i7Data.guid_gu), (0, util_create_1.createNotation)([i7Data.bezeichner, '_GU']), i7Data.kurzname);
+                                    generatingUnit = new GeneratingUnit_1.GeneratingUnit(parser_utils_1.getUUID(i7Data.guid_gu), util_create_1.createNotation([i7Data.bezeichner, '_GU']), i7Data.kurzname);
                                     break;
                                 }
                             }
@@ -1386,12 +1386,12 @@ class ConverterIntegral7 {
                         else {
                             /** Wenn über Config keine spezielle Klasse bestimmt wurde,
                              * dann initialisiere die Standardklasse GeneratingUnit. */
-                            generatingUnit = new GeneratingUnit_1.GeneratingUnit((0, parser_utils_1.getUUID)(i7Data.guid_gu), (0, util_create_1.createNotation)([i7Data.bezeichner, '_GU']), i7Data.kurzname);
+                            generatingUnit = new GeneratingUnit_1.GeneratingUnit(parser_utils_1.getUUID(i7Data.guid_gu), util_create_1.createNotation([i7Data.bezeichner, '_GU']), i7Data.kurzname);
                         }
                         // TODO: genControlSource is not required.
                         //generatingUnit.genControlSource = GeneratorControlSource.onAGC;
                         /**Complete GeneratingUnit data */
-                        generatingUnit.initialP = (0, parser_utils_1.isNumericI7)(i7Data.p0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p0) : undefined;
+                        generatingUnit.initialP = parser_utils_1.isNumericI7(i7Data.p0) ? parser_utils_1.convertToNumberI7(i7Data.p0) : undefined;
                         // generatingUnit.longPF
                         // generatingUnit.maximumAllowableSpinningReserve
                         generatingUnit.maxOperatingP = maxP;
@@ -1400,16 +1400,16 @@ class ConverterIntegral7 {
                          * The nominal power of the generating unit.  Used to give precise meaning to percentage based attributes such as the governor speed change droop (governorSCD attribute).
                          * The attribute shall be a positive value equal or less than RotatingMachine.ratedS.
                          */
-                        generatingUnit.nominalP = (0, parser_utils_1.isNumericI7)(cosphir) && (0, parser_utils_1.isNumericI7)(sr) ? cosphir * sr : generatingUnit.maxOperatingP;
+                        generatingUnit.nominalP = parser_utils_1.isNumericI7(cosphir) && parser_utils_1.isNumericI7(sr) ? cosphir * sr : generatingUnit.maxOperatingP;
                         /**
                          * Governor Speed Changer Droop. This is the change in generator power output divided by the change in frequency normalized by the nominal power of the
                          * generator and the nominal frequency and expressed in percent and negated. A positive value of speed change droop provides additional generator output
                          * upon a drop in frequency.
                          */
-                        const kr = (0, parser_utils_1.isNumericI7)(i7Data.kr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : undefined;
+                        const kr = parser_utils_1.isNumericI7(i7Data.kr) ? parser_utils_1.convertToNumberI7(i7Data.kr) : undefined;
                         //Nominal frequency.
                         const fn = 50;
-                        generatingUnit.governorSCD = ((0, parser_utils_1.isNumericI7)(kr) && (0, parser_utils_1.isNumericI7)(generatingUnit.nominalP)) ? (0, utils_2.calculateSigma)(fn, generatingUnit.nominalP, kr) : undefined;
+                        generatingUnit.governorSCD = (parser_utils_1.isNumericI7(kr) && parser_utils_1.isNumericI7(generatingUnit.nominalP)) ? utils_2.calculateSigma(fn, generatingUnit.nominalP, kr) : undefined;
                         // generatingUnit.ratedGrossMaxP
                         // generatingUnit.ratedGrossMinP
                         // generatingUnit.ratedNetMaxP
@@ -1426,26 +1426,26 @@ class ConverterIntegral7 {
                     // TODO: default value?
                     /*              smtcr.rotorType = undefined;
                                   smtcr.modelType = undefined; */
-                    smtcr.tpdo = (0, parser_utils_1.isNumericI7)(i7Data.td1s) ? (0, parser_utils_1.convertToNumberI7)(i7Data.td1s) : undefined;
-                    smtcr.tppdo = (0, parser_utils_1.isNumericI7)(i7Data.td2s) ? (0, parser_utils_1.convertToNumberI7)(i7Data.td2s) : undefined;
-                    smtcr.tpqo = (0, parser_utils_1.isNumericI7)(i7Data.tq1s) ? (0, parser_utils_1.convertToNumberI7)(i7Data.tq1s) : undefined;
-                    smtcr.tppqo = (0, parser_utils_1.isNumericI7)(i7Data.tq2s) ? (0, parser_utils_1.convertToNumberI7)(i7Data.tq2s) : undefined;
+                    smtcr.tpdo = parser_utils_1.isNumericI7(i7Data.td1s) ? parser_utils_1.convertToNumberI7(i7Data.td1s) : undefined;
+                    smtcr.tppdo = parser_utils_1.isNumericI7(i7Data.td2s) ? parser_utils_1.convertToNumberI7(i7Data.td2s) : undefined;
+                    smtcr.tpqo = parser_utils_1.isNumericI7(i7Data.tq1s) ? parser_utils_1.convertToNumberI7(i7Data.tq1s) : undefined;
+                    smtcr.tppqo = parser_utils_1.isNumericI7(i7Data.tq2s) ? parser_utils_1.convertToNumberI7(i7Data.tq2s) : undefined;
                     /** Längsachse
                      * xdu   xDirectSync
                      * xdu'  xDirectTrans
                      * xdu'' xDirectSubtrans
                      * xd'' TODO */
-                    smtcr.xDirectSync = (0, parser_utils_1.isNumericI7)(i7Data.xdu) ? (0, parser_utils_1.convertToNumberI7)(i7Data.xdu) : undefined;
-                    smtcr.xDirectTrans = (0, parser_utils_1.isNumericI7)(i7Data.xdu1s) ? (0, parser_utils_1.convertToNumberI7)(i7Data.xdu1s) : undefined;
-                    smtcr.xDirectSubtrans = (0, parser_utils_1.isNumericI7)(i7Data.xdu2s) ? (0, parser_utils_1.convertToNumberI7)(i7Data.xdu2s) : undefined;
+                    smtcr.xDirectSync = parser_utils_1.isNumericI7(i7Data.xdu) ? parser_utils_1.convertToNumberI7(i7Data.xdu) : undefined;
+                    smtcr.xDirectTrans = parser_utils_1.isNumericI7(i7Data.xdu1s) ? parser_utils_1.convertToNumberI7(i7Data.xdu1s) : undefined;
+                    smtcr.xDirectSubtrans = parser_utils_1.isNumericI7(i7Data.xdu2s) ? parser_utils_1.convertToNumberI7(i7Data.xdu2s) : undefined;
                     /** Querachse
                      * xqu   xQuadSync
                      * xqu'  xQuadTrans
                      * xqu'' xQuadSubtrans
                      * xq''  TODO */
-                    smtcr.xQuadSync = (0, parser_utils_1.isNumericI7)(i7Data.xqu) ? (0, parser_utils_1.convertToNumberI7)(i7Data.xqu) : undefined;
-                    smtcr.xQuadTrans = (0, parser_utils_1.isNumericI7)(i7Data.xqu1s) ? (0, parser_utils_1.convertToNumberI7)(i7Data.xqu1s) : undefined;
-                    smtcr.xQuadSubtrans = (0, parser_utils_1.isNumericI7)(i7Data.xqu2s) ? (0, parser_utils_1.convertToNumberI7)(i7Data.xqu2s) : undefined;
+                    smtcr.xQuadSync = parser_utils_1.isNumericI7(i7Data.xqu) ? parser_utils_1.convertToNumberI7(i7Data.xqu) : undefined;
+                    smtcr.xQuadTrans = parser_utils_1.isNumericI7(i7Data.xqu1s) ? parser_utils_1.convertToNumberI7(i7Data.xqu1s) : undefined;
+                    smtcr.xQuadSubtrans = parser_utils_1.isNumericI7(i7Data.xqu2s) ? parser_utils_1.convertToNumberI7(i7Data.xqu2s) : undefined;
                     /** Ständer
                      * TODO
                      * Streufeldreaktanz xsigma a -> .tc wird in Sekunden angegeben (!)*/
@@ -1468,10 +1468,10 @@ class ConverterIntegral7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             // Generatoren werden als GeneratingUnit und SynchronousMachine abgebildet
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ASYNCHRONMOTOR)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getNetzQuery)(integral_sql_1.I7Objects.ASYNCHRONMOTOR, 0, 0, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.ASYNCHRONMOTOR, 0, 0, knotenSfIDs));
                 for (const i7Data of result) {
                     const assetType = this.asynchronmotorTypen.get(i7Data.nametyp);
-                    const asynchronousMachine = new INTEGRALAsynchronousMachine_1.INTEGRALAsynchronousMachine((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_AM']), i7Data.kurzname, 'SO-' + i7Data.ukz + integral_prefix_1.MITTIGER_PUNKT + i7Data.bezeichner);
+                    const asynchronousMachine = new INTEGRALAsynchronousMachine_1.INTEGRALAsynchronousMachine(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_AM']), i7Data.kurzname, 'SO-' + i7Data.ukz + integral_prefix_1.MITTIGER_PUNKT + i7Data.bezeichner);
                     let mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
                     if (mf) {
                         cimModel.addMultiplierFactor(mf);
@@ -1479,14 +1479,14 @@ class ConverterIntegral7 {
                     }
                     asynchronousMachine.asynchronousMachineType = AsynchronousMachineKind_1.AsynchronousMachineKind.motor;
                     asynchronousMachine.efficiency = i7Data.wirkungsgrad * 100;
-                    asynchronousMachine.iaIrRatio = (0, parser_utils_1.isNumericI7)(i7Data.ilr_ir) ? i7Data.ilr_ir : assetType === null || assetType === void 0 ? void 0 : assetType.ilr_ir;
+                    asynchronousMachine.iaIrRatio = parser_utils_1.isNumericI7(i7Data.ilr_ir) ? i7Data.ilr_ir : assetType === null || assetType === void 0 ? void 0 : assetType.ilr_ir;
                     //asynchronousMachine.rxLockedRotorRatio = 0;
-                    asynchronousMachine.polePairNumber = (0, parser_utils_1.isNumericI7)(i7Data.polpaarz) ? i7Data.polpaarz : assetType === null || assetType === void 0 ? void 0 : assetType.polpaarz;
-                    asynchronousMachine.ratedMechanicalPower = (0, parser_utils_1.isNumericI7)(i7Data.p_mech) ? i7Data.p_mech : assetType === null || assetType === void 0 ? void 0 : assetType.p_mech;
-                    asynchronousMachine.ratedPowerFactor = (0, parser_utils_1.isNumericI7)(i7Data.cos_phir) ? i7Data.cos_phir : assetType === null || assetType === void 0 ? void 0 : assetType.cosphir;
-                    asynchronousMachine.ratedS = (0, parser_utils_1.isNumericI7)(i7Data.sr) ? i7Data.sr : assetType === null || assetType === void 0 ? void 0 : assetType.sr;
-                    asynchronousMachine.ratedU = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? i7Data.ur : assetType === null || assetType === void 0 ? void 0 : assetType.ur;
-                    const powerData = (0, utils_2.getActiveReactivePower)(i7Data, mf);
+                    asynchronousMachine.polePairNumber = parser_utils_1.isNumericI7(i7Data.polpaarz) ? i7Data.polpaarz : assetType === null || assetType === void 0 ? void 0 : assetType.polpaarz;
+                    asynchronousMachine.ratedMechanicalPower = parser_utils_1.isNumericI7(i7Data.p_mech) ? i7Data.p_mech : assetType === null || assetType === void 0 ? void 0 : assetType.p_mech;
+                    asynchronousMachine.ratedPowerFactor = parser_utils_1.isNumericI7(i7Data.cos_phir) ? i7Data.cos_phir : assetType === null || assetType === void 0 ? void 0 : assetType.cosphir;
+                    asynchronousMachine.ratedS = parser_utils_1.isNumericI7(i7Data.sr) ? i7Data.sr : assetType === null || assetType === void 0 ? void 0 : assetType.sr;
+                    asynchronousMachine.ratedU = parser_utils_1.isNumericI7(i7Data.ur) ? i7Data.ur : assetType === null || assetType === void 0 ? void 0 : assetType.ur;
+                    const powerData = utils_2.getActiveReactivePower(i7Data, mf);
                     const p = powerData[0];
                     const q = powerData[1];
                     asynchronousMachine.setActivePower(p);
@@ -1494,11 +1494,11 @@ class ConverterIntegral7 {
                     asynchronousMachine.p_mf = powerData[2] ? powerData[2] : undefined;
                     asynchronousMachine.q_mf = powerData[3] ? powerData[3] : undefined;
                     asynchronousMachine.controlEnabled = false;
-                    const inBetrieb = (0, parser_utils_1.isBooleanI7)(i7Data.betrieb) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb) : true;
+                    const inBetrieb = parser_utils_1.isBooleanI7(i7Data.betrieb) ? parser_utils_1.convertToBooleanI7(i7Data.betrieb) : true;
                     asynchronousMachine.normallyInService = inBetrieb;
                     const connectivityNode = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
                     if (connectivityNode) {
-                        (0, util_create_1.createConnection)(cimModel, asynchronousMachine, connectivityNode, PhaseCode_1.PhaseCode.ABC);
+                        util_create_1.createConnection(cimModel, asynchronousMachine, connectivityNode, PhaseCode_1.PhaseCode.ABC);
                         //const equipmentContainer = determineEquipmentContainer('VoltageLevel', this.cimModel, this.cimModel.getObject(connectivityNode.getConnectivityNodeContainerUUID()) as EquipmentContainer);
                         const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject(connectivityNode.getConnectivityNodeContainerUUID()));
                         if (equipmentContainer) {
@@ -1525,9 +1525,9 @@ class ConverterIntegral7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             // Generatoren werden als GeneratingUnit und SynchronousMachine abgebildet
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KWBLOCK)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.KWBLOCK, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KWBLOCK), knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KWBLOCK, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KWBLOCK), knotenSfIDs));
                 for (const i7Data of result) {
-                    const synchronousMachine = new INTEGRALSynchronousMachine_1.INTEGRALSynchronousMachine((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SM']), i7Data.kurzname);
+                    const synchronousMachine = new INTEGRALSynchronousMachine_1.INTEGRALSynchronousMachine(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_SM']), i7Data.kurzname);
                     let mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
                     if (mf) {
                         cimModel.addMultiplierFactor(mf);
@@ -1536,17 +1536,17 @@ class ConverterIntegral7 {
                     /** Immer Generator */
                     synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generator;
                     synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.generator;
-                    synchronousMachine.referencePriority = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio) : undefined;
-                    const maxP = (0, parser_utils_1.isNumericI7)(i7Data.p_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_max) : 0;
-                    const maxQ = (0, parser_utils_1.isNumericI7)(i7Data.q_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_max) : undefined;
-                    const minQ = (0, parser_utils_1.isNumericI7)(i7Data.q_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_min) : undefined;
+                    synchronousMachine.referencePriority = parser_utils_1.isNumericI7(i7Data.einspprio) ? parser_utils_1.convertToNumberI7(i7Data.einspprio) : undefined;
+                    const maxP = parser_utils_1.isNumericI7(i7Data.p_max) ? parser_utils_1.convertToNumberI7(i7Data.p_max) : 0;
+                    const maxQ = parser_utils_1.isNumericI7(i7Data.q_max) ? parser_utils_1.convertToNumberI7(i7Data.q_max) : undefined;
+                    const minQ = parser_utils_1.isNumericI7(i7Data.q_min) ? parser_utils_1.convertToNumberI7(i7Data.q_min) : undefined;
                     synchronousMachine.maxQ = maxQ;
                     synchronousMachine.minQ = minQ;
-                    const sr = (0, parser_utils_1.isNumericI7)(i7Data.srg) ? (0, parser_utils_1.convertToNumberI7)(i7Data.srg) : undefined;
+                    const sr = parser_utils_1.isNumericI7(i7Data.srg) ? parser_utils_1.convertToNumberI7(i7Data.srg) : undefined;
                     synchronousMachine.ratedS = sr;
-                    const ur = (0, parser_utils_1.isNumericI7)(i7Data.urg) ? (0, parser_utils_1.convertToNumberI7)(i7Data.urg) : undefined;
+                    const ur = parser_utils_1.isNumericI7(i7Data.urg) ? parser_utils_1.convertToNumberI7(i7Data.urg) : undefined;
                     synchronousMachine.ratedU = ur;
-                    const cosphir = (0, parser_utils_1.isNumericI7)(i7Data.cosphir) ? (0, parser_utils_1.convertToNumberI7)(i7Data.cosphir) : undefined;
+                    const cosphir = parser_utils_1.isNumericI7(i7Data.cosphir) ? parser_utils_1.convertToNumberI7(i7Data.cosphir) : undefined;
                     // alle aggregiert
                     synchronousMachine.aggregate = true;
                     /** Percent of the coordinated reactive control that comes from this machine.*/
@@ -1598,18 +1598,18 @@ class ConverterIntegral7 {
                     if (generatingUnitConfig) {
                         switch (generatingUnitConfig.class) {
                             case 'ThermalGeneratingUnit': {
-                                generatingUnit = new ThermalGeneratingUnit_1.ThermalGeneratingUnit((0, parser_utils_1.getUUID)(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname, i7Data.nameprimaertyp);
+                                generatingUnit = new ThermalGeneratingUnit_1.ThermalGeneratingUnit(parser_utils_1.getUUID(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname, i7Data.nameprimaertyp);
                                 if (generatingUnitConfig.fuelType) {
-                                    (0, utils_2.generateFuelType)(i7Data.nameprimaertyp, generatingUnitConfig.fuelType, generatingUnit, cimModel);
+                                    utils_2.generateFuelType(i7Data.nameprimaertyp, generatingUnitConfig.fuelType, generatingUnit, cimModel);
                                 }
                                 break;
                             }
                             case 'SolarGeneratingUnit': {
-                                generatingUnit = new SolarGeneratingUnit_1.SolarGeneratingUnit((0, parser_utils_1.getUUID)(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname, i7Data.nameprimaertyp);
+                                generatingUnit = new SolarGeneratingUnit_1.SolarGeneratingUnit(parser_utils_1.getUUID(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname, i7Data.nameprimaertyp);
                                 break;
                             }
                             case 'WindGeneratingUnit': {
-                                generatingUnit = new WindGeneratingUnit_1.WindGeneratingUnit((0, parser_utils_1.getUUID)(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname, i7Data.nameprimaertyp);
+                                generatingUnit = new WindGeneratingUnit_1.WindGeneratingUnit(parser_utils_1.getUUID(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname, i7Data.nameprimaertyp);
                                 switch (generatingUnitConfig.fuelType) {
                                     case 'onshore': {
                                         generatingUnit.windGenUnitType = WindGenUnitKind_1.WindGenUnitKind.onshore;
@@ -1627,31 +1627,31 @@ class ConverterIntegral7 {
                                 break;
                             }
                             case 'NuclearGeneratingUnit': {
-                                generatingUnit = new NuclearGeneratingUnit_1.NuclearGeneratingUnit((0, parser_utils_1.getUUID)(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname);
+                                generatingUnit = new NuclearGeneratingUnit_1.NuclearGeneratingUnit(parser_utils_1.getUUID(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname);
                                 break;
                             }
                         }
                     }
                     if (!generatingUnit) {
-                        generatingUnit = new GeneratingUnit_1.GeneratingUnit((0, parser_utils_1.getUUID)(''), 'KWBlock' + i7Data.bezeichner, i7Data.kurzname);
+                        generatingUnit = new GeneratingUnit_1.GeneratingUnit(parser_utils_1.getUUID(''), 'KWBlock' + i7Data.bezeichner, i7Data.kurzname);
                     }
                     generatingUnit.genControlSource = GeneratorControlSource_1.GeneratorControlSource.unavailable;
-                    generatingUnit.initialP = (0, parser_utils_1.isNumericI7)(i7Data.p0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p0) : undefined;
+                    generatingUnit.initialP = parser_utils_1.isNumericI7(i7Data.p0) ? parser_utils_1.convertToNumberI7(i7Data.p0) : undefined;
                     // generatingUnit.longPF
                     // generatingUnit.maximumAllowableSpinningReserve
-                    generatingUnit.maxOperatingP = (0, parser_utils_1.isNumericI7)(i7Data.p_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_max) : undefined;
-                    generatingUnit.minOperatingP = (0, parser_utils_1.isNumericI7)(i7Data.p_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_min) : undefined;
+                    generatingUnit.maxOperatingP = parser_utils_1.isNumericI7(i7Data.p_max) ? parser_utils_1.convertToNumberI7(i7Data.p_max) : undefined;
+                    generatingUnit.minOperatingP = parser_utils_1.isNumericI7(i7Data.p_min) ? parser_utils_1.convertToNumberI7(i7Data.p_min) : undefined;
                     //Nominal power assignement. -> See generatingUnit.nominalP assignement at convertGeneratoren(...) method definition.
-                    generatingUnit.nominalP = (0, parser_utils_1.isNumericI7)(cosphir) && (0, parser_utils_1.isNumericI7)(sr) ? cosphir * sr : generatingUnit.maxOperatingP;
+                    generatingUnit.nominalP = parser_utils_1.isNumericI7(cosphir) && parser_utils_1.isNumericI7(sr) ? cosphir * sr : generatingUnit.maxOperatingP;
                     /**
                      * Governor Speed Changer Droop. This is the change in generator power output divided by the change in frequency normalized by the nominal power of the
                      * generator and the nominal frequency and expressed in percent and negated. A positive value of speed change droop provides additional generator output
                      * upon a drop in frequency.
                      */
-                    const kr = (0, parser_utils_1.isNumericI7)(i7Data.kr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : undefined;
+                    const kr = parser_utils_1.isNumericI7(i7Data.kr) ? parser_utils_1.convertToNumberI7(i7Data.kr) : undefined;
                     //Nominal frequency.
                     const fn = 50;
-                    generatingUnit.governorSCD = ((0, parser_utils_1.isNumericI7)(kr) && (0, parser_utils_1.isNumericI7)(generatingUnit.nominalP)) ? (0, utils_2.calculateSigma)(fn, generatingUnit.nominalP, kr) : undefined;
+                    generatingUnit.governorSCD = (parser_utils_1.isNumericI7(kr) && parser_utils_1.isNumericI7(generatingUnit.nominalP)) ? utils_2.calculateSigma(fn, generatingUnit.nominalP, kr) : undefined;
                     // generatingUnit.ratedGrossMaxP
                     // generatingUnit.ratedGrossMinP
                     // generatingUnit.ratedNetMaxP
@@ -1673,13 +1673,13 @@ class ConverterIntegral7 {
     convertErsatzQuerZweige2ExternalNetworkInjection(cimModel, result) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
-                const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_ENI']), i7Data.kurzname);
+                const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_ENI']), i7Data.kurzname);
                 // ??
-                const usoll = (0, parser_utils_1.isNumericI7)(i7Data.usoll) ? (0, parser_utils_1.convertToNumberI7)(i7Data.usoll) : undefined;
+                const usoll = parser_utils_1.isNumericI7(i7Data.usoll) ? parser_utils_1.convertToNumberI7(i7Data.usoll) : undefined;
                 // TODO: Beteiligen sich Ersatzquerzweige an der Wirkleistungsregelung? Hier: NEIN
-                const governorscd = (0, parser_utils_1.isNumericI7)(i7Data.kr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : undefined;
+                const governorscd = parser_utils_1.isNumericI7(i7Data.kr) ? parser_utils_1.convertToNumberI7(i7Data.kr) : undefined;
                 externalNetworkInjection.governorSCD = governorscd;
-                const prio = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio) : undefined;
+                const prio = parser_utils_1.isNumericI7(i7Data.einspprio) ? parser_utils_1.convertToNumberI7(i7Data.einspprio) : undefined;
                 externalNetworkInjection.referencePriority = prio;
                 externalNetworkInjection.aggregate = true; // default Wert im I7 Export
                 externalNetworkInjection.ikSecond = undefined; // default Wert im I7 Export
@@ -1708,21 +1708,21 @@ class ConverterIntegral7 {
     convertErsatzQuerZweige2EquivalentInjection(cimModel, result) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
-                const einspeisePrio = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio) : 1;
-                const flag_lfl = (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_lfl);
-                const flag_ks = (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_ks);
-                const usoll = (0, parser_utils_1.isNumericI7)(i7Data.usoll) ? (0, parser_utils_1.convertToNumberI7)(i7Data.usoll) : undefined;
-                const r_ext = (0, parser_utils_1.isNumericI7)(i7Data.r_ext) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r_ext) : undefined;
-                const x_ext = (0, parser_utils_1.isNumericI7)(i7Data.x_ext) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x_ext) : undefined;
-                const sk2 = (0, parser_utils_1.isNumericI7)(i7Data.sk) ? (0, parser_utils_1.convertToNumberI7)(i7Data.sk) : undefined;
-                const p_ein = (0, parser_utils_1.isNumericI7)(i7Data.p_ein) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_ein) * -1 : undefined; //Einspeisung: Erzeugerzählpfeilsystem, d.h. eine Übersetzung ins Verbraucherzählpfeilsystem wird durchgeführt
-                const q_ein = (0, parser_utils_1.isNumericI7)(i7Data.q_ein) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_ein) * -1 : undefined; //Einspeisung: Erzeugerzählpfeilsystem, d.h. eine Übersetzung ins Verbraucherzählpfeilsystem wird durchgeführt
-                const kr = (0, parser_utils_1.isNumericI7)(i7Data.kr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : undefined;
-                const r0 = (0, parser_utils_1.isNumericI7)(i7Data.r0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r1) : undefined;
-                const r1 = (0, parser_utils_1.isNumericI7)(i7Data.r1) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r1) : undefined;
-                const x0 = (0, parser_utils_1.isNumericI7)(i7Data.r1) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r1) : undefined;
-                const x1 = (0, parser_utils_1.isNumericI7)(i7Data.r1) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r1) : undefined;
-                const equivalentInjection = new INTEGRALEquivalentInjection_1.INTEGRALEquivalentInjection((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_EI']), i7Data.kurzname);
+                const einspeisePrio = parser_utils_1.isNumericI7(i7Data.einspprio) ? parser_utils_1.convertToNumberI7(i7Data.einspprio) : 1;
+                const flag_lfl = parser_utils_1.convertToBooleanI7(i7Data.flag_lfl);
+                const flag_ks = parser_utils_1.convertToBooleanI7(i7Data.flag_ks);
+                const usoll = parser_utils_1.isNumericI7(i7Data.usoll) ? parser_utils_1.convertToNumberI7(i7Data.usoll) : undefined;
+                const r_ext = parser_utils_1.isNumericI7(i7Data.r_ext) ? parser_utils_1.convertToNumberI7(i7Data.r_ext) : undefined;
+                const x_ext = parser_utils_1.isNumericI7(i7Data.x_ext) ? parser_utils_1.convertToNumberI7(i7Data.x_ext) : undefined;
+                const sk2 = parser_utils_1.isNumericI7(i7Data.sk) ? parser_utils_1.convertToNumberI7(i7Data.sk) : undefined;
+                const p_ein = parser_utils_1.isNumericI7(i7Data.p_ein) ? parser_utils_1.convertToNumberI7(i7Data.p_ein) * -1 : undefined; //Einspeisung: Erzeugerzählpfeilsystem, d.h. eine Übersetzung ins Verbraucherzählpfeilsystem wird durchgeführt
+                const q_ein = parser_utils_1.isNumericI7(i7Data.q_ein) ? parser_utils_1.convertToNumberI7(i7Data.q_ein) * -1 : undefined; //Einspeisung: Erzeugerzählpfeilsystem, d.h. eine Übersetzung ins Verbraucherzählpfeilsystem wird durchgeführt
+                const kr = parser_utils_1.isNumericI7(i7Data.kr) ? parser_utils_1.convertToNumberI7(i7Data.kr) : undefined;
+                const r0 = parser_utils_1.isNumericI7(i7Data.r0) ? parser_utils_1.convertToNumberI7(i7Data.r1) : undefined;
+                const r1 = parser_utils_1.isNumericI7(i7Data.r1) ? parser_utils_1.convertToNumberI7(i7Data.r1) : undefined;
+                const x0 = parser_utils_1.isNumericI7(i7Data.r1) ? parser_utils_1.convertToNumberI7(i7Data.r1) : undefined;
+                const x1 = parser_utils_1.isNumericI7(i7Data.r1) ? parser_utils_1.convertToNumberI7(i7Data.r1) : undefined;
+                const equivalentInjection = new INTEGRALEquivalentInjection_1.INTEGRALEquivalentInjection(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_EI']), i7Data.kurzname);
                 /** Export Extended Ward equivalent with voltage regulation */
                 if (flag_lfl && !flag_ks && usoll && (r_ext !== 0 || x_ext !== 0)) {
                     //is regulating equivalent equipment
@@ -1795,7 +1795,7 @@ class ConverterIntegral7 {
     convertBoundaryInjections(cimModel, knotenSfIDs, targetClass) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.BOUNDARYINJECTION)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.BOUNDARYINJECTION, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.BOUNDARYINJECTION), knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.BOUNDARYINJECTION, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.BOUNDARYINJECTION), knotenSfIDs));
                 switch (targetClass) {
                     case cim_class_names_1.ClassNames.EquivalentInjection: {
                         yield this.convertBoundaryInjections2EquivalentInjection(cimModel, result);
@@ -1818,13 +1818,13 @@ class ConverterIntegral7 {
     }
     convertBoundaryInjections2EquivalentInjection(cimModel, result) {
         for (const i7Data of result) {
-            const equivalentInjection = new EquivalentInjection_1.EquivalentInjection((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), 'BD_EI']), i7Data.kurzname);
-            const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
+            const equivalentInjection = new EquivalentInjection_1.EquivalentInjection(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), 'BD_EI']), i7Data.kurzname);
+            const inBetrieb = parser_utils_1.convertToBooleanI7(i7Data.betrieb);
             // const usoll = i7Data.usoll;
-            const einspeisePrio = (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio);
+            const einspeisePrio = parser_utils_1.convertToNumberI7(i7Data.einspprio);
             // const spannungsgeregelt = convertToBooleanI7(i7Data.spannungsgeregelt);
-            equivalentInjection.p = (0, parser_utils_1.convertToNumberI7)(i7Data.p_ersatznetz) + (0, parser_utils_1.convertToNumberI7)(i7Data.p_restnetz);
-            equivalentInjection.q = (0, parser_utils_1.convertToNumberI7)(i7Data.q_ersatznetz) + (0, parser_utils_1.convertToNumberI7)(i7Data.q_restnetz);
+            equivalentInjection.p = parser_utils_1.convertToNumberI7(i7Data.p_ersatznetz) + parser_utils_1.convertToNumberI7(i7Data.p_restnetz);
+            equivalentInjection.q = parser_utils_1.convertToNumberI7(i7Data.q_ersatznetz) + parser_utils_1.convertToNumberI7(i7Data.q_restnetz);
             // TODO Beteiligen sich Randnetzeinspeisungen an der Leistungsregelung? Hier: NEIN
             const kr = 0;
             //equivalentInjection.governorSCD = kr;
@@ -1870,20 +1870,20 @@ class ConverterIntegral7 {
     }
     convertBoundaryInjections2ExternalNetworkInjection(cimModel, result) {
         for (const i7Data of result) {
-            const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection((0, parser_utils_1.getUUID)(i7Data.guid), (0, utils_2.getName)(i7Data), i7Data.kurzname);
-            const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
+            const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection(parser_utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+            const inBetrieb = parser_utils_1.convertToBooleanI7(i7Data.betrieb);
             // const usoll = i7Data.usoll;
-            const einspeisePrio = (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio);
+            const einspeisePrio = parser_utils_1.convertToNumberI7(i7Data.einspprio);
             // const spannungsgeregelt = convertToBooleanI7(i7Data.spannungsgeregelt);
-            externalNetworkInjection.p = (0, parser_utils_1.convertToNumberI7)(i7Data.p_ersatznetz) + (0, parser_utils_1.convertToNumberI7)(i7Data.p_restnetz);
-            externalNetworkInjection.q = (0, parser_utils_1.convertToNumberI7)(i7Data.q_ersatznetz) + (0, parser_utils_1.convertToNumberI7)(i7Data.q_restnetz);
+            externalNetworkInjection.p = parser_utils_1.convertToNumberI7(i7Data.p_ersatznetz) + parser_utils_1.convertToNumberI7(i7Data.p_restnetz);
+            externalNetworkInjection.q = parser_utils_1.convertToNumberI7(i7Data.q_ersatznetz) + parser_utils_1.convertToNumberI7(i7Data.q_restnetz);
             // TODO Beteiligen sich Randnetzeinspeisungen an der Leistungsregelung? Hier: NEIN
-            const governorscd = (0, parser_utils_1.isNumericI7)(i7Data.kr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : undefined;
+            const governorscd = parser_utils_1.isNumericI7(i7Data.kr) ? parser_utils_1.convertToNumberI7(i7Data.kr) : undefined;
             externalNetworkInjection.governorSCD = governorscd;
             externalNetworkInjection.referencePriority = einspeisePrio;
             /**        externalNetworkInjection.maxR0ToX0Ratio = 1/(/x0/r0)
              externalNetworkInjection.maxR1ToX1Ratio = (1/x1/r1) */
-            externalNetworkInjection.maxZ0ToZ1Ratio = (0, parser_utils_1.convertToNumberI7)(i7Data.z0_z1);
+            externalNetworkInjection.maxZ0ToZ1Ratio = parser_utils_1.convertToNumberI7(i7Data.z0_z1);
             /** RegulatingControl */
             const regulatingControl = new RegulatingControl_1.RegulatingControl(common_utils_1.CommonUtils.generateUUID(), `RC_BI_${i7Data.id}`);
             regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
@@ -1925,7 +1925,7 @@ class ConverterIntegral7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const cimModel = frame.cimModel;
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG) && integral7.ersatzZweigAnschlussKnotenIDs.length > 0) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.ERSATZLAENGSZWEIG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG), integral7.ersatzZweigAnschlussKnotenIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.ERSATZLAENGSZWEIG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG), integral7.ersatzZweigAnschlussKnotenIDs));
                 //const result2: LeitungErsatzLaengszweig[] = await this.mysqlController.execQuery(getI7Query(I7Objects.ERSATZLAENGSZWEIGDIFF, integral7.ersatzZweigAnschlussKnotenIDs));
                 for (const i7Data of result) {
                     // Topologie
@@ -1935,17 +1935,17 @@ class ConverterIntegral7 {
                       *  KnotenSf -> Schaltfeldpunkt
                       *  KnotenZw -> Netzschlaufe -> KnotenSo -> Anschlusspunkt */
                     const i7Schluessel = integral_prefix_1.ERSATZLAENGSZWEIG_PRAEFIX +
-                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.ukz) +
+                        utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
                         integral_prefix_1.MITTIGER_PUNKT +
-                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.kurzname) +
+                        utils_2.ueberpruefeZeichenkette(i7Data.kurzname) +
                         integral_prefix_1.MITTIGER_PUNKT +
-                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner) +
+                        utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
                         integral_prefix_1.MITTIGER_PUNKT +
-                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.stkabname);
-                    const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid);
-                    const equivalentBranch = new INTEGRALEquivalentBranch_1.INTEGRALEquivalentBranch(rdfid, (0, util_create_1.createNotation)([i7Data.bezeichner, '_', rdfid.substring(0, 8), '_EB'], 32, true), i7Data.kurzname, i7Schluessel);
-                    const flag_lfl = (0, parser_utils_1.isBooleanI7)(i7Data.flag_lfl) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_lfl) : false;
-                    const flag_ks = (0, parser_utils_1.isBooleanI7)(i7Data.flag_ks) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_ks) : false;
+                        utils_2.ueberpruefeZeichenkette(i7Data.stkabname);
+                    const rdfid = parser_utils_1.getUUID(i7Data.guid);
+                    const equivalentBranch = new INTEGRALEquivalentBranch_1.INTEGRALEquivalentBranch(rdfid, util_create_1.createNotation([i7Data.bezeichner, '_', rdfid.substring(0, 8), '_EB'], 32, true), i7Data.kurzname, i7Schluessel);
+                    const flag_lfl = parser_utils_1.isBooleanI7(i7Data.flag_lfl) ? parser_utils_1.convertToBooleanI7(i7Data.flag_lfl) : false;
+                    const flag_ks = parser_utils_1.isBooleanI7(i7Data.flag_ks) ? parser_utils_1.convertToBooleanI7(i7Data.flag_ks) : false;
                     // Topologie
                     /** Anfang
                      * 3 moegliche Anschluesse
@@ -1956,61 +1956,61 @@ class ConverterIntegral7 {
                     this.createBoundaryConnection(frame, equivalentBranch, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC);
                     /**EQ */
                     if (flag_lfl || (flag_lfl && flag_ks)) {
-                        equivalentBranch.r = (0, parser_utils_1.isNumericI7)(i7Data.r12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r12_lfl) : 0;
-                        equivalentBranch.x = (0, parser_utils_1.isNumericI7)(i7Data.x12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x12_lfl) : 0;
-                        equivalentBranch.r21 = (0, parser_utils_1.isNumericI7)(i7Data.r21_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r21_lfl) : equivalentBranch.r;
-                        equivalentBranch.x21 = (0, parser_utils_1.isNumericI7)(i7Data.x21_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x21_lfl) : equivalentBranch.x;
-                        equivalentBranch.positiveR12 = (0, parser_utils_1.isNumericI7)(i7Data.r12_ks) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r12_ks) : 10e9;
+                        equivalentBranch.r = parser_utils_1.isNumericI7(i7Data.r12_lfl) ? parser_utils_1.convertToNumberI7(i7Data.r12_lfl) : 0;
+                        equivalentBranch.x = parser_utils_1.isNumericI7(i7Data.x12_lfl) ? parser_utils_1.convertToNumberI7(i7Data.x12_lfl) : 0;
+                        equivalentBranch.r21 = parser_utils_1.isNumericI7(i7Data.r21_lfl) ? parser_utils_1.convertToNumberI7(i7Data.r21_lfl) : equivalentBranch.r;
+                        equivalentBranch.x21 = parser_utils_1.isNumericI7(i7Data.x21_lfl) ? parser_utils_1.convertToNumberI7(i7Data.x21_lfl) : equivalentBranch.x;
+                        equivalentBranch.positiveR12 = parser_utils_1.isNumericI7(i7Data.r12_ks) ? parser_utils_1.convertToNumberI7(i7Data.r12_ks) : 10e9;
                         equivalentBranch.positiveR21 = equivalentBranch.positiveR12;
-                        equivalentBranch.positiveX12 = (0, parser_utils_1.isNumericI7)(i7Data.x12_ks) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x12_ks) : 10e9;
+                        equivalentBranch.positiveX12 = parser_utils_1.isNumericI7(i7Data.x12_ks) ? parser_utils_1.convertToNumberI7(i7Data.x12_ks) : 10e9;
                         equivalentBranch.positiveX21 = equivalentBranch.positiveX12;
                         equivalentBranch.negativeR12 = equivalentBranch.positiveR12;
                         equivalentBranch.negativeR21 = equivalentBranch.positiveR21;
                         equivalentBranch.negativeX12 = equivalentBranch.positiveX12;
                         equivalentBranch.negativeX21 = equivalentBranch.positiveX21;
-                        equivalentBranch.zeroR12 = (0, parser_utils_1.isNumericI7)(i7Data.r0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r0) : 10e9;
+                        equivalentBranch.zeroR12 = parser_utils_1.isNumericI7(i7Data.r0) ? parser_utils_1.convertToNumberI7(i7Data.r0) : 10e9;
                         equivalentBranch.zeroR21 = equivalentBranch.zeroR12;
-                        equivalentBranch.zeroX12 = (0, parser_utils_1.isNumericI7)(i7Data.x0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x0) : 10e9;
+                        equivalentBranch.zeroX12 = parser_utils_1.isNumericI7(i7Data.x0) ? parser_utils_1.convertToNumberI7(i7Data.x0) : 10e9;
                         equivalentBranch.zeroX21 = equivalentBranch.zeroX12;
                     }
                     else if (!flag_lfl && flag_ks) {
                         /**EQ-SC */
-                        equivalentBranch.positiveR12 = (0, parser_utils_1.isNumericI7)(i7Data.r12_ks) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r12_ks) : 10e9;
+                        equivalentBranch.positiveR12 = parser_utils_1.isNumericI7(i7Data.r12_ks) ? parser_utils_1.convertToNumberI7(i7Data.r12_ks) : 10e9;
                         equivalentBranch.positiveR21 = equivalentBranch.positiveR12;
-                        equivalentBranch.positiveX12 = (0, parser_utils_1.isNumericI7)(i7Data.x12_ks) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x12_ks) : 10e9;
+                        equivalentBranch.positiveX12 = parser_utils_1.isNumericI7(i7Data.x12_ks) ? parser_utils_1.convertToNumberI7(i7Data.x12_ks) : 10e9;
                         equivalentBranch.positiveX21 = equivalentBranch.positiveX12;
                         equivalentBranch.negativeR12 = equivalentBranch.positiveR12;
                         equivalentBranch.negativeR21 = equivalentBranch.positiveR21;
                         equivalentBranch.negativeX12 = equivalentBranch.positiveX12;
                         equivalentBranch.negativeX21 = equivalentBranch.positiveX21;
-                        equivalentBranch.zeroR12 = (0, parser_utils_1.isNumericI7)(i7Data.r0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r0) : 10e9;
+                        equivalentBranch.zeroR12 = parser_utils_1.isNumericI7(i7Data.r0) ? parser_utils_1.convertToNumberI7(i7Data.r0) : 10e9;
                         equivalentBranch.zeroR21 = equivalentBranch.zeroR12;
-                        equivalentBranch.zeroX12 = (0, parser_utils_1.isNumericI7)(i7Data.x0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x0) : 10e9;
+                        equivalentBranch.zeroX12 = parser_utils_1.isNumericI7(i7Data.x0) ? parser_utils_1.convertToNumberI7(i7Data.x0) : 10e9;
                         equivalentBranch.zeroX21 = equivalentBranch.zeroX12;
                     }
                     else { //If neither flag_lfl nor flag_ks are specified, any impedance value that is specified will be exported.
-                        equivalentBranch.r = (0, parser_utils_1.isNumericI7)(i7Data.r12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r12_lfl) : 0;
-                        equivalentBranch.x = (0, parser_utils_1.isNumericI7)(i7Data.x12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x12_lfl) : 0;
-                        equivalentBranch.r21 = (0, parser_utils_1.isNumericI7)(i7Data.r21_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r21_lfl) : equivalentBranch.r;
-                        equivalentBranch.x21 = (0, parser_utils_1.isNumericI7)(i7Data.x21_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x21_lfl) : equivalentBranch.x;
-                        equivalentBranch.positiveR12 = (0, parser_utils_1.isNumericI7)(i7Data.r12_ks) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r12_ks) : 10e9;
+                        equivalentBranch.r = parser_utils_1.isNumericI7(i7Data.r12_lfl) ? parser_utils_1.convertToNumberI7(i7Data.r12_lfl) : 0;
+                        equivalentBranch.x = parser_utils_1.isNumericI7(i7Data.x12_lfl) ? parser_utils_1.convertToNumberI7(i7Data.x12_lfl) : 0;
+                        equivalentBranch.r21 = parser_utils_1.isNumericI7(i7Data.r21_lfl) ? parser_utils_1.convertToNumberI7(i7Data.r21_lfl) : equivalentBranch.r;
+                        equivalentBranch.x21 = parser_utils_1.isNumericI7(i7Data.x21_lfl) ? parser_utils_1.convertToNumberI7(i7Data.x21_lfl) : equivalentBranch.x;
+                        equivalentBranch.positiveR12 = parser_utils_1.isNumericI7(i7Data.r12_ks) ? parser_utils_1.convertToNumberI7(i7Data.r12_ks) : 10e9;
                         equivalentBranch.positiveR21 = equivalentBranch.positiveR12;
-                        equivalentBranch.positiveX12 = (0, parser_utils_1.isNumericI7)(i7Data.x12_ks) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x12_ks) : 10e9;
+                        equivalentBranch.positiveX12 = parser_utils_1.isNumericI7(i7Data.x12_ks) ? parser_utils_1.convertToNumberI7(i7Data.x12_ks) : 10e9;
                         equivalentBranch.positiveX21 = equivalentBranch.positiveX12;
                         equivalentBranch.negativeR12 = equivalentBranch.positiveR12;
                         equivalentBranch.negativeR21 = equivalentBranch.positiveR21;
                         equivalentBranch.negativeX12 = equivalentBranch.positiveX12;
                         equivalentBranch.negativeX21 = equivalentBranch.positiveX21;
-                        equivalentBranch.zeroR12 = (0, parser_utils_1.isNumericI7)(i7Data.r0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r0) : 10e9;
+                        equivalentBranch.zeroR12 = parser_utils_1.isNumericI7(i7Data.r0) ? parser_utils_1.convertToNumberI7(i7Data.r0) : 10e9;
                         equivalentBranch.zeroR21 = equivalentBranch.zeroR12;
-                        equivalentBranch.zeroX12 = (0, parser_utils_1.isNumericI7)(i7Data.x0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x0) : 10e9;
+                        equivalentBranch.zeroX12 = parser_utils_1.isNumericI7(i7Data.x0) ? parser_utils_1.convertToNumberI7(i7Data.x0) : 10e9;
                         equivalentBranch.zeroX21 = equivalentBranch.zeroX12;
                         this.logger.warn(`Ersatzlängszweig mit GUID ${equivalentBranch.getUUID()} sind die Flags flag_lfl sowie flag_ks nicht definiert.`);
                     }
                     const bdf = [];
                     bdf.push(this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.aknoten)));
                     bdf.push(this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.eknoten)));
-                    const baseVoltages = (0, utils_2.getTerminalUn)(cimModel, bdf, equivalentBranch);
+                    const baseVoltages = utils_2.getTerminalUn(cimModel, bdf, equivalentBranch);
                     if (baseVoltages[0]) {
                         equivalentBranch.baseVoltage = baseVoltages[0];
                     }
@@ -2021,8 +2021,8 @@ class ConverterIntegral7 {
                         equivalentBranch.baseVoltage = undefined;
                         this.logger.error(`Ersatzlängszweig mit GUID ${equivalentBranch.getUUID()} konnte keine Bezugsspannung ermittelt werden.`);
                     }
-                    equivalentBranch.ur1 = (0, parser_utils_1.isNumericI7)(i7Data.ur1) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur1) : undefined;
-                    equivalentBranch.ur2 = (0, parser_utils_1.isNumericI7)(i7Data.ur2) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur2) : undefined;
+                    equivalentBranch.ur1 = parser_utils_1.isNumericI7(i7Data.ur1) ? parser_utils_1.convertToNumberI7(i7Data.ur1) : undefined;
+                    equivalentBranch.ur2 = parser_utils_1.isNumericI7(i7Data.ur2) ? parser_utils_1.convertToNumberI7(i7Data.ur2) : undefined;
                     cimModel.addEquivalentBranch(equivalentBranch);
                     this.checkErsatzZweigID(i7Data.id, integral7);
                     this.addIdMapping(i7Data.id, equivalentBranch.mrid, integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG);
@@ -2038,51 +2038,51 @@ class ConverterIntegral7 {
         var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.KOMPENSATIONSDROSSEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL), knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KOMPENSATIONSDROSSEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL), knotenSfIDs));
                 let sternpunktKnotenResult = [];
                 let sternpunktKnotenMap = new Map();
                 if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN)) {
-                    sternpunktKnotenResult = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN), []));
+                    sternpunktKnotenResult = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN), []));
                     for (const spKnoten of sternpunktKnotenResult) {
                         sternpunktKnotenMap.set(spKnoten.id, spKnoten);
                     }
                 }
                 for (const i7Data of result) {
-                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_LSC']), i7Data.kurzname);
+                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_LSC']), i7Data.kurzname);
                     // Get electrical properties
-                    const inBetrieb = (0, parser_utils_1.isBooleanI7)(i7Data.betrieb) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb) : undefined;
+                    const inBetrieb = parser_utils_1.isBooleanI7(i7Data.betrieb) ? parser_utils_1.convertToBooleanI7(i7Data.betrieb) : undefined;
                     shunt.normallyInService = inBetrieb;
-                    const qr = (0, parser_utils_1.isNumericI7)(i7Data.qr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qr) : undefined;
-                    const pr = (0, parser_utils_1.isNumericI7)(i7Data.pr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pr) : undefined;
-                    shunt.nomU = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur) : undefined;
+                    const qr = parser_utils_1.isNumericI7(i7Data.qr) ? parser_utils_1.convertToNumberI7(i7Data.qr) : undefined;
+                    const pr = parser_utils_1.isNumericI7(i7Data.pr) ? parser_utils_1.convertToNumberI7(i7Data.pr) : undefined;
+                    shunt.nomU = parser_utils_1.isNumericI7(i7Data.ur) ? parser_utils_1.convertToNumberI7(i7Data.ur) : undefined;
                     // Set electrical properties
                     // Set electrical properties (EQ)
-                    if ((0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.isNumericI7)(i7Data.maxstufe)) {
-                        shunt.sections = (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe);
-                        shunt.normalSections = (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe);
-                        shunt.maximumSections = (0, parser_utils_1.convertToNumberI7)(i7Data.maxstufe);
+                    if (parser_utils_1.isNumericI7(i7Data.aktstufe) && parser_utils_1.isNumericI7(i7Data.maxstufe)) {
+                        shunt.sections = parser_utils_1.convertToNumberI7(i7Data.aktstufe);
+                        shunt.normalSections = parser_utils_1.convertToNumberI7(i7Data.aktstufe);
+                        shunt.maximumSections = parser_utils_1.convertToNumberI7(i7Data.maxstufe);
                     }
-                    else if (!(0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && !(0, parser_utils_1.isNumericI7)(i7Data.maxstufe)) {
+                    else if (!parser_utils_1.isNumericI7(i7Data.aktstufe) && !parser_utils_1.isNumericI7(i7Data.maxstufe)) {
                         shunt.sections = 1;
                         shunt.normalSections = 1;
                         shunt.maximumSections = 1;
                     }
-                    else if (!(0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.isNumericI7)(i7Data.maxstufe) && (0, parser_utils_1.convertToNumberI7)(i7Data.maxstufe) > 0) {
-                        shunt.maximumSections = (0, parser_utils_1.convertToNumberI7)(i7Data.maxstufe);
+                    else if (!parser_utils_1.isNumericI7(i7Data.aktstufe) && parser_utils_1.isNumericI7(i7Data.maxstufe) && parser_utils_1.convertToNumberI7(i7Data.maxstufe) > 0) {
+                        shunt.maximumSections = parser_utils_1.convertToNumberI7(i7Data.maxstufe);
                         shunt.sections = shunt.maximumSections;
                         shunt.normalSections = shunt.maximumSections;
                     }
-                    else if (!(0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.isNumericI7)(i7Data.maxstufe) && (0, parser_utils_1.convertToNumberI7)(i7Data.maxstufe) <= 0) {
+                    else if (!parser_utils_1.isNumericI7(i7Data.aktstufe) && parser_utils_1.isNumericI7(i7Data.maxstufe) && parser_utils_1.convertToNumberI7(i7Data.maxstufe) <= 0) {
                         shunt.maximumSections = 1;
                         shunt.sections = shunt.maximumSections;
                         shunt.normalSections = shunt.maximumSections;
                     }
-                    else if (!(0, parser_utils_1.isNumericI7)(i7Data.maxstufe) && (0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe) > 0) {
-                        shunt.sections = (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe);
+                    else if (!parser_utils_1.isNumericI7(i7Data.maxstufe) && parser_utils_1.isNumericI7(i7Data.aktstufe) && parser_utils_1.convertToNumberI7(i7Data.aktstufe) > 0) {
+                        shunt.sections = parser_utils_1.convertToNumberI7(i7Data.aktstufe);
                         shunt.normalSections = shunt.sections;
                         shunt.maximumSections = shunt.normalSections;
                     }
-                    else if (!(0, parser_utils_1.isNumericI7)(i7Data.maxstufe) && (0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe) <= 0) {
+                    else if (!parser_utils_1.isNumericI7(i7Data.maxstufe) && parser_utils_1.isNumericI7(i7Data.aktstufe) && parser_utils_1.convertToNumberI7(i7Data.aktstufe) <= 0) {
                         shunt.sections = 1;
                         shunt.normalSections = shunt.sections;
                         shunt.maximumSections = shunt.normalSections;
@@ -2090,11 +2090,11 @@ class ConverterIntegral7 {
                     else {
                         this.logger.error(`Kompensationsdrossel mit GUID ${i7Data.guid} besitzt unerwartete $akstufe oder $maxstufe.`);
                     }
-                    shunt.bPerSection = (0, utils_2.calculateBPerSection)(qr * -1, shunt.nomU, shunt.maximumSections);
-                    shunt.gPerSection = (0, utils_2.calculateGPerSection)(pr, shunt.nomU, shunt.maximumSections);
+                    shunt.bPerSection = utils_2.calculateBPerSection(qr * -1, shunt.nomU, shunt.maximumSections);
+                    shunt.gPerSection = utils_2.calculateGPerSection(pr, shunt.nomU, shunt.maximumSections);
                     // RegulatingControl
-                    const spannungsregelungLokal = (0, parser_utils_1.isBooleanI7)(i7Data.flag_lf) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_lf) : false;
-                    const spannungsregelungRemote = (0, parser_utils_1.isBooleanI7)(i7Data.rpv_geregelt) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.rpv_geregelt) : (cimModel.objects.get(this.integralID2UUID.get(i7Data.knotenspgreg)) !== undefined ? true : false);
+                    const spannungsregelungLokal = parser_utils_1.isBooleanI7(i7Data.flag_lf) ? parser_utils_1.convertToBooleanI7(i7Data.flag_lf) : false;
+                    const spannungsregelungRemote = parser_utils_1.isBooleanI7(i7Data.rpv_geregelt) ? parser_utils_1.convertToBooleanI7(i7Data.rpv_geregelt) : (cimModel.objects.get(this.integralID2UUID.get(i7Data.knotenspgreg)) !== undefined ? true : false);
                     let knotenSpgGeregelt = undefined;
                     if (spannungsregelungRemote) {
                         knotenSpgGeregelt = cimModel.objects.get(this.integralID2UUID.get(i7Data.knotenspgreg));
@@ -2102,23 +2102,23 @@ class ConverterIntegral7 {
                     let regulatingControl = undefined;
                     if (spannungsregelungLokal || spannungsregelungRemote) {
                         //Create and define regulating control for voltage control
-                        regulatingControl = new RegulatingControl_1.RegulatingControl((0, parser_utils_1.getUUID)(i7Data.guid_rc), (0, util_create_1.createNotation)([shunt.getUUID().substring(0, 8), '_LSC']));
+                        regulatingControl = new RegulatingControl_1.RegulatingControl(parser_utils_1.getUUID(i7Data.guid_rc), util_create_1.createNotation([shunt.getUUID().substring(0, 8), '_LSC']));
                         regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                         regulatingControl.discrete = true; //default für ShuntCompensator ist true. s. CGMES Doku
-                        regulatingControl.targetDeadband = (0, parser_utils_1.isNumericI7)(i7Data.uband) ? (0, parser_utils_1.convertToNumberI7)(i7Data.uband) : undefined; //zulässiges Spannungsband
+                        regulatingControl.targetDeadband = parser_utils_1.isNumericI7(i7Data.uband) ? parser_utils_1.convertToNumberI7(i7Data.uband) : undefined; //zulässiges Spannungsband
                         /** Spannung in kilo*/
                         regulatingControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.k;
                         regulatingControl.enabled = true;
                         if (knotenSpgGeregelt) {
                             const cn_point = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
-                            const terminal = (0, util_graph2tree_1.getControlledNode)(cn_point, knotenSpgGeregelt);
+                            const terminal = util_graph2tree_1.getControlledNode(cn_point, knotenSpgGeregelt);
                             if (terminal) {
                                 const cn = terminal.getConnectivityNode();
                                 if (regulatingControl.targetDeadband === undefined) {
                                     regulatingControl.targetDeadband = cn.getBaseVoltageAsNumber() * 0.1;
                                 }
                                 regulatingControl.terminalUUID = terminal.getUUID();
-                                regulatingControl.name = (0, util_create_1.createNotation)([regulatingControl.name, '_', (_a = cn.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getUUID().substring(0, 8), '_RC'], 32, true);
+                                regulatingControl.name = util_create_1.createNotation([regulatingControl.name, '_', (_a = cn.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getUUID().substring(0, 8), '_RC'], 32, true);
                                 const tV = targetVoltages.get(this.UUID2Integral7ID.get(cn.getUUID()).find(elem => elem));
                                 if (tV && regulatingControl.targetValue === undefined) {
                                     regulatingControl.targetValue = tV['usoll'];
@@ -2140,10 +2140,10 @@ class ConverterIntegral7 {
                         }
                     }
                     //SHC section
-                    const r0 = (0, parser_utils_1.isNumericI7)(i7Data.r0) ? i7Data.r0 : undefined;
-                    const x0 = (0, parser_utils_1.isNumericI7)(i7Data.x0) ? i7Data.x0 : undefined;
-                    shunt.b0PerSection = (0, utils_2.calculateB0PerSection)(/*r0,*/ Math.abs(x0)) * -1;
-                    shunt.g0PerSection = (0, utils_2.calculateG0PerSection)(r0 /*,x0*/);
+                    const r0 = parser_utils_1.isNumericI7(i7Data.r0) ? i7Data.r0 : undefined;
+                    const x0 = parser_utils_1.isNumericI7(i7Data.x0) ? i7Data.x0 : undefined;
+                    shunt.b0PerSection = utils_2.calculateB0PerSection(/*r0,*/ Math.abs(x0)) * -1;
+                    shunt.g0PerSection = utils_2.calculateG0PerSection(r0 /*,x0*/);
                     this.setShuntGrounding(shunt, sternpunktKnotenMap.get(i7Data.knoten1p), r0, x0);
                     this.setTopologyEnergySourceConsumerObject(cimModel, shunt, i7Data, shunt.regulatingControl, undefined, targetVoltages);
                     cimModel.addLinearShuntCompensator(shunt);
@@ -2160,51 +2160,51 @@ class ConverterIntegral7 {
         var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KOMPENSATIONSKONDENSATOR)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.KOMPENSATIONSKONDENSATOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KOMPENSATIONSKONDENSATOR), knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KOMPENSATIONSKONDENSATOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KOMPENSATIONSKONDENSATOR), knotenSfIDs));
                 let sternpunktKnotenResult = [];
                 let sternpunktKnotenMap = new Map();
                 if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN)) {
-                    sternpunktKnotenResult = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN), []));
+                    sternpunktKnotenResult = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN), []));
                     for (const spKnoten of sternpunktKnotenResult) {
                         sternpunktKnotenMap.set(spKnoten.id, spKnoten);
                     }
                 }
                 for (const i7Data of result) {
-                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_LSC']), i7Data.kurzname);
+                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_LSC']), i7Data.kurzname);
                     // Get electrical properties
-                    const inBetrieb = (0, parser_utils_1.isBooleanI7)(i7Data.betrieb) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb) : undefined;
-                    const qr = (0, parser_utils_1.isNumericI7)(i7Data.qr) ? i7Data.qr : undefined;
-                    const pr = (0, parser_utils_1.isNumericI7)(i7Data.pr) ? i7Data.pr : undefined;
-                    shunt.nomU = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? i7Data.ur : undefined;
+                    const inBetrieb = parser_utils_1.isBooleanI7(i7Data.betrieb) ? parser_utils_1.convertToBooleanI7(i7Data.betrieb) : undefined;
+                    const qr = parser_utils_1.isNumericI7(i7Data.qr) ? i7Data.qr : undefined;
+                    const pr = parser_utils_1.isNumericI7(i7Data.pr) ? i7Data.pr : undefined;
+                    shunt.nomU = parser_utils_1.isNumericI7(i7Data.ur) ? i7Data.ur : undefined;
                     // Set extension properties (AMPI7)
                     shunt.normallyInService = inBetrieb;
                     // Set electrical properties (EQ)
-                    if ((0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.isNumericI7)(i7Data.maxstufe)) {
-                        shunt.sections = (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe);
-                        shunt.normalSections = (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe);
-                        shunt.maximumSections = (0, parser_utils_1.convertToNumberI7)(i7Data.maxstufe);
+                    if (parser_utils_1.isNumericI7(i7Data.aktstufe) && parser_utils_1.isNumericI7(i7Data.maxstufe)) {
+                        shunt.sections = parser_utils_1.convertToNumberI7(i7Data.aktstufe);
+                        shunt.normalSections = parser_utils_1.convertToNumberI7(i7Data.aktstufe);
+                        shunt.maximumSections = parser_utils_1.convertToNumberI7(i7Data.maxstufe);
                     }
-                    else if (!(0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && !(0, parser_utils_1.isNumericI7)(i7Data.maxstufe)) {
+                    else if (!parser_utils_1.isNumericI7(i7Data.aktstufe) && !parser_utils_1.isNumericI7(i7Data.maxstufe)) {
                         shunt.sections = 1;
                         shunt.normalSections = 1;
                         shunt.maximumSections = 1;
                     }
-                    else if (!(0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.isNumericI7)(i7Data.maxstufe) && (0, parser_utils_1.convertToNumberI7)(i7Data.maxstufe) > 0) {
-                        shunt.maximumSections = (0, parser_utils_1.convertToNumberI7)(i7Data.maxstufe);
+                    else if (!parser_utils_1.isNumericI7(i7Data.aktstufe) && parser_utils_1.isNumericI7(i7Data.maxstufe) && parser_utils_1.convertToNumberI7(i7Data.maxstufe) > 0) {
+                        shunt.maximumSections = parser_utils_1.convertToNumberI7(i7Data.maxstufe);
                         shunt.sections = shunt.maximumSections;
                         shunt.normalSections = shunt.maximumSections;
                     }
-                    else if (!(0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.isNumericI7)(i7Data.maxstufe) && (0, parser_utils_1.convertToNumberI7)(i7Data.maxstufe) <= 0) {
+                    else if (!parser_utils_1.isNumericI7(i7Data.aktstufe) && parser_utils_1.isNumericI7(i7Data.maxstufe) && parser_utils_1.convertToNumberI7(i7Data.maxstufe) <= 0) {
                         shunt.maximumSections = 1;
                         shunt.sections = shunt.maximumSections;
                         shunt.normalSections = shunt.maximumSections;
                     }
-                    else if (!(0, parser_utils_1.isNumericI7)(i7Data.maxstufe) && (0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe) > 0) {
-                        shunt.sections = (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe);
+                    else if (!parser_utils_1.isNumericI7(i7Data.maxstufe) && parser_utils_1.isNumericI7(i7Data.aktstufe) && parser_utils_1.convertToNumberI7(i7Data.aktstufe) > 0) {
+                        shunt.sections = parser_utils_1.convertToNumberI7(i7Data.aktstufe);
                         shunt.normalSections = shunt.sections;
                         shunt.maximumSections = shunt.normalSections;
                     }
-                    else if (!(0, parser_utils_1.isNumericI7)(i7Data.maxstufe) && (0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe) <= 0) {
+                    else if (!parser_utils_1.isNumericI7(i7Data.maxstufe) && parser_utils_1.isNumericI7(i7Data.aktstufe) && parser_utils_1.convertToNumberI7(i7Data.aktstufe) <= 0) {
                         shunt.sections = 1;
                         shunt.normalSections = shunt.sections;
                         shunt.maximumSections = shunt.normalSections;
@@ -2212,11 +2212,11 @@ class ConverterIntegral7 {
                     else {
                         this.logger.error(`Kompensationskondensator mit GUID ${i7Data.guid} besitzt unerwartete $akstufe oder $maxstufe.`);
                     }
-                    shunt.bPerSection = (0, utils_2.calculateBPerSection)(qr, shunt.nomU, shunt.maximumSections);
-                    shunt.gPerSection = (0, utils_2.calculateGPerSection)(pr, shunt.nomU, shunt.maximumSections);
+                    shunt.bPerSection = utils_2.calculateBPerSection(qr, shunt.nomU, shunt.maximumSections);
+                    shunt.gPerSection = utils_2.calculateGPerSection(pr, shunt.nomU, shunt.maximumSections);
                     // RegulatingControl
-                    const spannungsregelungLokal = (0, parser_utils_1.isBooleanI7)(i7Data.flag_lf) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_lf) : false;
-                    const spannungsregelungRemote = (0, parser_utils_1.isBooleanI7)(i7Data.rpv_geregelt) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.rpv_geregelt) : false;
+                    const spannungsregelungLokal = parser_utils_1.isBooleanI7(i7Data.flag_lf) ? parser_utils_1.convertToBooleanI7(i7Data.flag_lf) : false;
+                    const spannungsregelungRemote = parser_utils_1.isBooleanI7(i7Data.rpv_geregelt) ? parser_utils_1.convertToBooleanI7(i7Data.rpv_geregelt) : false;
                     let knotenSpgGeregelt = undefined;
                     if (spannungsregelungRemote) {
                         knotenSpgGeregelt = cimModel.objects.get(this.integralID2UUID.get(i7Data.knotenspgreg));
@@ -2224,23 +2224,23 @@ class ConverterIntegral7 {
                     let regulatingControl = undefined;
                     if (spannungsregelungLokal || spannungsregelungRemote) {
                         //Create and define regulating control for voltage control
-                        regulatingControl = new RegulatingControl_1.RegulatingControl(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([shunt.getUUID().substring(0, 8), '_LSC']));
+                        regulatingControl = new RegulatingControl_1.RegulatingControl(common_utils_1.CommonUtils.generateUUID(), util_create_1.createNotation([shunt.getUUID().substring(0, 8), '_LSC']));
                         regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                         regulatingControl.discrete = true; //default für ShuntCompensator ist true. s. CGMES Doku
-                        regulatingControl.targetDeadband = (0, parser_utils_1.isNumericI7)(i7Data.uband) ? (0, parser_utils_1.convertToNumberI7)(i7Data.uband) : undefined; //zulässiges Spannungsband
+                        regulatingControl.targetDeadband = parser_utils_1.isNumericI7(i7Data.uband) ? parser_utils_1.convertToNumberI7(i7Data.uband) : undefined; //zulässiges Spannungsband
                         /** Spannung in kilo*/
                         regulatingControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.k;
                         regulatingControl.enabled = true;
                         if (knotenSpgGeregelt) {
                             const cn_point = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
-                            const terminal = (0, util_graph2tree_1.getControlledNode)(cn_point, knotenSpgGeregelt);
+                            const terminal = util_graph2tree_1.getControlledNode(cn_point, knotenSpgGeregelt);
                             if (terminal) {
                                 const cn = terminal.getConnectivityNode();
                                 if (regulatingControl.targetDeadband === undefined) {
                                     regulatingControl.targetDeadband = cn.getBaseVoltageAsNumber() * 0.1;
                                 }
                                 regulatingControl.terminalUUID = terminal.getUUID();
-                                regulatingControl.name = (0, util_create_1.createNotation)([regulatingControl.name, '_', (_a = cn.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getUUID().substring(0, 8), '_RC'], 32, true);
+                                regulatingControl.name = util_create_1.createNotation([regulatingControl.name, '_', (_a = cn.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getUUID().substring(0, 8), '_RC'], 32, true);
                                 const tV = targetVoltages.get(this.UUID2Integral7ID.get(cn.getUUID()).find(elem => elem));
                                 if (tV && regulatingControl.targetValue === undefined) {
                                     regulatingControl.targetValue = tV['usoll'];
@@ -2262,10 +2262,10 @@ class ConverterIntegral7 {
                         }
                     }
                     //SHC section
-                    const r0 = (0, parser_utils_1.isNumericI7)(i7Data.r0) ? i7Data.r0 : undefined;
-                    const x0 = (0, parser_utils_1.isNumericI7)(i7Data.x0) ? i7Data.x0 : undefined;
-                    shunt.b0PerSection = (0, utils_2.calculateB0PerSection)(/*r0,*/ Math.abs(x0));
-                    shunt.g0PerSection = (0, utils_2.calculateG0PerSection)(r0 /*,x0*/);
+                    const r0 = parser_utils_1.isNumericI7(i7Data.r0) ? i7Data.r0 : undefined;
+                    const x0 = parser_utils_1.isNumericI7(i7Data.x0) ? i7Data.x0 : undefined;
+                    shunt.b0PerSection = utils_2.calculateB0PerSection(/*r0,*/ Math.abs(x0));
+                    shunt.g0PerSection = utils_2.calculateG0PerSection(r0 /*,x0*/);
                     this.setShuntGrounding(shunt, sternpunktKnotenMap.get(i7Data.knoten1p), r0, x0);
                     this.setTopologyEnergySourceConsumerObject(cimModel, shunt, i7Data, shunt.regulatingControl, undefined, targetVoltages);
                     cimModel.addLinearShuntCompensator(shunt);
@@ -2280,32 +2280,32 @@ class ConverterIntegral7 {
     convertStatcom(cimModel, knotenSfIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STATCOM)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STATCOM, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STATCOM), knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STATCOM, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STATCOM), knotenSfIDs));
                 for (const i7Data of result) {
-                    const statVarCom = new StaticVarCompensator_1.StaticVarCompensator((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SVC']), i7Data.kurzname);
-                    const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
-                    const ur = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur) : undefined;
-                    const uref = (0, parser_utils_1.isNumericI7)(i7Data.uref) ? (0, parser_utils_1.convertToNumberI7)(i7Data.uref) : undefined;
-                    const mrez = (0, parser_utils_1.isNumericI7)(i7Data.mrez) ? (0, parser_utils_1.convertToNumberI7)(i7Data.mrez) : undefined;
-                    const qkapr = (0, parser_utils_1.isNumericI7)(i7Data.qkapr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qkapr) : undefined;
-                    const qindr = (0, parser_utils_1.isNumericI7)(i7Data.qindr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qindr) : undefined;
+                    const statVarCom = new StaticVarCompensator_1.StaticVarCompensator(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_SVC']), i7Data.kurzname);
+                    const inBetrieb = parser_utils_1.convertToBooleanI7(i7Data.betrieb);
+                    const ur = parser_utils_1.isNumericI7(i7Data.ur) ? parser_utils_1.convertToNumberI7(i7Data.ur) : undefined;
+                    const uref = parser_utils_1.isNumericI7(i7Data.uref) ? parser_utils_1.convertToNumberI7(i7Data.uref) : undefined;
+                    const mrez = parser_utils_1.isNumericI7(i7Data.mrez) ? parser_utils_1.convertToNumberI7(i7Data.mrez) : undefined;
+                    const qkapr = parser_utils_1.isNumericI7(i7Data.qkapr) ? parser_utils_1.convertToNumberI7(i7Data.qkapr) : undefined;
+                    const qindr = parser_utils_1.isNumericI7(i7Data.qindr) ? parser_utils_1.convertToNumberI7(i7Data.qindr) : undefined;
                     /** EQ */
-                    statVarCom.capacitiveRating = (0, utils_2.calculateStatVarComRating)(uref, qkapr);
-                    statVarCom.inductiveRating = Math.abs((0, utils_2.calculateStatVarComRating)(uref, qindr)) * -1;
+                    statVarCom.capacitiveRating = utils_2.calculateStatVarComRating(uref, qkapr);
+                    statVarCom.inductiveRating = Math.abs(utils_2.calculateStatVarComRating(uref, qindr)) * -1;
                     statVarCom.slope = mrez !== 0 ? 1 / mrez : 0;
                     statVarCom.sVCControlMode = SVCControlMode_1.SVCControlMode.voltage;
                     statVarCom.aggregate = false;
                     /** EQ-SC */
                     /** SSH */
-                    statVarCom.q = (0, parser_utils_1.isNumericI7)(i7Data.q0svc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q0svc) : undefined;
+                    statVarCom.q = parser_utils_1.isNumericI7(i7Data.q0svc) ? parser_utils_1.convertToNumberI7(i7Data.q0svc) : undefined;
                     /** SV */
                     //statVarCom.svpowerflow
                     /** Regelung */
-                    const regulatingControl = (0, utils_2.createRegulatingControl)(`RC_Statcom_${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
+                    const regulatingControl = utils_2.createRegulatingControl(`RC_Statcom_${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
                     this.setTopologyEnergySourceConsumerObject(cimModel, statVarCom, i7Data, regulatingControl);
                     regulatingControl.enabled = true;
                     statVarCom.controlEnabled = true;
-                    const flagOS = (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_os);
+                    const flagOS = parser_utils_1.convertToBooleanI7(i7Data.flag_os);
                     /** die Regelung erfolgt auf die Oberspannungsseite des zugehörenden Transformators */
                     if (flagOS && i7Data.trafo) {
                         const trafoUUID = this.integralID2UUID.get(i7Data.trafo);
@@ -2341,32 +2341,32 @@ class ConverterIntegral7 {
     convertSVC(cimModel, knotenSfIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SVC)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.SVC, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SVC), knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SVC, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SVC), knotenSfIDs));
                 for (const i7Data of result) {
-                    const statVarCom = new StaticVarCompensator_1.StaticVarCompensator((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SVC']), i7Data.kurzname);
-                    const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
-                    const ur = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur) : undefined;
-                    const uref = (0, parser_utils_1.isNumericI7)(i7Data.uref) ? (0, parser_utils_1.convertToNumberI7)(i7Data.uref) : undefined;
-                    const mrez = (0, parser_utils_1.isNumericI7)(i7Data.mrez) ? (0, parser_utils_1.convertToNumberI7)(i7Data.mrez) : undefined;
-                    const qkapr = (0, parser_utils_1.isNumericI7)(i7Data.qkapr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qkapr) : undefined;
-                    const qindr = (0, parser_utils_1.isNumericI7)(i7Data.qindr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qindr) : undefined;
+                    const statVarCom = new StaticVarCompensator_1.StaticVarCompensator(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_SVC']), i7Data.kurzname);
+                    const inBetrieb = parser_utils_1.convertToBooleanI7(i7Data.betrieb);
+                    const ur = parser_utils_1.isNumericI7(i7Data.ur) ? parser_utils_1.convertToNumberI7(i7Data.ur) : undefined;
+                    const uref = parser_utils_1.isNumericI7(i7Data.uref) ? parser_utils_1.convertToNumberI7(i7Data.uref) : undefined;
+                    const mrez = parser_utils_1.isNumericI7(i7Data.mrez) ? parser_utils_1.convertToNumberI7(i7Data.mrez) : undefined;
+                    const qkapr = parser_utils_1.isNumericI7(i7Data.qkapr) ? parser_utils_1.convertToNumberI7(i7Data.qkapr) : undefined;
+                    const qindr = parser_utils_1.isNumericI7(i7Data.qindr) ? parser_utils_1.convertToNumberI7(i7Data.qindr) : undefined;
                     /** EQ */
-                    statVarCom.capacitiveRating = (0, utils_2.calculateStatVarComRating)(uref, qkapr);
-                    statVarCom.inductiveRating = Math.abs((0, utils_2.calculateStatVarComRating)(uref, qindr)) * -1;
+                    statVarCom.capacitiveRating = utils_2.calculateStatVarComRating(uref, qkapr);
+                    statVarCom.inductiveRating = Math.abs(utils_2.calculateStatVarComRating(uref, qindr)) * -1;
                     statVarCom.slope = mrez !== 0 ? 1 / mrez : 0;
                     statVarCom.sVCControlMode = SVCControlMode_1.SVCControlMode.voltage;
                     statVarCom.aggregate = false;
                     /** EQ-SC */
                     /** SSH */
-                    statVarCom.q = (0, parser_utils_1.isNumericI7)(i7Data.q0svc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q0svc) : undefined;
+                    statVarCom.q = parser_utils_1.isNumericI7(i7Data.q0svc) ? parser_utils_1.convertToNumberI7(i7Data.q0svc) : undefined;
                     /** SV */
                     //statVarCom.svpowerflow
                     /** Regelung */
-                    const regulatingControl = (0, utils_2.createRegulatingControl)(`RC_Statcom_${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
+                    const regulatingControl = utils_2.createRegulatingControl(`RC_Statcom_${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
                     this.setTopologyEnergySourceConsumerObject(cimModel, statVarCom, i7Data, regulatingControl);
                     regulatingControl.enabled = true;
                     statVarCom.controlEnabled = true;
-                    const flagOS = (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_os);
+                    const flagOS = parser_utils_1.convertToBooleanI7(i7Data.flag_os);
                     /** die Regelung erfolgt auf die Oberspannungsseite des zugehörenden Transformators */
                     if (flagOS && i7Data.trafo) {
                         const trafoUUID = this.integralID2UUID.get(i7Data.trafo);
@@ -2402,13 +2402,13 @@ class ConverterIntegral7 {
     convertCsConverterDC(cimModel, integral7, knotenSfIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_KLASSISCH)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.HGUE_KOPFSTATION_KLASSISCH, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_KLASSISCH), knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_KOPFSTATION_KLASSISCH, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_KLASSISCH), knotenSfIDs));
                 for (const i7Data of result) {
                     /** Containment DC DCConverterUnit */
-                    const dcConverterUnit = new DCConverterUnit_1.INTEGRALDCConverterUnit((0, parser_utils_1.getUUID)(i7Data.guid_dcconverterp), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCCU']));
-                    dcConverterUnit.referencePriority = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : undefined;
-                    dcConverterUnit.governorSCDAc = (0, parser_utils_1.isNumericI7)(i7Data.kr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : undefined;
-                    dcConverterUnit.governorSCDDc = (0, parser_utils_1.isNumericI7)(i7Data.kr_dc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr_dc) : undefined;
+                    const dcConverterUnit = new DCConverterUnit_1.INTEGRALDCConverterUnit(parser_utils_1.getUUID(i7Data.guid_dcconverterp), util_create_1.createNotation([utils_2.getName(i7Data), '_DCCU']));
+                    dcConverterUnit.referencePriority = parser_utils_1.isNumericI7(i7Data.einspprio) ? parser_utils_1.convertToNumberI7(i7Data.kr) : undefined;
+                    dcConverterUnit.governorSCDAc = parser_utils_1.isNumericI7(i7Data.kr) ? parser_utils_1.convertToNumberI7(i7Data.kr) : undefined;
+                    dcConverterUnit.governorSCDDc = parser_utils_1.isNumericI7(i7Data.kr_dc) ? parser_utils_1.convertToNumberI7(i7Data.kr_dc) : undefined;
                     // Topologie
                     /* Anfang
                      * 3 moegliche Anschluesse
@@ -2434,17 +2434,17 @@ class ConverterIntegral7 {
                     else {
                         this.logger.debug(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
-                    const csConverter = new CsConverter_1.CsConverter((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_CSC']), i7Data.kurzname);
+                    const csConverter = new CsConverter_1.CsConverter(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_CSC']), i7Data.kurzname);
                     /** Wenn Leitungen konvertiert werden, wird das Attribut operationMode gesetzt. */
                     csConverter.equipmentContainer = dcConverterUnit;
                     /** Bemessungsleistung (Gleichstromseite) in MW
                      * im CS-Fall S = P?
                      * Abhängig vom  */
-                    csConverter.baseS = (0, parser_utils_1.isNumericI7)(i7Data.pr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pr) : undefined;
+                    csConverter.baseS = parser_utils_1.isNumericI7(i7Data.pr) ? parser_utils_1.convertToNumberI7(i7Data.pr) : undefined;
                     /** Bemessungsspannung (Gleichstromseite) in kV*/
-                    csConverter.ratedUdc = (0, parser_utils_1.isNumericI7)(i7Data.udc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.udc) : ((0, parser_utils_1.isNumericI7)(i7Data.ur) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur) : undefined);
+                    csConverter.ratedUdc = parser_utils_1.isNumericI7(i7Data.udc) ? parser_utils_1.convertToNumberI7(i7Data.udc) : (parser_utils_1.isNumericI7(i7Data.ur) ? parser_utils_1.convertToNumberI7(i7Data.ur) : undefined);
                     /** spannungsabhängige Wirk-Verluste in kW bei Leerlauf mit Bemessungsspannung in kV*/
-                    csConverter.idleLoss = (0, parser_utils_1.isNumericI7)(i7Data.p_leer) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_leer) * Math.pow(10, -3) : undefined;
+                    csConverter.idleLoss = parser_utils_1.isNumericI7(i7Data.p_leer) ? parser_utils_1.convertToNumberI7(i7Data.p_leer) * Math.pow(10, -3) : undefined;
                     csConverter.maxUdc = csConverter.ratedUdc * 1.05; // +5% * ratedUdc
                     csConverter.minUdc = csConverter.ratedUdc * 0.95; // -5% * ratedUdc
                     csConverter.resistiveLoss = 0;
@@ -2459,10 +2459,10 @@ class ConverterIntegral7 {
                     /*      csConverter.maxGamma = i7Data.gamma;
                             csConverter.minGamma = i7Data.gamma;*/
                     /** SSH profile export*/
-                    csConverter.p = (0, parser_utils_1.isNumericI7)(i7Data.pges) ? i7Data.pges * -1 : 0;
-                    csConverter.q = (0, parser_utils_1.isNumericI7)(i7Data.qges) ? i7Data.qges * -1 : 0;
-                    const regelungU = (0, parser_utils_1.convertToBooleanI7)(i7Data.u_geregelt);
-                    const regelungP = (0, parser_utils_1.convertToBooleanI7)(i7Data.p_geregelt);
+                    csConverter.p = parser_utils_1.isNumericI7(i7Data.pges) ? i7Data.pges * -1 : 0;
+                    csConverter.q = parser_utils_1.isNumericI7(i7Data.qges) ? i7Data.qges * -1 : 0;
+                    const regelungU = parser_utils_1.convertToBooleanI7(i7Data.u_geregelt);
+                    const regelungP = parser_utils_1.convertToBooleanI7(i7Data.p_geregelt);
                     if (regelungU) {
                         csConverter.operatingMode = CsOperatingModeKind_1.CsOperatingModeKind.inverter;
                     }
@@ -2473,7 +2473,7 @@ class ConverterIntegral7 {
                         csConverter.operatingMode = CsOperatingModeKind_1.CsOperatingModeKind.rectifier;
                     }
                     /** Status */
-                    const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
+                    const inBetrieb = parser_utils_1.convertToBooleanI7(i7Data.betrieb);
                     csConverter.normallyInService = inBetrieb;
                     /** Topologie AC Seite*/
                     if (acConnectivityNode) {
@@ -2483,10 +2483,10 @@ class ConverterIntegral7 {
                         this.logger.debug(`CsConverter ${i7Data.id} ${csConverter.mrid} besitzt keinen AC Anschluss.`);
                     }
                     /** Topologie DC Seite*/
-                    const dcNode = new DCNode_1.DCNode((0, parser_utils_1.getUUID)(i7Data.guid_dcnodep), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCN']));
+                    const dcNode = new DCNode_1.DCNode(parser_utils_1.getUUID(i7Data.guid_dcnodep), util_create_1.createNotation([utils_2.getName(i7Data), '_DCN']));
                     dcNode.dcEquipmentContainer = dcConverterUnit;
                     dcConverterUnit.dCNodes.set(dcNode.getUUID(), dcNode);
-                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal((0, parser_utils_1.getUUID)(i7Data.guid_dcterminalp), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_ACDCC-DCT']));
+                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal(parser_utils_1.getUUID(i7Data.guid_dcterminalp), util_create_1.createNotation([utils_2.getName(i7Data), '_ACDCC-DCT']));
                     acDCConverterDCTerminal.polarity = DCPolarityKind_1.DCPolarityKind.positive;
                     acDCConverterDCTerminal.dCConductingEquipment = csConverter;
                     csConverter.dCTerminals.set(acDCConverterDCTerminal.getUUID(), acDCConverterDCTerminal);
@@ -2511,13 +2511,13 @@ class ConverterIntegral7 {
         var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.HGUE_KOPFSTATION_VSC, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC), knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_KOPFSTATION_VSC, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC), knotenSfIDs));
                 for (const i7Data of result) {
                     /** Containment DC DCConverterUnit */
-                    const dcConverterUnit = new DCConverterUnit_1.INTEGRALDCConverterUnit((0, parser_utils_1.getUUID)(i7Data.guid_dcconverterp), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCCU']));
-                    dcConverterUnit.referencePriority = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : undefined;
-                    dcConverterUnit.governorSCDAc = (0, parser_utils_1.isNumericI7)(i7Data.kr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : undefined;
-                    dcConverterUnit.governorSCDDc = (0, parser_utils_1.isNumericI7)(i7Data.kr_dc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr_dc) : undefined;
+                    const dcConverterUnit = new DCConverterUnit_1.INTEGRALDCConverterUnit(parser_utils_1.getUUID(i7Data.guid_dcconverterp), util_create_1.createNotation([utils_2.getName(i7Data), '_DCCU']));
+                    dcConverterUnit.referencePriority = parser_utils_1.isNumericI7(i7Data.einspprio) ? parser_utils_1.convertToNumberI7(i7Data.kr) : undefined;
+                    dcConverterUnit.governorSCDAc = parser_utils_1.isNumericI7(i7Data.kr) ? parser_utils_1.convertToNumberI7(i7Data.kr) : undefined;
+                    dcConverterUnit.governorSCDDc = parser_utils_1.isNumericI7(i7Data.kr_dc) ? parser_utils_1.convertToNumberI7(i7Data.kr_dc) : undefined;
                     // Topologie
                     /** Anfang
                      * 3 moegliche Anschluesse
@@ -2538,7 +2538,7 @@ class ConverterIntegral7 {
                     else {
                         this.logger.debug(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
-                    const vsConverter = new VsConverter_1.VsConverter((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_VSC']), i7Data.kurzname);
+                    const vsConverter = new VsConverter_1.VsConverter(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_VSC']), i7Data.kurzname);
                     if (vsConverter.getUUID() === "1b2b2901-0bb9-4aa3-9117-06d68fbbc7cb") {
                         let stop = true;
                     }
@@ -2550,9 +2550,9 @@ class ConverterIntegral7 {
                     vsConverter.baseS = i7Data.pr;
                     /** Bemessungsspannung (Gleichstromseite) in kV*/
                     //If udc is set in Integral data model set converter.ratedUdc as i7Data.udc else take the data value for i7Data.ur (Bemessungsspannung)
-                    vsConverter.ratedUdc = (0, parser_utils_1.isNumericI7)(i7Data.udc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.udc) : ((0, parser_utils_1.isNumericI7)(i7Data.ur) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur) : undefined);
+                    vsConverter.ratedUdc = parser_utils_1.isNumericI7(i7Data.udc) ? parser_utils_1.convertToNumberI7(i7Data.udc) : (parser_utils_1.isNumericI7(i7Data.ur) ? parser_utils_1.convertToNumberI7(i7Data.ur) : undefined);
                     /** spannungsabhängige Wirk-Verluste bei Leerlauf mit Bemessungsspannung in kV*/
-                    vsConverter.idleLoss = (0, parser_utils_1.isNumericI7)(i7Data.p_leer) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_leer) / 1000 : undefined;
+                    vsConverter.idleLoss = parser_utils_1.isNumericI7(i7Data.p_leer) ? parser_utils_1.convertToNumberI7(i7Data.p_leer) / 1000 : undefined;
                     vsConverter.maxUdc = vsConverter.ratedUdc * 1.05; // +5% * ratedUdc
                     vsConverter.minUdc = vsConverter.ratedUdc * 0.95; // -5% * ratedUdc
                     vsConverter.resistiveLoss = undefined;
@@ -2560,10 +2560,10 @@ class ConverterIntegral7 {
                     /*  csConverter.maxModulationIndex = ;
                         csConverter.maxValveCurrent =  */
                     /** SSH export values */
-                    vsConverter.p = (0, parser_utils_1.isNumericI7)(i7Data.pges) ? i7Data.pges * -1 : 0;
-                    vsConverter.q = (0, parser_utils_1.isNumericI7)(i7Data.qges) ? i7Data.qges * -1 : 0;
-                    const regelungU = (0, parser_utils_1.convertToBooleanI7)(i7Data.u_geregelt);
-                    const regelungP = (0, parser_utils_1.convertToBooleanI7)(i7Data.p_geregelt);
+                    vsConverter.p = parser_utils_1.isNumericI7(i7Data.pges) ? i7Data.pges * -1 : 0;
+                    vsConverter.q = parser_utils_1.isNumericI7(i7Data.qges) ? i7Data.qges * -1 : 0;
+                    const regelungU = parser_utils_1.convertToBooleanI7(i7Data.u_geregelt);
+                    const regelungP = parser_utils_1.convertToBooleanI7(i7Data.p_geregelt);
                     if (regelungU) {
                         vsConverter.pPccControl = VsPpccControlKind_1.VsPpccControlKind.udc;
                         vsConverter.qPccControl = VsQpccControlKind_1.VsQpccControlKind.voltagePcc;
@@ -2581,29 +2581,29 @@ class ConverterIntegral7 {
                     vsConverter.droopCompensation = 0; //Resistance
                     vsConverter.qShare = 0; //PerCent
                     /** Status */
-                    const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
+                    const inBetrieb = parser_utils_1.convertToBooleanI7(i7Data.betrieb);
                     vsConverter.normallyInService = inBetrieb;
                     /** Topologie AC Seite*/
                     if (acConnectivityNode) {
-                        vsConverter.pccTerminal = (0, util_create_1.createConnection)(cimModel, vsConverter, acConnectivityNode, PhaseCode_1.PhaseCode.ABC, 1);
+                        vsConverter.pccTerminal = util_create_1.createConnection(cimModel, vsConverter, acConnectivityNode, PhaseCode_1.PhaseCode.ABC, 1);
                     }
                     else {
                         this.logger.debug(`VsConverter ${i7Data.id} ${vsConverter.mrid} besitzt keinen AC Anschluss.`);
                     }
                     /** Topologie DC Seite mit DCGround*/
-                    const dcNode = new DCNode_1.DCNode((0, parser_utils_1.getUUID)(i7Data.guid_dcnodep), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCN']));
+                    const dcNode = new DCNode_1.DCNode(parser_utils_1.getUUID(i7Data.guid_dcnodep), util_create_1.createNotation([utils_2.getName(i7Data), '_DCN']));
                     dcNode.dcEquipmentContainer = dcConverterUnit;
                     dcConverterUnit.dCNodes.set(dcNode.getUUID(), dcNode);
-                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal((0, parser_utils_1.getUUID)(i7Data.guid_dcterminalp), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_ACDCC-DCT']));
+                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal(parser_utils_1.getUUID(i7Data.guid_dcterminalp), util_create_1.createNotation([utils_2.getName(i7Data), '_ACDCC-DCT']));
                     acDCConverterDCTerminal.polarity = DCPolarityKind_1.DCPolarityKind.positive;
                     acDCConverterDCTerminal.dCConductingEquipment = vsConverter;
                     vsConverter.dCTerminals.set(acDCConverterDCTerminal.getUUID(), acDCConverterDCTerminal);
                     acDCConverterDCTerminal.dcNode = dcNode;
                     dcNode.dcTerminals.set(acDCConverterDCTerminal.getUUID(), acDCConverterDCTerminal);
-                    const dcGround = new DCGround_1.DCGround((0, parser_utils_1.getUUID)(i7Data.guid_dcground), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCG'], 32, true));
-                    const dcTerminalG = new DCTerminal_1.DCTerminal((0, parser_utils_1.getUUID)(i7Data.guid_dcterminalg), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCT']));
-                    const dcTerminalM1 = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal((0, parser_utils_1.getUUID)(i7Data.guid_dcterminalm1), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCT']));
-                    const dcNodeG = new DCNode_1.DCNode((0, parser_utils_1.getUUID)(i7Data.guid_dcnodem1));
+                    const dcGround = new DCGround_1.DCGround(parser_utils_1.getUUID(i7Data.guid_dcground), util_create_1.createNotation([utils_2.getName(i7Data), '_DCG'], 32, true));
+                    const dcTerminalG = new DCTerminal_1.DCTerminal(parser_utils_1.getUUID(i7Data.guid_dcterminalg), util_create_1.createNotation([utils_2.getName(i7Data), '_DCT']));
+                    const dcTerminalM1 = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal(parser_utils_1.getUUID(i7Data.guid_dcterminalm1), util_create_1.createNotation([utils_2.getName(i7Data), '_DCT']));
+                    const dcNodeG = new DCNode_1.DCNode(parser_utils_1.getUUID(i7Data.guid_dcnodem1));
                     dcTerminalG.dCConductingEquipment = dcGround;
                     dcTerminalM1.dCConductingEquipment = vsConverter;
                     dcTerminalM1.polarity = DCPolarityKind_1.DCPolarityKind.middle;
@@ -2642,12 +2642,12 @@ class ConverterIntegral7 {
                         console.log();
                     }
                     const prio = i7Data.einspprio;
-                    const inBetrieb = (0, parser_utils_1.isBooleanI7)(i7Data.betrieb) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb) : false;
-                    const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid);
-                    const energySource = new EnergySource_1.EnergySource(rdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), rdfid.substring(0, 8), '_ES'], 32, true), i7Data.kurzname);
+                    const inBetrieb = parser_utils_1.isBooleanI7(i7Data.betrieb) ? parser_utils_1.convertToBooleanI7(i7Data.betrieb) : false;
+                    const rdfid = parser_utils_1.getUUID(i7Data.guid);
+                    const energySource = new EnergySource_1.EnergySource(rdfid, util_create_1.createNotation([utils_2.getName(i7Data), rdfid.substring(0, 8), '_ES'], 32, true), i7Data.kurzname);
                     energySource.nominalVoltage = (_c = (_b = (_a = energySource.equipmentContainer) === null || _a === void 0 ? void 0 : _a.baseVoltage) === null || _b === void 0 ? void 0 : _b.nominalVoltage) === null || _c === void 0 ? void 0 : _c.value;
                     energySource.normallyInService = inBetrieb;
-                    const powerData = (0, utils_2.getActiveReactivePower)(i7Data);
+                    const powerData = utils_2.getActiveReactivePower(i7Data);
                     energySource.activePower = powerData[0];
                     energySource.reactivePower = powerData[1];
                     this.setTopologyEnergySourceConsumerObject(cimModel, energySource, i7Data);
@@ -2656,16 +2656,16 @@ class ConverterIntegral7 {
                     let typeName = (_d = energySourceTypeMappingConfig.find(it => it.i7Name === i7Data.nameprimaertyp)) === null || _d === void 0 ? void 0 : _d.ePlanningType;
                     /** 2 Anhand des Namens vom Objekt */
                     if (!typeName) {
-                        typeName = (0, utils_1.getTypeNameFromStringByRegEx)(i7Data.bezeichner, energySourceTypeMappingConfig);
+                        typeName = utils_1.getTypeNameFromStringByRegEx(i7Data.bezeichner, energySourceTypeMappingConfig);
                     }
                     /** 3 Anhand des Names vom Multiplikationsfaktor */
                     if (!typeName) {
                         const mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
                         if (mf)
-                            typeName = (0, utils_1.getTypeNameFromStringByRegEx)(mf.name, energySourceTypeMappingConfig);
+                            typeName = utils_1.getTypeNameFromStringByRegEx(mf.name, energySourceTypeMappingConfig);
                     }
                     if (typeName) {
-                        const psrType = (0, utils_1.createIfNotExitsPSRType)(cimModel, typeName);
+                        const psrType = utils_1.createIfNotExitsPSRType(cimModel, typeName);
                         energySource.psrTypeUUID = psrType.mrid;
                     }
                     if (typeName === 'Wasserkraft') {
@@ -2682,8 +2682,8 @@ class ConverterIntegral7 {
         });
     }
     convertEnergySourceToExternalNetworkInjection(cimModel, i7Data, prio, inBetrieb) {
-        const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid);
-        const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection(rdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', rdfid.substring(0, 8), '_EI'], 32, true), i7Data.kurzname);
+        const rdfid = parser_utils_1.getUUID(i7Data.guid);
+        const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection(rdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', rdfid.substring(0, 8), '_EI'], 32, true), i7Data.kurzname);
         externalNetworkInjection.referencePriority = prio;
         const usoll = i7Data.usoll;
         // RegulatingControl
@@ -2692,8 +2692,8 @@ class ConverterIntegral7 {
         switch (i7Data.spannungsgeregelt) {
             // TODO Welche Modi sind möglich?
             case 1: {
-                const cimrdfid = (0, parser_utils_1.getUUID)(externalNetworkInjection.getUUID());
-                regulatingControl = new RegulatingControl_1.RegulatingControl(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([cimrdfid.substring(0, 8), '_RC_ENI'], 32, true));
+                const cimrdfid = parser_utils_1.getUUID(externalNetworkInjection.getUUID());
+                regulatingControl = new RegulatingControl_1.RegulatingControl(common_utils_1.CommonUtils.generateUUID(), util_create_1.createNotation([cimrdfid.substring(0, 8), '_RC_ENI'], 32, true));
                 regulatingControl.targetValue = usoll;
                 regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                 regulatingControl.discrete = false;
@@ -2708,7 +2708,7 @@ class ConverterIntegral7 {
                 externalNetworkInjection.controlEnabled = false;
             }
         }
-        const powerData = (0, utils_2.getActiveReactivePower)(i7Data);
+        const powerData = utils_2.getActiveReactivePower(i7Data);
         externalNetworkInjection.p = powerData[0];
         externalNetworkInjection.q = powerData[1];
         this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data, regulatingControl);
@@ -2719,8 +2719,8 @@ class ConverterIntegral7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
                 try {
-                    const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid);
-                    const equivalentInjection = new EquivalentInjection_1.EquivalentInjection(rdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', rdfid.substring(0, 8), '_EI'], 32, true), i7Data.kurzname);
+                    const rdfid = parser_utils_1.getUUID(i7Data.guid);
+                    const equivalentInjection = new EquivalentInjection_1.EquivalentInjection(rdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', rdfid.substring(0, 8), '_EI'], 32, true), i7Data.kurzname);
                     /** TODO
                      * regulationCapability
                      * r, r0 und r2
@@ -2728,7 +2728,7 @@ class ConverterIntegral7 {
                      * */
                     const prio = i7Data.einspprio;
                     const usoll = i7Data.usoll;
-                    const powerData = (0, utils_2.getActiveReactivePower)(i7Data);
+                    const powerData = utils_2.getActiveReactivePower(i7Data);
                     equivalentInjection.p = powerData[0];
                     equivalentInjection.q = powerData[1];
                     this.setTopologyEnergySourceConsumerObject(cimModel, equivalentInjection, i7Data);
@@ -2747,8 +2747,8 @@ class ConverterIntegral7 {
             for (const i7Data of result) {
                 try {
                     const cn = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
-                    const cimrdfid = (0, parser_utils_1.getUUID)(i7Data.guid);
-                    const externalNetworkInjection = new INTEGRALExternalNetworkInjection_1.INTEGRALExternalNetworkInjection(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_ENI'], 32, true), i7Data.kurzname);
+                    const cimrdfid = parser_utils_1.getUUID(i7Data.guid);
+                    const externalNetworkInjection = new INTEGRALExternalNetworkInjection_1.INTEGRALExternalNetworkInjection(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_ENI'], 32, true), i7Data.kurzname);
                     // const un = cn.getVoltageLevel().getBaseVoltageAsNumber();
                     externalNetworkInjection.nameprimaertyp = i7Data.nameprimaertyp;
                     let mf = undefined;
@@ -2758,50 +2758,50 @@ class ConverterIntegral7 {
                         externalNetworkInjection.multiplierFactorUUID = mf.getUUID();
                     }
                     /** Convert EQ-profile dataset. */
-                    const maxP = (0, parser_utils_1.isNumericI7)(i7Data.p_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_max) : undefined;
+                    const maxP = parser_utils_1.isNumericI7(i7Data.p_max) ? parser_utils_1.convertToNumberI7(i7Data.p_max) : undefined;
                     externalNetworkInjection.maxP = maxP;
-                    const governorscd = (0, parser_utils_1.isNumericI7)(i7Data.kr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : undefined;
+                    const governorscd = parser_utils_1.isNumericI7(i7Data.kr) ? parser_utils_1.convertToNumberI7(i7Data.kr) : undefined;
                     externalNetworkInjection.governorSCD = governorscd;
-                    const maxQ = (0, parser_utils_1.isNumericI7)(i7Data.q_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_max) : undefined;
+                    const maxQ = parser_utils_1.isNumericI7(i7Data.q_max) ? parser_utils_1.convertToNumberI7(i7Data.q_max) : undefined;
                     externalNetworkInjection.maxQ = maxQ;
-                    const minP = (0, parser_utils_1.isNumericI7)(i7Data.p_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_min) : undefined;
+                    const minP = parser_utils_1.isNumericI7(i7Data.p_min) ? parser_utils_1.convertToNumberI7(i7Data.p_min) : undefined;
                     externalNetworkInjection.minP = minP;
-                    const minQ = (0, parser_utils_1.isNumericI7)(i7Data.q_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_min) : undefined;
+                    const minQ = parser_utils_1.isNumericI7(i7Data.q_min) ? parser_utils_1.convertToNumberI7(i7Data.q_min) : undefined;
                     externalNetworkInjection.minQ = minQ;
                     //TODO: get data from database
                     /**Convert short circuit constants */
-                    const r0X0 = (0, parser_utils_1.isNumericI7)(i7Data.x0_r0) ? 1 / (0, parser_utils_1.convertToNumberI7)(i7Data.x0_r0) : undefined;
-                    const r1X1 = (0, parser_utils_1.isNumericI7)(i7Data.x1_r1) ? 1 / (0, parser_utils_1.convertToNumberI7)(i7Data.x1_r1) : undefined;
-                    const z0Z1 = (0, parser_utils_1.isNumericI7)(i7Data.z0_z1) ? (0, parser_utils_1.convertToNumberI7)(i7Data.z0_z1) : undefined;
-                    const maxR0X0Ratio = (0, parser_utils_1.isNumericI7)(i7Data.x0_r0_max) ? 1 / (0, parser_utils_1.convertToNumberI7)(i7Data.x0_r0_max) : r0X0;
+                    const r0X0 = parser_utils_1.isNumericI7(i7Data.x0_r0) ? 1 / parser_utils_1.convertToNumberI7(i7Data.x0_r0) : undefined;
+                    const r1X1 = parser_utils_1.isNumericI7(i7Data.x1_r1) ? 1 / parser_utils_1.convertToNumberI7(i7Data.x1_r1) : undefined;
+                    const z0Z1 = parser_utils_1.isNumericI7(i7Data.z0_z1) ? parser_utils_1.convertToNumberI7(i7Data.z0_z1) : undefined;
+                    const maxR0X0Ratio = parser_utils_1.isNumericI7(i7Data.x0_r0_max) ? 1 / parser_utils_1.convertToNumberI7(i7Data.x0_r0_max) : r0X0;
                     externalNetworkInjection.maxR0ToX0Ratio = maxR0X0Ratio;
-                    const maxR1X1Ratio = (0, parser_utils_1.isNumericI7)(i7Data.x1_r1_max) ? 1 / (0, parser_utils_1.convertToNumberI7)(i7Data.x1_r1_max) : r1X1;
+                    const maxR1X1Ratio = parser_utils_1.isNumericI7(i7Data.x1_r1_max) ? 1 / parser_utils_1.convertToNumberI7(i7Data.x1_r1_max) : r1X1;
                     externalNetworkInjection.maxR1ToX1Ratio = maxR1X1Ratio;
-                    const maxZ0Z1Ratio = (0, parser_utils_1.isNumericI7)(i7Data.z0_z1_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.z0_z1_max) : z0Z1;
+                    const maxZ0Z1Ratio = parser_utils_1.isNumericI7(i7Data.z0_z1_max) ? parser_utils_1.convertToNumberI7(i7Data.z0_z1_max) : z0Z1;
                     externalNetworkInjection.maxZ0ToZ1Ratio = maxZ0Z1Ratio;
-                    const minR0X0Ratio = (0, parser_utils_1.isNumericI7)(i7Data.x0_r0_min) ? 1 / (0, parser_utils_1.convertToNumberI7)(i7Data.x0_r0_min) : r0X0;
+                    const minR0X0Ratio = parser_utils_1.isNumericI7(i7Data.x0_r0_min) ? 1 / parser_utils_1.convertToNumberI7(i7Data.x0_r0_min) : r0X0;
                     externalNetworkInjection.minR0ToX0Ratio = minR0X0Ratio;
-                    const minR1X1Ratio = (0, parser_utils_1.isNumericI7)(i7Data.x1_r1_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x1_r1_min) : r1X1;
+                    const minR1X1Ratio = parser_utils_1.isNumericI7(i7Data.x1_r1_min) ? parser_utils_1.convertToNumberI7(i7Data.x1_r1_min) : r1X1;
                     externalNetworkInjection.minR1ToX1Ratio = minR1X1Ratio;
-                    const minZ0Z1Ratio = (0, parser_utils_1.isNumericI7)(i7Data.z0_z1_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.z0_z1_min) : z0Z1;
+                    const minZ0Z1Ratio = parser_utils_1.isNumericI7(i7Data.z0_z1_min) ? parser_utils_1.convertToNumberI7(i7Data.z0_z1_min) : z0Z1;
                     externalNetworkInjection.minZ0ToZ1Ratio = minZ0Z1Ratio;
-                    const skAkt = (0, parser_utils_1.isNumericI7)(i7Data.sk_akt) ? (0, parser_utils_1.convertToNumberI7)(i7Data.sk_akt) : undefined;
-                    const skMin = (0, parser_utils_1.isNumericI7)(i7Data.sk_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.sk_min) : skAkt;
-                    const skMax = (0, parser_utils_1.isNumericI7)(i7Data.sk_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.sk_max) : skAkt;
-                    const minIkSecond = (0, parser_utils_1.isNumericI7)(i7Data.sk_min) ? (0, parser_utils_1.convertToNumberI7)(skMin) / Math.sqrt(3) * skMin : undefined;
+                    const skAkt = parser_utils_1.isNumericI7(i7Data.sk_akt) ? parser_utils_1.convertToNumberI7(i7Data.sk_akt) : undefined;
+                    const skMin = parser_utils_1.isNumericI7(i7Data.sk_min) ? parser_utils_1.convertToNumberI7(i7Data.sk_min) : skAkt;
+                    const skMax = parser_utils_1.isNumericI7(i7Data.sk_max) ? parser_utils_1.convertToNumberI7(i7Data.sk_max) : skAkt;
+                    const minIkSecond = parser_utils_1.isNumericI7(i7Data.sk_min) ? parser_utils_1.convertToNumberI7(skMin) / Math.sqrt(3) * skMin : undefined;
                     externalNetworkInjection.minInitialSymShCCurrent = minIkSecond;
-                    const maxIkSecond = (0, parser_utils_1.isNumericI7)(i7Data.sk_max) ? (0, parser_utils_1.convertToNumberI7)(skMax) / Math.sqrt(3) * skMax : undefined;
+                    const maxIkSecond = parser_utils_1.isNumericI7(i7Data.sk_max) ? parser_utils_1.convertToNumberI7(skMax) / Math.sqrt(3) * skMax : undefined;
                     externalNetworkInjection.maxInitialSymShCCurrent = maxIkSecond;
-                    const usoll = (0, parser_utils_1.isNumericI7)(i7Data.usoll) ? (0, parser_utils_1.convertToNumberI7)(i7Data.usoll) : undefined;
-                    const inBetrieb = (0, parser_utils_1.isBooleanI7)(i7Data.betrieb) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb) : false;
+                    const usoll = parser_utils_1.isNumericI7(i7Data.usoll) ? parser_utils_1.convertToNumberI7(i7Data.usoll) : undefined;
+                    const inBetrieb = parser_utils_1.isBooleanI7(i7Data.betrieb) ? parser_utils_1.convertToBooleanI7(i7Data.betrieb) : false;
                     // RegulatingControl
                     let regulatingControl = undefined;
                     // TODO targetDeadband: ab welcher spannung soll reguliert werden.
                     switch (i7Data.spannungsgeregelt) {
                         // TODO Welche Modi sind möglich?
                         case 1: {
-                            const cimrdfid = (0, parser_utils_1.getUUID)(externalNetworkInjection.getUUID());
-                            regulatingControl = new RegulatingControl_1.RegulatingControl(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([cimrdfid.substring(0, 8), '_RC_ENI'], 32, true));
+                            const cimrdfid = parser_utils_1.getUUID(externalNetworkInjection.getUUID());
+                            regulatingControl = new RegulatingControl_1.RegulatingControl(common_utils_1.CommonUtils.generateUUID(), util_create_1.createNotation([cimrdfid.substring(0, 8), '_RC_ENI'], 32, true));
                             regulatingControl.targetValue = usoll;
                             regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                             regulatingControl.discrete = false;
@@ -2823,7 +2823,7 @@ class ConverterIntegral7 {
                      * @description Set einspprio as referencePriority. PowerFactory sets external network injections with referencePriority to has slack control mode. In regular case referencePriority for externalnetworkextensions is set to value '0'.
                      *                einspprio having no effect in loadflow calculation if voltage control does not exists.
                      * */
-                    let prio = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio) : undefined;
+                    let prio = parser_utils_1.isNumericI7(i7Data.einspprio) ? parser_utils_1.convertToNumberI7(i7Data.einspprio) : undefined;
                     if ((regulatingControl === null || regulatingControl === void 0 ? void 0 : regulatingControl.mode) === RegulatingControlModeKind_1.RegulatingControlModeKind.voltage) {
                         if (prio && prio > 0) {
                             externalNetworkInjection.referencePriority = prio + 1;
@@ -2832,7 +2832,7 @@ class ConverterIntegral7 {
                             prio = undefined;
                         }
                     }
-                    const powerData = (0, utils_2.getActiveReactivePower)(i7Data, mf);
+                    const powerData = utils_2.getActiveReactivePower(i7Data, mf);
                     const p = powerData[0];
                     const q = powerData[1];
                     externalNetworkInjection.setActivePower(p * -1); //convert to load sign system
@@ -2850,7 +2850,7 @@ class ConverterIntegral7 {
     }
     setTopologyEnergySourceConsumerObject(cimModel, condEquip, i7Data, regulatingControl, generatingUnit, targetVoltages) {
         var _a, _b, _c;
-        const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
+        const inBetrieb = parser_utils_1.convertToBooleanI7(i7Data.betrieb);
         condEquip.normallyInService = inBetrieb;
         const connectivityNode = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
         let controlledTerm = undefined;
@@ -2860,10 +2860,10 @@ class ConverterIntegral7 {
             if (regulatingControl) {
                 if (regulatingControl.terminalUUID === undefined) {
                     if (!(controlledTerm.conductingEquipment instanceof BusbarSection_1.BusbarSection)) {
-                        controlledTerm = (0, util_graph2tree_1.getControlledNode)(connectivityNode, undefined);
+                        controlledTerm = util_graph2tree_1.getControlledNode(connectivityNode, undefined);
                     }
                     regulatingControl.terminalUUID = terminal.getUUID();
-                    regulatingControl.name = (0, util_create_1.createNotation)([regulatingControl.name, '_', (_a = connectivityNode.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getUUID().substring(0, 8), '_RC'], 32, true);
+                    regulatingControl.name = util_create_1.createNotation([regulatingControl.name, '_', (_a = connectivityNode.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getUUID().substring(0, 8), '_RC'], 32, true);
                     if (regulatingControl.targetValue === undefined) {
                         const tV = targetVoltages === null || targetVoltages === void 0 ? void 0 : targetVoltages.get(this.UUID2Integral7ID.get(connectivityNode.getUUID()).find(elem => elem));
                         if (tV) {
@@ -2879,19 +2879,19 @@ class ConverterIntegral7 {
                 //TODO: Überarbeitung notwendig, da hier der Präfix nicht eindeutig für Einspeisungen ermittelt werden kann.
                 let i7Schluessel = '';
                 if (condEquip instanceof EnergyConsumer_1.EnergyConsumer) {
-                    i7Schluessel = (0, utils_2.getDescription)(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
+                    i7Schluessel = utils_2.getDescription(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
                         integral_prefix_1.BELASTUNG_PRAEFIX + i7Data.bezeichner;
                 }
                 else if (condEquip instanceof EquivalentInjection_1.EquivalentInjection) {
-                    i7Schluessel = (0, utils_2.getDescription)(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
+                    i7Schluessel = utils_2.getDescription(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
                         integral_prefix_1.ERSATZQUERZWEIG_PRAEFIX + i7Data.bezeichner;
                 }
                 else if (condEquip instanceof StaticVarCompensator_1.StaticVarCompensator) {
-                    i7Schluessel = (0, utils_2.getDescription)(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
+                    i7Schluessel = utils_2.getDescription(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
                         integral_prefix_1.STATCOM_PRAEFIX + i7Data.bezeichner;
                 }
                 else if (condEquip instanceof ExternalNetworkInjection_1.ExternalNetworkInjection) {
-                    i7Schluessel = (0, utils_2.getDescription)(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
+                    i7Schluessel = utils_2.getDescription(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
                         integral_prefix_1.EINSPEISUNG_PRAEFIX + i7Data.bezeichner;
                 }
                 condEquip.description = i7Schluessel;
@@ -2911,11 +2911,11 @@ class ConverterIntegral7 {
     convertQuerkupplungen(cimModel, integral7, schaltanlagenAbschnittIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.QUERKUPPLUNG)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.QUERKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.QUERKUPPLUNG), schaltanlagenAbschnittIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.QUERKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.QUERKUPPLUNG), schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
-                    const cimrdfid = (0, parser_utils_1.getUUID)(i7Data.guid);
-                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_B']), 'Querkupplung');
-                    bay.number = (0, parser_utils_1.isNumericI7)(i7Data.feldnummer) ? (0, parser_utils_1.convertToNumberI7)(i7Data.feldnummer).toString() : undefined;
+                    const cimrdfid = parser_utils_1.getUUID(i7Data.guid);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_B']), 'Querkupplung');
+                    bay.number = parser_utils_1.isNumericI7(i7Data.feldnummer) ? parser_utils_1.convertToNumberI7(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.saabschnitt));
                     if (voltageLevel) {
@@ -2923,7 +2923,7 @@ class ConverterIntegral7 {
                         voltageLevel.addBay(bay);
                         const i7Schluessel = voltageLevel.description +
                             '/QK-' +
-                            (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
+                            utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
                         bay.description = i7Schluessel;
                     }
                     else {
@@ -2942,19 +2942,19 @@ class ConverterIntegral7 {
     convertLaegskupplungen(cimModel, integral7, schaltanlagenIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.LAENGSKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG), schaltanlagenIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG), schaltanlagenIDs));
                 for (const i7Data of result) {
-                    const cimrdfid = (0, parser_utils_1.getUUID)(i7Data.guid);
-                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_B']), i7Data.kurzname, 'Laengskupplung');
+                    const cimrdfid = parser_utils_1.getUUID(i7Data.guid);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_B']), i7Data.kurzname, 'Laengskupplung');
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
-                    bay.number = (0, parser_utils_1.isNumericI7)(i7Data.feldnummer) ? (0, parser_utils_1.convertToNumberI7)(i7Data.feldnummer).toString() : undefined;
+                    bay.number = parser_utils_1.isNumericI7(i7Data.feldnummer) ? parser_utils_1.convertToNumberI7(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
                     if (voltageLevel) {
                         bay.voltageLevel = voltageLevel;
                         voltageLevel.addBay(bay);
                         const i7Schluessel = voltageLevel.description +
                             '/LK-' +
-                            (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
+                            utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
                         bay.description = i7Schluessel;
                     }
                     else {
@@ -2975,10 +2975,10 @@ class ConverterIntegral7 {
     convertStarreVerbindungen(cimModel, containerIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_STARR)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.KNOTEN_STARR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_STARR), containerIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_STARR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_STARR), containerIDs));
                 for (const i7Data of result) {
                     //const junction = new Junction(getUUID(i7Data.guid), createNotation([getName(i7Data),"_J",`_${cimModel.junctions]), 'JNCT', 'starre Verbindung');
-                    const breaker = new Breaker_1.Breaker((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_BR']), 'Breaker', 'starre Verbindung');
+                    const breaker = new Breaker_1.Breaker(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_BR']), 'Breaker', 'starre Verbindung');
                     yield this.convertSwitch(breaker, cimModel, i7Data);
                     cimModel.addBreaker(breaker);
                     this.addIdMapping(i7Data.id, breaker.mrid, integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER);
@@ -3029,9 +3029,9 @@ class ConverterIntegral7 {
     convertTrennerFi3f(cimModel, containerIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRENNERFI_3P)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TRENNERFI_3P, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRENNERFI_3P), containerIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRENNERFI_3P, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRENNERFI_3P), containerIDs));
                 for (const i7Data of result) {
-                    const disconnector = new Disconnector_1.Disconnector((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_D']));
+                    const disconnector = new Disconnector_1.Disconnector(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_D']));
                     yield this.convertSwitch(disconnector, cimModel, i7Data);
                     cimModel.addDisconnector(disconnector);
                     this.addIdMapping(i7Data.id, disconnector.mrid, integral_sql_1.Integral7TableNames.TRENNERFI_3P);
@@ -3045,9 +3045,9 @@ class ConverterIntegral7 {
     convertTrenner3f(cimModel, containerIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRENNER_3P)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TRENNER_3P, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRENNER_3P), containerIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRENNER_3P, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRENNER_3P), containerIDs));
                 for (const i7Data of result) {
-                    const disconnector = new Disconnector_1.Disconnector((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_D']));
+                    const disconnector = new Disconnector_1.Disconnector(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_D']));
                     yield this.convertSwitch(disconnector, cimModel, i7Data);
                     cimModel.addDisconnector(disconnector);
                     this.addIdMapping(i7Data.id, disconnector.mrid, integral_sql_1.Integral7TableNames.TRENNER_3P);
@@ -3061,9 +3061,9 @@ class ConverterIntegral7 {
     convertLeistungsschalter(cimModel, containerIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.LEISTUNGSSCHALTER, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER), containerIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LEISTUNGSSCHALTER, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER), containerIDs));
                 for (const i7Data of result) {
-                    const breaker = new Breaker_1.Breaker((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_BR']));
+                    const breaker = new Breaker_1.Breaker(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_BR']));
                     yield this.convertSwitch(breaker, cimModel, i7Data);
                     cimModel.addBreaker(breaker);
                     this.addIdMapping(i7Data.id, breaker.mrid, integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER);
@@ -3075,9 +3075,10 @@ class ConverterIntegral7 {
         });
     }
     convertSwitch(swtch, cimModel, i7Data) {
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            swtch.normalOpen = !(0, parser_utils_1.convertToBooleanI7)(i7Data.schaltzustand);
-            swtch.open = !(0, parser_utils_1.convertToBooleanI7)(i7Data.schaltzustand);
+            swtch.normalOpen = !parser_utils_1.convertToBooleanI7(i7Data.schaltzustand);
+            swtch.open = !parser_utils_1.convertToBooleanI7(i7Data.schaltzustand);
             const equipmentContainer = cimModel.objects.get(this.integralID2UUID.get(i7Data.seliste));
             const cnStart = cimModel.getConnectivityNode(this.integralID2UUID.get(i7Data.aknoten));
             const cnZiel = cimModel.getConnectivityNode(this.integralID2UUID.get(i7Data.eknoten));
@@ -3100,7 +3101,7 @@ class ConverterIntegral7 {
             else {
                 this.logger.debug(`Schalter ${i7Data.id} besitzt keinen Zielknoten.`);
             }
-            const voltageLevel = equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getVoltageLevel();
+            const voltageLevel = (_a = equipmentContainer) === null || _a === void 0 ? void 0 : _a.getVoltageLevel();
             const baseVoltage = voltageLevel === null || voltageLevel === void 0 ? void 0 : voltageLevel.baseVoltage;
             if (baseVoltage) {
                 swtch.baseVoltageUUID = baseVoltage.mrid;
@@ -3114,9 +3115,9 @@ class ConverterIntegral7 {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSDROSSEL) && integral7.lDrosselAnschlussKnotenIDs.length) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.LAENGSDROSSEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSDROSSEL), integral7.lDrosselAnschlussKnotenIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSDROSSEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSDROSSEL), integral7.lDrosselAnschlussKnotenIDs));
                 for (const i7Data of result) {
-                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SC']), i7Data.kurzname, i7Data.kommentar + '; LD-' + i7Data.bezeichner);
+                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_SC']), i7Data.kurzname, i7Data.kommentar + '; LD-' + i7Data.bezeichner);
                     // Topologie
                     /* Anfang
                      * 3 moegliche Anschluesse
@@ -3126,7 +3127,7 @@ class ConverterIntegral7 {
                     const start = cimModel.objects.get(this.integralID2UUID.get(i7Data.aknoten));
                     let startTerminal;
                     if (start) {
-                        startTerminal = (0, util_create_1.createConnection)(cimModel, seriesCompensator, start, PhaseCode_1.PhaseCode.ABC, 1);
+                        startTerminal = util_create_1.createConnection(cimModel, seriesCompensator, start, PhaseCode_1.PhaseCode.ABC, 1);
                     }
                     else {
                         this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Anfangsknoten.`);
@@ -3135,7 +3136,7 @@ class ConverterIntegral7 {
                     const target = cimModel.objects.get(this.integralID2UUID.get(i7Data.eknoten));
                     let targetTerminal;
                     if (target) {
-                        targetTerminal = (0, util_create_1.createConnection)(cimModel, seriesCompensator, target, PhaseCode_1.PhaseCode.ABC, 2);
+                        targetTerminal = util_create_1.createConnection(cimModel, seriesCompensator, target, PhaseCode_1.PhaseCode.ABC, 2);
                     }
                     else {
                         this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Zielknoten.`);
@@ -3144,18 +3145,18 @@ class ConverterIntegral7 {
                     bdf.push(this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.aknoten)));
                     bdf.push(this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.eknoten)));
                     /** Spannungsebene */
-                    const baseVoltages = (0, utils_2.getTerminalUn)(cimModel, bdf, seriesCompensator);
+                    const baseVoltages = utils_2.getTerminalUn(cimModel, bdf, seriesCompensator);
                     seriesCompensator.baseVoltage = baseVoltages[0] ? baseVoltages[0] : baseVoltages[1];
                     if (seriesCompensator.baseVoltage === undefined) {
                         let stop = true;
                     }
                     /** EQ */
-                    const ur = (0, utils_2.getU)(i7Data.ur);
-                    const ir = (0, parser_utils_1.isNumericI7)(i7Data.ir) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ir) : undefined;
-                    const ukr = (0, parser_utils_1.isNumericI7)(i7Data.ukr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ukr) : undefined;
-                    const pkr = (0, parser_utils_1.isNumericI7)(i7Data.pkr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pkr) : undefined;
-                    seriesCompensator.r = (0, utils_2.calculateRSeriesCompensator)(ir, pkr);
-                    seriesCompensator.x = (0, utils_2.calculateXSeriesCompensator)(ur, ukr, ir);
+                    const ur = utils_2.getU(i7Data.ur);
+                    const ir = parser_utils_1.isNumericI7(i7Data.ir) ? parser_utils_1.convertToNumberI7(i7Data.ir) : undefined;
+                    const ukr = parser_utils_1.isNumericI7(i7Data.ukr) ? parser_utils_1.convertToNumberI7(i7Data.ukr) : undefined;
+                    const pkr = parser_utils_1.isNumericI7(i7Data.pkr) ? parser_utils_1.convertToNumberI7(i7Data.pkr) : undefined;
+                    seriesCompensator.r = utils_2.calculateRSeriesCompensator(ir, pkr);
+                    seriesCompensator.x = utils_2.calculateXSeriesCompensator(ur, ukr, ir);
                     seriesCompensator.varistorPresent = false;
                     /** EQ-SC */
                     seriesCompensator.r0 = seriesCompensator.r;
@@ -3186,7 +3187,7 @@ class ConverterIntegral7 {
                         this.logger.debug(`Längsdrossel ${i7Data.id} besitzt kein VoltageLevel Ur ${i7Data.ur}.`);
                     }
                     /** PSR Types */
-                    const psrType = (0, utils_1.createIfNotExitsPSRType)(cimModel, 'Längsdrossel');
+                    const psrType = utils_1.createIfNotExitsPSRType(cimModel, 'Längsdrossel');
                     seriesCompensator.psrTypeUUID = psrType.mrid;
                     cimModel.addSeriesCompensator(seriesCompensator);
                     this.addIdMapping(i7Data.id, seriesCompensator.mrid, integral_sql_1.Integral7TableNames.LAENGSDROSSEL);
@@ -3201,9 +3202,9 @@ class ConverterIntegral7 {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR) && integral7.lKondensatorAnschlussKnotenIDs.length > 0) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.LAENGSKONDENSATOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR), integral7.lKondensatorAnschlussKnotenIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKONDENSATOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR), integral7.lKondensatorAnschlussKnotenIDs));
                 for (const i7Data of result) {
-                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SC']), i7Data.kurzname);
+                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_SC']), i7Data.kurzname);
                     // Topologie
                     /* Anfang
                      * 3 moegliche Anschluesse
@@ -3233,15 +3234,15 @@ class ConverterIntegral7 {
                     bdf.push(this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.aknoten)));
                     bdf.push(this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.eknoten)));
                     /** Spannungsebene */
-                    const baseVoltages = (0, utils_2.getTerminalUn)(cimModel, bdf, seriesCompensator);
+                    const baseVoltages = utils_2.getTerminalUn(cimModel, bdf, seriesCompensator);
                     seriesCompensator.baseVoltage = baseVoltages[0];
                     /** EQ */
-                    const ur = (0, utils_2.getU)(i7Data.ur);
-                    const ir = (0, parser_utils_1.isNumericI7)(i7Data.ir) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ir) : undefined;
-                    const ukr = (0, parser_utils_1.isNumericI7)(i7Data.ukr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ukr) : undefined;
-                    const pkr = (0, parser_utils_1.isNumericI7)(i7Data.pkr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pkr) : undefined;
-                    seriesCompensator.r = (0, utils_2.calculateRSeriesCompensator)(ir, pkr);
-                    seriesCompensator.x = (0, utils_2.calculateXSeriesCompensator)(ur, ukr, ir * -1);
+                    const ur = utils_2.getU(i7Data.ur);
+                    const ir = parser_utils_1.isNumericI7(i7Data.ir) ? parser_utils_1.convertToNumberI7(i7Data.ir) : undefined;
+                    const ukr = parser_utils_1.isNumericI7(i7Data.ukr) ? parser_utils_1.convertToNumberI7(i7Data.ukr) : undefined;
+                    const pkr = parser_utils_1.isNumericI7(i7Data.pkr) ? parser_utils_1.convertToNumberI7(i7Data.pkr) : undefined;
+                    seriesCompensator.r = utils_2.calculateRSeriesCompensator(ir, pkr);
+                    seriesCompensator.x = utils_2.calculateXSeriesCompensator(ur, ukr, ir * -1);
                     seriesCompensator.varistorPresent = false;
                     /** EQ-SC */
                     seriesCompensator.r0 = seriesCompensator.r;
@@ -3269,7 +3270,7 @@ class ConverterIntegral7 {
                         this.logger.debug(`Längskondensator ${i7Data.id} besitzt kein VoltageLevel Ur ${i7Data.ur}.`);
                     }
                     /** PSR Types */
-                    const psrType = (0, utils_1.createIfNotExitsPSRType)(cimModel, 'Längskondensator');
+                    const psrType = utils_1.createIfNotExitsPSRType(cimModel, 'Längskondensator');
                     seriesCompensator.psrType = psrType;
                     cimModel.addSeriesCompensator(seriesCompensator);
                     this.addIdMapping(i7Data.id, seriesCompensator.mrid, integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR);
@@ -3284,7 +3285,7 @@ class ConverterIntegral7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             // KDrosseltypen
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_KDROSSEL)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TYP_KDROSSEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_KDROSSEL), []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_KDROSSEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_KDROSSEL), []));
                 for (const i7Data of result) {
                     /** Keine CIM Klasse vorhanden
                      * Vorläufig werden die Typdaten als Map gespiechert */
@@ -3303,12 +3304,12 @@ class ConverterIntegral7 {
             return new Promise((resolve) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 const stpSchieneIDs = [];
                 if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_SCHIENE)) {
-                    const stpSchiene = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STERNPUNKT_SCHIENE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_SCHIENE), standortIDs));
+                    const stpSchiene = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_SCHIENE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_SCHIENE), standortIDs));
                     for (const i7DataSchiene of stpSchiene) {
                         try {
                             stpSchieneIDs.push(i7DataSchiene.id);
-                            const connectivityNode = new ConnectivityNode_1.ConnectivityNode(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7DataSchiene), '_CN']));
-                            const junction = new Junction_1.Junction(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7DataSchiene), '_J']));
+                            const connectivityNode = new ConnectivityNode_1.ConnectivityNode(common_utils_1.CommonUtils.generateUUID(), util_create_1.createNotation([utils_2.getName(i7DataSchiene), '_CN']));
+                            const junction = new Junction_1.Junction(common_utils_1.CommonUtils.generateUUID(), util_create_1.createNotation([utils_2.getName(i7DataSchiene), '_J']));
                             const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject(this.integralID2UUID.get(i7DataSchiene.id)));
                             connectivityNode.setConnectivityNodeContainer(equipmentContainer);
                             if (equipmentContainer) {
@@ -3343,17 +3344,17 @@ class ConverterIntegral7 {
             try {
                 if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ)) {
                     if (stpScheinenID.length) {
-                        const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STERNPUNKT_IMPEDANZ, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ), stpScheinenID));
+                        const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_IMPEDANZ, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ), stpScheinenID));
                         for (const i7Data of result) {
                             const kdType = this.kdrosseltypen.get(i7Data.nametyp);
-                            const imax = (0, parser_utils_1.isNumericI7)(i7Data.imax) ? i7Data.imax : ((0, parser_utils_1.isNumericI7)(kdType === null || kdType === void 0 ? void 0 : kdType.imax) ? kdType === null || kdType === void 0 ? void 0 : kdType.imax : undefined);
-                            const imin = (0, parser_utils_1.isNumericI7)(i7Data.imin) ? i7Data.imin : ((0, parser_utils_1.isNumericI7)(kdType === null || kdType === void 0 ? void 0 : kdType.imin) ? kdType === null || kdType === void 0 ? void 0 : kdType.imin : undefined);
+                            const imax = parser_utils_1.isNumericI7(i7Data.imax) ? i7Data.imax : (parser_utils_1.isNumericI7(kdType === null || kdType === void 0 ? void 0 : kdType.imax) ? kdType === null || kdType === void 0 ? void 0 : kdType.imax : undefined);
+                            const imin = parser_utils_1.isNumericI7(i7Data.imin) ? i7Data.imin : (parser_utils_1.isNumericI7(kdType === null || kdType === void 0 ? void 0 : kdType.imin) ? kdType === null || kdType === void 0 ? void 0 : kdType.imin : undefined);
                             const connectivityNode = integral7.sternPunktImpModel.connectivityNodes.get(this.integralID2UUID.get(i7Data.anschluss));
                             const junctionUUID = integral7.sternPunktImpModel.stpSchieneJunctionUUIDs.get((i7Data.anschluss));
                             let conductingEquip;
                             if (imax && imin) {
                                 /** PetersenCoil */
-                                const petersenCoil = new PetersenCoil_1.PetersenCoil((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_PC']), i7Data.kurzname);
+                                const petersenCoil = new PetersenCoil_1.PetersenCoil(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_PC']), i7Data.kurzname);
                                 integral7.sternPunktImpModel.petersenCoils.set(petersenCoil.mrid, petersenCoil);
                                 integral7.sternPunktImpModel.junctionUUIDstpImp.set(junctionUUID, petersenCoil);
                                 this.addIdMapping(i7Data.id, petersenCoil.mrid, integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ);
@@ -3361,9 +3362,9 @@ class ConverterIntegral7 {
                             }
                             else {
                                 /** GroundingImpedance */
-                                const groundingImpedance = new GroundingImpedance_1.GroundingImpedance((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_GI']), i7Data.kurzname);
-                                groundingImpedance.r = (0, parser_utils_1.isNumericI7)(i7Data.rne) ? i7Data.rne : ((0, parser_utils_1.isNumericI7)(kdType === null || kdType === void 0 ? void 0 : kdType.rne) ? kdType === null || kdType === void 0 ? void 0 : kdType.rne : undefined);
-                                groundingImpedance.x = (0, parser_utils_1.isNumericI7)(i7Data.xne) ? i7Data.xne : ((0, parser_utils_1.isNumericI7)(kdType === null || kdType === void 0 ? void 0 : kdType.xne) ? kdType === null || kdType === void 0 ? void 0 : kdType.xne : undefined);
+                                const groundingImpedance = new GroundingImpedance_1.GroundingImpedance(parser_utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_GI']), i7Data.kurzname);
+                                groundingImpedance.r = parser_utils_1.isNumericI7(i7Data.rne) ? i7Data.rne : (parser_utils_1.isNumericI7(kdType === null || kdType === void 0 ? void 0 : kdType.rne) ? kdType === null || kdType === void 0 ? void 0 : kdType.rne : undefined);
+                                groundingImpedance.x = parser_utils_1.isNumericI7(i7Data.xne) ? i7Data.xne : (parser_utils_1.isNumericI7(kdType === null || kdType === void 0 ? void 0 : kdType.xne) ? kdType === null || kdType === void 0 ? void 0 : kdType.xne : undefined);
                                 integral7.sternPunktImpModel.groundingImpedances.set(groundingImpedance.mrid, groundingImpedance);
                                 integral7.sternPunktImpModel.junctionUUIDstpImp.set(junctionUUID, groundingImpedance);
                                 this.addIdMapping(i7Data.id, groundingImpedance.mrid, integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ);
@@ -3397,11 +3398,11 @@ class ConverterIntegral7 {
             try {
                 if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_SCHALTER)) {
                     if (stpSchienenID.length) {
-                        const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STERNPUNKT_SCHALTER, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_SCHALTER), stpSchienenID));
+                        const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_SCHALTER, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_SCHALTER), stpSchienenID));
                         for (const i7Data of result) {
                             const terminal = integral7.sternPunktImpModel.stpSchieneTerminal.get(i7Data.eknoten);
                             if (terminal) {
-                                terminal.connected = (0, parser_utils_1.isBooleanI7)(i7Data.schaltzustand) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.schaltzustand) : true;
+                                terminal.connected = parser_utils_1.isBooleanI7(i7Data.schaltzustand) ? parser_utils_1.convertToBooleanI7(i7Data.schaltzustand) : true;
                             }
                             /** SchaltelementID mit Junstion UUID verknüpfen, um Topologie des netz_knoten1pelem-Elements herstellen zu können */
                             integral7.sternPunktImpModel.stpSchieneJunctionUUIDs.set(i7Data.id, integral7.sternPunktImpModel.stpSchieneJunctionUUIDs.get(i7Data.eknoten));
@@ -3428,19 +3429,19 @@ class ConverterIntegral7 {
     convertLaengskupplungen(cimModel, integral7, schaltanlagenIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.LAENGSKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG), schaltanlagenIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG), schaltanlagenIDs));
                 for (const i7Data of result) {
-                    const cimrdfid = (0, parser_utils_1.getUUID)(i7Data.guid);
-                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_B']), i7Data.kurzname, 'Laengskupplung');
+                    const cimrdfid = parser_utils_1.getUUID(i7Data.guid);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_B']), i7Data.kurzname, 'Laengskupplung');
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
-                    bay.number = (0, parser_utils_1.isNumericI7)(i7Data.feldnummer) ? (0, parser_utils_1.convertToNumberI7)(i7Data.feldnummer).toString() : undefined;
+                    bay.number = parser_utils_1.isNumericI7(i7Data.feldnummer) ? parser_utils_1.convertToNumberI7(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
                     if (voltageLevel) {
                         bay.voltageLevel = voltageLevel;
                         voltageLevel.addBay(bay);
                         const i7Schluessel = voltageLevel.description +
                             '/LK-' +
-                            (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
+                            utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
                         bay.description = i7Schluessel;
                     }
                     else {
@@ -3462,7 +3463,7 @@ class ConverterIntegral7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             // Freileitungstypen
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_FREILEITUNG)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TYP_FREILEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_FREILEITUNG), []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_FREILEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_FREILEITUNG), []));
                 for (const i7Data of result) {
                     const typ = new EVWireInfo_1.EVWireInfo(common_utils_1.CommonUtils.generateUUID(), i7Data.name);
                     this.setWireInfoProperties(typ, i7Data, 'Freileitung');
@@ -3474,7 +3475,7 @@ class ConverterIntegral7 {
             }
             // Kabeltypen
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_KABEL)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TYP_KABEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_KABEL), []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_KABEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_KABEL), []));
                 for (const i7Data of result) {
                     const typ = new EVWireInfo_1.EVWireInfo(common_utils_1.CommonUtils.generateUUID(), i7Data.name);
                     this.setWireInfoProperties(typ, i7Data, 'Kabel');
@@ -3503,7 +3504,7 @@ class ConverterIntegral7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LEITUNG) && integral7.leitungsAnschlussIDs.length) {
                 const cimModel = frame.cimModel;
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.LEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LEITUNG), integral7.leitungsAnschlussIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LEITUNG), integral7.leitungsAnschlussIDs));
                 const leitungIDs = result.map(elem => elem.id);
                 const cableAvailable = this.isTableAvailable(integral_sql_1.Integral7TableNames.KABEL);
                 const overheadAvailable = this.isTableAvailable(integral_sql_1.Integral7TableNames.FREILEITUNG);
@@ -3520,7 +3521,7 @@ class ConverterIntegral7 {
                     type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_FREILEITUNG;
                     tableName = integral_sql_1.Integral7TableNames.FREILEITUNG;
                 }
-                const leitungStromkreisabschnitt = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(type, this.getAvailableColumnNames(tableName), leitungIDs));
+                const leitungStromkreisabschnitt = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(type, this.getAvailableColumnNames(tableName), leitungIDs));
                 for (const i7Data of result) {
                     /** Alle Stromkreisabschnitte */
                     const stromkreisabschnitte = leitungStromkreisabschnitt.filter(elem => elem.leitung === i7Data.id);
@@ -3532,36 +3533,36 @@ class ConverterIntegral7 {
                     const leitung = new Leitung_1.LeitungImpl(i7Data);
                     integral7.integralLeitungen.set(i7Data.id, leitung);
                     let i7Schluessel = integral_prefix_1.LEITUNG_PRAEFIX +
-                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.ukz) +
+                        utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
                         integral_prefix_1.MITTIGER_PUNKT +
-                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.kurzname) +
+                        utils_2.ueberpruefeZeichenkette(i7Data.kurzname) +
                         integral_prefix_1.MITTIGER_PUNKT +
-                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner) +
+                        utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
                         integral_prefix_1.MITTIGER_PUNKT +
-                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.stkabname);
-                    let name = (0, utils_2.ueberpruefeZeichenkette)(i7Data.ukz) +
+                        utils_2.ueberpruefeZeichenkette(i7Data.stkabname);
+                    let name = utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
                         '-' +
-                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner) +
+                        utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
                         '-' +
-                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.stkabname);
+                        utils_2.ueberpruefeZeichenkette(i7Data.stkabname);
                     /** Wenn kein Stromkreisobjekt vorhanden ist, dann erstelle ein neues Objekt. */
-                    const uuidString = (0, parser_utils_1.getUUID)(i7Data.guid);
-                    const line = new AMPRIONLine_1.AMPRIONLine(uuidString, (0, util_create_1.createNotation)([name, '_', uuidString.substring(0, 8), '_L'], 32, true), i7Data.stkabname, i7Schluessel);
+                    const uuidString = parser_utils_1.getUUID(i7Data.guid);
+                    const line = new AMPRIONLine_1.AMPRIONLine(uuidString, util_create_1.createNotation([name, '_', uuidString.substring(0, 8), '_L'], 32, true), i7Data.stkabname, i7Schluessel);
                     line.ukz = i7Data.ukz;
                     let acLineSegments = [];
                     /** ACLineSegments erstellen */
                     for (const stk of stromkreisabschnitte) {
-                        i7Schluessel += integral_prefix_1.LEITUNGSABSCHNITT_PRAEFIX + (0, utils_2.ueberpruefeZeichenkette)(stk.bezeichner);
-                        name = (0, utils_2.ueberpruefeZeichenkette)(i7Data.ukz) +
+                        i7Schluessel += integral_prefix_1.LEITUNGSABSCHNITT_PRAEFIX + utils_2.ueberpruefeZeichenkette(stk.bezeichner);
+                        name = utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
                             '-' +
-                            (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner) +
+                            utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
                             '-' +
-                            (0, utils_2.ueberpruefeZeichenkette)(stk.bezeichner);
-                        const cimrdfid = (0, parser_utils_1.getUUID)(stk.custom_guid_0120 + stk.custom_guid_2137);
+                            utils_2.ueberpruefeZeichenkette(stk.bezeichner);
+                        const cimrdfid = parser_utils_1.getUUID(stk.custom_guid_0120 + stk.custom_guid_2137);
                         if (cimrdfid === 'C7E21969-4389-45BA-A693-5D72BEEA8158') {
                             const stop = true;
                         }
-                        const acLineSegment = new INTEGRALACLineSegment_1.INTEGRALACLineSegment(cimrdfid, (0, util_create_1.createNotation)([name, '_' + stk.pos.toString(), '_' + cimrdfid.substring(0, 8), '_ACLS'], 32, true), i7Data.stkabname, i7Schluessel);
+                        const acLineSegment = new INTEGRALACLineSegment_1.INTEGRALACLineSegment(cimrdfid, util_create_1.createNotation([name, '_' + stk.pos.toString(), '_' + cimrdfid.substring(0, 8), '_ACLS'], 32, true), i7Data.stkabname, i7Schluessel);
                         let mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(stk.multfaktor));
                         if (mf) {
                             cimModel.addMultiplierFactor(mf);
@@ -3608,7 +3609,7 @@ class ConverterIntegral7 {
                     for (let i = 0; i < anzahl - 1; i++) {
                         const acLineSegment1 = acLineSegments[i];
                         /**Connectivity Node to connect end of line and start of neighbouring line.*/
-                        const cn = new ConnectivityNode_1.ConnectivityNode(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([acLineSegment1.name, '_', acLineSegment1.getUUID().substring(0, 8), '_CN'], 32, true));
+                        const cn = new ConnectivityNode_1.ConnectivityNode(common_utils_1.CommonUtils.generateUUID(), util_create_1.createNotation([acLineSegment1.name, '_', acLineSegment1.getUUID().substring(0, 8), '_CN'], 32, true));
                         /**Connect end of aclinesegment i*/
                         cn.connectivityNodeContainer = acLineSegment1.equipmentContainer;
                         tmp_terminal = this.createConnection(cimModel, acLineSegment1, cn, PhaseCode_1.PhaseCode.ABC, true);
@@ -3712,14 +3713,14 @@ class ConverterIntegral7 {
             //}
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_LEITUNG) && integral7.hgueAnschlussKnotenIDs.length > 0) {
                 // const result: Hgueleitung[] = await this.queryFunctionWrapper(getNetzQuery(I7Objects.HGUE_LEITUNG, limit, offset, []));
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.HGUE_LEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_LEITUNG), integral7.hgueAnschlussKnotenIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_LEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_LEITUNG), integral7.hgueAnschlussKnotenIDs));
                 for (const i7Data of result) {
                     //console.log(getUUID(i7Data.guid_dcline));
                     integral7.integralHgueLeitungen.set(i7Data.id, i7Data);
-                    const dcLine = new DCLine_1.DCLine((0, parser_utils_1.getUUID)(i7Data.guid_dcline), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCL']));
+                    const dcLine = new DCLine_1.DCLine(parser_utils_1.getUUID(i7Data.guid_dcline), util_create_1.createNotation([utils_2.getName(i7Data), '_DCL']));
                     let dcLineNeg = undefined;
                     const i7Schluessel = integral_prefix_1.HGUELEITUNG_PRAEFIX +
-                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
+                        utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
                     /** operationMode der Anfangs- und Zielkopfstation setzen */
                     let converterStart = false;
                     let converterStartNeg = false;
@@ -3727,10 +3728,10 @@ class ConverterIntegral7 {
                     let converterTarget = false;
                     let converterTargetNeg = false;
                     let converterUnitTargetSide = false;
-                    let bipol = (0, parser_utils_1.convertToBooleanI7)(i7Data.bipol);
-                    bipol = (0, parser_utils_1.convertToBooleanI7)(false);
+                    let bipol = parser_utils_1.convertToBooleanI7(i7Data.bipol);
+                    bipol = parser_utils_1.convertToBooleanI7(false);
                     //Parameter "guidp" is available for monopolar and bipolar dc systems. Thus create DCLineSegment with positive sign property in any case.
-                    const dcLineSegment = new DCLineSegment_1.DCLineSegment((0, parser_utils_1.getUUID)(i7Data.guidp), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCLS']), i7Data.kurzname, i7Schluessel);
+                    const dcLineSegment = new DCLineSegment_1.DCLineSegment(parser_utils_1.getUUID(i7Data.guidp), util_create_1.createNotation([utils_2.getName(i7Data), '_DCLS']), i7Data.kurzname, i7Schluessel);
                     let dcLineSegmentNeg = undefined;
                     if (dcLineSegment.getUUID() === "579b6a04-23c5-452f-b7ad-db283dad1cdb") {
                         const stop = true;
@@ -3740,31 +3741,31 @@ class ConverterIntegral7 {
                     dcLineSegment.capacitance = undefined;
                     dcLineSegment.inductance = undefined;
                     /**EQ: given directly by the INTEGRAL system model */
-                    dcLineSegment.resistance = (0, parser_utils_1.isNumericI7)(i7Data.rdc) ? (bipol ? (0, parser_utils_1.convertToNumberI7)(i7Data.rdc) / 2 : (0, parser_utils_1.convertToNumberI7)(i7Data.rdc)) : undefined;
+                    dcLineSegment.resistance = parser_utils_1.isNumericI7(i7Data.rdc) ? (bipol ? parser_utils_1.convertToNumberI7(i7Data.rdc) / 2 : parser_utils_1.convertToNumberI7(i7Data.rdc)) : undefined;
                     dcLineSegment.equipmentContainer = dcLine;
                     //create second dcLineSegment in case this dcLine is a bipol.
                     if (bipol) {
-                        dcLineNeg = new DCLine_1.DCLine(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_neg', '_DCL']));
-                        dcLineSegmentNeg = new DCLineSegment_1.DCLineSegment((0, parser_utils_1.getUUID)(i7Data.guidn), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_neg', '_DCLS'], 32, true), (0, util_create_1.createNotation)([i7Data.kurzname, '_neg'], 12, true), i7Schluessel);
+                        dcLineNeg = new DCLine_1.DCLine(common_utils_1.CommonUtils.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_neg', '_DCL']));
+                        dcLineSegmentNeg = new DCLineSegment_1.DCLineSegment(parser_utils_1.getUUID(i7Data.guidn), util_create_1.createNotation([utils_2.getName(i7Data), '_neg', '_DCLS'], 32, true), util_create_1.createNotation([i7Data.kurzname, '_neg'], 12, true), i7Schluessel);
                         dcLineSegmentNeg.length = dcLineSegment.length;
                         dcLineSegmentNeg.capacitance = undefined;
                         dcLineSegmentNeg.inductance = undefined;
-                        dcLineSegmentNeg.resistance = (0, parser_utils_1.isNumericI7)(i7Data.rdc) ? (bipol ? (0, parser_utils_1.convertToNumberI7)(i7Data.rdc) / 2 : (0, parser_utils_1.convertToNumberI7)(i7Data.rdc)) : undefined;
+                        dcLineSegmentNeg.resistance = parser_utils_1.isNumericI7(i7Data.rdc) ? (bipol ? parser_utils_1.convertToNumberI7(i7Data.rdc) / 2 : parser_utils_1.convertToNumberI7(i7Data.rdc)) : undefined;
                         dcLineSegmentNeg.equipmentContainer = dcLineNeg;
                     }
                     const acDCConverterStart = cimModel.getObject(this.integralID2UUID.get(i7Data.anetzobjekt)) ? cimModel.getObject(this.integralID2UUID.get(i7Data.anetzobjekt)) : undefined;
-                    converterStart = (0, parser_utils_1.convertToBooleanI7)(acDCConverterStart !== undefined);
+                    converterStart = parser_utils_1.convertToBooleanI7(acDCConverterStart !== undefined);
                     let acDCConverterStartNeg = undefined;
                     const acDCConverterTarget = cimModel.getObject(this.integralID2UUID.get(i7Data.enetzobjekt)) ? cimModel.getObject(this.integralID2UUID.get(i7Data.enetzobjekt)) : undefined;
-                    converterStart = (0, parser_utils_1.convertToBooleanI7)(acDCConverterTarget !== undefined);
+                    converterStart = parser_utils_1.convertToBooleanI7(acDCConverterTarget !== undefined);
                     let acDCConverterTargetNeg = undefined;
                     //Setting acDCConverterStartNeg and acDCConverterTargetNeg in case this DCLine is a bipol
                     if (bipol) {
                         const int7hguekopf = converterStart ? (_a = integral7.integralHgueKopf) === null || _a === void 0 ? void 0 : _a.get(this.UUID2Integral7ID.get(acDCConverterStart.getUUID()).find(elem => elem)) : undefined;
-                        acDCConverterStartNeg = converterStart && int7hguekopf !== undefined ? (0, util_create_1.createACDCConverterNeg)(cimModel, int7hguekopf, acDCConverterStart.constructor.name, acDCConverterStart) : undefined;
-                        converterStartNeg = (0, parser_utils_1.convertToBooleanI7)(acDCConverterStartNeg !== undefined);
-                        acDCConverterTargetNeg = converterTarget && int7hguekopf !== undefined ? (0, util_create_1.createACDCConverterNeg)(cimModel, int7hguekopf, acDCConverterTarget.constructor.name, acDCConverterTarget) : undefined;
-                        converterTargetNeg = (0, parser_utils_1.convertToBooleanI7)(acDCConverterTargetNeg !== undefined);
+                        acDCConverterStartNeg = converterStart && int7hguekopf !== undefined ? util_create_1.createACDCConverterNeg(cimModel, int7hguekopf, acDCConverterStart.constructor.name, acDCConverterStart) : undefined;
+                        converterStartNeg = parser_utils_1.convertToBooleanI7(acDCConverterStartNeg !== undefined);
+                        acDCConverterTargetNeg = converterTarget && int7hguekopf !== undefined ? util_create_1.createACDCConverterNeg(cimModel, int7hguekopf, acDCConverterTarget.constructor.name, acDCConverterTarget) : undefined;
+                        converterTargetNeg = parser_utils_1.convertToBooleanI7(acDCConverterTargetNeg !== undefined);
                     }
                     if (converterStart && !converterStartNeg) {
                         createDCGround(acDCConverterStart);
@@ -3774,9 +3775,9 @@ class ConverterIntegral7 {
                         connectDCGround(acDCConverterStartNeg);
                     }
                     const converterUnitStart = acDCConverterStart.equipmentContainer ? acDCConverterStart.equipmentContainer : undefined;
-                    converterUnitStartSide = (0, parser_utils_1.convertToBooleanI7)(converterUnitStart !== undefined);
+                    converterUnitStartSide = parser_utils_1.convertToBooleanI7(converterUnitStart !== undefined);
                     const converterUnitTarget = acDCConverterTarget.equipmentContainer ? acDCConverterTarget.equipmentContainer : undefined;
-                    converterUnitTargetSide = (0, parser_utils_1.convertToBooleanI7)(converterUnitTarget !== undefined);
+                    converterUnitTargetSide = parser_utils_1.convertToBooleanI7(converterUnitTarget !== undefined);
                     switch (bipol) {
                         case true: {
                             if (converterUnitStartSide && !converterUnitTargetSide) {
@@ -3822,7 +3823,7 @@ class ConverterIntegral7 {
                     const startDCNode = acDCConverterStart ? getDCNodeFromConverter(acDCConverterStart) : undefined;
                     const startDCNodeNeg = acDCConverterStartNeg ? getDCNodeFromConverter(acDCConverterStartNeg) : undefined;
                     if (startDCNode) {
-                        const dcTerminal = new DCTerminal_1.DCTerminal((0, parser_utils_1.getUUID)('i7Data.guid_dcterminalp'), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCT'], 32, true));
+                        const dcTerminal = new DCTerminal_1.DCTerminal(parser_utils_1.getUUID('i7Data.guid_dcterminalp'), util_create_1.createNotation([utils_2.getName(i7Data), '_DCT'], 32, true));
                         dcTerminal.connected = true;
                         dcTerminal.dCConductingEquipment = dcLineSegment;
                         dcTerminal.dcNode = startDCNode;
@@ -3833,7 +3834,7 @@ class ConverterIntegral7 {
                         this.logger.debug(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Anfangsknoten. ${i7Data.anetzobjekt} ${this.integralID2UUID.get(i7Data.anetzobjekt)}`);
                     }
                     if (startDCNodeNeg) {
-                        const dcTerminal = new DCTerminal_1.DCTerminal((0, parser_utils_1.getUUID)('i7Data.guid_dcterminaln'), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_neg', '_DCT'], 32, true));
+                        const dcTerminal = new DCTerminal_1.DCTerminal(parser_utils_1.getUUID('i7Data.guid_dcterminaln'), util_create_1.createNotation([utils_2.getName(i7Data), '_neg', '_DCT'], 32, true));
                         dcTerminal.connected = true;
                         dcTerminal.dCConductingEquipment = dcLineSegmentNeg;
                         dcTerminal.dcNode = startDCNodeNeg;
@@ -3846,7 +3847,7 @@ class ConverterIntegral7 {
                     const targetDCNode = acDCConverterTarget ? getDCNodeFromConverter(acDCConverterTarget) : undefined;
                     const targetDCNodeNeg = acDCConverterTargetNeg ? getDCNodeFromConverter(acDCConverterTargetNeg) : undefined;
                     if (targetDCNode) {
-                        const dcTerminal = new DCTerminal_1.DCTerminal(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCT'], 32, true));
+                        const dcTerminal = new DCTerminal_1.DCTerminal(common_utils_1.CommonUtils.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_DCT'], 32, true));
                         dcTerminal.connected = true;
                         dcTerminal.dCConductingEquipment = dcLineSegment;
                         dcTerminal.dcNode = targetDCNode;
@@ -3857,7 +3858,7 @@ class ConverterIntegral7 {
                         this.logger.debug(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Zielknoten. ${i7Data.enetzobjekt} ${this.integralID2UUID.get(i7Data.enetzobjekt)}`);
                     }
                     if (targetDCNodeNeg) {
-                        const dcTerminal = new DCTerminal_1.DCTerminal(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_neg', '_DCT'], 32, true));
+                        const dcTerminal = new DCTerminal_1.DCTerminal(common_utils_1.CommonUtils.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_neg', '_DCT'], 32, true));
                         dcTerminal.connected = true;
                         dcTerminal.dCConductingEquipment = dcLineSegmentNeg;
                         dcTerminal.dcNode = targetDCNodeNeg;
@@ -3885,7 +3886,7 @@ class ConverterIntegral7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             // Trafo2WTypen
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_TRAFO2W)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TYP_TRAFO2W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_TRAFO2W), []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_TRAFO2W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_TRAFO2W), []));
                 for (const i7Data of result) {
                     const typTrafo = new EVPowerTransformerInfo_1.EVPowerTransformerInfo(common_utils_1.CommonUtils.generateUUID(), i7Data.name);
                     typTrafo.pLeer = i7Data.p_leer;
@@ -3893,7 +3894,7 @@ class ConverterIntegral7 {
                     typTrafo.ukr12 = i7Data.ukr;
                     typTrafo.pkr12 = i7Data.pkr;
                     typTrafo.schaltgruppe = i7Data.schaltgr;
-                    typTrafo.spezialRegelung = (0, parser_utils_1.isNumericI7)(i7Data.trafo_spezial) ? (0, parser_utils_1.convertToNumberI7)(i7Data.trafo_spezial) : undefined;
+                    typTrafo.spezialRegelung = parser_utils_1.isNumericI7(i7Data.trafo_spezial) ? parser_utils_1.convertToNumberI7(i7Data.trafo_spezial) : undefined;
                     typTrafo.x00r1 = i7Data.x00r1;
                     typTrafo.x00r2 = i7Data.x00r2;
                     typTrafo.x0kr1 = i7Data.x0kr1;
@@ -3926,7 +3927,7 @@ class ConverterIntegral7 {
             }
             // Trafo3WTypen
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_TRAFO3W)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TYP_TRAFO3W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_TRAFO3W), []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_TRAFO3W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_TRAFO3W), []));
                 for (const i7Data of result) {
                     const typTrafo = new EVPowerTransformerInfo_1.EVPowerTransformerInfo(common_utils_1.CommonUtils.generateUUID(), i7Data.name);
                     typTrafo.pLeer = i7Data.p_leer;
@@ -3977,7 +3978,7 @@ class ConverterIntegral7 {
     convertBetriebsmitteltypenGenerator() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_GENERATOR)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TYP_GENERATOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_GENERATOR), []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_GENERATOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_GENERATOR), []));
                 for (const i7Data of result) {
                     /** Keine CIM Klasse vorhanden
                      * Vorläufig werden die Typdaten als Map gespiechert */
@@ -3993,7 +3994,7 @@ class ConverterIntegral7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             // Asynchronmotor
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_ASYNCHRONMOTOR)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TYP_ASYNCHRONMOTOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_ASYNCHRONMOTOR), []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_ASYNCHRONMOTOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_ASYNCHRONMOTOR), []));
                 for (const i7Data of result) {
                     /** Keine CIM Klasse vorhanden
                      * Vorläufig werden die Typdaten als Map gespiechert */
@@ -4009,14 +4010,14 @@ class ConverterIntegral7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             // Trafo2WTypen
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.MULTIPLIKATIONSFAKTOR)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.MULTIPLIKATIONSFAKTOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.MULTIPLIKATIONSFAKTOR), []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.MULTIPLIKATIONSFAKTOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.MULTIPLIKATIONSFAKTOR), []));
                 for (const i7Data of result) {
-                    const multFaktor = new INTEGRALMultiplierFactor_1.INTEGRALMultiplierFactor((0, parser_utils_1.getUUID)(undefined), (0, utils_2.getName)(i7Data), i7Data.kurzname, i7Data.kommentar);
-                    multFaktor.p = (0, parser_utils_1.isNumericI7)(i7Data.p) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p) : undefined;
-                    multFaktor.qInd = (0, parser_utils_1.isNumericI7)(i7Data.q_ind) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_ind) : undefined;
-                    multFaktor.qKap = (0, parser_utils_1.isNumericI7)(i7Data.q_kap) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_kap) : undefined;
-                    multFaktor.cosPhiInd = (0, parser_utils_1.isNumericI7)(i7Data.cos_phi_ind) ? (0, parser_utils_1.convertToNumberI7)(i7Data.cos_phi_ind) : undefined;
-                    multFaktor.cosPhiKap = (0, parser_utils_1.isNumericI7)(i7Data.cos_phi_kap) ? (0, parser_utils_1.convertToNumberI7)(i7Data.cos_phi_kap) : undefined;
+                    const multFaktor = new INTEGRALMultiplierFactor_1.INTEGRALMultiplierFactor(parser_utils_1.getUUID(undefined), utils_2.getName(i7Data), i7Data.kurzname, i7Data.kommentar);
+                    multFaktor.p = parser_utils_1.isNumericI7(i7Data.p) ? parser_utils_1.convertToNumberI7(i7Data.p) : undefined;
+                    multFaktor.qInd = parser_utils_1.isNumericI7(i7Data.q_ind) ? parser_utils_1.convertToNumberI7(i7Data.q_ind) : undefined;
+                    multFaktor.qKap = parser_utils_1.isNumericI7(i7Data.q_kap) ? parser_utils_1.convertToNumberI7(i7Data.q_kap) : undefined;
+                    multFaktor.cosPhiInd = parser_utils_1.isNumericI7(i7Data.cos_phi_ind) ? parser_utils_1.convertToNumberI7(i7Data.cos_phi_ind) : undefined;
+                    multFaktor.cosPhiKap = parser_utils_1.isNumericI7(i7Data.cos_phi_kap) ? parser_utils_1.convertToNumberI7(i7Data.cos_phi_kap) : undefined;
                     this.cimModelDefault.addMultiplierFactor(multFaktor);
                     this.addIdMapping(i7Data.id, multFaktor.mrid, integral_sql_1.Integral7TableNames.MULTIPLIKATIONSFAKTOR);
                 }
@@ -4031,7 +4032,7 @@ class ConverterIntegral7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO2W)) {
                 const cimModel = frame.cimModel;
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TRAFO2W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRAFO2W), standortIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRAFO2W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRAFO2W), standortIDs));
                 const trafoIDs = result.map(obj => obj['id']);
                 /** Sternpunktknoten */
                 const sternpunktKnotenMap = new Map();
@@ -4039,14 +4040,14 @@ class ConverterIntegral7 {
                     sternpunktKnotenMap.set(elem, new Map());
                 }
                 if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN) && trafoIDs.length) {
-                    const sternpunktKnotenResult = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN_FILTERED, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN), trafoIDs));
+                    const sternpunktKnotenResult = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN_FILTERED, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN), trafoIDs));
                     for (const spKnoten of sternpunktKnotenResult) {
                         (_a = sternpunktKnotenMap.get(spKnoten.netzobjekt)) === null || _a === void 0 ? void 0 : _a.set(spKnoten.id, spKnoten);
                     }
                 }
                 for (const i7Data of result) {
-                    const cimrdfid = (0, parser_utils_1.getUUID)(i7Data.guid);
-                    const powerTransformer = new PowerTransformer_1.PowerTransformer(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_PT']), i7Data.kurzname, i7Data.kommentar);
+                    const cimrdfid = parser_utils_1.getUUID(i7Data.guid);
+                    const powerTransformer = new PowerTransformer_1.PowerTransformer(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_PT']), i7Data.kurzname, i7Data.kommentar);
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     if (substation) {
                         powerTransformer.equipmentContainer = substation;
@@ -4081,7 +4082,7 @@ class ConverterIntegral7 {
                     const powerTransformerInfo = this.cimModelDefault.getPowerTransformerInfoByName(i7Data.nametyp);
                     /**Set property 'isPartOfGeneratorUnit' to 'true' if property 'Blocktransformator'
                      *is set in Integral data.*/
-                    if (this.blocktransformatoren.includes((0, parser_utils_1.convertToNumberI7)(i7Data.id))) {
+                    if (this.blocktransformatoren.includes(parser_utils_1.convertToNumberI7(i7Data.id))) {
                         powerTransformer.isPartOfGeneratorUnit = true;
                     }
                     else {
@@ -4089,33 +4090,33 @@ class ConverterIntegral7 {
                     }
                     const schaltgruppe = ((_b = i7Data.schaltgr) === null || _b === void 0 ? void 0 : _b.length) ? i7Data.schaltgr : powerTransformerInfo === null || powerTransformerInfo === void 0 ? void 0 : powerTransformerInfo.schaltgruppe;
                     // Wicklung 1
-                    const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd((0, parser_utils_1.getUUID)(i7Data.guid_w1), `W1-${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
+                    const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd(parser_utils_1.getUUID(i7Data.guid_w1), `W1-${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd1.endNumber = 1;
-                    const pkr = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, '');
-                    const ukr = (0, utils_2.getUkrTrafo)(i7Data, powerTransformerInfo, '');
-                    const sr = (0, utils_2.getSrTrafo)(i7Data, powerTransformerInfo, powerTransformerEnd1.endNumber, false);
-                    const ur = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, powerTransformerEnd1.endNumber);
+                    const pkr = utils_2.getPkrTrafo(i7Data, powerTransformerInfo, '');
+                    const ukr = utils_2.getUkrTrafo(i7Data, powerTransformerInfo, '');
+                    const sr = utils_2.getSrTrafo(i7Data, powerTransformerInfo, powerTransformerEnd1.endNumber, false);
+                    const ur = utils_2.getUrTrafo(i7Data, powerTransformerInfo, powerTransformerEnd1.endNumber);
                     //const x0 = get
                     // I rated
-                    const ir1 = (0, utils_2.getTrafoIr)(ur, sr);
+                    const ir1 = utils_2.getTrafoIr(ur, sr);
                     // P0 Lastverluste im I7 Modell p_leer
-                    const pLeer = (0, utils_2.getTrafoPleer)(i7Data, powerTransformerInfo);
+                    const pLeer = utils_2.getTrafoPleer(i7Data, powerTransformerInfo);
                     // Leerlaufverluste
-                    const iLeer = (0, utils_2.getTrafoIleer)(i7Data, powerTransformerInfo);
+                    const iLeer = utils_2.getTrafoIleer(i7Data, powerTransformerInfo);
                     // Berechnung
-                    powerTransformerEnd1.r = (0, utils_2.calculateR)(ur, pkr, sr);
-                    powerTransformerEnd1.x = (0, utils_2.calculateX)(ur, ukr, sr);
+                    powerTransformerEnd1.r = utils_2.calculateR(ur, pkr, sr);
+                    powerTransformerEnd1.x = utils_2.calculateX(ur, ukr, sr);
                     // TODO was ist P0 in I7 Trafomodell
                     // P0 Lastverluste abhängig von Last
-                    powerTransformerEnd1.g = (0, utils_2.calculateG)(ur, pLeer);
-                    powerTransformerEnd1.b = (0, utils_2.calculateB)(ur, sr, iLeer, pLeer);
+                    powerTransformerEnd1.g = utils_2.calculateG(ur, pLeer);
+                    powerTransformerEnd1.b = utils_2.calculateB(ur, sr, iLeer, pLeer);
                     powerTransformerEnd1.ratedU = ur;
                     powerTransformerEnd1.ratedS = sr;
                     //Short-Circuit data export EQ-SC profile //TODO: Read data for enervancetransformertype object.
-                    const x00r1 = (0, parser_utils_1.isNumericI7)(i7Data.x00r1) ? i7Data.x00r1 : 0;
-                    const x0kr1 = (0, parser_utils_1.isNumericI7)(i7Data.x0kr1) ? i7Data.x0kr1 : 0;
-                    const x00r2 = (0, parser_utils_1.isNumericI7)(i7Data.x00r2) ? i7Data.x00r2 : 0;
-                    const r00r1 = (0, parser_utils_1.isNumericI7)(i7Data.r00r1) ? i7Data.r00r1 : 0;
+                    const x00r1 = parser_utils_1.isNumericI7(i7Data.x00r1) ? i7Data.x00r1 : 0;
+                    const x0kr1 = parser_utils_1.isNumericI7(i7Data.x0kr1) ? i7Data.x0kr1 : 0;
+                    const x00r2 = parser_utils_1.isNumericI7(i7Data.x00r2) ? i7Data.x00r2 : 0;
+                    const r00r1 = parser_utils_1.isNumericI7(i7Data.r00r1) ? i7Data.r00r1 : 0;
                     /** Topologie 3 moegliche Anschluesse
                      *  KontenSo -> Anschluesspunkt
                      *  KnotenSf -> Schaltfeldpunkt
@@ -4137,13 +4138,13 @@ class ConverterIntegral7 {
                         }
                     }
                     // Wicklung 2
-                    const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd((0, parser_utils_1.getUUID)(i7Data.guid_w2), `W2-${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
+                    const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd(parser_utils_1.getUUID(i7Data.guid_w2), `W2-${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd2.endNumber = 2;
-                    const sr2 = (0, utils_2.getSrTrafo)(i7Data, powerTransformerInfo, powerTransformerEnd2.endNumber, false);
-                    const ur2 = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, powerTransformerEnd2.endNumber);
+                    const sr2 = utils_2.getSrTrafo(i7Data, powerTransformerInfo, powerTransformerEnd2.endNumber, false);
+                    const ur2 = utils_2.getUrTrafo(i7Data, powerTransformerInfo, powerTransformerEnd2.endNumber);
                     // Berechnung
                     // NullSystem Impedanzen (nur Reaktanzen)
-                    const zeroSequImpedanzWx = (0, utils_trafo3w_1.calculateZeroSequImpedanzenTrafo2W)(r00r1, x00r1, x0kr1, x00r2, ur, ur2);
+                    const zeroSequImpedanzWx = utils_trafo3w_1.calculateZeroSequImpedanzenTrafo2W(r00r1, x00r1, x0kr1, x00r2, ur, ur2);
                     powerTransformerEnd2.r = 0;
                     powerTransformerEnd2.x = 0;
                     powerTransformerEnd2.ratedS = sr2;
@@ -4170,10 +4171,10 @@ class ConverterIntegral7 {
                     }
                     /** set winding connection */
                     /** Transformator Schaltgruppen nach CGMES konvertieren !!!Dieser Aufruf muss immer vor dem Funktionsaufruf [PowerTransformer].sortTransformerEnd(...) erfolgen**/
-                    powerTransformerEnd1.connectionKind = (0, utils_2.getSchaltgruppe)(schaltgruppe, powerTransformerEnd1.endNumber, powerTransformerEnd1.grounded);
-                    powerTransformerEnd1.phaseAngleClock = (0, utils_2.getSchaltgruppeAngleClock)(schaltgruppe, powerTransformerEnd1.endNumber);
-                    powerTransformerEnd2.connectionKind = (0, utils_2.getSchaltgruppe)(schaltgruppe, powerTransformerEnd2.endNumber, powerTransformerEnd2.grounded);
-                    powerTransformerEnd2.phaseAngleClock = (0, utils_2.getSchaltgruppeAngleClock)(schaltgruppe, powerTransformerEnd2.endNumber);
+                    powerTransformerEnd1.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd1.endNumber, powerTransformerEnd1.grounded);
+                    powerTransformerEnd1.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd1.endNumber);
+                    powerTransformerEnd2.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd2.endNumber, powerTransformerEnd2.grounded);
+                    powerTransformerEnd2.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd2.endNumber);
                     /** Transormator Anschlusspunkte nach Spannungsebene sortieren */
                     this.sortTransformerEnd(powerTransformer, 'ratedU', 'desc');
                     // TODO
@@ -4225,14 +4226,14 @@ class ConverterIntegral7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO3W)) {
                 const cimModel = frame.cimModel;
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TRAFO3W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRAFO3W), standortIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRAFO3W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRAFO3W), standortIDs));
                 const trafoIDs = result.map(obj => obj['id']);
                 const tableNameStpKnoten = integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN;
                 const trafoWicklungen = new Map();
                 const trafoWicklungIDs = [];
                 const tableNameWicklung = integral_sql_1.Integral7TableNames.TRAFO3_WICKLUNG;
                 if (this.isTableAvailable(tableNameWicklung) && trafoIDs.length) {
-                    const wicklungenResult = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TRAFO3_WICKLUNG, this.getAvailableColumnNames(tableNameWicklung), trafoIDs));
+                    const wicklungenResult = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRAFO3_WICKLUNG, this.getAvailableColumnNames(tableNameWicklung), trafoIDs));
                     for (const wicklung of wicklungenResult) {
                         trafoWicklungen.set(wicklung.id, wicklung);
                         trafoWicklungIDs.push(wicklung.id);
@@ -4244,12 +4245,12 @@ class ConverterIntegral7 {
                 /** Sternpunktknoten */
                 let sternpunktKnotenResult;
                 if (this.isTableAvailable(tableNameStpKnoten) && trafoWicklungIDs.length > 0) {
-                    sternpunktKnotenResult = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN_FILTERED, this.getAvailableColumnNames(tableNameStpKnoten), trafoWicklungIDs));
+                    sternpunktKnotenResult = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN_FILTERED, this.getAvailableColumnNames(tableNameStpKnoten), trafoWicklungIDs));
                 }
                 for (const i7Data of result) {
                     const sternpunktKnotenMap = new Map();
-                    const cimrdfid = (0, parser_utils_1.getUUID)(i7Data.guid);
-                    const powerTransformer = new PowerTransformer_1.PowerTransformer(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_PT']), i7Data.kurzname, i7Data.kommentar);
+                    const cimrdfid = parser_utils_1.getUUID(i7Data.guid);
+                    const powerTransformer = new PowerTransformer_1.PowerTransformer(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_PT']), i7Data.kurzname, i7Data.kommentar);
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     if (substation) {
                         powerTransformer.equipmentContainer = substation;
@@ -4260,7 +4261,7 @@ class ConverterIntegral7 {
                     const powerTransformerInfo = this.cimModelDefault.getPowerTransformerInfoByName(i7Data.nametyp);
                     const schaltgruppe = i7Data.schaltgr;
                     //Set property 'isPartOfGeneratorUnit' to 'true' if property 'Blocktransformator' is set in Integral data.
-                    if (this.blocktransformatoren.includes((0, parser_utils_1.convertToNumberI7)(i7Data.id))) {
+                    if (this.blocktransformatoren.includes(parser_utils_1.convertToNumberI7(i7Data.id))) {
                         powerTransformer.isPartOfGeneratorUnit = true;
                     }
                     else {
@@ -4269,39 +4270,39 @@ class ConverterIntegral7 {
                     if (i7Data.nametyp) {
                         const stop = true;
                     }
-                    const x00r1 = (0, parser_utils_1.isNumericI7)(i7Data.x00r1) ? i7Data.x00r1 : 0;
-                    const x0kr1 = (0, parser_utils_1.isNumericI7)(i7Data.x0kr1) ? i7Data.x0kr1 : 0;
-                    const x00r2 = (0, parser_utils_1.isNumericI7)(i7Data.x00r2) ? i7Data.x00r2 : 0;
-                    const r00r1 = (0, parser_utils_1.isNumericI7)(i7Data.r00r1) ? i7Data.r00r1 : 0;
-                    const r0kr1 = (0, parser_utils_1.isNumericI7)(i7Data.r0kr1) ? i7Data.r0kr1 : 0;
-                    const r00r2 = (0, parser_utils_1.isNumericI7)(i7Data.r00r2) ? i7Data.r00r2 : 0;
-                    const pkr12 = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, '12');
-                    const pkr13 = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, '13');
-                    const pkr23 = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, '23');
-                    const ukr12 = (0, utils_2.getUkrTrafo)(i7Data, powerTransformerInfo, '12');
-                    const ukr13 = (0, utils_2.getUkrTrafo)(i7Data, powerTransformerInfo, '13');
-                    const ukr23 = (0, utils_2.getUkrTrafo)(i7Data, powerTransformerInfo, '23');
-                    const sr1 = (0, utils_2.getSrTrafo)(i7Data, powerTransformerInfo, 1, true);
-                    const sr2 = (0, utils_2.getSrTrafo)(i7Data, powerTransformerInfo, 2, true);
-                    const sr3 = (0, utils_2.getSrTrafo)(i7Data, powerTransformerInfo, 3, true);
-                    const ur1 = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, 1);
-                    const ur2 = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, 2);
-                    const ur3 = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, 3);
+                    const x00r1 = parser_utils_1.isNumericI7(i7Data.x00r1) ? i7Data.x00r1 : 0;
+                    const x0kr1 = parser_utils_1.isNumericI7(i7Data.x0kr1) ? i7Data.x0kr1 : 0;
+                    const x00r2 = parser_utils_1.isNumericI7(i7Data.x00r2) ? i7Data.x00r2 : 0;
+                    const r00r1 = parser_utils_1.isNumericI7(i7Data.r00r1) ? i7Data.r00r1 : 0;
+                    const r0kr1 = parser_utils_1.isNumericI7(i7Data.r0kr1) ? i7Data.r0kr1 : 0;
+                    const r00r2 = parser_utils_1.isNumericI7(i7Data.r00r2) ? i7Data.r00r2 : 0;
+                    const pkr12 = utils_2.getPkrTrafo(i7Data, powerTransformerInfo, '12');
+                    const pkr13 = utils_2.getPkrTrafo(i7Data, powerTransformerInfo, '13');
+                    const pkr23 = utils_2.getPkrTrafo(i7Data, powerTransformerInfo, '23');
+                    const ukr12 = utils_2.getUkrTrafo(i7Data, powerTransformerInfo, '12');
+                    const ukr13 = utils_2.getUkrTrafo(i7Data, powerTransformerInfo, '13');
+                    const ukr23 = utils_2.getUkrTrafo(i7Data, powerTransformerInfo, '23');
+                    const sr1 = utils_2.getSrTrafo(i7Data, powerTransformerInfo, 1, true);
+                    const sr2 = utils_2.getSrTrafo(i7Data, powerTransformerInfo, 2, true);
+                    const sr3 = utils_2.getSrTrafo(i7Data, powerTransformerInfo, 3, true);
+                    const ur1 = utils_2.getUrTrafo(i7Data, powerTransformerInfo, 1);
+                    const ur2 = utils_2.getUrTrafo(i7Data, powerTransformerInfo, 2);
+                    const ur3 = utils_2.getUrTrafo(i7Data, powerTransformerInfo, 3);
                     // I rated: power in MVA, ur in kV
                     const ir1 = sr1 * Math.pow(10, 6) / ((ur1 * Math.pow(10, 3)) * Math.sqrt(3));
                     const ir2 = sr2 * Math.pow(10, 6) / ((ur2 * Math.pow(10, 3)) * Math.sqrt(3));
                     const ir3 = sr3 * Math.pow(10, 6) / ((ur3 * Math.pow(10, 3)) * Math.sqrt(3));
                     //Leerlaufverluste in kW
-                    const pLeer = (0, utils_2.getTrafoPleer)(i7Data, powerTransformerInfo);
+                    const pLeer = utils_2.getTrafoPleer(i7Data, powerTransformerInfo);
                     // Leerlaufstrom bezogen auf Wicklung mit dem grössten Sr in %
-                    const iLeer = (0, utils_2.getTrafoIleer)(i7Data, powerTransformerInfo);
+                    const iLeer = utils_2.getTrafoIleer(i7Data, powerTransformerInfo);
                     // Impedanzen //TODO: prove if rated voltage is correct!!! current assumption: ur1>ur2>ur3
-                    const impedanzW1 = (0, utils_trafo3w_1.calculateImpedanzenTrafo3W)(1, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, pLeer, iLeer);
-                    const impedanzW2 = (0, utils_trafo3w_1.calculateImpedanzenTrafo3W)(2, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, 0, 0);
-                    const impedanzW3 = (0, utils_trafo3w_1.calculateImpedanzenTrafo3W)(3, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, 0, 0);
+                    const impedanzW1 = utils_trafo3w_1.calculateImpedanzenTrafo3W(1, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, pLeer, iLeer);
+                    const impedanzW2 = utils_trafo3w_1.calculateImpedanzenTrafo3W(2, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, 0, 0);
+                    const impedanzW3 = utils_trafo3w_1.calculateImpedanzenTrafo3W(3, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, 0, 0);
                     // NullSystem Impedanzen (nur Reaktanzen)
-                    const zeroSequImpedanzWx = (0, utils_trafo3w_1.calculateZeroSequImpedanzenTrafo3W)(r00r1, r0kr1, r00r2, x00r1, x0kr1, x00r2, ur1, ur2, ur3);
-                    const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd((0, parser_utils_1.getUUID)(i7Data.guid_w1), `W1-${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
+                    const zeroSequImpedanzWx = utils_trafo3w_1.calculateZeroSequImpedanzenTrafo3W(r00r1, r0kr1, r00r2, x00r1, x0kr1, x00r2, ur1, ur2, ur3);
+                    const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd(parser_utils_1.getUUID(i7Data.guid_w1), `W1-${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd1.endNumber = 1;
                     // Topologie
                     /** Anfang
@@ -4354,8 +4355,8 @@ class ConverterIntegral7 {
                         }
                     }
                     //set transformer end winding connection
-                    powerTransformerEnd1.connectionKind = (0, utils_2.getSchaltgruppe)(schaltgruppe, powerTransformerEnd1.endNumber, powerTransformerEnd1.grounded);
-                    powerTransformerEnd1.phaseAngleClock = (0, utils_2.getSchaltgruppeAngleClock)(schaltgruppe, powerTransformerEnd1.endNumber);
+                    powerTransformerEnd1.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd1.endNumber, powerTransformerEnd1.grounded);
+                    powerTransformerEnd1.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd1.endNumber);
                     // Wicklung 2
                     const wicklung2 = trafoWicklungen.get(i7Data.trafowicklung3w2);
                     //Setup 'SternpunktKnotenMap' to derive grounding capability for PowerTransformerEnd2
@@ -4381,7 +4382,7 @@ class ConverterIntegral7 {
                     const terminal2 = this.createBoundaryConnection(frame, powerTransformer, wicklung2.aknoten, PhaseCode_1.PhaseCode.ABC);
                     if (!terminal2)
                         this.logger.debug(`PowerTransformer3W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
-                    const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd((0, parser_utils_1.getUUID)(i7Data.guid_w2), `W2-${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
+                    const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd(parser_utils_1.getUUID(i7Data.guid_w2), `W2-${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd2.endNumber = 2;
                     // Berechnung
                     powerTransformerEnd2.r = impedanzW2.r;
@@ -4404,8 +4405,8 @@ class ConverterIntegral7 {
                         }
                     }
                     //set transformer end winding connection
-                    powerTransformerEnd2.connectionKind = (0, utils_2.getSchaltgruppe)(schaltgruppe, powerTransformerEnd2.endNumber, powerTransformerEnd2.grounded);
-                    powerTransformerEnd2.phaseAngleClock = (0, utils_2.getSchaltgruppeAngleClock)(schaltgruppe, powerTransformerEnd2.endNumber);
+                    powerTransformerEnd2.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd2.endNumber, powerTransformerEnd2.grounded);
+                    powerTransformerEnd2.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd2.endNumber);
                     // Wicklung 3
                     const wicklung3 = trafoWicklungen.get(i7Data.trafowicklung3w3);
                     //Setup 'SternpunktKnotenMap' to derive grounding capability for PowerTransformerEnd1
@@ -4431,7 +4432,7 @@ class ConverterIntegral7 {
                     const terminal3 = this.createBoundaryConnection(frame, powerTransformer, wicklung3.aknoten, PhaseCode_1.PhaseCode.ABC);
                     if (!terminal3)
                         this.logger.debug(`PowerTransformer3W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
-                    const powerTransformerEnd3 = new PowerTransformerEnd_1.PowerTransformerEnd((0, parser_utils_1.getUUID)(i7Data.guid_w3), `W3-${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
+                    const powerTransformerEnd3 = new PowerTransformerEnd_1.PowerTransformerEnd(parser_utils_1.getUUID(i7Data.guid_w3), `W3-${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd3.endNumber = 3;
                     // Berechnung
                     powerTransformerEnd3.r = impedanzW3.r;
@@ -4454,8 +4455,8 @@ class ConverterIntegral7 {
                         }
                     }
                     //set transformer end winding connection
-                    powerTransformerEnd3.connectionKind = (0, utils_2.getSchaltgruppe)(schaltgruppe, powerTransformerEnd3.endNumber, powerTransformerEnd3.grounded);
-                    powerTransformerEnd3.phaseAngleClock = (0, utils_2.getSchaltgruppeAngleClock)(schaltgruppe, powerTransformerEnd3.endNumber);
+                    powerTransformerEnd3.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd3.endNumber, powerTransformerEnd3.grounded);
+                    powerTransformerEnd3.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd3.endNumber);
                     // Transormator Anschlusspunkte nach Spannungsebene sortieren
                     this.sortTransformerEnd(powerTransformer, 'ratedU', 'desc');
                     //TODO
@@ -4520,15 +4521,15 @@ class ConverterIntegral7 {
         const winkel = `uzus_winkel_s${endNumber}`;
         const ur = `ur${endNumber}`;
         powerTransformerEndInfo.endNumber = endNumber;
-        powerTransformerEndInfo.ratedU = (0, parser_utils_1.isNumericI7)(data[ur]) ? new Voltage_1.Voltage(data[ur], UnitMultiplier_1.UnitMultiplier.k, UnitSymbol_1.UnitSymbol.V) : undefined;
-        powerTransformerEndInfo.gestufteSeite = (0, parser_utils_1.isNumericI7)(data[gestufteSeite]) ? (0, parser_utils_1.convertToNumberI7)(data[gestufteSeite]) : undefined;
+        powerTransformerEndInfo.ratedU = parser_utils_1.isNumericI7(data[ur]) ? new Voltage_1.Voltage(data[ur], UnitMultiplier_1.UnitMultiplier.k, UnitSymbol_1.UnitSymbol.V) : undefined;
+        powerTransformerEndInfo.gestufteSeite = parser_utils_1.isNumericI7(data[gestufteSeite]) ? parser_utils_1.convertToNumberI7(data[gestufteSeite]) : undefined;
         const tapChangerInfo = new EVTapChangerInfo_1.EVTapChangerInfo(common_utils_1.CommonUtils.generateUUID(), `TapChangerInfo_${data['id']}`);
-        tapChangerInfo.highStep = (0, parser_utils_1.isNumericI7)(data[maxstufe]) ? (0, parser_utils_1.convertToNumberI7)(data[maxstufe]) : undefined;
-        tapChangerInfo.lowStep = (0, parser_utils_1.isNumericI7)(data[minstufe]) ? (0, parser_utils_1.convertToNumberI7)(data[minstufe]) : undefined;
-        tapChangerInfo.neutralStep = (0, parser_utils_1.isNumericI7)(data[neutralstufe]) ? (0, parser_utils_1.convertToNumberI7)(data[neutralstufe]) : undefined;
-        tapChangerInfo.stepPhaseIncrement = (0, parser_utils_1.isNumericI7)(data[winkel]) ? new AngleDegrees_1.AngleDegrees(data[winkel], UnitMultiplier_1.UnitMultiplier.none, UnitSymbol_1.UnitSymbol.deg) : undefined;
-        tapChangerInfo.uMax = (0, parser_utils_1.isNumericI7)(data[umax]) ? (0, parser_utils_1.convertToNumberI7)(data[umax]) : undefined;
-        tapChangerInfo.uMin = (0, parser_utils_1.isNumericI7)(data[umin]) ? (0, parser_utils_1.convertToNumberI7)(data[umin]) : undefined;
+        tapChangerInfo.highStep = parser_utils_1.isNumericI7(data[maxstufe]) ? parser_utils_1.convertToNumberI7(data[maxstufe]) : undefined;
+        tapChangerInfo.lowStep = parser_utils_1.isNumericI7(data[minstufe]) ? parser_utils_1.convertToNumberI7(data[minstufe]) : undefined;
+        tapChangerInfo.neutralStep = parser_utils_1.isNumericI7(data[neutralstufe]) ? parser_utils_1.convertToNumberI7(data[neutralstufe]) : undefined;
+        tapChangerInfo.stepPhaseIncrement = parser_utils_1.isNumericI7(data[winkel]) ? new AngleDegrees_1.AngleDegrees(data[winkel], UnitMultiplier_1.UnitMultiplier.none, UnitSymbol_1.UnitSymbol.deg) : undefined;
+        tapChangerInfo.uMax = parser_utils_1.isNumericI7(data[umax]) ? parser_utils_1.convertToNumberI7(data[umax]) : undefined;
+        tapChangerInfo.uMin = parser_utils_1.isNumericI7(data[umin]) ? parser_utils_1.convertToNumberI7(data[umin]) : undefined;
         tapChangerInfo.setPowerTransfomerEndInfo(powerTransformerEndInfo);
         powerTransformerEndInfo.setTapChangerInfo(tapChangerInfo);
     }
@@ -4666,7 +4667,7 @@ class ConverterIntegral7 {
                      * */
                     const junction = new Junction_1.Junction(common_utils_1.CommonUtils.generateUUID(), `${line.name}_BD-J`, `Junction`, 'Junction for Geo');
                     junction.equipmentContainer = line;
-                    let terminal = new Terminal_1.Terminal(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([line.getUUID().substring(0, 8), '_BD-JCT-T']), 'bd_jct_lab', 'terminal to connect junction to associated boundary ConnectivityNode', 1);
+                    let terminal = new Terminal_1.Terminal(common_utils_1.CommonUtils.generateUUID(), util_create_1.createNotation([line.getUUID().substring(0, 8), '_BD-JCT-T']), 'bd_jct_lab', 'terminal to connect junction to associated boundary ConnectivityNode', 1);
                     junction.terminals.set(terminal.getUUID(), terminal);
                     terminal.conductingEquipment = junction;
                     // TODO ist nicht notwendig
@@ -4739,15 +4740,15 @@ class ConverterIntegral7 {
         }
     }
     setACLineSegmentProperties(defaultModel, cimModel, acLineSegment, data, defaultValuesConfig) {
-        if ((0, parser_utils_1.isBooleanI7)(data.flag_impedanzlos) && (0, parser_utils_1.convertToBooleanI7)(data.flag_impedanzlos)) {
+        if (parser_utils_1.isBooleanI7(data.flag_impedanzlos) && parser_utils_1.convertToBooleanI7(data.flag_impedanzlos)) {
             data.flag_impedanzlos = 1;
         }
-        else if (!(0, parser_utils_1.isNumericI7)(data.laenge) && (0, parser_utils_1.isBooleanI7)(data.flag_impedanzlos) && !(0, parser_utils_1.convertToBooleanI7)(data.flag_impedanzlos)) {
+        else if (!parser_utils_1.isNumericI7(data.laenge) && parser_utils_1.isBooleanI7(data.flag_impedanzlos) && !parser_utils_1.convertToBooleanI7(data.flag_impedanzlos)) {
             data.flag_impedanzlos = 0;
             data.laenge = 1;
         }
         // Laenge: If valid data.laenge is given then assign it to parameter length, else set parameter length to zero. REMARK: CGMES Standard 2.x.y defines that a cim:ACLineSegment with no impedance has length of zero and arbitrary r, x, b, g etc.
-        if ((0, parser_utils_1.isNumericI7)(data.laenge) && data.laenge > 0 && !data.flag_impedanzlos) {
+        if (parser_utils_1.isNumericI7(data.laenge) && data.laenge > 0 && !data.flag_impedanzlos) {
             acLineSegment.length = data.laenge;
         }
         else {
@@ -4755,7 +4756,7 @@ class ConverterIntegral7 {
         }
         const assetType = defaultModel.getWireInfoByName(data.nametyp);
         // r0
-        if ((0, parser_utils_1.isNumericI7)(data.r0) && data.r0 > 0 && !data.flag_impedanzlos) {
+        if (parser_utils_1.isNumericI7(data.r0) && data.r0 > 0 && !data.flag_impedanzlos) {
             acLineSegment.r0 = data.r0;
         }
         else if (assetType && !data.flag_impedanzlos) {
@@ -4765,7 +4766,7 @@ class ConverterIntegral7 {
             acLineSegment.r0 = 0;
         }
         // x0
-        if ((0, parser_utils_1.isNumericI7)(data.x0) && data.x0 > 0 && !data.flag_impedanzlos) {
+        if (parser_utils_1.isNumericI7(data.x0) && data.x0 > 0 && !data.flag_impedanzlos) {
             acLineSegment.x0 = data.x0;
         }
         else if (assetType && !data.flag_impedanzlos) {
@@ -4775,27 +4776,27 @@ class ConverterIntegral7 {
             acLineSegment.x0 = 0;
         }
         // b0ch
-        if ((0, parser_utils_1.isNumericI7)(data.c0) && data.c0 > 0 && !data.flag_impedanzlos) {
-            acLineSegment.b0ch = (0, utils_2.calculateBC)(data.c0, 50);
+        if (parser_utils_1.isNumericI7(data.c0) && data.c0 > 0 && !data.flag_impedanzlos) {
+            acLineSegment.b0ch = utils_2.calculateBC(data.c0, 50);
         }
         else if (assetType && !data.flag_impedanzlos) {
-            acLineSegment.b0ch = (0, utils_2.calculateBC)(assetType.c0, 50) * data.laenge;
+            acLineSegment.b0ch = utils_2.calculateBC(assetType.c0, 50) * data.laenge;
         }
         else {
             acLineSegment.b0ch = 0;
         }
         // g0ch
-        if ((0, parser_utils_1.isNumericI7)(data.c0) && data.c0 > 0 && !data.flag_impedanzlos) {
-            acLineSegment.g0ch = (0, utils_2.calculateG0ch)(data.r0);
+        if (parser_utils_1.isNumericI7(data.c0) && data.c0 > 0 && !data.flag_impedanzlos) {
+            acLineSegment.g0ch = utils_2.calculateG0ch(data.r0);
         }
         else if (assetType && !data.flag_impedanzlos) {
-            acLineSegment.g0ch = (0, utils_2.calculateG0ch)(assetType.r0) * data.laenge;
+            acLineSegment.g0ch = utils_2.calculateG0ch(assetType.r0) * data.laenge;
         }
         else {
             acLineSegment.g0ch = 0;
         }
         // r1
-        if ((0, parser_utils_1.isNumericI7)(data.r1) && data.r1 > 0 && !data.flag_impedanzlos) {
+        if (parser_utils_1.isNumericI7(data.r1) && data.r1 > 0 && !data.flag_impedanzlos) {
             acLineSegment.r = data.r1;
         }
         else if (assetType && !data.flag_impedanzlos) {
@@ -4805,7 +4806,7 @@ class ConverterIntegral7 {
             acLineSegment.r = 0;
         }
         // x1
-        if ((0, parser_utils_1.isNumericI7)(data.x1) && data.x1 > 0 && !data.flag_impedanzlos) {
+        if (parser_utils_1.isNumericI7(data.x1) && data.x1 > 0 && !data.flag_impedanzlos) {
             acLineSegment.x = data.x1;
         }
         else if (assetType && !data.flag_impedanzlos) {
@@ -4815,25 +4816,25 @@ class ConverterIntegral7 {
             acLineSegment.x = 0;
         }
         // bch
-        if ((0, parser_utils_1.isNumericI7)(data.c1) && data.c1 > 0 && !data.flag_impedanzlos) {
-            acLineSegment.bch = (0, utils_2.calculateBC)(data.c1, 50);
+        if (parser_utils_1.isNumericI7(data.c1) && data.c1 > 0 && !data.flag_impedanzlos) {
+            acLineSegment.bch = utils_2.calculateBC(data.c1, 50);
         }
         else if (assetType && !data.flag_impedanzlos) {
-            acLineSegment.bch = (0, utils_2.calculateBC)(assetType.c1, 50) * data.laenge;
+            acLineSegment.bch = utils_2.calculateBC(assetType.c1, 50) * data.laenge;
         }
         else {
             acLineSegment.bch = 0;
         }
         // ir
         for (const terminal of acLineSegment.terminals.values()) {
-            if ((0, parser_utils_1.isNumericI7)(data.ir) && data.ir > 0) {
+            if (parser_utils_1.isNumericI7(data.ir) && data.ir > 0) {
                 this.setConductingEquipmentCurrentLimit(cimModel, acLineSegment.name, terminal, data.ir);
             }
             else if (assetType && assetType.ratedCurrent && assetType.ratedCurrent !== 0) {
                 this.setConductingEquipmentCurrentLimit(cimModel, acLineSegment.name, terminal, assetType.ratedCurrent);
             }
             //PSRType
-            const psrType = (0, utils_1.createIfNotExitsPSRType)(cimModel, data.typ);
+            const psrType = utils_1.createIfNotExitsPSRType(cimModel, data.typ);
             acLineSegment.psrTypeUUID = psrType.mrid;
             // psrType.addPowerSystemResource(acLineSegment);
         }
@@ -4885,7 +4886,7 @@ class ConverterIntegral7 {
         let terminal;
         if (object instanceof ConnectivityNode_1.ConnectivityNode) {
             const cn = object;
-            terminal = new Terminal_1.Terminal(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([conductingEquipment.getUUID().substring(0, 8), '_T']));
+            terminal = new Terminal_1.Terminal(common_utils_1.CommonUtils.generateUUID(), util_create_1.createNotation([conductingEquipment.getUUID().substring(0, 8), '_T']));
             isNameSet = true;
             terminal.setConnectivityNode(cn);
             //terminal.setConnectivityNodeUUID(cn.getUUID());
@@ -4901,7 +4902,7 @@ class ConverterIntegral7 {
             conductingEquipment.addTerminal(terminal);
             terminal.connected = connected;
             if (!isNameSet) {
-                terminal.name = (0, util_create_1.createNotation)([conductingEquipment.getUUID().substring(0, 8), '_' + terminal.name], 32, true);
+                terminal.name = util_create_1.createNotation([conductingEquipment.getUUID().substring(0, 8), '_' + terminal.name], 32, true);
             }
         }
         return terminal;
@@ -4934,7 +4935,7 @@ class ConverterIntegral7 {
                 const object = cimModelBD.getObject(anschlussUUID);
                 if (object instanceof ConnectivityNode_1.ConnectivityNode) {
                     cn = object;
-                    terminal = new Terminal_1.Terminal(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([conductingEquipment.getUUID().substring(0, 8), '_', cn.getUUID().substring(0, 8), '_BD_T']));
+                    terminal = new Terminal_1.Terminal(common_utils_1.CommonUtils.generateUUID(), util_create_1.createNotation([conductingEquipment.getUUID().substring(0, 8), '_', cn.getUUID().substring(0, 8), '_BD_T']));
                     /** wchtig uuid zu setzen, da sonst ein memory leak entsteht */
                     terminal.connectivityNodeUUID = cn.mrid;
                     terminal.phases = phase;
@@ -4955,7 +4956,7 @@ class ConverterIntegral7 {
                         terminal.setConnectivityNodeUUID(cn.getUUID());
                         terminal.setConnectivityNode(undefined);
                     }
-                    terminal.name = (0, util_create_1.createNotation)([conductingEquipment.getUUID().substring(0, 8), '_' + terminal.name], 32, true);
+                    terminal.name = util_create_1.createNotation([conductingEquipment.getUUID().substring(0, 8), '_' + terminal.name], 32, true);
                     cimModelBD.terminals.delete(terminal.mrid);
                     cimModel.addTerminal(terminal);
                 }
@@ -5005,7 +5006,7 @@ class ConverterIntegral7 {
                 tmp_terminal.connected = true;
                 tmp_terminal.sequenceNumber = 1;
                 //create equivalent injection as boundary injection
-                equivalentInjection = new EquivalentInjection_1.EquivalentInjection(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([frame.tsoName, '_BD-EI', '_' + cn.mrid.substring(0, 8)], 32, true));
+                equivalentInjection = new EquivalentInjection_1.EquivalentInjection(common_utils_1.CommonUtils.generateUUID(), util_create_1.createNotation([frame.tsoName, '_BD-EI', '_' + cn.mrid.substring(0, 8)], 32, true));
                 equivalentInjection.p = 0;
                 equivalentInjection.q = 0;
                 equivalentInjection.regulationStatus = false;
@@ -5013,7 +5014,7 @@ class ConverterIntegral7 {
                 equivalentInjection.baseVoltage = cn.getBaseVoltage();
                 equivalentInjection.normallyInService = false;
                 tmp_terminal.setConductingEquipment(equivalentInjection);
-                tmp_terminal.name = (0, util_create_1.createNotation)([frame.tsoName, '_BD-EI-T'], 32, true);
+                tmp_terminal.name = util_create_1.createNotation([frame.tsoName, '_BD-EI-T'], 32, true);
                 cn.addTerminal(tmp_terminal);
                 frame.cimModel.addEquivalentInjection(equivalentInjection);
                 if (tmp_terminal.getConductingEquipmentUUID() !== undefined) {
@@ -5266,7 +5267,7 @@ class ConverterIntegral7 {
                             this.logger.error(`Kein ${exportEntry.objectType} mit dem Namen ${exportObject.name} gefunden.`);
                             continue;
                         }
-                        const geoRegionNew = (0, util_create_1.createGeoregion)(common_utils_1.CommonUtils.generateUUID(), exportObject.name, exportObject.name, 'Default GeographicalRegion');
+                        const geoRegionNew = util_create_1.createGeoregion(common_utils_1.CommonUtils.generateUUID(), exportObject.name, exportObject.name, 'Default GeographicalRegion');
                         subGeoRegion.region.removeSubGeographicalRegion(subGeoRegion);
                         geoRegionNew.addSubGeographicalRegion(subGeoRegion);
                         subGeoRegion.region = geoRegionNew;
@@ -5309,7 +5310,7 @@ class ConverterIntegral7 {
                 const offset = i * limit;
                 const currentLimit = (i + 1 === numberOfIntervals && restCount > 0) ? restCount : limit;
                 const partSchaltfeldIDs = ids.slice(offset, offset + currentLimit);
-                result.push(...yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(objectName, this.getAvailableColumnNames(objectName), partSchaltfeldIDs)));
+                result.push(...yield this.mysqlController.execQuery(integral_sql_1.getI7Query(objectName, this.getAvailableColumnNames(objectName), partSchaltfeldIDs)));
             }
             return result;
         });
@@ -5378,9 +5379,9 @@ class ConverterIntegral7 {
     }
     addDefaultObjectsRegion(cimModel, defaultValuesConfig) {
         /** GeographicalRegion */
-        const region = (0, utils_1.createIfNotExitsGeoregionByName)(cimModel, defaultValuesConfig.GeographicalRegion.name);
+        const region = utils_1.createIfNotExitsGeoregionByName(cimModel, defaultValuesConfig.GeographicalRegion.name);
         region.description = defaultValuesConfig.GeographicalRegion.description;
-        const subregion = (0, utils_1.createIfNotExitsSubGeoregionByName)(cimModel, defaultValuesConfig.SubGeographicalRegion.name, region);
+        const subregion = utils_1.createIfNotExitsSubGeoregionByName(cimModel, defaultValuesConfig.SubGeographicalRegion.name, region);
         subregion.shortName = defaultValuesConfig.SubGeographicalRegion.shortName;
         subregion.description = defaultValuesConfig.SubGeographicalRegion.description;
     }
@@ -5452,7 +5453,7 @@ class ConverterIntegral7 {
             powerTransformerEnd.baseVoltage = powerTransformerEnd.terminal.connectivityNode.getBaseVoltage();
         }
         else if (powerTransformerEnd.ratedU) {
-            powerTransformerEnd.baseVoltage = (0, util_create_1.createBaseVoltageIfNotExists)(cimModel, powerTransformerEnd.ratedU, this.exportFramesBoundary);
+            powerTransformerEnd.baseVoltage = util_create_1.createBaseVoltageIfNotExists(cimModel, powerTransformerEnd.ratedU, this.exportFramesBoundary);
         }
         else {
             this.logger.debug(`Wicklung ${powerTransformerEnd.mrid} Nr. ${powerTransformerEnd.endNumber} keine Spannungsangabe.`);
@@ -5471,13 +5472,13 @@ class ConverterIntegral7 {
         /*if(getUUID(i7Data.guid)=== 'CFDAA56A-A0DA-4C5B-92CC-21138B6D6D07'){ //Standard LR
           let stop = true;
         }*/
-        if ((0, parser_utils_1.getUUID)(i7Data.guid) === '00ebe00e-50fa-4fc0-9ed6-557528a9b460') { //Zeile53 - Typ Meeden'
+        if (parser_utils_1.getUUID(i7Data.guid) === '00ebe00e-50fa-4fc0-9ed6-557528a9b460') { //Zeile53 - Typ Meeden'
             let stop = true;
         }
         /*if(getUUID(i7Data.guid) === '012416f2d9584971baa93360fcf40be2'){ //Zeile55 - SR statt LR'
           let stop = true;
         }*/
-        if ((0, parser_utils_1.getUUID)(i7Data.guid) === '515508dc-5982-4686-ad26-08d39db91421') { //Zeile81 - SR statt LR'
+        if (parser_utils_1.getUUID(i7Data.guid) === '515508dc-5982-4686-ad26-08d39db91421') { //Zeile81 - SR statt LR'
             let stop = true;
         }
         /*if(getUUID(i7Data.guid) === '5ec82d14-ee64-43b6-86ff-c7615d96f7ad'){ //Zeile58
@@ -5489,7 +5490,7 @@ class ConverterIntegral7 {
         let tapChangerNumber = [];
         //let transformerEndInfo:EVPowerTransformerEndInfo[] = [];
         for (let tapChangerPos = 1; tapChangerPos <= 2; tapChangerPos++) {
-            if ((0, parser_utils_1.isNumericI7)(i7Data[`gestufte_seite_s${tapChangerPos}`])) {
+            if (parser_utils_1.isNumericI7(i7Data[`gestufte_seite_s${tapChangerPos}`])) {
                 tapChangerNumberI7.push(i7Data[`gestufte_seite_s${tapChangerPos}`]);
                 tapChangerNumber.push(i7Data[`gestufte_seite_s${tapChangerPos}`]);
             }
@@ -5497,7 +5498,7 @@ class ConverterIntegral7 {
         //collect information about tap changers (type)
         if (tapChangerNumberI7.length === 0) {
             for (let endNumber = 1; endNumber <= transformerEnds.length; endNumber++) {
-                if ((0, parser_utils_1.isNumericI7)((_a = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _a === void 0 ? void 0 : _a.find(elem => elem.endNumber === endNumber).gestufteSeite)) {
+                if (parser_utils_1.isNumericI7((_a = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _a === void 0 ? void 0 : _a.find(elem => elem.endNumber === endNumber).gestufteSeite)) {
                     tapChangerNumberI7.push((_b = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _b === void 0 ? void 0 : _b.find(elem => elem.endNumber === endNumber).gestufteSeite);
                     tapChangerNumber.push((_c = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _c === void 0 ? void 0 : _c.find(elem => elem.endNumber === endNumber).gestufteSeite);
                 }
@@ -5507,13 +5508,13 @@ class ConverterIntegral7 {
         let index = undefined;
         if (tapChangerNumberI7.length > 1) {
             for (let entry of tapChangerNumberI7) {
-                const spezialRegelung = (0, parser_utils_1.isNumericI7)(i7Data.trafo_spezial) ? i7Data.trafo_spezial : transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.spezialRegelung;
+                const spezialRegelung = parser_utils_1.isNumericI7(i7Data.trafo_spezial) ? i7Data.trafo_spezial : transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.spezialRegelung;
                 const transformerEndInfo = (_d = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _d === void 0 ? void 0 : _d.find(elem => elem.endNumber === entry);
                 const tapChangerInfo = transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.tapChangerInfo;
-                const angle = (0, parser_utils_1.isNumericI7)(i7Data[`uzus_winkel_s${entry}`])
-                    ? (0, parser_utils_1.convertToNumberI7)(i7Data[`uzus_winkel_s${entry}`])
+                const angle = parser_utils_1.isNumericI7(i7Data[`uzus_winkel_s${entry}`])
+                    ? parser_utils_1.convertToNumberI7(i7Data[`uzus_winkel_s${entry}`])
                     : (_e = tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.stepPhaseIncrement) === null || _e === void 0 ? void 0 : _e.value;
-                if (!((0, parser_utils_1.isNumericI7)(angle) && (0, parser_utils_1.convertToNumberI7)(angle) != 0 || spezialRegelung) && tapChangerNumberI7.indexOf(entry) > 0) {
+                if (!(parser_utils_1.isNumericI7(angle) && parser_utils_1.convertToNumberI7(angle) != 0 || spezialRegelung) && tapChangerNumberI7.indexOf(entry) > 0) {
                     index = tapChangerNumberI7.indexOf(entry);
                     ratioPhaseTapChangerPresent = true;
                 }
@@ -5535,7 +5536,7 @@ class ConverterIntegral7 {
             let gestufteSeite = tapChangerNumberI7[entryI7 - 1];
             const transformerEndInfo = (_f = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _f === void 0 ? void 0 : _f.find(elem => elem.endNumber === entryI7);
             const transformerEnd = transformerEnds.find(elem => elem.endNumber === entryI7);
-            if ((0, parser_utils_1.isNumericI7)(gestufteSeite)) {
+            if (parser_utils_1.isNumericI7(gestufteSeite)) {
                 if (gestufteSeite === 0) { //'Oberspannungsseite'
                     gestufteSeite = transformerEnds.sort(function (w1, w2) {
                         return w2['desc'] - w1['desc'];
@@ -5552,13 +5553,13 @@ class ConverterIntegral7 {
                 continue;
             }
             const tapChangerInfo = transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.tapChangerInfo;
-            const angle = (0, parser_utils_1.isNumericI7)(i7Data[`uzus_winkel_s${entryI7}`])
-                ? (0, parser_utils_1.convertToNumberI7)(i7Data[`uzus_winkel_s${entryI7}`])
+            const angle = parser_utils_1.isNumericI7(i7Data[`uzus_winkel_s${entryI7}`])
+                ? parser_utils_1.convertToNumberI7(i7Data[`uzus_winkel_s${entryI7}`])
                 : (_h = tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.stepPhaseIncrement) === null || _h === void 0 ? void 0 : _h.value;
-            const spezialRegelung = (0, parser_utils_1.isNumericI7)(i7Data.trafo_spezial) ? i7Data.trafo_spezial : transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.spezialRegelung;
+            const spezialRegelung = parser_utils_1.isNumericI7(i7Data.trafo_spezial) ? i7Data.trafo_spezial : transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.spezialRegelung;
             //const neutralU = transformerEnd.ratedU;
             let tapChanger = undefined;
-            if ((0, parser_utils_1.isNumericI7)(angle) && (0, parser_utils_1.convertToNumberI7)(angle) % 180 !== 0 || spezialRegelung) {
+            if (parser_utils_1.isNumericI7(angle) && parser_utils_1.convertToNumberI7(angle) % 180 !== 0 || spezialRegelung) {
                 // Winkel ist definiert =>PST/Queregler/PhaseTapChanger
                 tapChanger = this.createPhaseTapChanger(i7Data, transformerEnds, cimModel, gestufteSeite, entryI7, transformerinfo);
             }
@@ -5574,35 +5575,35 @@ class ConverterIntegral7 {
     }
     setTapChangerVoltageProperties(i7Data, cimModel, tapChanger, tapChangerNumber, ratioPhaseTapChangerPresent, tapChangerInfo) {
         var _a;
-        let lowStep = (0, parser_utils_1.isNumericI7)(i7Data[`minstufe_s${tapChangerNumber}`])
+        let lowStep = parser_utils_1.isNumericI7(i7Data[`minstufe_s${tapChangerNumber}`])
             ? i7Data[`minstufe_s${tapChangerNumber}`]
             : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.lowStep;
-        let highStep = (0, parser_utils_1.isNumericI7)(i7Data[`maxstufe_s${tapChangerNumber}`])
+        let highStep = parser_utils_1.isNumericI7(i7Data[`maxstufe_s${tapChangerNumber}`])
             ? i7Data[`maxstufe_s${tapChangerNumber}`]
             : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.highStep;
-        let neutralStep = (0, parser_utils_1.isNumericI7)(i7Data[`mittelstufe_s${tapChangerNumber}`])
+        let neutralStep = parser_utils_1.isNumericI7(i7Data[`mittelstufe_s${tapChangerNumber}`])
             ? i7Data[`mittelstufe_s${tapChangerNumber}`]
             : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.neutralStep;
-        let currentStep = (0, parser_utils_1.isNumericI7)(i7Data[`aktstufe_s${tapChangerNumber}`])
+        let currentStep = parser_utils_1.isNumericI7(i7Data[`aktstufe_s${tapChangerNumber}`])
             ? i7Data[`aktstufe_s${tapChangerNumber}`]
             : neutralStep;
-        const angle = (0, parser_utils_1.isNumericI7)(i7Data[`uzus_winkel_s${tapChangerNumber}`])
-            ? (0, parser_utils_1.convertToNumberI7)(i7Data[`uzus_winkel_s${tapChangerNumber}`])
+        const angle = parser_utils_1.isNumericI7(i7Data[`uzus_winkel_s${tapChangerNumber}`])
+            ? parser_utils_1.convertToNumberI7(i7Data[`uzus_winkel_s${tapChangerNumber}`])
             : (_a = tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.stepPhaseIncrement) === null || _a === void 0 ? void 0 : _a.value;
-        const i7TapArray = (0, utils_2.getTapChangerStepArray)(lowStep, highStep);
+        const i7TapArray = utils_2.getTapChangerStepArray(lowStep, highStep);
         /*    const tapStepCount = i7TapArray.length;
             const neutralStepIndex = i7TapArray.indexOf(neutralStep);*/
-        const lowerVoltageStepCount = (0, utils_2.getTapChangerStepCount)(lowStep, neutralStep);
-        const upperVoltageStepCount = (0, utils_2.getTapChangerStepCount)(neutralStep, highStep);
-        const uMin = (0, parser_utils_1.isNumericI7)(i7Data[`umin_s${tapChangerNumber}`])
+        const lowerVoltageStepCount = utils_2.getTapChangerStepCount(lowStep, neutralStep);
+        const upperVoltageStepCount = utils_2.getTapChangerStepCount(neutralStep, highStep);
+        const uMin = parser_utils_1.isNumericI7(i7Data[`umin_s${tapChangerNumber}`])
             ? i7Data[`umin_s${tapChangerNumber}`]
             : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.uMin;
-        const uMax = (0, parser_utils_1.isNumericI7)(i7Data[`umax_s${tapChangerNumber}`])
+        const uMax = parser_utils_1.isNumericI7(i7Data[`umax_s${tapChangerNumber}`])
             ? i7Data[`umax_s${tapChangerNumber}`]
             : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.uMax;
         let lowerVoltageStepIncrement = Math.abs(uMin / lowerVoltageStepCount);
         let upperVoltageStepIncrement = Math.abs(uMax / upperVoltageStepCount);
-        let increaseVoltageStepIncrement = (0, parser_utils_1.isNumericI7)(upperVoltageStepIncrement) ? upperVoltageStepIncrement : 0;
+        let increaseVoltageStepIncrement = parser_utils_1.isNumericI7(upperVoltageStepIncrement) ? upperVoltageStepIncrement : 0;
         if (tapChanger instanceof RatioTapChanger_1.RatioTapChanger) {
             const ratioTapChanger = tapChanger;
             // Min/Max Zusatzspannung sind nicht symmetrisch
@@ -5612,17 +5613,17 @@ class ConverterIntegral7 {
                 let start_step_tmp = step_tmp;
                 // Spannung verringern
                 for (let i = 0; i < Math.abs(lowerVoltageStepCount); i++) {
-                    (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i7TapArray[i], (1 - ((lowerVoltageStepIncrement * Math.abs(lowerVoltageStepCount - i)) / 100)));
+                    util_create_1.createRatioTapChangerTablePoint(ratioTapChangerTable, i7TapArray[i], (1 - ((lowerVoltageStepIncrement * Math.abs(lowerVoltageStepCount - i)) / 100)));
                     step_tmp = i;
                 }
                 // neutral Step
                 step_tmp++;
-                (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i7TapArray[step_tmp], 1);
+                util_create_1.createRatioTapChangerTablePoint(ratioTapChangerTable, i7TapArray[step_tmp], 1);
                 step_tmp++;
                 start_step_tmp = step_tmp;
                 // Spannung erhoehen
                 for (let i = start_step_tmp; i < start_step_tmp + Math.abs(upperVoltageStepCount); i++) {
-                    (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i7TapArray[i], (1 + ((upperVoltageStepIncrement * (i - start_step_tmp + 1)) / 100)));
+                    util_create_1.createRatioTapChangerTablePoint(ratioTapChangerTable, i7TapArray[i], (1 + ((upperVoltageStepIncrement * (i - start_step_tmp + 1)) / 100)));
                 }
                 tapChanger.ratioTapChangerTable = ratioTapChangerTable;
                 ratioTapChangerTable.ratioTapChanger = tapChanger;
@@ -5660,13 +5661,13 @@ class ConverterIntegral7 {
          * ? - Externer Knoten  (Anschluss 3)
          * */
         /** Regelung */
-        const ratioTapChanger = new RatioTapChanger_1.RatioTapChanger((0, parser_utils_1.getUUID)(eval(`i7Data.guid_tch${tapChangerNumber}`)), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
-        ratioTapChanger.ltcFlag = (0, parser_utils_1.isNumericI7)(`i7Data.unter_last_nicht_verstellbar_s${gestufteSeite}`) ? !(0, parser_utils_1.convertToBooleanI7)(`i7Data.unter_last_nicht_verstellbar_s${gestufteSeite}`) : false;
+        const ratioTapChanger = new RatioTapChanger_1.RatioTapChanger(parser_utils_1.getUUID(eval(`i7Data.guid_tch${tapChangerNumber}`)), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+        ratioTapChanger.ltcFlag = parser_utils_1.isNumericI7(`i7Data.unter_last_nicht_verstellbar_s${gestufteSeite}`) ? !parser_utils_1.convertToBooleanI7(`i7Data.unter_last_nicht_verstellbar_s${gestufteSeite}`) : false;
         ratioTapChanger.transformerEnd = transformerEnd;
         //transformerEnd.ratioTapChanger = ratioTapChanger;
         ratioTapChanger.neutralU = transformerEnd.ratedU;
         ratioTapChanger.tculControlMode = TransformerControlMode_1.TransformerControlMode.volt;
-        const regelung = (0, parser_utils_1.isNumericI7)(i7Data[`regelung_s${tapChangerNumber}`]) ? (0, parser_utils_1.convertToNumberI7)(i7Data[`regelung_s${tapChangerNumber}`]) : undefined;
+        const regelung = parser_utils_1.isNumericI7(i7Data[`regelung_s${tapChangerNumber}`]) ? parser_utils_1.convertToNumberI7(i7Data[`regelung_s${tapChangerNumber}`]) : undefined;
         const regulatingTerminal = ((_a = regulatingConnectivityNode === null || regulatingConnectivityNode === void 0 ? void 0 : regulatingConnectivityNode.terminals) === null || _a === void 0 ? void 0 : _a.size) ? [...(_b = regulatingConnectivityNode === null || regulatingConnectivityNode === void 0 ? void 0 : regulatingConnectivityNode.terminals) === null || _b === void 0 ? void 0 : _b.values()].find(elem => elem.connected) : undefined;
         if (isFinite(spannungsband === null || spannungsband === void 0 ? void 0 : spannungsband.usoll) && regulatingTerminal) {
             /** Ausprägungen
@@ -5686,7 +5687,7 @@ class ConverterIntegral7 {
              * 2 - Typ Helmstedt
              *     Asymmetrischer Querregler => PhaseTapChangerAsymmetrical
              * */
-            const tapChangerControl = new TapChangerControl_1.TapChangerControl((0, parser_utils_1.getUUID)(i7Data.guid_rc_v), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+            const tapChangerControl = new TapChangerControl_1.TapChangerControl(parser_utils_1.getUUID(i7Data.guid_rc_v), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
             tapChangerControl.discrete = true;
             const regulatingControlEnabled = regelung === 1 ? true : false;
             tapChangerControl.enabled = regulatingControlEnabled;
@@ -5727,22 +5728,22 @@ class ConverterIntegral7 {
          * Trafo3W mit Winkelangabe und kein Typ Helmstedt angegeben => mappe auf den asymetrischen PST
          * Defaul-Werte aus der Config für Typ Helmsted verwenden.
          * */
-        let spezialregelung = (0, parser_utils_1.isNumericI7)(i7Data.trafo_spezial) ? i7Data.trafo_spezial : transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.spezialRegelung;
-        spezialregelung = (0, parser_utils_1.isNumericI7)(spezialregelung) ? (0, parser_utils_1.convertToNumberI7)(spezialregelung) : undefined;
-        const winkel = (0, parser_utils_1.isNumericI7)(i7Data[`uzus_winkel_s${tapChangerNumber}`])
+        let spezialregelung = parser_utils_1.isNumericI7(i7Data.trafo_spezial) ? i7Data.trafo_spezial : transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.spezialRegelung;
+        spezialregelung = parser_utils_1.isNumericI7(spezialregelung) ? parser_utils_1.convertToNumberI7(spezialregelung) : undefined;
+        const winkel = parser_utils_1.isNumericI7(i7Data[`uzus_winkel_s${tapChangerNumber}`])
             ? i7Data[`uzus_winkel_s${tapChangerNumber}`]
             : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.stepPhaseIncrement;
         switch (spezialregelung) {
             case (1): {
                 // 1 - Typ Meeden
-                const phaseTapChangerSym = new PhaseTapChangerSymmetrical_1.PhaseTapChangerSymmetrical((0, parser_utils_1.getUUID)(eval(`i7Data.guid_tch${tapChangerNumber}`)), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+                const phaseTapChangerSym = new PhaseTapChangerSymmetrical_1.PhaseTapChangerSymmetrical(parser_utils_1.getUUID(eval(`i7Data.guid_tch${tapChangerNumber}`)), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
                 phaseTapChanger = phaseTapChangerSym;
                 cimModel.addPhaseTapChangerSymmetrical(phaseTapChangerSym);
                 break;
             }
             case (2): {
                 // 2 - Typ Helmstedt
-                const phaseTapChangerAsym = new PhaseTapChangerAsymmetrical_1.PhaseTapChangerAsymmetrical((0, parser_utils_1.getUUID)(eval(`i7Data.guid_tch${tapChangerNumber}`)), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+                const phaseTapChangerAsym = new PhaseTapChangerAsymmetrical_1.PhaseTapChangerAsymmetrical(parser_utils_1.getUUID(eval(`i7Data.guid_tch${tapChangerNumber}`)), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
                 phaseTapChangerAsym.windingConnectionAngle = winkel;
                 phaseTapChanger = phaseTapChangerAsym;
                 cimModel.addPhaseTapChangerAsymmetrical(phaseTapChangerAsym);
@@ -5750,23 +5751,23 @@ class ConverterIntegral7 {
             }
             default: {
                 // There is no information given about special tapchanger control, thus create PhaseTapChangerLinear
-                const phaseTapChangerLin = new PhaseTapChangerLinear_1.PhaseTapChangerLinear((0, parser_utils_1.getUUID)(eval(`i7Data.guid_tch${tapChangerNumber}`)), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+                const phaseTapChangerLin = new PhaseTapChangerLinear_1.PhaseTapChangerLinear(parser_utils_1.getUUID(eval(`i7Data.guid_tch${tapChangerNumber}`)), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
                 phaseTapChanger = phaseTapChangerLin;
                 cimModel.addPhaseTapChangerLinear(phaseTapChangerLin);
                 break;
             }
         }
         // Attribute
-        phaseTapChanger.ltcFlag = (0, parser_utils_1.isNumericI7)(`i7Data.unter_last_nicht_verstellbar_s${tapChangerNumber}`) ? (0, parser_utils_1.convertToBooleanI7)(`i7Data.unter_last_nicht_verstellbar_s${tapChangerNumber}`) : false;
+        phaseTapChanger.ltcFlag = parser_utils_1.isNumericI7(`i7Data.unter_last_nicht_verstellbar_s${tapChangerNumber}`) ? parser_utils_1.convertToBooleanI7(`i7Data.unter_last_nicht_verstellbar_s${tapChangerNumber}`) : false;
         phaseTapChanger.transformerEnd = transformerEnd;
         //transformerEnd.phaseTapChanger = phaseTapChanger;
         // Wirkleistungsregelung Anschluss
-        const pRegulationToNode = (0, parser_utils_1.isNumericI7)(i7Data.nach_a_nr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.nach_a_nr) : undefined;
+        const pRegulationToNode = parser_utils_1.isNumericI7(i7Data.nach_a_nr) ? parser_utils_1.convertToNumberI7(i7Data.nach_a_nr) : undefined;
         const regulatingTransformerEnd = transformerEnds.find(elem => elem.endNumber === pRegulationToNode);
         // Regelung
-        let pVorgabe = (0, parser_utils_1.isNumericI7)(i7Data[`p_vorgabe`]) ? (0, parser_utils_1.convertToNumberI7)(+i7Data[`p_vorgabe`]) : undefined; // PST Trafo
+        let pVorgabe = parser_utils_1.isNumericI7(i7Data[`p_vorgabe`]) ? parser_utils_1.convertToNumberI7(+i7Data[`p_vorgabe`]) : undefined; // PST Trafo
         if (pVorgabe === undefined) {
-            pVorgabe = (0, parser_utils_1.isNumericI7)(i7Data[`p_vorgabe_2`]) ? (0, parser_utils_1.convertToNumberI7)(+i7Data[`p_vorgabe_2`]) : undefined; // PST Trafo
+            pVorgabe = parser_utils_1.isNumericI7(i7Data[`p_vorgabe_2`]) ? parser_utils_1.convertToNumberI7(+i7Data[`p_vorgabe_2`]) : undefined; // PST Trafo
         }
         // Wirkflussvorgabe
         if (isFinite(pVorgabe) && regulatingTransformerEnd) {
@@ -5781,7 +5782,7 @@ class ConverterIntegral7 {
              * 3 -> Stromkompoundierung -> stromabhängige Spannungsregelung
              * 4 -> Blindleitungsbilazierung
              * */
-            const tapChangerControl = new TapChangerControl_1.TapChangerControl((0, parser_utils_1.getUUID)(i7Data.guid_rc_p), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+            const tapChangerControl = new TapChangerControl_1.TapChangerControl(parser_utils_1.getUUID(i7Data.guid_rc_p), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
             tapChangerControl.discrete = true;
             const regulatingControlEnabled = regelung === 2 ? true : false;
             tapChangerControl.enabled = regulatingControlEnabled;
@@ -5878,7 +5879,7 @@ class ConverterIntegral7 {
      * */
     setShuntGrounding(shnt, stpKnoten, r0, x0) {
         if (stpKnoten) {
-            shnt.grounded = (0, parser_utils_1.isBooleanI7)(stpKnoten.geerdet) ? (0, parser_utils_1.convertToBooleanI7)(stpKnoten.geerdet) : false;
+            shnt.grounded = parser_utils_1.isBooleanI7(stpKnoten.geerdet) ? parser_utils_1.convertToBooleanI7(stpKnoten.geerdet) : false;
         }
         else {
             //equipment is not grounded