Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
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
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 like above

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
Copy link
Contributor

Choose a reason for hiding this comment

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

why is the old year and old institute name added?
2008-2024 German Aerospace Center (DLR), Institute for Software Technology, Germany is right

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

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

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

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,50 @@
/*******************************************************************************
* 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);

//TODO: Setup test instances

testMigrator1v2.migrate(conceptMigrateFrom, conceptMigrateFromRepository, conceptMigrateTo);

//TODO: Check for correct migration
}

}
Loading