Permalink
Browse files

[#89]: Relax input spec grammar by using Xtext options

Fixing the model changes in the DSE evaluation

Task-Url: http://github.com/roberthilbrich/assist-public/issues/89
  • Loading branch information...
RobertHilbrich committed Oct 12, 2018
1 parent a6ae322 commit 9f6dfa70dbeae6051885b18eb02a742c89021f46
Showing with 398 additions and 2,085 deletions.
  1. +0 −27 ch.hilbri.assist.dse.dsl.ui/src/ch/hilbri/assist/dse/dsl/ui/labeling/DSEDslLabelProvider.xtend
  2. +201 −162 ch.hilbri.assist.dse.dsl/src/ch/hilbri/assist/dse/dsl/DSEDsl.xtext
  3. +0 −18 ch.hilbri.assist.dse.dsl/src/ch/hilbri/assist/dse/dsl/formatting2/DSEDslFormatter.xtend
  4. +10 −16 ch.hilbri.assist.dse/src/ch/hilbri/assist/dse/evaluation/Evaluation.xtend
  5. +5 −2 ch.hilbri.assist.mapping.dsl/src/ch/hilbri/assist/mapping/dsl/MappingDSL.xtext
  6. BIN ...odel.edit/icons/full/ctool16/CreateAssistModel_applicationAlternatives_ApplicationAlternative.gif
  7. BIN ...odel.edit/icons/full/ctool16/CreateAssistModel_restrictionAlternatives_RestrictionAlternative.gif
  8. +0 −168 ...ri.assist.model.edit/src/ch/hilbri/assist/model/provider/ApplicationAlternativesItemProvider.java
  9. +8 −8 ch.hilbri.assist.model.edit/src/ch/hilbri/assist/model/provider/AssistModelItemProvider.java
  10. +0 −168 ch.hilbri.assist.model.edit/src/ch/hilbri/assist/model/provider/BoardAlternativesItemProvider.java
  11. +1 −1 ch.hilbri.assist.model.edit/src/ch/hilbri/assist/model/provider/BoxItemProvider.java
  12. +0 −72 ch.hilbri.assist.model.edit/src/ch/hilbri/assist/model/provider/ModelItemProviderAdapterFactory.java
  13. +0 −168 ...ri.assist.model.edit/src/ch/hilbri/assist/model/provider/RestrictionAlternativesItemProvider.java
  14. +4 −17 ch.hilbri.assist.model/model/ASSIST-Model.xcore
  15. +0 −42 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/ApplicationAlternatives.java
  16. +19 −19 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/AssistModel.java
  17. +0 −42 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/BoardAlternatives.java
  18. +2 −2 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/Box.java
  19. +0 −27 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/ModelFactory.java
  20. +74 −302 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/ModelPackage.java
  21. +4 −0 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/RestrictionAlternative.java
  22. +0 −46 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/RestrictionAlternatives.java
  23. +0 −152 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/ApplicationAlternativesImpl.java
  24. +42 −42 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/AssistModelImpl.java
  25. +0 −152 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/BoardAlternativesImpl.java
  26. +5 −5 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/BoxImpl.java
  27. +0 −36 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/ModelFactoryImpl.java
  28. +9 −105 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/ModelPackageImpl.java
  29. +0 −152 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/impl/RestrictionAlternativesImpl.java
  30. +0 −57 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/util/ModelAdapterFactory.java
  31. +0 −66 ch.hilbri.assist.model/src-gen/ch/hilbri/assist/model/util/ModelSwitch.java
  32. +7 −4 ch.hilbri.assist.scheduling.dsl/src/ch/hilbri/assist/scheduling/dsl/SchedulingDsl.xtext
  33. +7 −7 ...ssist.scheduling.dsl/src/ch/hilbri/assist/scheduling/dsl/formatting2/SchedulingDslFormatter.xtend
@@ -2,11 +2,9 @@ package ch.hilbri.assist.dse.dsl.ui.labeling
import ch.hilbri.assist.model.Application
import ch.hilbri.assist.model.ApplicationAlternative
import ch.hilbri.assist.model.ApplicationAlternatives
import ch.hilbri.assist.model.AssistModel
import ch.hilbri.assist.model.Board
import ch.hilbri.assist.model.BoardAlternative
import ch.hilbri.assist.model.BoardAlternatives
import ch.hilbri.assist.model.Box
import ch.hilbri.assist.model.ColocalityRelation
import ch.hilbri.assist.model.Compartment
@@ -16,7 +14,6 @@ import ch.hilbri.assist.model.DissimilarityRelation
import ch.hilbri.assist.model.ExplorationCandidate
import ch.hilbri.assist.model.Processor
import ch.hilbri.assist.model.RestrictionAlternative
import ch.hilbri.assist.model.RestrictionAlternatives
import ch.hilbri.assist.model.Task
import com.google.inject.Inject
import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider
@@ -146,38 +143,14 @@ class DSEDslLabelProvider extends DefaultEObjectLabelProvider {
'outlineview_constraint.png'
}
def image(BoardAlternatives ba) {
'outlineview_alternatives.png'
}
def text(BoardAlternatives ba) {
'Alternatives'
}
def image(BoardAlternative ba) {
'outlineview_alternative.gif'
}
def image(ApplicationAlternatives a) {
'outlineview_alternatives.png'
}
def text(ApplicationAlternatives ba) {
'Alternatives'
}
def image(ApplicationAlternative a) {
'outlineview_alternative.gif'
}
def image(RestrictionAlternatives a) {
'outlineview_alternatives.png'
}
def text(RestrictionAlternatives ba) {
'Alternatives'
}
def image(RestrictionAlternative a) {
'outlineview_alternative.gif'
}
Oops, something went wrong.

0 comments on commit 9f6dfa7

Please sign in to comment.