npm - @enervance/insight-cim-model - Versions diffs - 0.0.25 → 0.0.27 - Mend

@enervance/insight-cim-model 0.0.25 → 0.0.27

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 (480) hide show

package/dist/model/wires/RegulatingControl.js CHANGED Viewed

@@ -8,6 +8,7 @@ const datatype_converter_1 = require("../../util/datatype-converter");
 const utils_1 = require("../../util/utils");
 const __1 = require("../..");
 const utils_2 = require("../../converter/integral7/utils");
+const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class RegulatingControl extends __1.PowerSystemResource {
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
@@ -72,7 +73,7 @@ class RegulatingControl extends __1.PowerSystemResource {
             const suffixID = this.getSuffixID(profile);
             const prefixUUID = this.getPrefixUUID(suffixID);
             xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'RegulatingControl', __1.RDF_XML.CIM_NS_16);
-            utils_1.writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
+            xml_serializer_1.writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
             this.toCIMXMLAttributes(xmlWriter, profile);
             this.toCIMXMLAssociations(xmlWriter, profile);
             xmlWriter.endElement();
@@ -82,16 +83,16 @@ class RegulatingControl extends __1.PowerSystemResource {
         super.toCIMXMLAttributes(xmlWriter, profile);
         if (profile === __1.RDF_XML.PROFILE_EQ) {
             xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'RegulatingControl.mode', __1.RDF_XML.CIM_NS_16);
-            utils_1.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.CIM_NS_16}RegulatingControlModeKind.${this.mode}`);
+            xml_serializer_1.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.CIM_NS_16}RegulatingControlModeKind.${this.mode}`);
             xmlWriter.endElement();
         }
         else if (profile === __1.RDF_XML.PROFILE_SSH) {
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:RegulatingControl.discrete`, this.discrete);
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:RegulatingControl.enabled`, this.enabled);
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:RegulatingControl.targetDeadband`, this.targetDeadband);
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:RegulatingControl.targetValue`, this.targetValue);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:RegulatingControl.discrete`, this.discrete);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:RegulatingControl.enabled`, this.enabled);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:RegulatingControl.targetDeadband`, this.targetDeadband);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:RegulatingControl.targetValue`, this.targetValue);
             xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'RegulatingControl.targetValueUnitMultiplier', __1.RDF_XML.CIM_NS_16);
-            utils_1.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.CIM_NS_16}UnitMultiplier.${this.targetValueUnitMultiplier}`);
+            xml_serializer_1.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.CIM_NS_16}UnitMultiplier.${this.targetValueUnitMultiplier}`);
             xmlWriter.endElement();
         }
     }
@@ -101,7 +102,7 @@ class RegulatingControl extends __1.PowerSystemResource {
             this.terminalUUID = this.terminal ? this.terminal.mrid : this.terminalUUID;
             if (this.terminalUUID) {
                 xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'RegulatingControl.Terminal', __1.RDF_XML.CIM_NS_16);
-                utils_1.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.HASH_UNDERSCORE}${this.terminalUUID}`);
+                xml_serializer_1.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.HASH_UNDERSCORE}${this.terminalUUID}`);
                 xmlWriter.endElement();
             }
             else {

package/dist/model/wires/RegulatingControl.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RegulatingControl.js","sourceRoot":"","sources":["../../../src/model/wires/RegulatingControl.ts"],"names":[],"mappings":";;;AAAA,mFAOiD;AACjD,2EAAsE;AAEtE,6DAAwD;AAExD,sEAAwD;AACxD,~~4CAA+E~~;~~AAC/E~~,6BAA0D;AAI1D,2DAAyE;~~AAEzE~~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~~6BAAqB~~,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SACxB;IACH,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,WAAO,CAAC,UAAU,EAAE;YAClC,SAAS,CAAC,cAAc,CAAC,WAAO,CAAC,aAAa,EAAE,wBAAwB,EAAE,WAAO,CAAC,SAAS,CAAC,CAAC;YAC7F,~~6BAAqB~~,CAAC,SAAS,EAAE,WAAO,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,SAAS,6BAA6B,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YAClH,SAAS,CAAC,UAAU,EAAE,CAAC;SACxB;aAAM,IAAI,OAAO,KAAK,WAAO,CAAC,WAAW,EAAE;YAC1C,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,6BAA6B,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC9F,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,4BAA4B,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5F,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,mCAAmC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YAC1G,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,gCAAgC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAEpG,SAAS,CAAC,cAAc,CAAC,WAAO,CAAC,aAAa,EAAE,6CAA6C,EAAE,WAAO,CAAC,SAAS,CAAC,CAAC;YAClH,~~6BAAqB~~,CAAC,SAAS,EAAE,WAAO,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,SAAS,kBAAkB,IAAI,CAAC,yBAAyB,EAAE,CAAC,CAAC;YAC5H,SAAS,CAAC,UAAU,EAAE,CAAC;~~SAExB~~;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,WAAO,CAAC,UAAU,EAAE;YAClC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC;YAC3E,IAAI,IAAI,CAAC,YAAY,EAAE;gBACrB,SAAS,CAAC,cAAc,CAAC,WAAO,CAAC,aAAa,EAAE,4BAA4B,EAAE,WAAO,CAAC,SAAS,CAAC,CAAC;gBACjG,~~6BAAqB~~,CAAC,SAAS,EAAE,WAAO,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,eAAe,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;gBACtG,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,SAAS,CAAC,YAAY,CAAC,2CAA2C,CAAC,CAAC;aACrE;SACF;IACH,CAAC;IAED,gCAAgC,CAAC,mBAAyC;QACxE,IAAI,aAAa,GAAG,KAAK,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAChF,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACd,IAAI,CAAC,IAAI,GAAG,qDAAyB,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAClF,aAAa,IAAI,OAAO,CAAA;SACzB;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YAC/B,IAAI,CAAC,QAAQ,GAAG,mBAAmB,CAAC,iBAAiB,CAAC,QAAQ,CAAC;YAC/D,aAAa,IAAI,WAAW,CAAA;SAC7B;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAC9B,IAAI,CAAC,OAAO,GAAG,mBAAmB,CAAC,iBAAiB,CAAC,OAAO,CAAC;YAC7D,aAAa,IAAI,UAAU,CAAA;SAC5B;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;YACrC,IAAI,CAAC,cAAc,GAAG,mBAAmB,CAAC,iBAAiB,CAAC,cAAc,CAAC;YAC3E,aAAa,IAAI,iBAAiB,CAAA;SACnC;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YAClC,IAAI,CAAC,WAAW,GAAG,mBAAmB,CAAC,iBAAiB,CAAC,WAAW,CAAC;YACrE,aAAa,IAAI,cAAc,CAAA;SAChC;QACD,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE;YACnC,IAAI,CAAC,yBAAyB,GAAG,+BAAc,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;YACjH,aAAa,IAAI,4BAA4B,CAAA;SAC9C;QACD,IAAI,aAAa,CAAC,MAAM;YAAE,IAAI,CAAC,WAAW,GAAG,IAAI,aAAa,GAAG,CAAC;QAClE,OAAO,aAAa,CAAC;IACvB,CAAC;;~~AA5MH~~,~~8CA6MC~~;~~AArLe~~,6BAAW,GAAW;UAC5B,qCAAa;UACb,2CAAmB;UACnB,wCAAgB;UAChB,qCAAa;UACb,qCAAa;UACb,wCAAgB;UAChB,qCAAa;UACb,qCAAa;;;;;;;;;;;;;;;;;;;;;;;KAuBlB,CAAA"}
1	+ {"version":3,"file":"RegulatingControl.js","sourceRoot":"","sources":["../../../src/model/wires/RegulatingControl.ts"],"names":[],"mappings":"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"}

package/dist/model/wires/RotatingMachine.d.ts CHANGED Viewed

@@ -26,4 +26,5 @@ export declare class RotatingMachine extends RegulatingCondEq {
     protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string): void;
     validateMandatoryAttributesCGMES(defaultValuesConfig: IDefaultValuesConfig): string;
+    validateOptionalAttributesCGMES(defaultValuesConfig: IDefaultValuesConfig): string;
 }

package/dist/model/wires/RotatingMachine.js CHANGED Viewed

@@ -5,6 +5,7 @@ const RegulatingCondEq_1 = require("./RegulatingCondEq");
 const utils_1 = require("../../util/utils");
 const rdf_xml_1 = require("../../constants/rdf-xml");
 const utils_2 = require("../../converter/integral7/utils");
+const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class RotatingMachine extends RegulatingCondEq_1.RegulatingCondEq {
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
@@ -85,13 +86,13 @@ class RotatingMachine extends RegulatingCondEq_1.RegulatingCondEq {
     toCIMXMLAttributes(xmlWriter, profile) {
         super.toCIMXMLAttributes(xmlWriter, profile);
         if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:RotatingMachine.ratedPowerFactor`, this.ratedPowerFactor);
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:RotatingMachine.ratedS`, this.ratedS);
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:RotatingMachine.ratedU`, this.ratedU);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:RotatingMachine.ratedPowerFactor`, this.ratedPowerFactor);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:RotatingMachine.ratedS`, this.ratedS);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:RotatingMachine.ratedU`, this.ratedU);
         }
         else if (profile === rdf_xml_1.RDF_XML.PROFILE_SSH) {
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:RotatingMachine.p`, this.p);
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:RotatingMachine.q`, this.q);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:RotatingMachine.p`, this.p);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:RotatingMachine.q`, this.q);
         }
     }
     toCIMXMLAssociations(xmlWriter, profile) {
@@ -99,12 +100,12 @@ class RotatingMachine extends RegulatingCondEq_1.RegulatingCondEq {
         if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
             if (this.generatingUnit) {
                 xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'RotatingMachine.GeneratingUnit', rdf_xml_1.RDF_XML.CIM_NS_16);
-                utils_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.generatingUnit.mrid}`);
+                xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.generatingUnit.mrid}`);
                 xmlWriter.endElement();
             }
             else if (this.generatingUnitUUID) {
                 xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'RotatingMachine.GeneratingUnit', rdf_xml_1.RDF_XML.CIM_NS_16);
-                utils_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.generatingUnitUUID}`);
+                xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.generatingUnitUUID}`);
                 xmlWriter.endElement();
             }
             else {
@@ -124,6 +125,19 @@ class RotatingMachine extends RegulatingCondEq_1.RegulatingCondEq {
         }
         return defaultValues;
     }
+    validateOptionalAttributesCGMES(defaultValuesConfig) {
+        let defaultValues = super.validateOptionalAttributesCGMES(defaultValuesConfig);
+        if (!utils_2.isNumericI7(this.ratedS)) {
+            this.ratedS = defaultValuesConfig.RotatingMachine.ratedS;
+            if (defaultValues.length == 0) {
+                defaultValues += 'ratedS';
+            }
+            else {
+                defaultValues += ',ratedS';
+            }
+        }
+        return defaultValues;
+    }
 }
 exports.RotatingMachine = RotatingMachine;
 //# sourceMappingURL=RotatingMachine.js.map

package/dist/model/wires/RotatingMachine.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RotatingMachine.js","sourceRoot":"","sources":["../../../src/model/wires/RotatingMachine.ts"],"names":[],"mappings":";;;AAAA,yDAAoD;AAKpD,~~4CAA+E~~;~~AAG/E~~,qDAAgD;AAGhD,2DAA4D;~~AAE5D~~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~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,mCAAmC,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAC5G,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,yBAAyB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACxF,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,yBAAyB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;SACzF;aAAM,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,EAAE;YAC1C,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,oBAAoB,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YAC9E,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,oBAAoB,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;SAC/E;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,IAAI,IAAI,CAAC,cAAc,EAAE;gBACvB,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,gCAAgC,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBACrG,~~6BAAqB~~,CAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC7G,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM,IAAI,IAAI,CAAC,kBAAkB,EAAE;gBAClC,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,gCAAgC,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBACrG,~~6BAAqB~~,CAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;gBAC5G,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,oCAAoC,CAAC,CAAC;aAC3E;SACF;IACH,CAAC;IAED,gCAAgC,CAAC,mBAAyC;QACxE,IAAI,aAAa,GAAG,KAAK,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAChF,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YACxB,IAAI,CAAC,CAAC,GAAG,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAC;YAC/C,aAAa,IAAI,IAAI,CAAA;SACtB;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YACxB,IAAI,CAAC,CAAC,GAAG,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAC;YAC/C,aAAa,IAAI,IAAI,CAAA;SACtB;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;~~AAvJD~~,~~0CAuJC~~"}
1	+ {"version":3,"file":"RotatingMachine.js","sourceRoot":"","sources":["../../../src/model/wires/RotatingMachine.ts"],"names":[],"mappings":"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"}

package/dist/model/wires/SeriesCompensator.js CHANGED Viewed

@@ -6,6 +6,7 @@ const utils_1 = require("../../util/utils");
 const datatype_converter_1 = require("../../util/datatype-converter");
 const rdf_xml_1 = require("../../constants/rdf-xml");
 const utils_2 = require("../../converter/integral7/utils");
