From 36463a0101e0b77a08aefb34380bdda87dc7fd87 Mon Sep 17 00:00:00 2001
From: Simon Barner <barner@fortiss.org>
Date: Mon, 18 Dec 2017 08:16:49 +0000
Subject: [PATCH] 1) Introduce IAllocationType marker interface - Used to
semantically mark AllocationTables and AllocationEntries (e.g., which layers
of the system are connected by allocation, and which system entities) - Add
IAllocationService.addAllocationEntryType() and getAllocationEntryTypes() to
register and query IAllocationTypes - Apply IAllocationTypes specializations
to Task, Partition and Hardware architecture allocations
2) Move TaskToExecutionUnitAllocationTable and TaskWcetTable to af3.task (to avoid circular dependencies that would arise from the introduction of IAllocationType)
3) Schedule model UI
- Use IAllocationTypes to provide unified generic UI in af3.schedule.ui
- Remove most of the temporary hacks since allocation[.ui] is now in the build
- TODO: Remove SystemScheduleDeploymentPropertySection once Deployment has fully been replaced by AllocationTable
refs 2950,3188,3067
---
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 d094881f..093de346 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 platform:/resource/org.fortiss.af3.timing/model/timing.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">
<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 6a0f6ba0..77294a70 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 platform:/resource/org.fortiss.af3.timing/model/timing.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">
<foreignModel>moea.ecore</foreignModel>
<genPackages prefix="Moea" basePackage="org.fortiss.af3.exploration.moea" disposableProviderFactory="true"
ecorePackage="moea.ecore#/">
--
GitLab