Commit 7cd2beba authored by Marco Volpe's avatar Marco Volpe

YELLOW

* Function FrequencyAssigned moved to the smt plugin.

Issue-Ref: 3608
Issue-Url: https://af3-developer.fortiss.org/issues/3608Signed-off-by: Marco Volpe's avatarMarco Volpe <volpe@fortiss.org>
parent 11e94c00
model.ecore ec3a8b404acef40f7198b5e68628759fc99cd724 GREEN
model.ecore 05b413982198507b12ffa9243342741a501af3fe YELLOW
......@@ -46,4 +46,23 @@
<details key="documentation" value="Dummy anntotation to describe the duration of a model element."/>
</eAnnotations>
</eClassifiers>
<eSubpackages name="dseml" nsURI="http://www.fortiss.org/af3/exploration/smt/dseml"
nsPrefix="org-fortiss-af3-exploration-smt-dseml">
<eClassifiers xsi:type="ecore:EClass" name="FrequencyAssigned" eSuperTypes="platform:/resource/org.fortiss.af3.exploration/model/dseml.ecore#//function/IFunction platform:/resource/org.fortiss.af3.exploration/model/dseml.ecore#//arithmetic/ArithmeticLiteral">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="@deprecated (Function that returns the frequency assigned to an ECU.)"/>
</eAnnotations>
<eOperations name="toString" 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;frequencyAssigned(&quot; + this.getArg0().toString() + &quot;)&quot;;"/>
</eAnnotations>
</eOperations>
<eStructuralFeatures xsi:type="ecore:EReference" name="arg0" eType="ecore:EClass platform:/resource/org.fortiss.af3.exploration/model/dseml.ecore#//expression/ModelElementLiteral"
containment="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="TODO: write documentation (in the model!)"/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
</eSubpackages>
</ecore:EPackage>
......@@ -18,5 +18,13 @@
</genClasses>
<genClasses ecoreClass="model.ecore#//StartTimeDummy"/>
<genClasses ecoreClass="model.ecore#//DurationDummy"/>
<nestedGenPackages prefix="Dseml" basePackage="org.fortiss.af3.exploration.smt.model"
disposableProviderFactory="true" ecorePackage="model.ecore#//dseml">
<genClasses ecoreClass="model.ecore#//dseml/FrequencyAssigned">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model.ecore#//dseml/FrequencyAssigned/arg0"/>
<genOperations ecoreOperation="model.ecore#//dseml/FrequencyAssigned/toString"
body="return &quot;frequencyAssigned(&quot; + this.getArg0().toString() + &quot;)&quot;;"/>
</genClasses>
</nestedGenPackages>
</genPackages>
</genmodel:GenModel>
BasicDeploScheduleConstraint.java ffe4a4ba56a0f00bdc06a2117a7d889bfa0874b0 YELLOW
BasicDeploScheduleConstraint.java cf626f574d5ab1a5e8f5eb83a582989eaf6f56ad YELLOW
BasicDeploymentConstraint.java f66c59adfa5a1619db1f1178c95fe7a4b7930d6e GREEN
BasicScheduleConstraint.java 6b27221e6d41b22341686e65968d0f7d46228f78 GREEN
ConstraintDefinitionUtils.java 66c49d2c90b492171b4ba6775be59547410de701 YELLOW
ConstraintDefinitionUtils.java a51705fb421fd2d1d3c2a9b74a055947f7e70e98 YELLOW
ConstraintTransformationAdapter.java 8806164d71491c7d1af665990dd154f2275cad8c GREEN
DSMLTransformationService.java 56c5aff0a41c8665e90dad69a6ae79e84ed7b779 GREEN
DSMLtoSMTTransformator.java a0b590376a25d8a1c39c2b727396425f37abcb4d GREEN
DefaultExpressionTransformator.java feed18dc862dff3577ede56ce80578bbf5083ee4 GREEN
DSMLTransformationService.java ad80a8a464044de0791214d90a639bf27a393c53 YELLOW
DSMLtoSMTTransformator.java 66722717d29b98999f14ff274255a2d68956c1fc YELLOW
DefaultExpressionTransformator.java 47e3c00647a2a9845d1c0785668f6270cf06517e YELLOW
DeploScheduleRun.java 2b07bd6b40cf4ce2eabc12198f6db3b9655bed25 GREEN
DeploymentRun.java 4b2d0a6d64bb5a6efabc2ee9bf933cc523843ac8 GREEN
EnergyConstraintDefinition.java 36140db801498e870922a62f52b2cb565e673987 YELLOW
EnergyConstraintDefinition.java 5bbe0c08a29dcc4ec0e4006aaf3fd221a5ecab09 YELLOW
ExpressionTransformator.java 2823e34c90a86e11d7ad76e3ddefca9afde155d9 GREEN
IDSMLTransformationService.java 7e348d273adaaae3f161323275d7ead607c3a679 GREEN
IDSMLTransformationService.java eed05093deee8c85c8fc710159d7aa6fdb71c221 YELLOW
NonQuantifiedExpressionTransformator.java 9ee437aeaf518d94b81e34a275cd01b87cfca1bf GREEN
QuantifiedExpressionTransformator.java 01e7162b24d16adb23f646cf02340879e8a18205 GREEN
SMTTransformationUtils.java c4900a17c5a708a628e4267b35652e2cfd72c78d GREEN
......
......@@ -80,7 +80,6 @@ import org.fortiss.af3.exploration.dseml.model.booleanp.comparison.NotEqual;
import org.fortiss.af3.exploration.dseml.model.expression.ModelElementLiteral;
import org.fortiss.af3.exploration.dseml.model.expression.Set;
import org.fortiss.af3.exploration.dseml.model.expression.SuperSet;
import org.fortiss.af3.exploration.dseml.model.function.FrequencyAssigned;
import org.fortiss.af3.exploration.dseml.model.function.IFunction;
import org.fortiss.af3.exploration.dseml.model.function.IsTask;
import org.fortiss.af3.exploration.dseml.model.function.ScheduledSignal;
......@@ -92,6 +91,7 @@ import org.fortiss.af3.exploration.model.project.ModelSnapshot;
import org.fortiss.af3.exploration.model.project.RuleSet;
import org.fortiss.af3.exploration.smt.model.SMTConstraint;
import org.fortiss.af3.exploration.smt.model.SMTObjective;
import org.fortiss.af3.exploration.smt.model.dseml.FrequencyAssigned;
import org.fortiss.af3.platform.model.ExecutionUnit;
import org.fortiss.af3.platform.model.Route;
import org.fortiss.af3.platform.model.annotation.MessageSize;
......
......@@ -55,7 +55,6 @@ import org.fortiss.af3.exploration.dseml.model.expression.ModelElementLiteral;
import org.fortiss.af3.exploration.dseml.model.expression.Set;
import org.fortiss.af3.exploration.dseml.model.expression.SuperSet;
import org.fortiss.af3.exploration.dseml.model.function.End;
import org.fortiss.af3.exploration.dseml.model.function.FrequencyAssigned;
import org.fortiss.af3.exploration.dseml.model.function.FunctionFactory;
import org.fortiss.af3.exploration.dseml.model.function.IsTask;
import org.fortiss.af3.exploration.dseml.model.function.ScheduledSignal;
......@@ -64,6 +63,8 @@ import org.fortiss.af3.exploration.dseml.model.function.Start;
import org.fortiss.af3.exploration.dseml.model.function.StronglyCausal;
import org.fortiss.af3.exploration.smt.model.DurationDummy;
import org.fortiss.af3.exploration.smt.model.StartTimeDummy;
import org.fortiss.af3.exploration.smt.model.dseml.DsemlFactory;
import org.fortiss.af3.exploration.smt.model.dseml.FrequencyAssigned;
import org.fortiss.af3.platform.model.ExecutionUnit;
import org.fortiss.af3.platform.model.IPlatformResource;
import org.fortiss.af3.platform.model.Route;
......@@ -308,7 +309,7 @@ public class ConstraintDefinitionUtils {
// TODO (#3554)
/** Creates a {@link FrequencyAssigned} literal. */
public static FrequencyAssigned createFrequencyAssigned(Set<ExecutionUnit> ecuSet) {
FrequencyAssigned elem = FunctionFactory.eINSTANCE.createFrequencyAssigned();
FrequencyAssigned elem = DsemlFactory.eINSTANCE.createFrequencyAssigned();
ModelElementLiteral modelElementLiteral = createModelElementLiteral(ecuSet);
elem.setArg0(modelElementLiteral);
return elem;
......
......@@ -40,7 +40,6 @@ import org.fortiss.af3.exploration.dseml.model.expression.IExpression;
import org.fortiss.af3.exploration.dseml.model.expression.Set;
import org.fortiss.af3.exploration.dseml.model.expression.SuperSet;
import org.fortiss.af3.exploration.dseml.model.function.End;
import org.fortiss.af3.exploration.dseml.model.function.FrequencyAssigned;
import org.fortiss.af3.exploration.dseml.model.function.IsTask;
import org.fortiss.af3.exploration.dseml.model.function.MaxTime;
import org.fortiss.af3.exploration.dseml.model.function.ScheduledSignal;
......@@ -52,6 +51,7 @@ import org.fortiss.af3.exploration.dseml.model.function.Weight;
import org.fortiss.af3.exploration.model.SuperSetMap;
import org.fortiss.af3.exploration.smt.model.DurationDummy;
import org.fortiss.af3.exploration.smt.model.StartTimeDummy;
import org.fortiss.af3.exploration.smt.model.dseml.FrequencyAssigned;
import org.fortiss.af3.platform.model.ExecutionUnit;
import org.fortiss.af3.platform.model.Route;
import org.fortiss.af3.platform.model.TransmissionUnit;
......
......@@ -53,7 +53,6 @@ import org.fortiss.af3.exploration.dseml.model.arithmetic.ModelElementPropertyLi
import org.fortiss.af3.exploration.dseml.model.expression.ExpressionFactory;
import org.fortiss.af3.exploration.dseml.model.expression.IExpression;
import org.fortiss.af3.exploration.dseml.model.expression.Set;
import org.fortiss.af3.exploration.dseml.model.function.FrequencyAssigned;
import org.fortiss.af3.exploration.dseml.model.function.Maximize;
import org.fortiss.af3.exploration.dseml.model.function.Minimize;
import org.fortiss.af3.exploration.model.ExplorationConstraint;
......@@ -64,6 +63,7 @@ import org.fortiss.af3.exploration.model.project.RuleSet;
import org.fortiss.af3.exploration.smt.AF3ExplorationSMTActivator;
import org.fortiss.af3.exploration.smt.model.SMTConstraint;
import org.fortiss.af3.exploration.smt.model.SMTObjective;
import org.fortiss.af3.exploration.smt.model.dseml.FrequencyAssigned;
import org.fortiss.af3.platform.hierarchic.model.annotation.FailureRate;
import org.fortiss.af3.platform.model.ExecutionUnit;
import org.fortiss.af3.platform.model.IPlatformResource;
......
......@@ -66,7 +66,6 @@ import org.fortiss.af3.exploration.dseml.model.expression.IUnaryOperator;
import org.fortiss.af3.exploration.dseml.model.expression.ModelElementLiteral;
import org.fortiss.af3.exploration.dseml.model.expression.Set;
import org.fortiss.af3.exploration.dseml.model.function.End;
import org.fortiss.af3.exploration.dseml.model.function.FrequencyAssigned;
import org.fortiss.af3.exploration.dseml.model.function.IFunction;
import org.fortiss.af3.exploration.dseml.model.function.IsTask;
import org.fortiss.af3.exploration.dseml.model.function.MaxTime;
......@@ -76,6 +75,7 @@ import org.fortiss.af3.exploration.dseml.model.function.Start;
import org.fortiss.af3.exploration.dseml.model.function.StronglyCausal;
import org.fortiss.af3.exploration.dseml.model.function.Uses;
import org.fortiss.af3.exploration.dseml.model.function.Weight;
import org.fortiss.af3.exploration.smt.model.dseml.FrequencyAssigned;
import org.fortiss.tooling.base.model.element.IModelElement;
import com.microsoft.z3.ArithExpr;
......
......@@ -58,10 +58,10 @@ import org.fortiss.af3.exploration.dseml.model.booleanp.comparison.Equal;
import org.fortiss.af3.exploration.dseml.model.expression.ModelElementLiteral;
import org.fortiss.af3.exploration.dseml.model.expression.Set;
import org.fortiss.af3.exploration.dseml.model.expression.SuperSet;
import org.fortiss.af3.exploration.dseml.model.function.FrequencyAssigned;
import org.fortiss.af3.exploration.dseml.model.function.IFunction;
import org.fortiss.af3.exploration.dseml.model.function.Minimize;
import org.fortiss.af3.exploration.dseml.model.function.ScheduledTask;
import org.fortiss.af3.exploration.smt.model.dseml.FrequencyAssigned;
import org.fortiss.af3.platform.hierarchic.model.tile.Tile;
import org.fortiss.af3.platform.model.ExecutionUnit;
import org.fortiss.af3.platform.model.annotation.PowerConsumption;
......
......@@ -21,7 +21,6 @@ import java.util.Map;
import org.fortiss.af3.exploration.dseml.model.arithmetic.ModelElementPropertyLiteral;
import org.fortiss.af3.exploration.dseml.model.expression.Set;
import org.fortiss.af3.exploration.dseml.model.function.End;
import org.fortiss.af3.exploration.dseml.model.function.FrequencyAssigned;
import org.fortiss.af3.exploration.dseml.model.function.IsTask;
import org.fortiss.af3.exploration.dseml.model.function.MaxTime;
import org.fortiss.af3.exploration.dseml.model.function.ScheduledSignal;
......@@ -30,6 +29,7 @@ import org.fortiss.af3.exploration.dseml.model.function.Start;
import org.fortiss.af3.exploration.dseml.model.function.StronglyCausal;
import org.fortiss.af3.exploration.dseml.model.function.Uses;
import org.fortiss.af3.exploration.dseml.model.function.Weight;
import org.fortiss.af3.exploration.smt.model.dseml.FrequencyAssigned;
import org.fortiss.tooling.base.model.element.IAnnotatedSpecification;
import org.fortiss.tooling.base.model.element.IModelElement;
......
dseml.ecore dbfaa00e4fe86dc15c18cdeebd14ef9ae703a05b GREEN
dseml.ecore 7d40e97f4d0bcebc825455b334c7109573896cff YELLOW
exploration.ecore 80f1561f9575c41e06785a165d1f77325de1db35 GREEN
......@@ -782,22 +782,6 @@
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FrequencyAssigned" eSuperTypes="#//function/IFunction #//arithmetic/ArithmeticLiteral">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="@deprecated (Function that returns the frequency assigned to an ECU.)"/>
</eAnnotations>
<eOperations name="toString" 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 org.fortiss.af3.exploration.model.function.FunctionStaticImpl.toString(this);"/>
</eAnnotations>
</eOperations>
<eStructuralFeatures xsi:type="ecore:EReference" name="arg0" eType="#//expression/ModelElementLiteral"
containment="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="TODO: write documentation (in the model!)"/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
</eSubpackages>
<eSubpackages name="expression" nsURI="http://www.fortiss.org/af3/exploration/dseml/expression"
nsPrefix="org-fortiss-af3-exploration-dseml-expression">
......
......@@ -257,11 +257,6 @@
<genOperations ecoreOperation="dseml.ecore#//function/ScheduledTask/toString"
body="return org.fortiss.af3.exploration.model.function.FunctionStaticImpl.toString(this);"/>
</genClasses>
<genClasses ecoreClass="dseml.ecore#//function/FrequencyAssigned">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference dseml.ecore#//function/FrequencyAssigned/arg0"/>
<genOperations ecoreOperation="dseml.ecore#//function/FrequencyAssigned/toString"
body="return org.fortiss.af3.exploration.model.function.FunctionStaticImpl.toString(this);"/>
</genClasses>
</nestedGenPackages>
<nestedGenPackages prefix="Expression" basePackage="org.fortiss.af3.exploration.dseml.model"
disposableProviderFactory="true" ecorePackage="dseml.ecore#//expression">
......
FunctionStaticImpl.java 181c38829b46bd0087dd8638290a8957d2ea042e GREEN
FunctionStaticImpl.java dfd487c3f414af89604feff8da625a54ad1399f4 YELLOW
......@@ -16,7 +16,6 @@
package org.fortiss.af3.exploration.model.function;
import org.fortiss.af3.exploration.dseml.model.function.End;
import org.fortiss.af3.exploration.dseml.model.function.FrequencyAssigned;
import org.fortiss.af3.exploration.dseml.model.function.IsTask;
import org.fortiss.af3.exploration.dseml.model.function.MaxTime;
import org.fortiss.af3.exploration.dseml.model.function.Maximize;
......@@ -76,11 +75,6 @@ public class FunctionStaticImpl {
return "weight(" + weight.getArg0().toString() + ")";
}
/** {@link FrequencyAssigned} to string. */
public static String toString(FrequencyAssigned frequency) {
return "frequencyAssigned(" + frequency.getArg0().toString() + ")";
}
/**
* {@link MaxTime} to string.
*
......
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