Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/193 making the parameter naming consistent. #217

Closed
wants to merge 11 commits into from
Closed

feature/193 making the parameter naming consistent. #217

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5d4cc03
Task #193 Making the parameter naming consistent.
Mar 5, 2024
8ef23fc
Task #193 Code review.
Mar 6, 2024
e335b9c
Task #193 replace all the class with the development version.
Mar 14, 2024
4ef2e00
Task #193 add my name on the author's list.
Mar 14, 2024
d59f157
Task #193 updating of the concept.xmi, modifying of the concept.concept
Mar 14, 2024
482c6d7
Task #193 add my name to the author's list.
Mar 14, 2024
eecacd0
Task #193 remove the methods in the migrator's class.
Mar 14, 2024
6eee3f4
Task #193 updating the Migrator's class.
Mar 14, 2024
d162627
Task #193 - Revert changes in concept.xmi
Mar 18, 2024
5818409
Task #193 - Revert changed uuids
Mar 18, 2024
e38ef89
Fix wrong copyright message
dellerDLR Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 20 additions & 11 deletions ...ef.ui/src/de/dlr/sc/virsat/model/extension/cef/ui/templates/DLRCEFStudyCommandHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@
*/
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 EQUIPMENT_MASS_PARAMETERS = "EquipmentMassParameters";
franzTobiasDLR marked this conversation as resolved.
Show resolved Hide resolved
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";

/**
* private Constructor
*/
Expand All @@ -65,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);
return system;
}

Expand All @@ -75,7 +84,7 @@ public static System createSystemBean(Concept concept) {
*/
public static SubSystem createSubSystemBean(Concept concept) {
SubSystem subSystem = new SubSystem(concept);
subSystem.setName("subSystem");
subSystem.setName(SUB_SYSTEM);
return subSystem;
}

Expand All @@ -85,37 +94,37 @@ public static SubSystem createSubSystemBean(Concept concept) {
*/
public static Equipment createEquipmentBean(Concept concept) {
Equipment equipment = new Equipment(concept);
equipment.setName("equipment");
equipment.setName(EQUIPMENT);
return equipment;
}

//CHECKSTYLE:OFF
public static void addSystemParameters(Concept concept, System system) {
//default unit in concept is percent
SystemParameters systemParameters = new SystemParameters(concept);
systemParameters.setName("systemParameters");
systemParameters.setName(SYSTEM_PARAMETERS);
systemParameters.setSystemMargin(20);
system.add(systemParameters);

SystemMassParameters systemMassParameters = new SystemMassParameters(concept);
systemMassParameters.setName("massParameters");
systemMassParameters.setName(MASS_PARAMETERS);
systemMassParameters.getMassAdapter().setDefaultValue(100);
systemMassParameters.getMassLaunchMax().setDefaultValue(850);
systemMassParameters.getMassPropellant().setDefaultValue(35);
system.add(systemMassParameters);

SystemPowerParameters systemPowerParameters = new SystemPowerParameters(concept);
systemPowerParameters.setName("powerParameters");
systemPowerParameters.setName(POWER_PARAMETERS);
system.add(systemPowerParameters);
}

public static void addSubSystemParameters(Concept concept, SubSystem subSystem) {
SubSystemMassParameters subSystemMassParameters = new SubSystemMassParameters(concept);
subSystemMassParameters.setName("massParameters");
subSystemMassParameters.setName(MASS_PARAMETERS);
subSystem.add(subSystemMassParameters);

SubSystemPowerParameters subSystemPowerParameters = new SubSystemPowerParameters(concept);
subSystemPowerParameters.setName("powerParameters");
subSystemPowerParameters.setName(POWER_PARAMETERS);
subSystem.add(subSystemPowerParameters);
}

Expand All @@ -126,16 +135,16 @@ public static void addEquipmentParameters(Concept concept, Equipment equipment)
equipment.add(equipmentParams);

EquipmentMassParameters equipmentMassParameters = new EquipmentMassParameters(concept);
equipmentMassParameters.setName("EquipmentMassParameters");
equipmentMassParameters.setName(EQUIPMENT_MASS_PARAMETERS);
equipmentMassParameters.getMassPerUnit().setDefaultValue(10);
equipment.add(equipmentMassParameters);

EquipmentPowerParameters powerParameters = new EquipmentPowerParameters(concept);
powerParameters.setName("powerParameters");
powerParameters.setName(POWER_PARAMETERS);
equipment.add(powerParameters);

EquipmentTemperatureParameters temperatureParameters = new EquipmentTemperatureParameters(concept);
temperatureParameters.setName("temperatureParameters");
temperatureParameters.setName(TEMPERATURE_PARAMETERS);
temperatureParameters.getTemperatureNoOpsMax().setDefaultValue(30);
temperatureParameters.getTemperatureNoOpsMin().setDefaultValue(5);
temperatureParameters.getTemperatureOpsMax().setDefaultValue(60);
Expand Down
12 changes: 6 additions & 6 deletions ...sion.cef/src-gen/de/dlr/sc/virsat/model/extension/cef/model/AEquipmentMassParameters.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions ...xtension.cef/src-gen/de/dlr/sc/virsat/model/extension/cef/model/AEquipmentParameters.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 12 additions & 13 deletions ...tension.cef/src-gen/de/dlr/sc/virsat/model/extension/cef/model/ASystemMassParameters.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions known_authors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ JAmmermann-DLR
christoph-pietsch-DLR
dellerDLR
pchrszon-dlr
DimitriDiantos
Loading