Commit 912aa441 authored by Saad bin Abid's avatar Saad bin Abid

Extended exploration.ecore and ExplorationCLIUtils for Reconfiguration

Extended exploration.ecore with new EClasses and EOperations for
IReconfigurationSynthesis. Also extend the ExplorationCLIUtils.java to
incorporate Reconfiguration synthesis.

Issue-Ref: 4063
Issue-Url: https://af3-developer.fortiss.org/issues/4063Signed-off-by: Saad bin Abid's avatarSaad bin Abid <abid@fortiss.org>
parent 7c7c6d67
dseml.ecore df66fd1e1e45789fc18bcb2d5992eb839188e849 GREEN dseml.ecore df66fd1e1e45789fc18bcb2d5992eb839188e849 GREEN
exploration.ecore 4f9bc959514b30b8a875ea7a1fb113382dd5b241 GREEN exploration.ecore e65a609db5c6650bbab5144ccef266a19d407385 YELLOW
...@@ -1090,5 +1090,28 @@ ...@@ -1090,5 +1090,28 @@
</eAnnotations> </eAnnotations>
</eOperations> </eOperations>
</eClassifiers> </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="IReconfigurationSynthesis" abstract="true"
interface="true" eSuperTypes="#//synthesiscategory/ISynthesisCategory">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Marker interface for reconfiguration synthesis types of a DSE."/>
</eAnnotations>
<eOperations name="getName" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="body" value="return &quot;Reconfiguration&quot;;"/>
<details key="documentation" value="Returns the human-readable name of the {@link ISynthesisCategory}."/>
</eAnnotations>
</eOperations>
<eOperations name="equals" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="body" value="return ISythesisCategoryStaticImpl.equals(this,other);"/>
</eAnnotations>
<eParameters name="other" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
</eOperations>
<eOperations name="hasCode" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="body" value="return ISynthesisCategoryStaticImpl.hasCode(this);"/>
</eAnnotations>
</eOperations>
</eClassifiers>
</eSubpackages> </eSubpackages>
</ecore:EPackage> </ecore:EPackage>
...@@ -332,6 +332,16 @@ ...@@ -332,6 +332,16 @@
<genOperations ecoreOperation="exploration.ecore#//synthesiscategory/IScheduleSynthesis/hashCode" <genOperations ecoreOperation="exploration.ecore#//synthesiscategory/IScheduleSynthesis/hashCode"
body="return ISynthesisCategoryStaticImpl.hashCode(this);"/> body="return ISynthesisCategoryStaticImpl.hashCode(this);"/>
</genClasses> </genClasses>
<genClasses ecoreClass="exploration.ecore#//synthesiscategory/IReconfigurationSynthesis">
<genOperations ecoreOperation="exploration.ecore#//synthesiscategory/IReconfigurationSynthesis/getName"
body="return &quot;Reconfiguration&quot;;"/>
<genOperations ecoreOperation="exploration.ecore#//synthesiscategory/IReconfigurationSynthesis/equals"
body="return ISythesisCategoryStaticImpl.equals(this,other);">
<genParameters ecoreParameter="exploration.ecore#//synthesiscategory/IReconfigurationSynthesis/equals/other"/>
</genOperations>
<genOperations ecoreOperation="exploration.ecore#//synthesiscategory/IReconfigurationSynthesis/hasCode"
body="return ISynthesisCategoryStaticImpl.hasCode(this);"/>
</genClasses>
</nestedGenPackages> </nestedGenPackages>
</genPackages> </genPackages>
</genmodel:GenModel> </genmodel:GenModel>
...@@ -2,7 +2,7 @@ DSEProjectModelElementFactory.java e00a2ea157d571992a7d9a7ed4f842b78b4141d4 GREE ...@@ -2,7 +2,7 @@ DSEProjectModelElementFactory.java e00a2ea157d571992a7d9a7ed4f842b78b4141d4 GREE
DSESolutionConversionUtils.java a6ccbba92864c653d1518a92455e87c17f7cc72b GREEN DSESolutionConversionUtils.java a6ccbba92864c653d1518a92455e87c17f7cc72b GREEN
DSMLModelElementFactory.java fa4a735ff40ab8f7d9898cecc0b04cfd8997572f GREEN DSMLModelElementFactory.java fa4a735ff40ab8f7d9898cecc0b04cfd8997572f GREEN
DSMLUtils.java 1113377031374cef7e29afcef458c4aeecad2b21 GREEN DSMLUtils.java 1113377031374cef7e29afcef458c4aeecad2b21 GREEN
ExplorationCLIUtils.java b67c7621177b66c8677c0921127f9bc92a6790c0 GREEN ExplorationCLIUtils.java 32a4b2fc5f52e77c5e50b61912dcfe0f7f0c4cfd YELLOW
ExplorationModelElementFactory.java 0f870e8ce015fb4719b5cb0c35a8699b4f261d80 GREEN ExplorationModelElementFactory.java 0f870e8ce015fb4719b5cb0c35a8699b4f261d80 GREEN
ExplorationReflectionUtils.java 62731e1cef32fe93f2c2017f93f5ba1f054d5197 GREEN ExplorationReflectionUtils.java 62731e1cef32fe93f2c2017f93f5ba1f054d5197 GREEN
ExplorationScheduleUtils.java 95c9877ab2caa779a46fc20b8fdd63cd1cc392b1 GREEN ExplorationScheduleUtils.java 95c9877ab2caa779a46fc20b8fdd63cd1cc392b1 GREEN
......
...@@ -28,6 +28,7 @@ import org.fortiss.af3.exploration.AF3ExplorationActivator; ...@@ -28,6 +28,7 @@ import org.fortiss.af3.exploration.AF3ExplorationActivator;
import org.fortiss.af3.exploration.model.project.DSE; import org.fortiss.af3.exploration.model.project.DSE;
import org.fortiss.af3.exploration.model.synthesiscategory.IDeploymentSynthesis; import org.fortiss.af3.exploration.model.synthesiscategory.IDeploymentSynthesis;
import org.fortiss.af3.exploration.model.synthesiscategory.IPlatformSynthesis; import org.fortiss.af3.exploration.model.synthesiscategory.IPlatformSynthesis;
import org.fortiss.af3.exploration.model.synthesiscategory.IReconfigurationSynthesis;
import org.fortiss.af3.exploration.model.synthesiscategory.IScheduleSynthesis; import org.fortiss.af3.exploration.model.synthesiscategory.IScheduleSynthesis;
import org.fortiss.af3.exploration.model.synthesiscategory.ISynthesisCategory; import org.fortiss.af3.exploration.model.synthesiscategory.ISynthesisCategory;
import org.fortiss.af3.project.model.FileProject; import org.fortiss.af3.project.model.FileProject;
...@@ -136,7 +137,7 @@ public class ExplorationCLIUtils { ...@@ -136,7 +137,7 @@ public class ExplorationCLIUtils {
error(AF3ExplorationActivator.getDefault(), error(AF3ExplorationActivator.getDefault(),
"To execute a DSE, please specify it as follows: " + "To execute a DSE, please specify it as follows: " +
"<AF3-Project>/<DSE-Name>/<ExplorationType>.\n" + "<AF3-Project>/<DSE-Name>/<ExplorationType>.\n" +
"The exploration type can be a \"Deployment\", \"Schedule\", or " + "The exploration type can be a \"Deployment\", \"Schedule\",\"Reconfiguration\", or " +
"\"DeploySchedule\""); "\"DeploySchedule\"");
return null; return null;
} }
...@@ -151,6 +152,8 @@ public class ExplorationCLIUtils { ...@@ -151,6 +152,8 @@ public class ExplorationCLIUtils {
return newHashSet(IDeploymentSynthesis.class); return newHashSet(IDeploymentSynthesis.class);
case "Schedule": case "Schedule":
return newHashSet(IScheduleSynthesis.class); return newHashSet(IScheduleSynthesis.class);
case "Reconfiguration":
return newHashSet(IReconfigurationSynthesis.class);
case "DeploSchedule": case "DeploSchedule":
return newHashSet(IDeploymentSynthesis.class, IScheduleSynthesis.class); return newHashSet(IDeploymentSynthesis.class, IScheduleSynthesis.class);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment