@enervance/insight-cim-model 0.0.256 → 0.0.258

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 (104) hide show
  1. package/dist/converter/integral7/converter.integral7.d.ts +4 -1
  2. package/dist/converter/integral7/converter.integral7.js +23 -14
  3. package/dist/converter/integral7/converter.integral7.js.map +1 -1
  4. package/dist/converter/integral7/dl-convert/dl-converter-i7.d.ts +3 -0
  5. package/dist/converter/integral7/dl-convert/dl-converter-i7.js +7 -9
  6. package/dist/converter/integral7/dl-convert/dl-converter-i7.js.map +1 -1
  7. package/dist/converter/integral7/dl-convert/executor.d.ts +31 -3
  8. package/dist/converter/integral7/dl-convert/executor.js +90 -24
  9. package/dist/converter/integral7/dl-convert/executor.js.map +1 -1
  10. package/dist/converter/integral7/interface-i7/data-structures-i7.js.map +1 -1
  11. package/dist/converter/integral7/interface-i7/export-frame-i7.js +1 -0
  12. package/dist/converter/integral7/interface-i7/export-frame-i7.js.map +1 -1
  13. package/dist/converter/integral7/interface-i7/uuid-config.interface.d.ts +0 -1
  14. package/dist/converter/integral7/utils-cgmes-export.js +1 -0
  15. package/dist/converter/integral7/utils-cgmes-export.js.map +1 -1
  16. package/dist/etl/etl-neplan/etl-neplan-csv.js +1 -1
  17. package/dist/etl/etl-neplan/etl-neplan-csv.js.map +1 -1
  18. package/dist/model/common/Location.js +1 -2
  19. package/dist/model/common/Location.js.map +1 -1
  20. package/dist/model/common/PositionPoint.js +1 -2
  21. package/dist/model/common/PositionPoint.js.map +1 -1
  22. package/dist/model/core/BaseVoltage.js +1 -2
  23. package/dist/model/core/BaseVoltage.js.map +1 -1
  24. package/dist/model/core/ConnectivityNode.js +1 -2
  25. package/dist/model/core/ConnectivityNode.js.map +1 -1
  26. package/dist/model/core/IdentifiedObject.js +1 -3
  27. package/dist/model/core/IdentifiedObject.js.map +1 -1
  28. package/dist/model/core/Substation.js +1 -2
  29. package/dist/model/core/Substation.js.map +1 -1
  30. package/dist/model/core/Terminal.js +0 -2
  31. package/dist/model/core/Terminal.js.map +1 -1
  32. package/dist/model/core/VoltageLevel.js +3 -4
  33. package/dist/model/core/VoltageLevel.js.map +1 -1
  34. package/dist/model/diagram/Diagram.js +2 -2
  35. package/dist/model/diagram/Diagram.js.map +1 -1
  36. package/dist/model/equivalents/EquivalentBranch.d.ts +0 -1
  37. package/dist/model/equivalents/EquivalentBranch.js +2 -10
  38. package/dist/model/equivalents/EquivalentBranch.js.map +1 -1
  39. package/dist/model/equivalents/EquivalentInjection.d.ts +0 -4
  40. package/dist/model/equivalents/EquivalentInjection.js +1 -31
  41. package/dist/model/equivalents/EquivalentInjection.js.map +1 -1
  42. package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer2WInfo.js +2 -3
  43. package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer2WInfo.js.map +1 -1
  44. package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer3WInfo.js +0 -3
  45. package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer3WInfo.js.map +1 -1
  46. package/dist/model/extensions/integral/equivalents/INTEGRALEquivalentInjection.js +5 -12
  47. package/dist/model/extensions/integral/equivalents/INTEGRALEquivalentInjection.js.map +1 -1
  48. package/dist/model/extensions/neplan-westnetz/assets/WNFacility.js.map +1 -1
  49. package/dist/model/extensions/neplan-westnetz/core/WNFeeder.js +26 -5
  50. package/dist/model/extensions/neplan-westnetz/core/WNFeeder.js.map +1 -1
  51. package/dist/model/extensions/neplan-westnetz/wires/WNEnergyConsumer.js +12 -2
  52. package/dist/model/extensions/neplan-westnetz/wires/WNEnergyConsumer.js.map +1 -1
  53. package/dist/model/generation/ThermalGeneratingUnit.d.ts +0 -6
  54. package/dist/model/generation/ThermalGeneratingUnit.js +0 -53
  55. package/dist/model/generation/ThermalGeneratingUnit.js.map +1 -1
  56. package/dist/model/operationallimits/CurrentLimit.js +2 -6
  57. package/dist/model/operationallimits/CurrentLimit.js.map +1 -1
  58. package/dist/model/operationallimits/OperationalLimitSet.js +2 -5
  59. package/dist/model/operationallimits/OperationalLimitSet.js.map +1 -1
  60. package/dist/model/operationallimits/OperationalLimitType.js +1 -3
  61. package/dist/model/operationallimits/OperationalLimitType.js.map +1 -1
  62. package/dist/model/wires/ACLineSegment.js +2 -3
  63. package/dist/model/wires/ACLineSegment.js.map +1 -1
  64. package/dist/model/wires/BusbarSection.js +1 -2
  65. package/dist/model/wires/BusbarSection.js.map +1 -1
  66. package/dist/model/wires/ExternalNetworkInjection.js +2 -5
  67. package/dist/model/wires/ExternalNetworkInjection.js.map +1 -1
  68. package/dist/model/wires/GroundDisconnector.d.ts +1 -1
  69. package/dist/model/wires/GroundDisconnector.js +1 -1
  70. package/dist/model/wires/GroundDisconnector.js.map +1 -1
  71. package/dist/model/wires/Line.js +2 -5
  72. package/dist/model/wires/Line.js.map +1 -1
  73. package/dist/model/wires/PowerTransformer.js +0 -2
  74. package/dist/model/wires/PowerTransformer.js.map +1 -1
  75. package/dist/model/wires/PowerTransformerEnd.js +0 -2
  76. package/dist/model/wires/PowerTransformerEnd.js.map +1 -1
  77. package/dist/model/wires/RatioTapChanger.js +1 -1
  78. package/dist/model/wires/RegulatingControl.js +1 -2
  79. package/dist/model/wires/RegulatingControl.js.map +1 -1
  80. package/dist/model/wires/Switch.js +2 -3
  81. package/dist/model/wires/Switch.js.map +1 -1
  82. package/dist/model/wires/SynchronousMachine.js +1 -2
  83. package/dist/model/wires/SynchronousMachine.js.map +1 -1
  84. package/dist/model-container/model/EVModelsContainer.d.ts +0 -6
  85. package/dist/model-container/model/EVModelsContainer.js +2 -19
  86. package/dist/model-container/model/EVModelsContainer.js.map +1 -1
  87. package/dist/model-container/model/ModelContainer.d.ts +4 -1
  88. package/dist/model-container/model/ModelContainer.js +10 -0
  89. package/dist/model-container/model/ModelContainer.js.map +1 -1
  90. package/dist/util/util-topology.js +8 -23
  91. package/dist/util/util-topology.js.map +1 -1
  92. package/dist/utils2/cim.model.utils.js +1 -5
  93. package/dist/utils2/cim.model.utils.js.map +1 -1
  94. package/dist/utils2/common.utils.js +2 -3
  95. package/dist/utils2/common.utils.js.map +1 -1
  96. package/dist/utils2/import.utils.js +2 -0
  97. package/dist/utils2/import.utils.js.map +1 -1
  98. package/dist/utils2/parser.utils.d.ts +1 -0
  99. package/dist/utils2/parser.utils.js +3 -0
  100. package/dist/utils2/parser.utils.js.map +1 -1
  101. package/package.json +1 -1
  102. package/dist/etl/etl-igp/etl-igp.d.ts +0 -2
  103. package/dist/etl/etl-igp/etl-igp.js +0 -7
  104. package/dist/etl/etl-igp/etl-igp.js.map +0 -1
package/dist/model/core/VoltageLevel.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"VoltageLevel.js","sourceRoot":"","sources":["../../../src/model/core/VoltageLevel.ts"],"names":[],"mappings":";;;AAAA,mEAAgE;AAGhE,kEAAoF;AAKpF,qDAAkD;AAClD,4DAAwD;AAExD,MAAa,YAAa,SAAQ,uCAAkB;IAalD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB;QAClG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACnD,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;IACjB,CAAC;IAGM,iBAAiB;QACtB,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC;IAC3E,CAAC;IAEM,cAAc;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAEM,iBAAiB,CAAC,cAAsB;QAC7C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAEM,kBAAkB;QACvB,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,EAAE;YAChC,OAAO,IAAI,CAAC,eAAe,CAAC;SAC7B;aAAM,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,EAAE;YACnC,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;SACnC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAEM,kBAAkB,CAAC,eAAuB;QAC/C,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;IAEM,MAAM,CAAC,GAAQ;QACpB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtB,CAAC;IA2BM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACxE;QACD,OAAO,YAAY,CAAC,WAAW,CAAC;IAClC,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;;QACtE,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC;YACxC,YAAY,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAA;YAC/C,QAAQ,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,aAAa;QACb,IAAI,CAAC,eAAe,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;QACtE,YAAY;QACZ,IAAI,CAAC,cAAc,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;IACtE,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC1C,YAAY;QACZ,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC9D,IAAI,IAAI,CAAC,UAAU;YAAE,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC3D,qHAAqH;QAErH,iBAAiB;QACjB,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACvE,yIAAyI;IAC3I,CAAC;IAGM,MAAM;QACX,KAAK,CAAC,MAAM,EAAE,CAAC;QACf,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAEM,gBAAgB;QACrB,KAAK,CAAC,gBAAgB,EAAE,CAAC;IAC3B,CAAC;IAEM,kBAAkB;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC;QAC3F,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC;IACjG,CAAC;IAEM,sBAAsB;QAC3B,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC;SAC9C;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAChD,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,IAAA,sCAAqB,EAAC,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;aAAM,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YAC5C,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,cAAc,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YACnF,IAAA,sCAAqB,EAAC,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,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,gCAAgC,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACzG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,+BAA+B,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;SACxG;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,UAAU,EAAE;gBACnB,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,yBAAyB,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC9F,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;gBACzG,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM,IAAI,IAAI,CAAC,cAAc,EAAE;gBAC9B,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,yBAAyB,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC9F,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;gBACxG,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,SAAS,CAAC,YAAY,CAAC,2BAA2B,CAAC,CAAC;aACrD;YACD,IAAI,IAAI,CAAC,WAAW,EAAE;gBACpB,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,0BAA0B,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC/F,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC1G,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM,IAAI,IAAI,CAAC,eAAe,EAAE;gBAC7B,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,0BAA0B,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC/F,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;gBACzG,SAAS,CAAC,UAAU,EAAE,CAAC;aAC1B;iBAAM;gBACL,SAAS,CAAC,YAAY,CAAC,4BAA4B,CAAC,CAAC;aACtD;SACF;IACH,CAAC;IAEM,aAAa;QAClB,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;;AAhMH,oCAkMC;AAlJe,wBAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;KAuBjC,CAAA"}
1
+ {"version":3,"file":"VoltageLevel.js","sourceRoot":"","sources":["../../../src/model/core/VoltageLevel.ts"],"names":[],"mappings":"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"}
package/dist/model/diagram/Diagram.js CHANGED
@@ -62,8 +62,8 @@ class Diagram extends IdentifiedObject_1.IdentifiedObject {
62
62
  for (const diagramElement of this.diagramElements) {
63
63
  diagramElement.toCIMXML(xmlWriter, profile);
64
64
  }
65
- //DiagramStyle
66
- this.diagramStyle.toCIMXML(xmlWriter, profile);
65
+ // DiagramStyle
66
+ // this.diagramStyle.toCIMXML(xmlWriter, profile);
67
67
  }
68
68
  }
69
69
  toCIMXMLAttributes(xmlWriter, profile) {
package/dist/model/diagram/Diagram.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Diagram.js","sourceRoot":"","sources":["../../../src/model/diagram/Diagram.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Diagram.js","sourceRoot":"","sources":["../../../src/model/diagram/Diagram.ts"],"names":[],"mappings":";;;AAAA,+DAA0D;AAI1D,qDAAgD;AAGhD,kEAAsE;AAEtE,MAAa,OAAQ,SAAQ,mCAAgB;IAWzC,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB;QAChG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAHvD,oBAAe,GAAoB,EAAE,CAAC;IAItC,CAAC;IAEM,gBAAgB,CAAC,aAA4B;QAChD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC7C,CAAC;IAEM,kBAAkB;QACrB,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IAyBM,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACrE;QACD,OAAO,OAAO,CAAC,WAAW,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;;QACpE,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC5C,MAAM,QAAQ,GAAG,IAAI,OAAO,EAAE,CAAC;YAC/B,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,2BAA2B,CAAC,KAAU;QACzC,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACrD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAEM,MAAM;QACT,KAAK,CAAC,MAAM,EAAE,CAAC;QACf,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAEM,gBAAgB;QACnB,KAAK,CAAC,gBAAgB,EAAE,CAAC;IAC7B,CAAC;IAEM,kBAAkB;QACrB,KAAK,CAAC,kBAAkB,EAAE,CAAC;IAC/B,CAAC;IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACjD,IAAG,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAC/B,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,MAAM,EAAE,GAAG,iBAAO,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACtF,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;YAEnC;;2BAEe;YACH,kBAAkB;YAClB,KAAK,MAAM,cAAc,IAAI,IAAI,CAAC,eAAe,EAAC;gBAC9C,cAAc,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;aAC/C;YAED,eAAe;YACf,kDAAkD;SACrD;IACL,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAC9D,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAG,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAC/B,uHAAuH;YACvH,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,cAAc,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC3G,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,SAAS,mBAAmB,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YAC/G,SAAS,CAAC,UAAU,EAAE,CAAC;SAC1B;IACL,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAG,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAC/B,wFAAwF;YACxF,IAAG,IAAI,CAAC,YAAY,EAAE;gBAClB,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,eAAe,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC5G,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC3G,SAAS,CAAC,UAAU,EAAE,CAAC;aAC1B;iBAAM;gBACH,SAAS,CAAC,YAAY,CAAC,qCAAqC,CAAC,CAAC;aACjE;SACJ;IACL,CAAC;;AAhIL,0BAiIC;AAzGiB,mBAAW,GAAW;;;;;;;;;;;;;;;;;;;;KAoBnC,CAAA"}
package/dist/model/equivalents/EquivalentBranch.d.ts CHANGED
@@ -40,5 +40,4 @@ export declare class EquivalentBranch extends EquivalentEquipment {
40
40
  * Trust the convertErsatzlaengszweige() method to set the correct values, because impedances or not mandatory in every case.
41
41
  * */
42
42
  validateMandatoryAttributesCGMES(defaultValuesConfig: DefaultValuesConfigInterface): string;
43
- breadthFirstSearch(networkElements: any[]): void;
44
43
  }
package/dist/model/equivalents/EquivalentBranch.js CHANGED
@@ -125,12 +125,6 @@ class EquivalentBranch extends EquivalentEquipment_1.EquivalentEquipment {
125
125
  let defaultValues = super.validateMandatoryAttributesCGMES(defaultValuesConfig);
126
126
  return defaultValues;
127
127
  }
128
- breadthFirstSearch(networkElements) {
129
- if (!this.visited) {
130
- this.addNetworkElement(networkElements);
131
- super.breadthFirstSearch(networkElements);
132
- }
133
- }
134
128
  }
135
129
  exports.EquivalentBranch = EquivalentBranch;
136
130
  EquivalentBranch.sparqlQuery = `
@@ -141,13 +135,12 @@ EquivalentBranch.sparqlQuery = `
141
135
  PREFIX amp: <http://amprion.net/CIM/Extensions#>
142
136
  PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
143
137
  PREFIX afn: <http://jena.apache.org/ARQ/function#>
144
- PREFIX fgh: <http://fgh-ma.de/Integral/ProfileExtension/1#>
145
-
138
+
146
139
  SELECT (strafter(strafter(str(?equivalentBranchUUID), '#'), '_') AS ?uuid)
147
140
  (CONCAT(STRBEFORE(STR(?equivalentBranchUUID), '#_'), '#_') AS ?baseIRI)
148
141
  ?name ?shortName ?description
149
142
  ?negativeR12 ?negativeR21 ?negativeX12 ?negativeX21 ?positiveR12 ?positiveR21
150
- ?positiveX12 ?positiveX21 ?r ?x ?r21 ?x21 ?zeroR12 ?zeroR21 ?zeroX12 ?zeroX21 ?key
143
+ ?positiveX12 ?positiveX21 ?r ?x ?r21 ?x21 ?zeroR12 ?zeroR21 ?zeroX12 ?zeroX21
151
144
  (strafter(strafter(str(?bvUUID), '#'), '_') AS ?baseVoltageUUID)
152
145
  WHERE {
153
146
  GRAPH <http://default/>{
@@ -174,7 +167,6 @@ EquivalentBranch.sparqlQuery = `
174
167
  OPTIONAL {?equivalentBranchUUID cim:EquivalentBranch.zeroR21 ?zeroR21 .}
175
168
  OPTIONAL {?equivalentBranchUUID cim:EquivalentBranch.zeroX12 ?zeroX12 .}
176
169
  OPTIONAL {?equivalentBranchUUID cim:EquivalentBranch.zeroX21 ?zeroX21 .}
177
- OPTIONAL {?equivalentBranchUUID fgh:IdentifiedObject.key ?key .}
178
170
 
179
171
  OPTIONAL {?equivalentBranchUUID cim:ConductingEquipment.BaseVoltage ?bvUUID .}
180
172
  }
package/dist/model/equivalents/EquivalentBranch.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EquivalentBranch.js","sourceRoot":"","sources":["../../../src/model/equivalents/EquivalentBranch.ts"],"names":[],"mappings":";;;AAAA,+DAA4D;AAC5D,6BAAgF;AAChF,4DAAwD;AACxD,kEAAoF;AAIpF,MAAa,gBAAiB,SAAQ,yCAAmB;IAqBvD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,MAAe,EAAE,SAAmB;QACtH,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAED,uBAAuB;IAChB,yBAAyB,CAAC,SAA8B;QAC7D,OAAO;IACT,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;;QACtE,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAC;YAChD,gBAAgB,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YACpD,QAAQ,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QAEzC,IAAI,CAAC,WAAW,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QAC/D,IAAI,CAAC,WAAW,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QAC/D,IAAI,CAAC,WAAW,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QAC/D,IAAI,CAAC,WAAW,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QAE/D,IAAI,CAAC,WAAW,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QAC/D,IAAI,CAAC,WAAW,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QAC/D,IAAI,CAAC,WAAW,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QAC/D,IAAI,CAAC,WAAW,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QAE/D,IAAI,CAAC,CAAC,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC3C,IAAI,CAAC,GAAG,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC/C,IAAI,CAAC,CAAC,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC3C,IAAI,CAAC,GAAG,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACvD,IAAI,CAAC,OAAO,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACvD,IAAI,CAAC,OAAO,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACvD,IAAI,CAAC,OAAO,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACzD,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAEM,MAAM;QACX,KAAK,CAAC,MAAM,EAAE,CAAC;QACf,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAEM,gBAAgB;QACrB,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;QAE5C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;QAE5C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC;QAC5B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC;QAE5B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;QACpC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;QACpC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;QACpC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;IAEtC,CAAC;IAEM,kBAAkB;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,WAAW;YAClB,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IACzD,CAAC;IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QAEnD,IAAI,OAAO,KAAK,WAAO,CAAC,UAAU,IAAI,OAAO,KAAK,WAAO,CAAC,aAAa,EAAE;YACvE,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,WAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,WAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,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,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,+BAA+B,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YACnG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,+BAA+B,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YACnG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,+BAA+B,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YACnG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,+BAA+B,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAEnG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,+BAA+B,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YACnG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,+BAA+B,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YACnG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,+BAA+B,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YACnG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,+BAA+B,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAEnG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,qBAAqB,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YAC/E,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,uBAAuB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YACnF,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,qBAAqB,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YAC/E,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,uBAAuB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YAEnF,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,2BAA2B,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3F,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,2BAA2B,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3F,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,2BAA2B,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3F,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,2BAA2B,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;SAE5F;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC5E;QACD,OAAO,gBAAgB,CAAC,WAAW,CAAC;IACtC,CAAC;IAmDD;;;;;SAKK;IACL,gCAAgC,CAAC,mBAAiD;QAChF,IAAI,aAAa,GAAG,KAAK,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAChF,OAAO,aAAa,CAAC;IACvB,CAAC;IAEM,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;;AA1NH,4CA2NC;AAlEe,4BAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA8CrB,CAAA"}
1
+ {"version":3,"file":"EquivalentBranch.js","sourceRoot":"","sources":["../../../src/model/equivalents/EquivalentBranch.ts"],"names":[],"mappings":"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"}
package/dist/model/equivalents/EquivalentInjection.d.ts CHANGED
@@ -34,8 +34,4 @@ export declare class EquivalentInjection extends EquivalentEquipment {
34
34
  protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string): void;
35
35
  validateMandatoryAttributesCGMES(defaultValuesConfig: DefaultValuesConfigInterface): string;
36
36
  breadthFirstSearch(networkElements: any[]): void;
37
- getApparentPower(): number;
38
- getCosPhi(): number;
39
- getP(): number;
40
- getQ(): number;
41
37
  }
package/dist/model/equivalents/EquivalentInjection.js CHANGED
@@ -154,35 +154,6 @@ class EquivalentInjection extends EquivalentEquipment_1.EquivalentEquipment {
154
154
  super.breadthFirstSearch(networkElements);
155
155
  }
156
156
  }
157
- getApparentPower() {
158
- const pNew = this.getP();
159
- const qNew = this.getQ();
160
- const apparentPower = Math.sqrt(Math.pow(pNew, 2) + Math.pow(qNew, 2));
161
- return isNaN(apparentPower) ? 0 : apparentPower;
162
- }
163
- getCosPhi() {
164
- const pNew = this.getP();
165
- const qNew = this.getQ();
166
- const apparentPower = Math.sqrt(Math.pow(pNew, 2) + Math.pow(qNew, 2));
167
- if (apparentPower === 0) {
168
- return 1;
169
- }
170
- else if (qNew === 0) {
171
- return 1;
172
- }
173
- else if (apparentPower !== 0 && pNew) {
174
- return pNew / apparentPower;
175
- }
176
- else {
177
- return 1;
178
- }
179
- }
180
- getP() {
181
- return isNaN(this.p) ? 0 : this.p;
182
- }
183
- getQ() {
184
- return isNaN(this.q) ? 0 : this.q;
185
- }
186
157
  }
187
158
  exports.EquivalentInjection = EquivalentInjection;
188
159
  EquivalentInjection.sparqlQuery = `
@@ -197,7 +168,7 @@ EquivalentInjection.sparqlQuery = `
197
168
  SELECT (strafter(strafter(str(?mrid), '#'), '_') AS ?uuid)
198
169
  (CONCAT(STRBEFORE(str(?mrid), '#_'), '#_') AS ?baseIRI)
199
170
  (strafter(strafter(str(?ptUUID), '#'), '_') AS ?psrTypeUUID)
200
- ?mrid ?name ?shortName ?description ?aggregate
171
+ ?name ?shortName ?description ?aggregate
201
172
  ?maxP ?maxQ ?minP ?minQ ?p ?q
202
173
  ?r ?r0 ?r2 ?x ?x0 ?x2 ?regulationCapability
203
174
  ?regulationStatus ?regulationTarget
@@ -206,7 +177,6 @@ EquivalentInjection.sparqlQuery = `
206
177
  WHERE {
207
178
  GRAPH <http://default/>{
208
179
  ?mrid rdf:type cim:EquivalentInjection .
209
- OPTIONAL{?mrid cim:IdentifiedObject.mrid ?mrid .}
210
180
  OPTIONAL{?mrid cim:IdentifiedObject.name ?name .}
211
181
  OPTIONAL{?mrid entsoe:IdentifiedObject.shortName ?shortName .}
212
182
  OPTIONAL{?mrid cim:IdentifiedObject.description ?description .}
package/dist/model/equivalents/EquivalentInjection.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EquivalentInjection.js","sourceRoot":"","sources":["../../../src/model/equivalents/EquivalentInjection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"EquivalentInjection.js","sourceRoot":"","sources":["../../../src/model/equivalents/EquivalentInjection.ts"],"names":[],"mappings":"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"}
package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer2WInfo.js CHANGED
@@ -72,6 +72,8 @@ class INTEGRALPowerTransformer2WInfo extends INTEGRALPowerTransformerInfo_1.INTE
72
72
  this.x = +parser_utils_1.ParserUtils.getValue(value, 'x');
73
73
  this.b = +parser_utils_1.ParserUtils.getValue(value, 'b');
74
74
  this.g = +parser_utils_1.ParserUtils.getValue(value, 'g');
75
+ this.vkr = +parser_utils_1.ParserUtils.getValue(value, 'vkr');
76
+ this.vk = +parser_utils_1.ParserUtils.getValue(value, 'vk');
75
77
  this.pfe = +parser_utils_1.ParserUtils.getValue(value, 'pfe');
76
78
  this.i0 = +parser_utils_1.ParserUtils.getValue(value, 'i0');
77
79
  }
