Echtzeitsysteme/gips-tests
1
0
Fork 0
mirror of https://github.com/Echtzeitsysteme/gips-tests.git synced 2024-05-20 12:00:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes missing EOpposite in metamodel

Browse source
This commit is contained in:
Maximilian Kratz 2023-03-06 13:00:49 +01:00
parent e535de47a5
commit 83b4a397ec
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gips.generic.scheduling/src/gips/generic/scheduling/Model.gipsl
View file

@ -2,7 +2,7 @@ package "gipsl.generic.scheduling"
import "platform:/resource/gips.scheduling.taskmodel/model/Taskmodel.ecore"
config {
solver := GUROBI [home:="fu", license:="bar"];
solver := GLPK [home:="fu", license:="bar"];
timeLimit := true [value := 60.0];
randomSeed := true [value := 0];
presolve := true;

4
gips.scheduling.taskmodel/model/Taskmodel.ecore
View file

@ -14,13 +14,13 @@
<eClassifiers xsi:type="ecore:EClass" name="Slot">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="index" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="runningtask" upperBound="-1"
eType="#//Task"/>
eType="#//Task" eOpposite="#//Task/runningon"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Task">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="deadline" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="duration" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="runningon" upperBound="-1"
eType="#//Slot"/>
eType="#//Slot" eOpposite="#//Slot/runningtask"/>
</eClassifiers>
</ecore:EPackage>

2
test.suite.gips/src/test/suite/gips/scheduling/utils/SchedulingModelGenerator.java
View file

@ -96,7 +96,7 @@ public class SchedulingModelGenerator {
e.printStackTrace();
}
}
public static void setUpTask3_1() {
// Slots
// Task says that 99 slots should be used but to make it feasible, we give the