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

Jump to bottom

Task #206 fix the bug in the equation where mass and power are being #218

Open
wants to merge 6 commits into
base: development
Choose a base branch
from
Open

Task #206 fix the bug in the equation where mass and power are being #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0902adc
Task #206 fix the bug in the equation where mass and power are being
Mar 6, 2024
33ce018
Task #206 Add my name in the author's list.
Mar 6, 2024
c42c0e9
Task #206 correction of the detecting error from the mass.
Mar 6, 2024
b95ead9
Task #206 updating of the concept.concept and restore the destroyed
Mar 14, 2024
fb05cbb
Task #206 Fix the error of the calculation.
Mar 15, 2024
7e534b1
Task #206 fix the errors.
Mar 20, 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
6 changes: 3 additions & 3 deletions de.dlr.sc.virsat.model.extension.cef.interfaces/concept/concept.xmi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,20 @@
</left>
<right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="de.dlr.sc.virsat.model.extension.cef.interfaces.EquipmentDataParameters.DataDutyCycle"/>
</expression>
<result xsi:type="dvlm_calc:EquationIntermediateResult" uuid="b4f41b65-ac2d-4bc3-8cb0-853c76c57529" name="DataCombinedDutyCycle"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The cef concept should not change at all, since only the cefx is changed

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please replace this with the old version

<result xsi:type="dvlm_calc:EquationIntermediateResult" uuid="a10199a6-ef4f-482f-974f-46fc145bce3d" name="DataCombinedDutyCycle"/>
</equationDefinitions>
<equationDefinitions>
<expression xsi:type="dvlm_calc:AdditionAndSubtraction">
<left xsi:type="dvlm_calc:MultiplicationAndDivision" operator="*">
<left xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="de.dlr.sc.virsat.model.extension.cef.interfaces.EquipmentDataParameters.DataPerUnitOnWithMargin"/>
<right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="b4f41b65-ac2d-4bc3-8cb0-853c76c57529"/>
<right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="a10199a6-ef4f-482f-974f-46fc145bce3d"/>
</left>
<right xsi:type="dvlm_calc:MultiplicationAndDivision" operator="*">
<left xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="de.dlr.sc.virsat.model.extension.cef.interfaces.EquipmentDataParameters.DataPerUnitStbyWithMargin"/>
<right xsi:type="dvlm_calc:Parenthesis">
<right xsi:type="dvlm_calc:AdditionAndSubtraction" operator="-">
<left xsi:type="dvlm_calc:NumberLiteral" value="1"/>
<right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="b4f41b65-ac2d-4bc3-8cb0-853c76c57529"/>
<right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="a10199a6-ef4f-482f-974f-46fc145bce3d"/>
</right>
</right>
</right>
Expand Down
6 changes: 3 additions & 3 deletions de.dlr.sc.virsat.model.extension.cef.interfaces/concept/concept_v1_1.xmi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,20 @@
</left>
<right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="de.dlr.sc.virsat.model.extension.cef.interfaces.EquipmentDataParameters.DataDutyCycle"/>
</expression>
<result xsi:type="dvlm_calc:EquationIntermediateResult" uuid="b4f41b65-ac2d-4bc3-8cb0-853c76c57529" name="DataCombinedDutyCycle"/>
<result xsi:type="dvlm_calc:EquationIntermediateResult" uuid="a10199a6-ef4f-482f-974f-46fc145bce3d" name="DataCombinedDutyCycle"/>
</equationDefinitions>
<equationDefinitions>
<expression xsi:type="dvlm_calc:AdditionAndSubtraction">
<left xsi:type="dvlm_calc:MultiplicationAndDivision" operator="*">
<left xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="de.dlr.sc.virsat.model.extension.cef.interfaces.EquipmentDataParameters.DataPerUnitOnWithMargin"/>
<right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="b4f41b65-ac2d-4bc3-8cb0-853c76c57529"/>
<right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="a10199a6-ef4f-482f-974f-46fc145bce3d"/>
</left>
<right xsi:type="dvlm_calc:MultiplicationAndDivision" operator="*">
<left xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="de.dlr.sc.virsat.model.extension.cef.interfaces.EquipmentDataParameters.DataPerUnitStbyWithMargin"/>
<right xsi:type="dvlm_calc:Parenthesis">
<right xsi:type="dvlm_calc:AdditionAndSubtraction" operator="-">
<left xsi:type="dvlm_calc:NumberLiteral" value="1"/>
<right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="b4f41b65-ac2d-4bc3-8cb0-853c76c57529"/>
<right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="a10199a6-ef4f-482f-974f-46fc145bce3d"/>
</right>
</right>
</right>
Expand Down
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";
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
*/
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_NAME);
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_NAME);
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_NAME);
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
2 changes: 1 addition & 1 deletion ...c.virsat.model.extension.cef/src-gen/de/dlr/sc/virsat/model/extension/cef/ManifestMf.java
View file
Open in desktop

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

49 changes: 49 additions & 0 deletions ...on.cefx.test/src-gen/de/dlr/sc/virsat/model/extension/cefx/migrator/AMigrator1v2Test.java
View file
Open in desktop

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

2 changes: 2 additions & 0 deletions ...l.extension.cefx.test/src-gen/de/dlr/sc/virsat/model/extension/cefx/test/AllTestsGen.java
View file
Open in desktop

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

48 changes: 48 additions & 0 deletions ...tension.cefx.test/src/de/dlr/sc/virsat/model/extension/cefx/migrator/Migrator1v2Test.java
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the ToDos

Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/*******************************************************************************
* Copyright (c) 2008-2019 German Aerospace Center (DLR), Simulation and Software Technology, Germany.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package de.dlr.sc.virsat.model.extension.cefx.migrator;

// *****************************************************************
// * Import Statements
// *****************************************************************


import de.dlr.sc.virsat.model.dvlm.DVLMFactory;
import de.dlr.sc.virsat.model.dvlm.Repository;

// *****************************************************************
// * Class Declaration
// *****************************************************************

import org.junit.Test;

/**
* Auto Generated Class inheriting from Generator Gap Class
*
* This class is generated once, do your changes here
*
* VirSat DLR CEF Concept for extended Product Structures
*
*/
public class Migrator1v2Test extends AMigrator1v2Test {

@Test
public void testMigrator1v2() {
Migrator1v2 testMigrator1v2 = new Migrator1v2();

Repository repository = DVLMFactory.eINSTANCE.createRepository();
repository.getActiveConcepts().add(conceptMigrateFromRepository);

testMigrator1v2.migrate(conceptMigrateFrom, conceptMigrateFromRepository, conceptMigrateTo);


}

}
Loading
Loading