+const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class SeriesCompensator extends ConductingEquipment_1.ConductingEquipment {
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
@@ -48,7 +49,7 @@ class SeriesCompensator extends ConductingEquipment_1.ConductingEquipment {
             const suffixID = this.getSuffixID(profile);
             const prefixUUID = this.getPrefixUUID(suffixID);
             xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, rdf_xml_1.RDF_XML.CIM_NS_16);
-            utils_1.writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
+            xml_serializer_1.writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
             this.toCIMXMLAttributes(xmlWriter, profile);
             this.toCIMXMLAssociations(xmlWriter, profile);
             xmlWriter.endElement();
@@ -57,13 +58,13 @@ class SeriesCompensator extends ConductingEquipment_1.ConductingEquipment {
     toCIMXMLAttributes(xmlWriter, profile) {
         super.toCIMXMLAttributes(xmlWriter, profile);
         if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:SeriesCompensator.r`, this.r);
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:SeriesCompensator.x`, this.x);
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:SeriesCompensator.r0`, this.r0);
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:SeriesCompensator.x0`, this.x0);
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:SeriesCompensator.varistorPresent`, this.varistorPresent);
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:SeriesCompensator.varistorRatedCurrent`, this.varistorRatedCurrent);
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:SeriesCompensator.varistorVoltageThreshold`, this.varistorVoltageThreshold);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:SeriesCompensator.r`, this.r);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:SeriesCompensator.x`, this.x);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:SeriesCompensator.r0`, this.r0);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:SeriesCompensator.x0`, this.x0);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:SeriesCompensator.varistorPresent`, this.varistorPresent);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:SeriesCompensator.varistorRatedCurrent`, this.varistorRatedCurrent);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:SeriesCompensator.varistorVoltageThreshold`, this.varistorVoltageThreshold);
         }
     }
     toCIMXMLAssociations(xmlWriter, profile) {

package/dist/model/wires/SeriesCompensator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SeriesCompensator.js","sourceRoot":"","sources":["../../../src/model/wires/SeriesCompensator.ts"],"names":[],"mappings":";;;AAAA,qEAAgE;AAEhE,~~4CAA+E~~;~~AAC/E~~,sEAAwD;AACxD,qDAAgD;AAGhD,2DAAyE;~~AAEzE~~,MAAa,iBAAkB,SAAQ,yCAAmB;IAWxD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAGM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAe;;QAC7D,YAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;YAClD,iBAAiB,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YACrD,QAAQ,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;QACnD,CAAC,EAAE;IACL,CAAC;IAES,2BAA2B,CAAC,KAAU;QAC9C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,CAAC,GAAG,CAAC,gBAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC/B,IAAI,CAAC,CAAC,GAAG,CAAC,gBAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC/B,IAAI,CAAC,EAAE,GAAG,CAAC,gBAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,EAAE,GAAG,CAAC,gBAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAEjC,IAAI,CAAC,eAAe,GAAG,8BAAS,CAAC,gBAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,oBAAoB,GAAG,CAAC,gBAAQ,CAAC,KAAK,EAAE,sBAAsB,CAAC,CAAC;QACrE,IAAI,CAAC,wBAAwB,GAAG,CAAC,gBAAQ,CAAC,KAAK,EAAE,0BAA0B,CAAC,CAAC;IAE/E,CAAC;IAEM,yBAAyB,CAAC,QAAe;QAC9C,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,iBAAiB,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC7E;QACD,OAAO,iBAAiB,CAAC,WAAW,CAAC;IACvC,CAAC;IAwCM,kBAAkB,CAAC,eAAsB;QAC9C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;YACxC,KAAK,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;SAC3C;IACH,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,~~6BAAqB~~,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SACxB;IACH,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,sBAAsB,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YAChF,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,sBAAsB,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YAChF,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,uBAAuB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YAClF,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,uBAAuB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YAClF,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,oCAAoC,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;YAC5G,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,yCAAyC,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACtH,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,6CAA6C,EAAE,IAAI,CAAC,wBAAwB,CAAC,CAAC;SAC/H;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,gCAAgC,CAAC,mBAAyC;QACxE,IAAI,aAAa,GAAG,KAAK,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAEhF,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YACxB,IAAI,CAAC,CAAC,GAAG,mBAAmB,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACjD,aAAa,IAAI,IAAI,CAAA;SACtB;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YACxB,IAAI,CAAC,CAAC,GAAG,mBAAmB,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACjD,aAAa,IAAI,IAAI,CAAA;SACtB;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;YACzB,IAAI,CAAC,EAAE,GAAG,mBAAmB,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACnD,aAAa,IAAI,KAAK,CAAA;SACvB;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;YACzB,IAAI,CAAC,EAAE,GAAG,mBAAmB,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACnD,aAAa,IAAI,KAAK,CAAA;SACvB;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;YACtC,IAAI,CAAC,eAAe,GAAG,mBAAmB,CAAC,iBAAiB,CAAC,eAAe,CAAC;YAC7E,aAAa,IAAI,kBAAkB,CAAA;SACpC;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE;YAC3C,IAAI,CAAC,oBAAoB,GAAG,mBAAmB,CAAC,iBAAiB,CAAC,oBAAoB,CAAC;YACvF,aAAa,IAAI,uBAAuB,CAAA;SACzC;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,wBAAwB,CAAC,EAAE;YAC/C,IAAI,CAAC,wBAAwB,GAAG,mBAAmB,CAAC,iBAAiB,CAAC,wBAAwB,CAAC;YAC/F,aAAa,IAAI,2BAA2B,CAAA;SAC7C;QACD,IAAI,aAAa,CAAC,MAAM;YAAE,IAAI,CAAC,WAAW,GAAG,IAAI,aAAa,GAAG,CAAC;QAElE,OAAO,aAAa,CAAC;IACvB,CAAC;;AA7JH,8CA8JC;AA9Ge,6BAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAoCjC,CAAA"}
1	+ {"version":3,"file":"SeriesCompensator.js","sourceRoot":"","sources":["../../../src/model/wires/SeriesCompensator.ts"],"names":[],"mappings":"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"}

package/dist/model/wires/ShuntCompensator.js CHANGED Viewed

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShuntCompensator = void 0;
 const RegulatingCondEq_1 = require("./RegulatingCondEq");
 const rdf_xml_1 = require("../../constants/rdf-xml");
-const utils_1 = require("../../util/utils");
-const utils_2 = require("../../converter/integral7/utils");
+const utils_1 = require("../../converter/integral7/utils");
+const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class ShuntCompensator extends RegulatingCondEq_1.RegulatingCondEq {
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
@@ -12,34 +12,34 @@ class ShuntCompensator extends RegulatingCondEq_1.RegulatingCondEq {
     toCIMXMLAttributes(xmlWriter, profile) {
         super.toCIMXMLAttributes(xmlWriter, profile);
         if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:ShuntCompensator.aVRDelay`, this.aVRDelay);
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:ShuntCompensator.grounded`, this.grounded);
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:ShuntCompensator.maximumSections`, this.maximumSections);
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:ShuntCompensator.nomU`, this.nomU);
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:ShuntCompensator.normalSections`, this.normalSections);
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:ShuntCompensator.switchOnCount`, this.switchOnCount);
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:ShuntCompensator.switchOnDate`, this.switchOnDate);
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:ShuntCompensator.voltageSensitivity`, this.voltageSensitivity);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:ShuntCompensator.aVRDelay`, this.aVRDelay);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:ShuntCompensator.grounded`, this.grounded);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:ShuntCompensator.maximumSections`, this.maximumSections);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:ShuntCompensator.nomU`, this.nomU);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:ShuntCompensator.normalSections`, this.normalSections);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:ShuntCompensator.switchOnCount`, this.switchOnCount);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:ShuntCompensator.switchOnDate`, this.switchOnDate);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:ShuntCompensator.voltageSensitivity`, this.voltageSensitivity);
         }
         else if (profile === rdf_xml_1.RDF_XML.PROFILE_SSH) {
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:ShuntCompensator.sections`, this.sections);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:ShuntCompensator.sections`, this.sections);
         }
     }
     validateMandatoryAttributesCGMES(defaultValuesConfig) {
         let defaultValues = super.validateMandatoryAttributesCGMES(defaultValuesConfig);
-        if (!utils_2.isNumericI7(this.maximumSections)) {
+        if (!utils_1.isNumericI7(this.maximumSections)) {
             this.maximumSections = defaultValuesConfig.ShuntCompensator.maximumSections;
             defaultValues += 'maximumSections,';
         }
-        if (!utils_2.isNumericI7(this.nomU)) {
+        if (!utils_1.isNumericI7(this.nomU)) {
             this.nomU = defaultValuesConfig.ShuntCompensator.nomU;
             defaultValues += 'nomU,';
         }
-        if (!utils_2.isNumericI7(this.normalSections)) {
+        if (!utils_1.isNumericI7(this.normalSections)) {
             this.normalSections = defaultValuesConfig.ShuntCompensator.normalSections;
             defaultValues += 'normalSections,';
         }
-        if (!utils_2.isNumericI7(this.sections)) {
+        if (!utils_1.isNumericI7(this.sections)) {
             this.sections = defaultValuesConfig.ShuntCompensator.sections;
             defaultValues += 'sections,';
         }

package/dist/model/wires/ShuntCompensator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ShuntCompensator.js","sourceRoot":"","sources":["../../../src/model/wires/ShuntCompensator.ts"],"names":[],"mappings":";;;AAAA,yDAAoD;AACpD,qDAAgD;~~AAChD~~,~~4CAA8C~~;~~AAG9C~~,~~2DAA4D~~;~~AAE5D~~,MAAa,gBAAiB,SAAQ,mCAAgB;IAapD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,4BAA4B,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7F,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,4BAA4B,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7F,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,mCAAmC,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;YAC3G,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,wBAAwB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAErF,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,kCAAkC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YACzG,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,iCAAiC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YACvG,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,gCAAgC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;YACrG,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,sCAAsC,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;SAClH;aAAM,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,EAAE;YAC1C,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,4BAA4B,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC9F;IACH,CAAC;IAED,gCAAgC,CAAC,mBAAyC;QACxE,IAAI,aAAa,GAAG,KAAK,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAChF,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;YACtC,IAAI,CAAC,eAAe,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,eAAe,CAAC;YAC5E,aAAa,IAAI,kBAAkB,CAAA;SACpC;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC3B,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,IAAI,CAAC;YACtD,aAAa,IAAI,OAAO,CAAA;SACzB;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;YACrC,IAAI,CAAC,cAAc,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,cAAc,CAAC;YAC1E,aAAa,IAAI,iBAAiB,CAAA;SACnC;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YAC/B,IAAI,CAAC,QAAQ,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,QAAQ,CAAC;YAC9D,aAAa,IAAI,WAAW,CAAA;SAC7B;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;CAEF;AAvDD,4CAuDC"}
1	+ {"version":3,"file":"ShuntCompensator.js","sourceRoot":"","sources":["../../../src/model/wires/ShuntCompensator.ts"],"names":[],"mappings":";;;AAAA,yDAAoD;AACpD,qDAAgD;AAGhD,2DAA4D;AAC5D,kEAA6D;AAE7D,MAAa,gBAAiB,SAAQ,mCAAgB;IAapD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,4BAA4B,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7F,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,4BAA4B,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7F,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,mCAAmC,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;YAC3G,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,wBAAwB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAErF,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,kCAAkC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YACzG,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,iCAAiC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YACvG,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,gCAAgC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;YACrG,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,sCAAsC,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;SAClH;aAAM,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,EAAE;YAC1C,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,4BAA4B,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC9F;IACH,CAAC;IAED,gCAAgC,CAAC,mBAAyC;QACxE,IAAI,aAAa,GAAG,KAAK,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAChF,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;YACtC,IAAI,CAAC,eAAe,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,eAAe,CAAC;YAC5E,aAAa,IAAI,kBAAkB,CAAA;SACpC;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC3B,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,IAAI,CAAC;YACtD,aAAa,IAAI,OAAO,CAAA;SACzB;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;YACrC,IAAI,CAAC,cAAc,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,cAAc,CAAC;YAC1E,aAAa,IAAI,iBAAiB,CAAA;SACnC;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YAC/B,IAAI,CAAC,QAAQ,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,QAAQ,CAAC;YAC9D,aAAa,IAAI,WAAW,CAAA;SAC7B;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;CAEF;AAvDD,4CAuDC"}

package/dist/model/wires/StaticVarCompensator.js CHANGED Viewed

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StaticVarCompensator = void 0;
 const RegulatingCondEq_1 = require("./RegulatingCondEq");
 const rdf_xml_1 = require("../../constants/rdf-xml");
-const utils_1 = require("../../util/utils");
-const utils_2 = require("../../converter/integral7/utils");
+const utils_1 = require("../../converter/integral7/utils");
 const SVCControlMode_1 = require("./SVCControlMode");
+const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class StaticVarCompensator extends RegulatingCondEq_1.RegulatingCondEq {
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
@@ -15,7 +15,7 @@ class StaticVarCompensator extends RegulatingCondEq_1.RegulatingCondEq {
             const suffixID = this.getSuffixID(profile);
             const prefixUUID = this.getPrefixUUID(suffixID);
             xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, rdf_xml_1.RDF_XML.CIM_NS_16);
-            utils_1.writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
+            xml_serializer_1.writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
             this.toCIMXMLAttributes(xmlWriter, profile);
             this.toCIMXMLAssociations(xmlWriter, profile);
             xmlWriter.endElement();
@@ -24,29 +24,29 @@ class StaticVarCompensator extends RegulatingCondEq_1.RegulatingCondEq {
     toCIMXMLAttributes(xmlWriter, profile) {
         super.toCIMXMLAttributes(xmlWriter, profile);
         if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:StaticVarCompensator.capacitiveRating`, this.capacitiveRating);
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:StaticVarCompensator.inductiveRating`, this.inductiveRating);
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:StaticVarCompensator.slope`, this.slope);
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:StaticVarCompensator.voltageSetPoint`, this.voltageSetPoint);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:StaticVarCompensator.capacitiveRating`, this.capacitiveRating);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:StaticVarCompensator.inductiveRating`, this.inductiveRating);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:StaticVarCompensator.slope`, this.slope);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:StaticVarCompensator.voltageSetPoint`, this.voltageSetPoint);
             xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'StaticVarCompensator.sVCControlMode', rdf_xml_1.RDF_XML.CIM_NS_16);
-            utils_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.CIM_NS_16}SVCControlMode.${this.sVCControlMode}`);
+            xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.CIM_NS_16}SVCControlMode.${this.sVCControlMode}`);
             xmlWriter.endElement();
         }
         else if (profile === rdf_xml_1.RDF_XML.PROFILE_SSH) {
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:StaticVarCompensator.q`, this.q);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:StaticVarCompensator.q`, this.q);
         }
     }
     validateMandatoryAttributesCGMES(defaultValuesConfig) {
         let defaultValues = super.validateMandatoryAttributesCGMES(defaultValuesConfig);
-        if (!utils_2.isNumericI7(this.capacitiveRating)) {
+        if (!utils_1.isNumericI7(this.capacitiveRating)) {
             this.capacitiveRating = defaultValuesConfig.StaticVarCompensator.capacitiveRating;
             defaultValues += 'capacitiveRating,';
         }
-        if (!utils_2.isNumericI7(this.inductiveRating)) {
+        if (!utils_1.isNumericI7(this.inductiveRating)) {
             this.inductiveRating = defaultValuesConfig.StaticVarCompensator.inductiveRating;
             defaultValues += 'inductiveRating,';
         }
-        if (!utils_2.isNumericI7(this.slope)) {
+        if (!utils_1.isNumericI7(this.slope)) {
             this.slope = defaultValuesConfig.StaticVarCompensator.slope;
             defaultValues += 'slope,';
         }
@@ -54,11 +54,11 @@ class StaticVarCompensator extends RegulatingCondEq_1.RegulatingCondEq {
             this.sVCControlMode = SVCControlMode_1.SVCControlMode[defaultValuesConfig.StaticVarCompensator.sVCControlMode];
             defaultValues += 'sVCControlMode,';
         }
-        if (!utils_2.isNumericI7(this.voltageSetPoint)) {
+        if (!utils_1.isNumericI7(this.voltageSetPoint)) {
             this.voltageSetPoint = defaultValuesConfig.StaticVarCompensator.voltageSetPoint;
             defaultValues += 'voltageSetPoint,';
         }
-        if (!utils_2.isNumericI7(this.q)) {
+        if (!utils_1.isNumericI7(this.q)) {
             this.q = defaultValuesConfig.StaticVarCompensator.q;
             defaultValues += 'q,';
         }

package/dist/model/wires/StaticVarCompensator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"StaticVarCompensator.js","sourceRoot":"","sources":["../../../src/model/wires/StaticVarCompensator.ts"],"names":[],"mappings":";;;AAAA,yDAAoD;AACpD,qDAAgD;~~AAChD~~,~~4CAAqE;AAGrE,~~2DAA4D;AAC5D,qDAAgD;~~AAEhD~~,MAAa,oBAAqB,SAAQ,mCAAgB;IAQxD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,~~6BAAqB~~,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SACxB;IACH,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,wCAAwC,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACjH,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,uCAAuC,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;YAC/G,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,6BAA6B,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3F,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,uCAAuC,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;YAE/G,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,qCAAqC,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1G,~~6BAAqB~~,CAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,SAAS,kBAAkB,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;YACjH,SAAS,CAAC,UAAU,EAAE,CAAC;SAExB;aAAM,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,EAAE;YAC1C,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,yBAAyB,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;SACpF;IACH,CAAC;IAED,gCAAgC,CAAC,mBAAyC;QACxE,IAAI,aAAa,GAAG,KAAK,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAChF,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE;YACvC,IAAI,CAAC,gBAAgB,GAAG,mBAAmB,CAAC,oBAAoB,CAAC,gBAAgB,CAAC;YAClF,aAAa,IAAI,mBAAmB,CAAA;SACrC;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;YACtC,IAAI,CAAC,eAAe,GAAG,mBAAmB,CAAC,oBAAoB,CAAC,eAAe,CAAC;YAChF,aAAa,IAAI,kBAAkB,CAAA;SACpC;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YAC5B,IAAI,CAAC,KAAK,GAAG,mBAAmB,CAAC,oBAAoB,CAAC,KAAK,CAAC;YAC5D,aAAa,IAAI,QAAQ,CAAA;SAC1B;QACD,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACxB,IAAI,CAAC,cAAc,GAAG,+BAAc,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;YAC9F,aAAa,IAAI,iBAAiB,CAAA;SACnC;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;YACtC,IAAI,CAAC,eAAe,GAAG,mBAAmB,CAAC,oBAAoB,CAAC,eAAe,CAAC;YAChF,aAAa,IAAI,kBAAkB,CAAA;SACpC;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YACxB,IAAI,CAAC,CAAC,GAAG,mBAAmB,CAAC,oBAAoB,CAAC,CAAC,CAAC;YACpD,aAAa,IAAI,IAAI,CAAA;SACtB;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;CAEF;AAvED,oDAuEC"}
1	+ {"version":3,"file":"StaticVarCompensator.js","sourceRoot":"","sources":["../../../src/model/wires/StaticVarCompensator.ts"],"names":[],"mappings":"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"}

package/dist/model/wires/Switch.js CHANGED Viewed

@@ -5,6 +5,7 @@ const ConductingEquipment_1 = require("../core/ConductingEquipment");
 const datatype_converter_1 = require("../../util/datatype-converter");
 const utils_1 = require("../../util/utils");
 const rdf_xml_1 = require("../../constants/rdf-xml");
+const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class Switch extends ConductingEquipment_1.ConductingEquipment {
     constructor(uuid, name, shortName, description, open, normalOpen, retained) {
         super(uuid, name, shortName, description);
@@ -126,11 +127,11 @@ class Switch extends ConductingEquipment_1.ConductingEquipment {
     toCIMXMLAttributes(xmlWriter, profile) {
         super.toCIMXMLAttributes(xmlWriter, profile);
         if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:Switch.normalOpen`, this.normalOpen ? this.normalOpen : false);
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:Switch.retained`, this.retained ? this.normalOpen : false);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:Switch.normalOpen`, this.normalOpen ? this.normalOpen : false);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:Switch.retained`, this.retained ? this.normalOpen : false);
         }
         else if (profile === rdf_xml_1.RDF_XML.PROFILE_SSH) {
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:Switch.open`, this.open ? this.normalOpen : false);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:Switch.open`, this.open ? this.normalOpen : false);
         }
     }
 }

package/dist/model/wires/Switch.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Switch.js","sourceRoot":"","sources":["../../../src/model/wires/Switch.ts"],"names":[],"mappings":";;;AAAA,qEAAgE;AAIhE,sEAAwD;AACxD,~~4CAAwD~~;~~AACxD~~,qDAAgD;~~AAOhD~~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~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,oBAAoB,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACjH,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,kBAAkB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;SAC9G;aAAM,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,EAAE;YAC1C,~~oBAAY~~,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;SACtG;IACH,CAAC;;AArNH,wBAsNC;AAjKe,kBAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAgCjC,CAAA"}
1	+ {"version":3,"file":"Switch.js","sourceRoot":"","sources":["../../../src/model/wires/Switch.ts"],"names":[],"mappings":"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"}

package/dist/model/wires/SynchronousMachine.d.ts CHANGED Viewed

@@ -4,6 +4,7 @@ import XMLWriter from 'xml-writer';
 import { TripleData } from '../../interfaces/persistence-interfaces';
 import { SynchronousMachineOperatingMode } from './SynchronousMachineOperatingMode';
 import { IDefaultValuesConfig } from '../../converter/integral7/interface-i7/IDefaultValuesConfig';
+import { SynchronousMachineDynamics } from "../dynamics/standard-models/synchronous-machine-dynamics/SynchronousMachineDynamics";
 export declare class SynchronousMachine extends RotatingMachine {
     type: SynchronousMachineKind;
     referencePriority: number;
@@ -30,6 +31,7 @@ export declare class SynchronousMachine extends RotatingMachine {
     operatingMode: SynchronousMachineOperatingMode;
     initialReactiveCapabilityCurve: ReactiveCapabilityCurve;
     initialReactiveCapabilityCurveUUID: string;
+    synchronousMachineDynamics?: SynchronousMachineDynamics;
     constructor(uuid?: string, name?: string, shortName?: string, description?: string);
     static sparqlQuery: string;
     static getQuerySPARQL(graphURI: string): string;

package/dist/model/wires/SynchronousMachine.js CHANGED Viewed

@@ -7,6 +7,7 @@ const utils_1 = require("../../util/utils");
 const SynchronousMachineOperatingMode_1 = require("./SynchronousMachineOperatingMode");
 const datatype_converter_1 = require("../../util/datatype-converter");
 const utils_2 = require("../../converter/integral7/utils");
+const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class SynchronousMachine extends RotatingMachine_1.RotatingMachine {
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
@@ -89,11 +90,11 @@ class SynchronousMachine extends RotatingMachine_1.RotatingMachine {
         return { oldTriple: '', newTriple: '' };
     }
     toCIMXML(xmlWriter, profile) {
-        if (profile === __1.RDF_XML.PROFILE_EQ) {
+        if (profile === __1.RDF_XML.PROFILE_EQ || profile === __1.RDF_XML.PROFILE_SSH) {
             const suffixID = this.getSuffixID(profile);
             const prefixUUID = this.getPrefixUUID(suffixID);
             xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, __1.RDF_XML.CIM_NS_16);
-            utils_1.writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
+            xml_serializer_1.writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
             this.toCIMXMLAttributes(xmlWriter, profile);
             this.toCIMXMLAssociations(xmlWriter, profile);
             xmlWriter.endElement();
@@ -102,50 +103,46 @@ class SynchronousMachine extends RotatingMachine_1.RotatingMachine {
     toCIMXMLAttributes(xmlWriter, profile) {
         super.toCIMXMLAttributes(xmlWriter, profile);
         if (profile === __1.RDF_XML.PROFILE_EQ) {
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.maxQ`, this.maxQ);
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.minQ`, this.minQ);
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.qPercent`, this.qPercent);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.maxQ`, this.maxQ);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.minQ`, this.minQ);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.qPercent`, this.qPercent);
             xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'SynchronousMachine.type', __1.RDF_XML.CIM_NS_16);
-            utils_1.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.CIM_NS_16}SynchronousMachineKind.${this.type}`);
+            xml_serializer_1.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.CIM_NS_16}SynchronousMachineKind.${this.type}`);
             xmlWriter.endElement();
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.earthing`, this.earthing);
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.earthingStarPointR`, this.earthingStarPointR);
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.earthingStarPointX`, this.earthingStarPointX);
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.ikk`, this.ikk);
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.mu`, this.mu);
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.r0`, this.r0);
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.r2`, this.r2);
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.satDirectSubtransX`, this.satDirectSubtransX);
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.satDirectSyncX`, this.satDirectSyncX);
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.satDirectTransX`, this.satDirectTransX);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.earthing`, this.earthing);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.earthingStarPointR`, this.earthingStarPointR);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.earthingStarPointX`, this.earthingStarPointX);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.ikk`, this.ikk);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.mu`, this.mu);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.r0`, this.r0);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.r2`, this.r2);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.satDirectSubtransX`, this.satDirectSubtransX);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.satDirectSyncX`, this.satDirectSyncX);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.satDirectTransX`, this.satDirectTransX);
             if (this.shortCircuitRotorType) {
                 xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'SynchronousMachine.shortCircuitRotorType', __1.RDF_XML.CIM_NS_16);
