Maintenance today at 8:00 a.m. for about 30 minutes.

Commit f47c5b04 authored by Johannes Eder's avatar Johannes Eder

categories and composite constraints in DSE Navigator

parent 2476ec53
......@@ -9,9 +9,20 @@ Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.fortiss.af3.exploration.smt.AF3ExplorationSMTActivator
Require-Bundle: org.fortiss.af3.exploration;bundle-version="2.10.0",
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.fortiss.tooling.base;visibility:=reexport,
org.fortiss.af3.component;visibility:=reexport,
org.fortiss.af3.exploration;bundle-version="2.10.0";visibility:=reexport,
org.fortiss.af3.expression;visibility:=reexport,
org.fortiss.af3.platform;visibility:=reexport,
org.fortiss.af3.project;visibility:=reexport,
org.fortiss.af3.safety;visibility:=reexport,
org.fortiss.tooling.kernel;visibility:=reexport,
com.microsoft.z3;bundle-version="2.10.0",
org.fortiss.af3.scheduling;bundle-version="2.10.0"
Export-Package: org.fortiss.af3.exploration.smt.model,
org.fortiss.af3.exploration.smt.model.impl,
org.fortiss.af3.exploration.smt.model.util,
org.fortiss.af3.exploration.smt.modeltransformation,
org.fortiss.af3.exploration.smt.util
......@@ -5,10 +5,16 @@
<eGenericSuperTypes eClassifier="ecore:EClass platform:/resource/org.fortiss.af3.exploration/model/exploration.ecore#//ConstraintExpression">
<eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
</eGenericSuperTypes>
<eGenericSuperTypes eClassifier="#//CustomDimension"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="SMTObjective">
<eGenericSuperTypes eClassifier="ecore:EClass platform:/resource/org.fortiss.af3.exploration/model/exploration.ecore#//ObjectiveExpression">
<eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
</eGenericSuperTypes>
<eGenericSuperTypes eClassifier="#//CustomDimension"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CustomDimension" eSuperTypes="platform:/resource/org.fortiss.af3.exploration/model/exploration.ecore#//IProblemDimension">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="dimension" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
defaultValueLiteral="category"/>
</eClassifiers>
</ecore:EPackage>
<?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
modelDirectory="/org.fortiss.af3.exploration.smt/generated-src"
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.fortiss.af3.exploration.smt/generated-src"
editDirectory="/org.fortiss.af3.exploration.smt.edit/generated-src" editorDirectory="/org.fortiss.af3.exploration.smt.editor/generated-src"
modelPluginID="org.fortiss.af3.exploration.smt" modelName="AF3ExplorationSMT"
testsDirectory="/org.fortiss.af3.exploration.smt.tests/generated-src" importerID="org.eclipse.emf.importer.ecore"
......@@ -10,5 +10,8 @@
disposableProviderFactory="true" ecorePackage="model.ecore#/">
<genClasses ecoreClass="model.ecore#//SMTConstraint"/>
<genClasses ecoreClass="model.ecore#//SMTObjective"/>
<genClasses ecoreClass="model.ecore#//CustomDimension">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute model.ecore#//CustomDimension/dimension"/>
</genClasses>
</genPackages>
</genmodel:GenModel>
......@@ -5,7 +5,7 @@
<details key="documentation" value="Consists of the elements to specify a DSE process, e.g., objectives and constraints.&#xD;&#xA;&#xD;&#xA;Elements in this package starting from &lt;i>ExplorationManager&lt;/i> are DEPRECATED and exist only for migration purposes. See the class comment for the replacement class."/>
</eAnnotations>
<eClassifiers xsi:type="ecore:EClass" name="IDSEArtifact" abstract="true" interface="true"
eSuperTypes="../../org.fortiss.tooling.kernel/model/kernel.ecore#//INamedCommentedElement">
eSuperTypes="platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedCommentedElement">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Marker interface for denoting artifacts that are generated by a DSE process."/>
</eAnnotations>
......@@ -25,7 +25,7 @@
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ExplorationTarget" abstract="true" interface="true"
eSuperTypes="../../org.fortiss.tooling.kernel/model/kernel.ecore#//INamedCommentedElement">
eSuperTypes="platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedCommentedElement">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Interface to define targets that are to be considered by a DSE process, e.g., objectives and constraints."/>
</eAnnotations>
......@@ -70,7 +70,7 @@
</eGenericSuperTypes>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="IProblemDimension" abstract="true" interface="true"
eSuperTypes="../../org.fortiss.tooling.kernel/model/kernel.ecore#//INamedCommentedElement">
eSuperTypes="platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedCommentedElement">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Defines the dimension to which an {@link ExplorationTarget} belongs, e.g., the energy dimension. Allows the categorization of {@link ExplorationTarget}s."/>
</eAnnotations>
......@@ -133,14 +133,14 @@
<eTypeArguments eTypeParameter="#//GenericConstraint/T"/>
</eGenericSuperTypes>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ExplorationManager" eSuperTypes="../../org.fortiss.tooling.kernel/model/kernel.ecore#//IProjectRootElement">
<eClassifiers xsi:type="ecore:EClass" name="ExplorationManager" eSuperTypes="platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//IProjectRootElement">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="@deprecated Replaced by {@link org.fortiss.af3.exploration.moea.model.ExplorationManager}."/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EReference" name="dseModel" upperBound="-1"
eType="#//DesignSpaceExploration" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DesignSpaceExploration" eSuperTypes="../../org.fortiss.tooling.kernel/model/kernel.ecore#//INamedElement">
<eClassifiers xsi:type="ecore:EClass" name="DesignSpaceExploration" eSuperTypes="platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedElement">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="@deprecated Replaced by {@link org.fortiss.af3.exploration.moea.model.DesignSpaceExploration}."/>
</eAnnotations>
......@@ -201,7 +201,7 @@
<details key="documentation" value="@deprecated Replaced by {@link org.fortiss.af3.exploration.moea.model.predefined.FailureMinObjective}."/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EReference" name="component" lowerBound="1"
eType="ecore:EClass ../../org.fortiss.af3.component/model/component.ecore#//Component"/>
eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//Component"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="mode" lowerBound="1" eType="#//FailureMode"
defaultValueLiteral="FailSafe"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="type" lowerBound="1" eType="#//FailureType"/>
......@@ -252,9 +252,9 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="deadline" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="startComponent" lowerBound="1"
eType="ecore:EClass ../../org.fortiss.af3.component/model/component.ecore#//Component"/>
eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//Component"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="endComponent" lowerBound="1"
eType="ecore:EClass ../../org.fortiss.af3.component/model/component.ecore#//Component"/>
eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//Component"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="numericImprecision" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble" defaultValueLiteral="1e-9"/>
<eGenericSuperTypes eClassifier="#//ExplorationConstraint">
......@@ -284,15 +284,15 @@
</eAnnotations>
<eOperations name="getLimitation">
<eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">
<eTypeArguments eClassifier="ecore:EEnum ../../org.fortiss.af3.safety/model/safety.ecore#//SIL"/>
<eTypeArguments eClassifier="ecore:EEnum platform:/resource/org.fortiss.af3.safety/model/safety.ecore#//SIL"/>
</eGenericType>
</eOperations>
<eStructuralFeatures xsi:type="ecore:EReference" name="components" lowerBound="1"
upperBound="-1" eType="ecore:EClass ../../org.fortiss.af3.component/model/component.ecore#//Component"/>
upperBound="-1" eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//Component"/>
<eGenericSuperTypes eClassifier="#//ExplorationConstraint">
<eTypeArguments eClassifier="#//DummyType">
<eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">
<eTypeArguments eClassifier="ecore:EEnum ../../org.fortiss.af3.safety/model/safety.ecore#//SIL"/>
<eTypeArguments eClassifier="ecore:EEnum platform:/resource/org.fortiss.af3.safety/model/safety.ecore#//SIL"/>
</eTypeArguments>
</eTypeArguments>
</eGenericSuperTypes>
......@@ -305,9 +305,9 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="replication" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="deployableComponent" lowerBound="1"
eType="ecore:EClass ../../org.fortiss.af3.component/model/component.ecore#//Component"/>
eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//Component"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="deploymentTargets" lowerBound="1"
upperBound="-1" eType="ecore:EClass ../../org.fortiss.af3.platform/model/platform.ecore#//ExecutionUnit"/>
upperBound="-1" eType="ecore:EClass platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//ExecutionUnit"/>
<eGenericSuperTypes eClassifier="#//ExplorationConstraint">
<eTypeArguments eClassifier="#//DummyType">
<eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
......@@ -320,9 +320,9 @@
</eAnnotations>
<eOperations name="getLimitation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="deployableComponent" lowerBound="1"
eType="ecore:EClass ../../org.fortiss.af3.component/model/component.ecore#//Component"/>
eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//Component"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="deploymentTargets" lowerBound="1"
upperBound="-1" eType="ecore:EClass ../../org.fortiss.af3.platform/model/platform.ecore#//ExecutionUnit"/>
upperBound="-1" eType="ecore:EClass platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//ExecutionUnit"/>
<eGenericSuperTypes eClassifier="#//ExplorationConstraint">
<eTypeArguments eClassifier="#//DummyType">
<eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
......
......@@ -32,6 +32,7 @@
</genClasses>
<genClasses image="false" ecoreClass="exploration.ecore#//ExplorationTarget">
<genTypeParameters ecoreTypeParameter="exploration.ecore#//ExplorationTarget/T"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference exploration.ecore#//ExplorationTarget/containedTargets"/>
</genClasses>
<genClasses image="false" ecoreClass="exploration.ecore#//ExplorationObjective">
<genTypeParameters ecoreTypeParameter="exploration.ecore#//ExplorationObjective/T"/>
......
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