1. 07 Nov, 2019 2 commits
  2. 15 Oct, 2019 2 commits
  3. 26 Sep, 2019 2 commits
  4. 08 Jul, 2019 1 commit
  5. 03 May, 2019 2 commits
  6. 12 Apr, 2019 1 commit
    • Vivek Nigam's avatar
      Merge branch 'master' of https://git.fortiss.org/af3/af3.git into · 1442a58c
      Vivek Nigam authored
      
      3460-QuantitativeGSN
      
      Conflicts:
      	org.fortiss.af3.platform.beagle/.classpath
      	org.fortiss.af3.platform.beagle/model/beagle.genmodel
      	org.fortiss.af3.safetycases.ui/src/org/fortiss/af3/safetycases/ui/editpart/.ratings
      	org.fortiss.af3.safetycases.ui/src/org/fortiss/af3/safetycases/ui/editpart/figure/.ratings
      	org.fortiss.af3.safetycases.ui/src/org/fortiss/af3/safetycases/ui/utils/.ratings
      	org.fortiss.af3.specification.ui/.classpath
      	org.fortiss.af3.state.ui/.classpath
      	org.fortiss.af3.state/.classpath
      	org.fortiss.af3.task.ui/.classpath
      	org.fortiss.af3.task/.classpath
      	org.fortiss.af3.task/model/task.ecore
      	org.fortiss.af3.task/model/task.genmodel
      	org.fortiss.af3.testing.ui/.classpath
      	org.fortiss.af3.testing/.classpath
      	org.fortiss.af3.testing/model/testing.ecore
      	org.fortiss.af3.testing/model/testing.genmodel
      	org.fortiss.af3.timing.ui/.classpath
      	org.fortiss.af3.timing/.classpath
      	org.fortiss.af3.timing/model/timing.ecore
      	org.fortiss.af3.timing/model/timing.genmodel
      	org.fortiss.af3.tools/.classpath
      	org.fortiss.pragmatictransformation/.classpath
      Signed-off-by: Vivek Nigam's avatarVivek Nigam <nigam@fortiss.org>
      1442a58c
  7. 15 Mar, 2019 2 commits
    • Alexander Diewald's avatar
      Merge remote-tracking branch 'origin/master' into 3482 · 4851b8d3
      Alexander Diewald authored
      
      
      Conflicts:
      	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/backend/.ratings
      	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/modeltransformation/.ratings
      	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/modeltransformation/BasicDeploScheduleConstraint.java
      	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/modeltransformation/BasicDeploymentConstraint.java
      	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/util/.ratings
      	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/util/RouteUtils.java
      	org.fortiss.af3.exploration.smt/test-src/org/fortiss/af3/exploration/ui/RoutingTest.java
      	org.fortiss.af3.exploration.smt/test-src/org/fortiss/af3/exploration/ui/featuretest/GenerateTestBundles.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/constraint/.ratings
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/constraint/AllocationPatternCompositeBackend.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/constraint/FunctionCouplingCompositeBackend.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/constraint/SafetyPatternBackend.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/.ratings
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/DashboardWizard.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/DashboardWizardRootElementSelectionBase.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/DashboardWizardSelectProjectSource.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/DashboardWizardSelectTaskArchitecture.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/generic/.ratings
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/generic/SynthesisViewBase.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/generic/SynthesisViewBase2.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/generic/UtilizationPatternBackend.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/navigator/.ratings
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/navigator/DSENavigatorLabelProvider.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/objective/.ratings
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/objective/BusBandwidthOptimzationBackend.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/objective/BusEliminationBackend.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/objective/HardwareOptimizationPatternCompositeBackend.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/synthesis/.ratings
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/synthesis/DeploymentSynthesisViewBackend.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/synthesis/ScheduleSynthesisViewBackend.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/synthesis/subsetwizards/.ratings
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/synthesis/subsetwizards/ConstraintWizardLabelProvider.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/visualization/visualizations/fourD/.ratings
      	org.fortiss.af3.exploration/META-INF/MANIFEST.MF
      	org.fortiss.af3.exploration/model/.ratings
      	org.fortiss.af3.exploration/model/dseproject.ecore
      	org.fortiss.af3.exploration/model/dseproject.genmodel
      	org.fortiss.af3.exploration/plugin.xml
      	org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/.ratings
      	org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/ExplorationActivator.java
      	org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/migration/.ratings
      	org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/util/.ratings
      	org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/util/DSEProjectModelElementFactory.java
      	org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/util/ExplorationUtils.java
      	org.fortiss.af3.task/src/org/fortiss/af3/task/util/.ratings
      	org.fortiss.af3.task/src/org/fortiss/af3/task/util/TaskModelElementFactory.java
      Signed-off-by: Alexander Diewald's avatarAlexander Diewald <diewald@fortiss.org>
      4851b8d3
    • Alexander Diewald's avatar
      Merge remote-tracking branch 'origin/master' into 3482 · 373f8041
      Alexander Diewald authored
      
      
      Conflicts:
      	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/backend/.ratings
      	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/modeltransformation/.ratings
      	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/modeltransformation/BasicDeploScheduleConstraint.java
      	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/modeltransformation/BasicDeploymentConstraint.java
      	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/util/.ratings
      	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/util/RouteUtils.java
      	org.fortiss.af3.exploration.smt/test-src/org/fortiss/af3/exploration/ui/RoutingTest.java
      	org.fortiss.af3.exploration.smt/test-src/org/fortiss/af3/exploration/ui/featuretest/GenerateTestBundles.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/constraint/.ratings
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/constraint/AllocationPatternCompositeBackend.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/constraint/FunctionCouplingCompositeBackend.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/constraint/SafetyPatternBackend.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/.ratings
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/DashboardWizard.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/DashboardWizardRootElementSelectionBase.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/DashboardWizardSelectProjectSource.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/DashboardWizardSelectTaskArchitecture.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/generic/.ratings
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/generic/SynthesisViewBase.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/generic/SynthesisViewBase2.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/generic/UtilizationPatternBackend.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/navigator/.ratings
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/navigator/DSENavigatorLabelProvider.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/objective/.ratings
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/objective/BusBandwidthOptimzationBackend.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/objective/BusEliminationBackend.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/objective/HardwareOptimizationPatternCompositeBackend.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/synthesis/.ratings
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/synthesis/DeploymentSynthesisViewBackend.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/synthesis/ScheduleSynthesisViewBackend.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/synthesis/subsetwizards/.ratings
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/synthesis/subsetwizards/ConstraintWizardLabelProvider.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/visualization/visualizations/fourD/.ratings
      	org.fortiss.af3.exploration/META-INF/MANIFEST.MF
      	org.fortiss.af3.exploration/model/.ratings
      	org.fortiss.af3.exploration/model/dseproject.ecore
      	org.fortiss.af3.exploration/model/dseproject.genmodel
      	org.fortiss.af3.exploration/plugin.xml
      	org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/.ratings
      	org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/ExplorationActivator.java
      	org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/migration/.ratings
      	org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/util/.ratings
      	org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/util/DSEProjectModelElementFactory.java
      	org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/util/ExplorationUtils.java
      	org.fortiss.af3.task/src/org/fortiss/af3/task/util/.ratings
      	org.fortiss.af3.task/src/org/fortiss/af3/task/util/TaskModelElementFactory.java
      Signed-off-by: Alexander Diewald's avatarAlexander Diewald <diewald@fortiss.org>
      373f8041
  8. 14 Mar, 2019 3 commits
  9. 12 Mar, 2019 1 commit
    • Simon Barner's avatar
      Merge branch 'master' of https://git.fortiss.org/af3/af3.git into 3337 · 715d61a3
      Simon Barner authored
      
      
      Conflicts:
      	org.fortiss.af3.deployment/META-INF/MANIFEST.MF
      	org.fortiss.af3.deployment/plugin.xml
      	org.fortiss.af3.exploration/META-INF/MANIFEST.MF
      	org.fortiss.af3.exploration/plugin.xml
      	org.fortiss.af3.partition/META-INF/MANIFEST.MF
      	org.fortiss.af3.platform.beagle/META-INF/MANIFEST.MF
      	org.fortiss.af3.platform.hierarchic/META-INF/MANIFEST.MF
      	org.fortiss.af3.platform.hierarchic/plugin.xml
      	org.fortiss.af3.platform/plugin.xml
      	org.fortiss.af3.rcp.application/META-INF/MANIFEST.MF
      	org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/example/.ratings
      	org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/example/SimpleTrafficLightsCodeGenerationExample.java
      	org.fortiss.af3.rcp.application/test-src/test/org/fortiss/af3/rcp/application/semantic/alignment/c/CCodeEquivalenceTest.java
      	org.fortiss.af3.rcp.application/test-src/test/org/fortiss/af3/rcp/application/semantic/alignment/java/JavaEquivalenceTest_SimpleTrafficLights.java
      	org.fortiss.af3.safetycases/META-INF/MANIFEST.MF
      	org.fortiss.af3.safetycases/plugin.xml
      	org.fortiss.af3.schedule/META-INF/MANIFEST.MF
      	org.fortiss.af3.schedule/plugin.xml
      	org.fortiss.af3.task/META-INF/MANIFEST.MF
      	org.fortiss.af3.task/plugin.xml
      Signed-off-by: Simon Barner's avatarSimon Barner <barner@fortiss.org>
      715d61a3
  10. 11 Mar, 2019 2 commits
  11. 03 Mar, 2019 5 commits
  12. 26 Feb, 2019 3 commits
  13. 21 Feb, 2019 1 commit
  14. 12 Feb, 2019 2 commits
  15. 09 Feb, 2019 1 commit
  16. 31 Jan, 2019 2 commits
  17. 23 Jan, 2019 2 commits
  18. 18 Jan, 2019 2 commits
    • Alexander Diewald's avatar
      Merge remote-tracking branch 'origin/master' into 3482 · 4b463949
      Alexander Diewald authored
      
      
      Conflicts:
      	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/modeltransformation/.ratings
      	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/util/.ratings
      	org.fortiss.af3.exploration.smt/test-src/org/fortiss/af3/exploration/ui/RoutingTest.java
      	org.fortiss.af3.exploration.smt/test-src/org/fortiss/af3/exploration/ui/featuretest/GenerateTestBundles.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/constraint/.ratings
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/.ratings
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/DashboardWizard.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/DashboardWizardRootElementSelectionBase.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/DashboardWizardSelectPlatformArchitecture.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/DashboardWizardSelectTaskArchitecture.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/service/.ratings
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/synthesis/.ratings
      	org.fortiss.af3.exploration/model/.ratings
      	org.fortiss.af3.exploration/model/dseproject.ecore
      	org.fortiss.af3.exploration/model/dseproject.genmodel
      	org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/util/.ratings
      	org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/util/DSEProjectModelElementFactory.java
      Signed-off-by: Alexander Diewald's avatarAlexander Diewald <diewald@fortiss.org>
      4b463949
    • Alexander Diewald's avatar
      Merge remote-tracking branch 'origin/master' into 3482 · 8494e6b3
      Alexander Diewald authored
      
      
      Conflicts:
      	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/modeltransformation/.ratings
      	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/util/.ratings
      	org.fortiss.af3.exploration.smt/test-src/org/fortiss/af3/exploration/ui/RoutingTest.java
      	org.fortiss.af3.exploration.smt/test-src/org/fortiss/af3/exploration/ui/featuretest/GenerateTestBundles.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/constraint/.ratings
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/.ratings
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/DashboardWizard.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/DashboardWizardRootElementSelectionBase.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/DashboardWizardSelectPlatformArchitecture.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/DashboardWizardSelectTaskArchitecture.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/service/.ratings
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/synthesis/.ratings
      	org.fortiss.af3.exploration/model/.ratings
      	org.fortiss.af3.exploration/model/dseproject.ecore
      	org.fortiss.af3.exploration/model/dseproject.genmodel
      	org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/util/.ratings
      	org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/util/DSEProjectModelElementFactory.java
      Signed-off-by: Alexander Diewald's avatarAlexander Diewald <diewald@fortiss.org>
      8494e6b3
  19. 21 Dec, 2018 1 commit
    • Simon Barner's avatar
      Merge branch 'master' of https://git.fortiss.org/af3/af3.git into 3337 · 87806d15
      Simon Barner authored
      
      
      Conflicts:
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/.ratings
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/DashboardWizardSelectPlatformArchitecture.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/DashboardWizardSelectTaskArchitecture.java
      	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/synthesis/.ratings
      	org.fortiss.af3.partition/model/.ratings
      	org.fortiss.af3.platform/model/.ratings
      	org.fortiss.af3.schedule.ui/src/org/fortiss/af3/schedule/ui/properties/.ratings
      	org.fortiss.af3.schedule/src/org/fortiss/af3/schedule/utils/.ratings
      	org.fortiss.af3.task/META-INF/MANIFEST.MF
      	org.fortiss.af3.task/model/.ratings
      	org.fortiss.af3.task/model/task.ecore
      	org.fortiss.af3.task/src/org/fortiss/af3/task/model/.ratings
      	org.fortiss.af3.task/src/org/fortiss/af3/task/model/allocation/impl/.ratings
      	org.fortiss.af3.task/src/org/fortiss/af3/task/util/.ratings
      	org.fortiss.af3.task/src/org/fortiss/af3/task/util/TaskArchitectureUtils.java
      Signed-off-by: Simon Barner's avatarSimon Barner <barner@fortiss.org>
      87806d15
  20. 19 Dec, 2018 2 commits
  21. 13 Dec, 2018 1 commit