-                utils_1.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.CIM_NS_16}ShortCircuitRotorKind.${this.shortCircuitRotorType}`);
+                xml_serializer_1.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.CIM_NS_16}ShortCircuitRotorKind.${this.shortCircuitRotorType}`);
                 xmlWriter.endElement();
             }
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.voltageRegulationRange`, this.voltageRegulationRange);
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.r`, this.r);
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.x0`, this.x0);
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.x2`, this.x2);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.voltageRegulationRange`, this.voltageRegulationRange);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.r`, this.r);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.x0`, this.x0);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.x2`, this.x2);
         }
         else if (profile === __1.RDF_XML.PROFILE_SSH) {
             xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'SynchronousMachine.operatingMode', __1.RDF_XML.CIM_NS_16);
-            utils_1.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.CIM_NS_16}SynchronousMachineOperatingMode.${this.operatingMode}`);
+            xml_serializer_1.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.CIM_NS_16}SynchronousMachineOperatingMode.${this.operatingMode}`);
             xmlWriter.endElement();
-            utils_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.referencePriority`, this.referencePriority);
+            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SynchronousMachine.referencePriority`, this.referencePriority);
         }
     }
     toCIMXMLAssociations(xmlWriter, profile) {
         super.toCIMXMLAssociations(xmlWriter, profile);
         if (profile === __1.RDF_XML.PROFILE_EQ) {
-            if (this.initialReactiveCapabilityCurve) {
-                xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'SynchronousMachine.InitialReactiveCapabilityCurve', __1.RDF_XML.CIM_NS_16);
-                utils_1.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.HASH_UNDERSCORE}${this.initialReactiveCapabilityCurve.mrid}`);
-                xmlWriter.endElement();
-            }
-            else if (this.initialReactiveCapabilityCurveUUID) {
+            this.initialReactiveCapabilityCurveUUID = this.initialReactiveCapabilityCurve ? this.initialReactiveCapabilityCurve.mrid : this.initialReactiveCapabilityCurveUUID;
+            if (this.initialReactiveCapabilityCurveUUID) {
                 xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'SynchronousMachine.InitialReactiveCapabilityCurve', __1.RDF_XML.CIM_NS_16);
-                utils_1.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.HASH_UNDERSCORE}${this.initialReactiveCapabilityCurveUUID}`);
+                xml_serializer_1.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.HASH_UNDERSCORE}${this.initialReactiveCapabilityCurveUUID}`);
                 xmlWriter.endElement();
             }
         }
@@ -193,7 +190,7 @@ class SynchronousMachine extends RotatingMachine_1.RotatingMachine {
             defaultValues += 'referencePriority,';
         }
         if (defaultValues.length)
-            this.description = `[${defaultValues}]`;
+            this.description = `${this.description} [${defaultValues}]`;
         return defaultValues;
     }
 }