Merge branch 'master' of https://git.fortiss.org/af3/exploration-alg
into 3337
Conflicts:
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/comparch/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/deployment/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/deployment/DeploymentFinalizer.java
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/AF3SystemModelAdapter.java
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/plot/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/util/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/util/TransformationUtils.java
Signed-off-by:
Simon Barner <barner@fortiss.org>
No related branches found
No related tags found
Showing
- org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/plot/ScheduleGanttRenderer.java 1 addition, 1 deletion...rtiss/af3/exploration/alg/plot/ScheduleGanttRenderer.java
- org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/plot/ScheduleLabelGenerator.java 1 addition, 1 deletion...tiss/af3/exploration/alg/plot/ScheduleLabelGenerator.java
- org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/plot/ScheduleToolTipGenerator.java 2 additions, 2 deletions...ss/af3/exploration/alg/plot/ScheduleToolTipGenerator.java
- org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/plot/TaskSeriesCollectionFromSchedule.java 1 addition, 1 deletion...xploration/alg/plot/TaskSeriesCollectionFromSchedule.java
- org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/service/internal/.ratings 1 addition, 1 deletion...org/fortiss/af3/exploration/alg/service/internal/.ratings
- org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/service/internal/ExplorationRepairService.java 6 additions, 2 deletions...ration/alg/service/internal/ExplorationRepairService.java
- org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/util/.ratings 5 additions, 6 deletions...ion.alg/src/org/fortiss/af3/exploration/alg/util/.ratings
- org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/util/AF3Utils.java 0 additions, 158 deletions...lg/src/org/fortiss/af3/exploration/alg/util/AF3Utils.java
- org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/util/DesignSpaceExplorationModelElementFactory.java 0 additions, 82 deletions...n/alg/util/DesignSpaceExplorationModelElementFactory.java
- org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/util/ExplorationAlgUtils.java 27 additions, 471 deletions...fortiss/af3/exploration/alg/util/ExplorationAlgUtils.java
- org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/util/GraphUtils.java 9 additions, 59 deletions.../src/org/fortiss/af3/exploration/alg/util/GraphUtils.java
- org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/util/TransformationUtils.java 400 additions, 458 deletions...fortiss/af3/exploration/alg/util/TransformationUtils.java
Loading
Please register or sign in to comment