Task #193 Code review.

virtualsatellite · Mar 6, 2024 · 8ef23fc · 8ef23fc
1 parent 5d4cc03
commit 8ef23fc
Show file tree

Hide file tree

Showing 12 changed files with 498 additions and 76 deletions.
diff --git a/...ef.ui/src/de/dlr/sc/virsat/model/extension/cef/ui/templates/DLRCEFStudyCommandHelper.java b/...ef.ui/src/de/dlr/sc/virsat/model/extension/cef/ui/templates/DLRCEFStudyCommandHelper.java
@@ -42,14 +42,14 @@
  */
 public class DLRCEFStudyCommandHelper {
 
- public static final String POWER_PARAMETERS = "powerParameters";
- public static final String MASS_PARAMETERS = "massParameters";
- public static final String SYSTEM_PARAMETERS = "systemParameters";
+ public static final String POWER_PARAMETERS = "PowerParameters";
+ public static final String MASS_PARAMETERS = "MassParameters";
+ public static final String SYSTEM_PARAMETERS = "SystemParameters";
  public static final String EQUIPMENT_MASS_PARAMETERS = "EquipmentMassParameters";
- public static final String TEMPERATURE_PARAMETERS = "temperatureParameters";
- public static final String SYSTEM = "System";
- public static final String SUB_SYSTEM = "subSystem";
- public static final String EQUIPMENT = "equipment";
+ public static final String TEMPERATURE_PARAMETERS = "TemperatureParameters";
+ public static final String SYSTEM_NAME = "System";
+ public static final String SUB_SYSTEM_NAME = "SubSystem";
+ public static final String EQUIPMENT_NAME = "Equipment";
 
  /**
  * private Constructor
@@ -74,7 +74,7 @@ public static Concept getCefConcept(VirSatTransactionalEditingDomain domain) {
  */
  public static System createSystemBean(Concept concept) {
  System system = new System(concept);
- system.setName(SYSTEM);
+ system.setName(SYSTEM_NAME);
  return system;
  }
 
@@ -84,7 +84,7 @@ public static System createSystemBean(Concept concept) {
  */
  public static SubSystem createSubSystemBean(Concept concept) {
  SubSystem subSystem = new SubSystem(concept);
- subSystem.setName(SUB_SYSTEM);
+ subSystem.setName(SUB_SYSTEM_NAME);
  return subSystem;
  }
 
@@ -94,7 +94,7 @@ public static SubSystem createSubSystemBean(Concept concept) {
  */
  public static Equipment createEquipmentBean(Concept concept) {
  Equipment equipment = new Equipment(concept);
- equipment.setName(EQUIPMENT);
+ equipment.setName(EQUIPMENT_NAME);
  return equipment;
  }
 

diff --git a/...c.virsat.model.extension.cef/src-gen/de/dlr/sc/virsat/model/extension/cef/ManifestMf.java b/...c.virsat.model.extension.cef/src-gen/de/dlr/sc/virsat/model/extension/cef/ManifestMf.java
diff --git a/...on.cefx.test/src-gen/de/dlr/sc/virsat/model/extension/cefx/migrator/AMigrator1v2Test.java b/...on.cefx.test/src-gen/de/dlr/sc/virsat/model/extension/cefx/migrator/AMigrator1v2Test.java
diff --git a/...tension.cefx.test/src/de/dlr/sc/virsat/model/extension/cefx/migrator/Migrator1v2Test.java b/...tension.cefx.test/src/de/dlr/sc/virsat/model/extension/cefx/migrator/Migrator1v2Test.java
@@ -0,0 +1 @@
+
diff --git a/de.dlr.sc.virsat.model.extension.cefx/concept/concept.concept b/de.dlr.sc.virsat.model.extension.cefx/concept/concept.concept
@@ -9,9 +9,9 @@
  *******************************************************************************/
 Concept de.dlr.sc.virsat.model.extension.cefx 
  displayname "CEF-Extended" 
- version 1.1 
+ version 1.2 
  description "VirSat DLR CEF Concept for extended Product Structures"
- beta {
+ {
 
  Import de.dlr.sc.virsat.model.extension.ps.*; 
 
@@ -107,7 +107,7 @@ Concept de.dlr.sc.virsat.model.extension.cefx
  Type powerAvgWithMargin of Category Parameter quantityKind "Power" unit "Watt"; 
  Type powerEnergyWithMargin of Category Parameter quantityKind "Energy and Work" unit "Joule";
 
- Ref: powerAvgWithMargin = summary{EquipmentPowerParameters.PowerAvgWithMargin, 1};
+ Ref: powerAvgWithMargin = summary{EquipmentPowerParameters.powerAvgWithMargin, 1};
  Ref: powerEnergyWithMargin = powerAvgWithMargin * SystemParameters.modeDuration; 
  }
 
@@ -138,17 +138,17 @@ Concept de.dlr.sc.virsat.model.extension.cefx
  Type powerUnitIsInactive of Category Parameter quantityKind "Dimensionless" unit "No Unit" description "Should be 1 if the equipment is inactive in the given mode, meaning it is totally off."; 
 
  Type powerDutyCycle of Category Parameter quantityKind "Dimensionless" unit "Percent";
- Type PowerUnitOn of Category Parameter quantityKind "Power" unit "Watt";
- Type PowerUnitStby of Category Parameter quantityKind "Power" unit "Watt";
- Type PowerUnitOnWithMargin of Category Parameter quantityKind "Power" unit "Watt";
- Type PowerUnitStbyWithMargin of Category Parameter quantityKind "Power" unit "Watt";
- Type PowerUnitAvgWithMargin of Category Parameter quantityKind "Power" unit "Watt";
- Type PowerAvgWithMargin of Category Parameter quantityKind "Power" unit "Watt";
+ Type powerUnitOn of Category Parameter quantityKind "Power" unit "Watt";
+ Type powerUnitStby of Category Parameter quantityKind "Power" unit "Watt";
+ Type powerUnitOnWithMargin of Category Parameter quantityKind "Power" unit "Watt";
+ Type powerUnitStbyWithMargin of Category Parameter quantityKind "Power" unit "Watt";
+ Type powerUnitAvgWithMargin of Category Parameter quantityKind "Power" unit "Watt";
+ Type powerAvgWithMargin of Category Parameter quantityKind "Power" unit "Watt";
 
- Ref: PowerUnitOnWithMargin = PowerUnitOn + (PowerUnitOn * EquipmentParameters.marginMaturity);
- Ref: PowerUnitStbyWithMargin = PowerUnitStby + (PowerUnitStby * EquipmentParameters.marginMaturity);
- Ref: PowerUnitAvgWithMargin = PowerUnitOnWithMargin * powerDutyCycle + PowerUnitStbyWithMargin * (1 - powerDutyCycle);
- Ref: PowerAvgWithMargin = (PowerUnitAvgWithMargin + summary{PowerAvgWithMargin, 1}) * ( 1 - powerUnitIsInactive);
+ Ref: powerUnitOnWithMargin = powerUnitOn + (powerUnitOn * EquipmentParameters.marginMaturity);
+ Ref: powerUnitStbyWithMargin = powerUnitStby + (powerUnitStby * EquipmentParameters.marginMaturity);
+ Ref: powerUnitAvgWithMargin = powerUnitOnWithMargin * powerDutyCycle + powerUnitStbyWithMargin * (1 - powerDutyCycle);
+ Ref: powerAvgWithMargin = (powerUnitAvgWithMargin + summary{powerAvgWithMargin, 1}) * ( 1 - powerUnitIsInactive);
  }
 
  Category EquipmentTemperatureParameters {