@@ -87,9 +89,6 @@ class INTEGRALPowerTransformer2WInfo extends INTEGRALPowerTransformerInfo_1.INTE
87
89
  this.json['s'] = this.getSr();
88
90
  this.json['ukr'] = this.ukr;
89
91
  this.json['pkr'] = this.pkr;
90
- this.json['pLeer'] = this.pLeer;
91
- this.json['iLeer'] = this.iLeer;
92
- this.json['schaltgruppe'] = this.schaltgruppe;
93
92
  }
94
93
  toJSONAssociations() {
95
94
  super.toJSONAssociations();
package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer2WInfo.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"INTEGRALPowerTransformer2WInfo.js","sourceRoot":"","sources":["../../../../../src/model/extensions/integral/assetinfo/INTEGRALPowerTransformer2WInfo.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"INTEGRALPowerTransformer2WInfo.js","sourceRoot":"","sources":["../../../../../src/model/extensions/integral/assetinfo/INTEGRALPowerTransformer2WInfo.ts"],"names":[],"mappings":"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"}
package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer3WInfo.js CHANGED
@@ -91,9 +91,6 @@ class INTEGRALPowerTransformer3WInfo extends INTEGRALPowerTransformerInfo_1.INTE
91
91
  this.json['pkr12'] = this.pkr12;
92
92
  this.json['pkr13'] = this.pkr13;
93
93
  this.json['pkr23'] = this.pkr23;
94
- this.json['pLeer'] = this.pLeer;
95
- this.json['iLeer'] = this.iLeer;
96
- this.json['schaltgruppe'] = this.schaltgruppe;
97
94
  }
98
95
  toJSONAssociations() {
99
96
  super.toJSONAssociations();
package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer3WInfo.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"INTEGRALPowerTransformer3WInfo.js","sourceRoot":"","sources":["../../../../../src/model/extensions/integral/assetinfo/INTEGRALPowerTransformer3WInfo.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"INTEGRALPowerTransformer3WInfo.js","sourceRoot":"","sources":["../../../../../src/model/extensions/integral/assetinfo/INTEGRALPowerTransformer3WInfo.ts"],"names":[],"mappings":"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"}
package/dist/model/extensions/integral/equivalents/INTEGRALEquivalentInjection.js CHANGED
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.INTEGRALEquivalentInjection = void 0;
4
4
  const rdf_xml_1 = require("../../../../constants/rdf-xml.js");
5
5
  const xml_serializer_1 = require("../../../../util/xml/xml.serializer.js");
6
+ const xml_serializer_2 = require("../../../../util/xml/xml.serializer.js");
6
7
  const EquivalentInjection_1 = require("../../../equivalents/EquivalentInjection.js");
7
8
  const parser_utils_1 = require("../../../../utils2/parser.utils.js");
8
9
  class INTEGRALEquivalentInjection extends EquivalentInjection_1.EquivalentInjection {
@@ -21,7 +22,7 @@ class INTEGRALEquivalentInjection extends EquivalentInjection_1.EquivalentInject
21
22
  const suffixID = this.getSuffixID(profile);
22
23
  const prefixUUID = this.getPrefixUUID(suffixID);
23
24
  xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'EquivalentInjection', rdf_xml_1.RDF_XML.CIM_NS_16);
24
- (0, xml_serializer_1.writeElementAttribute)(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
25
+ (0, xml_serializer_2.writeElementAttribute)(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
25
26
  this.toCIMXMLAttributes(xmlWriter, profile);
26
27
  this.toCIMXMLAssociations(xmlWriter, profile);
27
28
  xmlWriter.endElement();
@@ -60,8 +61,6 @@ class INTEGRALEquivalentInjection extends EquivalentInjection_1.EquivalentInject
60
61
  this.p_ki = +parser_utils_1.ParserUtils.getValue(value, 'p_ki');
61
62
  this.q_ki = +parser_utils_1.ParserUtils.getValue(value, 'q_ki');
62
63
  this.kr = +parser_utils_1.ParserUtils.getValue(value, 'kr');
63
- this.rExt = +parser_utils_1.ParserUtils.getValue(value, 'rExt');
64
- this.xExt = +parser_utils_1.ParserUtils.getValue(value, 'xExt');
65
64
  }
66
65
  }
67
66
  exports.INTEGRALEquivalentInjection = INTEGRALEquivalentInjection;
@@ -73,8 +72,7 @@ INTEGRALEquivalentInjection.sparqlQuery = `
73
72
  PREFIX amp: <http://amprion.net/CIM/Extensions#>
74
73
  PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
75
74
  PREFIX afn: <http://jena.apache.org/ARQ/function#>
76
- PREFIX fgh: <http://fgh-ma.de/Integral/ProfileExtension/1#>
77
-
75
+
78
76
  SELECT (strafter(strafter(str(?mrid), '#'), '_') AS ?uuid)
79
77
  (CONCAT(STRBEFORE(str(?mrid), '#_'), '#_') AS ?baseIRI)
80
78
  (strafter(strafter(str(?ptUUID), '#'), '_') AS ?psrTypeUUID)
@@ -82,7 +80,7 @@ INTEGRALEquivalentInjection.sparqlQuery = `
82
80
  ?maxP ?maxQ ?minP ?minQ ?p ?q
83
81
  ?r ?r0 ?r2 ?x ?x0 ?x2 ?regulationCapability
84
82
  ?regulationStatus ?regulationTarget
85
- ?kr ?rExt ?xExt ?p_ein ?q_ein ?p_bel ?q_bel ?p_ki ?q_ki ?key
83
+ ?kr ?p_ein ?q_ein ?p_bel ?q_bel ?p_ki ?q_ki
86
84
  (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID)
87
85
 
88
86
  WHERE {
@@ -113,9 +111,6 @@ INTEGRALEquivalentInjection.sparqlQuery = `
113
111
 
114
112
  OPTIONAL{?mrid amp:EquivalentInjection.kr ?kr .}
115
113
 
116
- OPTIONAL{?mrid amp:EquivalentInjection.rExt ?rExt .}
117
- OPTIONAL{?mrid amp:EquivalentInjection.xExt ?xExt .}
118
-
119
114
  OPTIONAL{?mrid amp:EquivalentInjection.p_ein ?p_ein .}
120
115
  OPTIONAL{?mrid amp:EquivalentInjection.q_ein ?q_ein .}
121
116
 
@@ -125,11 +120,9 @@ INTEGRALEquivalentInjection.sparqlQuery = `
125
120
  OPTIONAL{?mrid amp:EquivalentInjection.p_ki ?p_ki .}
126
121
  OPTIONAL{?mrid amp:EquivalentInjection.q_ki ?q_ki .}
127
122
 
128
- OPTIONAL{?mrid fgh:IdentifiedObject.key ?key .}
129
-
130
123
  OPTIONAL{?mrid cim:EquivalentInjection.regulationStatus ?regulationStatus .}
131
124
  OPTIONAL{?mrid cim:EquivalentInjection.regulationTarget ?regulationTarget .}
132
- OPTIONAL{?mrid cim:PowerSystemResource.PSRType ?ptUUID .}
125
+ OPTIONAL{?esUUID cim:PowerSystemResource.PSRType ?ptUUID .}
133
126
  OPTIONAL{?mrid cim:Equipment.EquipmentContainer ?ecUUID .}
134
127
  }
135
128
  }
package/dist/model/extensions/integral/equivalents/INTEGRALEquivalentInjection.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"INTEGRALEquivalentInjection.js","sourceRoot":"","sources":["../../../../../src/model/extensions/integral/equivalents/INTEGRALEquivalentInjection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"INTEGRALEquivalentInjection.js","sourceRoot":"","sources":["../../../../../src/model/extensions/integral/equivalents/INTEGRALEquivalentInjection.ts"],"names":[],"mappings":"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"}
package/dist/model/extensions/neplan-westnetz/assets/WNFacility.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"WNFacility.js","sourceRoot":"","sources":["../../../../../src/model/extensions/neplan-westnetz/assets/WNFacility.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"WNFacility.js","sourceRoot":"","sources":["../../../../../src/model/extensions/neplan-westnetz/assets/WNFacility.ts"],"names":[],"mappings":"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"}
package/dist/model/extensions/neplan-westnetz/core/WNFeeder.js CHANGED
@@ -145,9 +145,18 @@ class WNFeeder extends Feeder_1.Feeder {
145
145
  resolveAttributesFusekiJSON(value) {
146
146
  super.resolveAttributesFusekiJSON(value);
147
147
  this.number = parser_utils_1.ParserUtils.getValue(value, 'number');
148
- this.current = +parser_utils_1.ParserUtils.getValue(value, 'current');
149
- this.p = +parser_utils_1.ParserUtils.getValue(value, 'p');
150
- this.q = +parser_utils_1.ParserUtils.getValue(value, 'q');
148
+ if (parser_utils_1.ParserUtils.isBlankNode(value['current']))
149
+ this.current = +parser_utils_1.ParserUtils.getValue(value, 'current_value');
150
+ else
151
+ this.current = +parser_utils_1.ParserUtils.getValue(value, 'current');
152
+ if (parser_utils_1.ParserUtils.isBlankNode(value['p']))
153
+ this.p = +parser_utils_1.ParserUtils.getValue(value, 'p_value');
154
+ else
155
+ this.p = +parser_utils_1.ParserUtils.getValue(value, 'p');
156
+ if (parser_utils_1.ParserUtils.isBlankNode(value['q']))
157
+ this.q = +parser_utils_1.ParserUtils.getValue(value, 'q_value');
158
+ else
159
+ this.q = +parser_utils_1.ParserUtils.getValue(value, 'q');
151
160
  }
152
161
  /** Initialisiert Assoziationen aus geparsten Daten
153
162
  * Fuseki und XML Daten */
@@ -190,7 +199,16 @@ WNFeeder.sparqlQuery = `
190
199
 
191
200
  SELECT (strafter(strafter(str(?fUUID), "#"), "_") AS ?uuid)
192
201
  (CONCAT(STRBEFORE(str(?fUUID), '#_'), '#_') AS ?baseIRI)
193
- ?name ?shortName ?description ?number ?current ?p ?q
202
+ ?name
203
+ ?shortName
204
+ ?description
205
+ ?number
206
+ ?current
207
+ ?current_value
208
+ ?p
209
+ ?p_value
210
+ ?q
211
+ ?q_value
194
212
  (STRAFTER(str(?negsUUID), '#_') AS ?normalEnergizingSubstationUUID)
195
213
  (group_concat(STRAFTER(str(?nedsUUIDs), '#_');separator=',') as ?energizedSubstationUUIDs)
196
214
  WHERE {
@@ -202,12 +220,15 @@ WNFeeder.sparqlQuery = `
202
220
  OPTIONAL{?fUUID cim:IdentifiedObject.description ?description .}
203
221
  OPTIONAL{?fUUID westnetzneplan:WNFeeder.number ?number .}
204
222
  OPTIONAL{?fUUID westnetzneplan:WNFeeder.current ?current .}
223
+ OPTIONAL{?fUUID westnetzneplan:WNFeeder.current [ cim:CurrentFlow.value ?current_value ] } .
205
224
  OPTIONAL{?fUUID westnetzneplan:WNFeeder.p ?p .}
225
+ OPTIONAL{?fUUID westnetzneplan:WNFeeder.p [ cim:ActivePower.value ?p_value ] } .
206
226
  OPTIONAL{?fUUID westnetzneplan:WNFeeder.q ?q .}
227
+ OPTIONAL{?fUUID westnetzneplan:WNFeeder.q [ cim:ReactivePower.value ?q_value ] } .
207
228
  OPTIONAL{?fUUID cim:Feeder.NormalEnergizingSubstation ?negsUUID .}
208
229
  OPTIONAL{?fUUID cim:Feeder.NormalEnergizedSubstation ?nedsUUIDs . }
209
230
  }
210
231
  }
211
- GROUP BY ?fUUID ?baseIRI ?name ?shortName ?description ?number ?current ?p ?q ?negsUUID
232
+ GROUP BY ?fUUID ?baseIRI ?name ?shortName ?description ?number ?current ?current_multiplier ?current_unit ?current_value ?p ?p_value ?q ?q_value ?negsUUID
212
233
  `;
213
234
  //# sourceMappingURL=WNFeeder.js.map
package/dist/model/extensions/neplan-westnetz/core/WNFeeder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"WNFeeder.js","sourceRoot":"","sources":["../../../../../src/model/extensions/neplan-westnetz/core/WNFeeder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"WNFeeder.js","sourceRoot":"","sources":["../../../../../src/model/extensions/neplan-westnetz/core/WNFeeder.ts"],"names":[],"mappings":"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"}
package/dist/model/extensions/neplan-westnetz/wires/WNEnergyConsumer.js CHANGED
@@ -131,8 +131,14 @@ class WNEnergyConsumer extends EnergyConsumer_1.EnergyConsumer {
131
131
  this.powerTransfomer3Q = +(0, parser_utils_1.getNumberValue)(value, 'powerTransfomer3Q');
132
132
  this.powerTransfomer4P = +(0, parser_utils_1.getNumberValue)(value, 'powerTransfomer4P');
133
133
  this.powerTransfomer4Q = +(0, parser_utils_1.getNumberValue)(value, 'powerTransfomer4Q');
134
- this.feederScaledP = +(0, parser_utils_1.getNumberValue)(value, 'feederScaledP');
135
- this.feederScaledQ = +(0, parser_utils_1.getNumberValue)(value, 'feederScaledQ');
134
+ if (parser_utils_1.ParserUtils.isBlankNode(value['feederScaledP']))
135
+ this.feederScaledP = +parser_utils_1.ParserUtils.getValue(value, 'feederScaledP_value');
136
+ else
137
+ this.feederScaledP = +(0, parser_utils_1.getNumberValue)(value, 'feederScaledP_value');
138
+ if (parser_utils_1.ParserUtils.isBlankNode(value['feederScaledQ']))
139
+ this.feederScaledQ = +parser_utils_1.ParserUtils.getValue(value, 'feederScaledQ_value');
140
+ else
141
+ this.feederScaledQ = +(0, parser_utils_1.getNumberValue)(value, 'feederScaledQ_value');
136
142
  this.igpP = +(0, parser_utils_1.getNumberValue)(value, 'igpP');
137
143
  this.igpQ = +(0, parser_utils_1.getNumberValue)(value, 'igpQ');
138
144
  this.selectedLoad = parser_utils_1.ParserUtils.getValue(value, 'selectedLoad');
@@ -421,6 +427,7 @@ WNEnergyConsumer.sparqlQuery = `
421
427
  ?powerTransfomer3P ?powerTransfomer3Q
422
428
  ?powerTransfomer4P ?powerTransfomer4Q
423
429
  ?feederScaledP ?feederScaledQ
430
+ ?feederScaledP_value ?feederScaledQ_value
424
431
  ?igpP ?igpQ
425
432
  ?selectedLoad ?cosPhi ?customMultiplier
426
433
  (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID)
@@ -463,7 +470,9 @@ WNEnergyConsumer.sparqlQuery = `
463
470
  OPTIONAL{?econUUID westnetzneplan:WNEnergyConsumer.powerTransfomer4Q ?powerTransfomer4Q .}
464
471
 
465
472
  OPTIONAL{?econUUID westnetzneplan:WNEnergyConsumer.feederScaledP ?feederScaledP .}
473
+ OPTIONAL{?econUUID westnetzneplan:WNEnergyConsumer.feederScaledP [ cim:ActivePower.value ?feederScaledP_value ] } .
466
474
  OPTIONAL{?econUUID westnetzneplan:WNEnergyConsumer.feederScaledQ ?feederScaledQ .}
475
+ OPTIONAL{?econUUID westnetzneplan:WNEnergyConsumer.feederScaledQ [ cim:ReactivePower.value ?feederScaledQ_value ] } .
467
476
 
468
477
  OPTIONAL{?econUUID westnetzneplan:WNEnergyConsumer.selectedLoad ?selectedLoad .}
469
478
 
@@ -489,6 +498,7 @@ WNEnergyConsumer.sparqlQuery = `
489
498
  ?powerTransfomer3P ?powerTransfomer3Q
490
499
  ?powerTransfomer4P ?powerTransfomer4Q
491
500
  ?feederScaledP ?feederScaledQ
501
+ ?feederScaledP_value ?feederScaledQ_value
492
502
  ?selectedLoad ?cosPhi ?customMultiplier
493
503
  ?ecUUID ?ptUUID
494
504
  `;