From 8b3334918d8a29fe71c7c5f137355b3dcfd604d6 Mon Sep 17 00:00:00 2001
From: Simon Barner <barner@fortiss.org>
Date: Wed, 13 Dec 2017 16:37:21 +0000
Subject: [PATCH] - Register af3.timing / Wcet and Period annotations to tasks.
 Wcet is the assumed WCET of a Task (independent of the ExecutionUnit to which
 it mapped) - Add TaskWcetTable that allows to specify the WCET for
 (Task,ExecutionUnit) pairs.   - For now, the values can be edited in the
 annotation view only   - TODO: Integrated task WCET table as secondary
 TaskArchitecture editor refs 2562

---
 org.fortiss.af3.exploration.alg/trunk/model/common.genmodel | 2 +-
 org.fortiss.af3.exploration.alg/trunk/model/moea.genmodel   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.fortiss.af3.exploration.alg/trunk/model/common.genmodel b/org.fortiss.af3.exploration.alg/trunk/model/common.genmodel
index afb037e9..d094881f 100644
--- a/org.fortiss.af3.exploration.alg/trunk/model/common.genmodel
+++ b/org.fortiss.af3.exploration.alg/trunk/model/common.genmodel
@@ -6,7 +6,7 @@
     modelName="Model" editPluginClass="org.fortiss.af3.exploration.model.provider.ExplorationEditPlugin"
     editorPluginClass="org.fortiss.af3.exploration.presentation.ExplorationEditorPlugin"
     testsDirectory="/org.fortiss.af3.exploration.alg.tests/generated-src" importerID="org.eclipse.emf.importer.ecore"
-    containmentProxies="true" complianceLevel="6.0" copyrightFields="false" usedGenPackages="platform:/resource/org.fortiss.tooling.base/model/base.genmodel#//model platform:/resource/org.fortiss.af3.component/model/component.genmodel#//model explorationDsl.genmodel#//model platform:/resource/org.fortiss.af3.exploration/model/exploration.genmodel#//model platform:/resource/org.fortiss.af3.exploration/model/dsl_v2.genmodel#//model platform:/resource/org.fortiss.af3.expression/model/expression.genmodel#//model platform:/resource/org.fortiss.af3.platform/model/platform.genmodel#//model platform:/resource/org.fortiss.af3.project/model/project.genmodel#//model platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model platform:/resource/org.fortiss.af3.allocation/model/allocation.genmodel#//model platform:/resource/org.fortiss.af3.task/model/task.genmodel#//model">
+    containmentProxies="true" complianceLevel="6.0" copyrightFields="false" usedGenPackages="platform:/resource/org.fortiss.tooling.base/model/base.genmodel#//model platform:/resource/org.fortiss.af3.component/model/component.genmodel#//model explorationDsl.genmodel#//model platform:/resource/org.fortiss.af3.exploration/model/exploration.genmodel#//model platform:/resource/org.fortiss.af3.exploration/model/dsl_v2.genmodel#//model platform:/resource/org.fortiss.af3.expression/model/expression.genmodel#//model platform:/resource/org.fortiss.af3.platform/model/platform.genmodel#//model platform:/resource/org.fortiss.af3.project/model/project.genmodel#//model platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model platform:/resource/org.fortiss.af3.allocation/model/allocation.genmodel#//model platform:/resource/org.fortiss.af3.task/model/task.genmodel#//model platform:/resource/org.fortiss.af3.timing/model/timing.genmodel#//model">
   <foreignModel>common.ecore</foreignModel>
   <genPackages prefix="Common" basePackage="org.fortiss.af3.exploration" disposableProviderFactory="true"
       ecorePackage="common.ecore#/">
diff --git a/org.fortiss.af3.exploration.alg/trunk/model/moea.genmodel b/org.fortiss.af3.exploration.alg/trunk/model/moea.genmodel
index b039fa65..6a0f6ba0 100644
--- a/org.fortiss.af3.exploration.alg/trunk/model/moea.genmodel
+++ b/org.fortiss.af3.exploration.alg/trunk/model/moea.genmodel
@@ -7,7 +7,7 @@
     editorPluginClass="org.fortiss.af3.exploration.presentation.ExplorationEditorPlugin"
     testsDirectory="/org.fortiss.af3.exploration.alg.tests/generated-src" importerID="org.eclipse.emf.importer.ecore"
     containmentProxies="true" complianceLevel="6.0" copyrightFields="false" editPluginID="org.fortiss.af3.exploration.alg.edit"
-    editorPluginID="org.fortiss.af3.exploration.alg.editor" usedGenPackages="platform:/resource/org.fortiss.tooling.base/model/base.genmodel#//model platform:/resource/org.fortiss.af3.component/model/component.genmodel#//model common.genmodel#//model explorationDsl.genmodel#//model platform:/resource/org.fortiss.af3.exploration/model/exploration.genmodel#//model platform:/resource/org.fortiss.af3.exploration/model/dimensions.genmodel#//model platform:/resource/org.fortiss.af3.exploration/model/dsl_v2.genmodel#//model platform:/resource/org.fortiss.af3.expression/model/expression.genmodel#//model platform:/resource/org.fortiss.af3.platform/model/platform.genmodel#//model platform:/resource/org.fortiss.af3.project/model/project.genmodel#//model platform:/resource/org.fortiss.af3.safety/model/safety.genmodel#//model platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model platform:/resource/org.fortiss.af3.allocation/model/allocation.genmodel#//model platform:/resource/org.fortiss.af3.task/model/task.genmodel#//model">
+    editorPluginID="org.fortiss.af3.exploration.alg.editor" usedGenPackages="platform:/resource/org.fortiss.tooling.base/model/base.genmodel#//model platform:/resource/org.fortiss.af3.component/model/component.genmodel#//model common.genmodel#//model explorationDsl.genmodel#//model platform:/resource/org.fortiss.af3.exploration/model/exploration.genmodel#//model platform:/resource/org.fortiss.af3.exploration/model/dimensions.genmodel#//model platform:/resource/org.fortiss.af3.exploration/model/dsl_v2.genmodel#//model platform:/resource/org.fortiss.af3.expression/model/expression.genmodel#//model platform:/resource/org.fortiss.af3.platform/model/platform.genmodel#//model platform:/resource/org.fortiss.af3.project/model/project.genmodel#//model platform:/resource/org.fortiss.af3.safety/model/safety.genmodel#//model platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model platform:/resource/org.fortiss.af3.allocation/model/allocation.genmodel#//model platform:/resource/org.fortiss.af3.task/model/task.genmodel#//model platform:/resource/org.fortiss.af3.timing/model/timing.genmodel#//model">
   <foreignModel>moea.ecore</foreignModel>
   <genPackages prefix="Moea" basePackage="org.fortiss.af3.exploration.moea" disposableProviderFactory="true"
       ecorePackage="moea.ecore#/">
-- 
GitLab