Bläddra i källkod

refactor: change PrecendenceNode (typo) to PrecedenceNode

Claudio Gomes 5 år sedan
förälder
incheckning
340f430de4
35 ändrade filer med 395 tillägg och 606 borttagningar
  1. 5 5
      HintCOEngine/src/ua/ansymo/hintco/AdaptedFMUInstance.xtend
  2. 1 1
      HintCOEngine/src/ua/ansymo/hintco/AdaptiveCosimRunner.xtend
  3. 5 5
      HintCOEngine/src/ua/ansymo/hintco/CandidatesGenerator.xtend
  4. 1 1
      HintCOEngine/src/ua/ansymo/hintco/ConstraintChecker.xtend
  5. 3 4
      HintCOEngine/src/ua/ansymo/hintco/ConstraintsStack.xtend
  6. 3 3
      HintCOEngine/src/ua/ansymo/hintco/CosimRunUtils.xtend
  7. 1 2
      HintCOEngine/src/ua/ansymo/hintco/FmuLoader.xtend
  8. 2 3
      HintCOEngine/src/ua/ansymo/hintco/HierarchicalInstance.xtend
  9. 1 2
      HintCOEngine/src/ua/ansymo/hintco/IConstraintChecker.xtend
  10. 1 2
      HintCOEngine/src/ua/ansymo/hintco/ICosimRunner.xtend
  11. 1 2
      HintCOEngine/src/ua/ansymo/hintco/IFmuLoader.xtend
  12. 10 10
      HintCOEngine/src/ua/ansymo/hintco/ModelQuery.xtend
  13. 1 1
      HintCOEngine/src/ua/ansymo/hintco/SingleCosimRunner.xtend
  14. 6 6
      HintCOEngine/src/ua/ansymo/hintco/StrongCouplingRunner.xtend
  15. 4 5
      HintCOEngine/src/ua/ansymo/hintco/VariantProcessor.xtend
  16. 4 4
      HintCOEngine/test/ua/ansymo/hintco/test/AdaptedFMUTest.xtend
  17. 5 5
      HintConfiguration.edit/plugin.properties
  18. 12 12
      HintConfiguration.edit/src/ua/ansymo/hintco/provider/HierarchicalCosimUnitItemProvider.java
  19. 1 1
      HintConfiguration.edit/src/ua/ansymo/hintco/provider/PortInstanceItemProvider.java
  20. 0 204
      HintConfiguration.edit/src/ua/ansymo/hintco/provider/PrecendenceNodeItemProvider.java
  21. 12 12
      HintConfiguration.edit/src/ua/ansymo/hintco/provider/UnitInstanceItemProvider.java
  22. 5 5
      HintConfiguration/model/HintConfiguration.genmodel
  23. 7 7
      HintConfiguration/model/HintConfiguration.xcore
  24. 9 9
      HintConfiguration/model/hintco.ecore
  25. 53 53
      HintConfiguration/src-gen/ua/ansymo/hintco/HintcoPackage.java
  26. 1 1
      HintConfiguration/src-gen/ua/ansymo/hintco/PortInstance.java
  27. 32 32
      HintConfiguration/src-gen/ua/ansymo/hintco/PrecendenceNode.java
  28. 1 1
      HintConfiguration/src-gen/ua/ansymo/hintco/UnitInstance.java
  29. 46 46
      HintConfiguration/src-gen/ua/ansymo/hintco/impl/HierarchicalCosimUnitImpl.java
  30. 24 24
      HintConfiguration/src-gen/ua/ansymo/hintco/impl/HintcoPackageImpl.java
  31. 1 1
      HintConfiguration/src-gen/ua/ansymo/hintco/impl/PortInstanceImpl.java
  32. 74 74
      HintConfiguration/src-gen/ua/ansymo/hintco/impl/PrecendenceNodeImpl.java
  33. 45 45
      HintConfiguration/src-gen/ua/ansymo/hintco/impl/UnitInstanceImpl.java
  34. 5 5
      HintConfiguration/src-gen/ua/ansymo/hintco/util/HintcoAdapterFactory.java
  35. 13 13
      HintConfiguration/src-gen/ua/ansymo/hintco/util/HintcoSwitch.java

+ 5 - 5
HintCOEngine/src/ua/ansymo/hintco/AdaptedFMUInstance.xtend

@@ -30,7 +30,7 @@ class AdaptedFMUInstance extends FmuInstance {
 	
 	List<OutputPortInstance> outputPorts
 	
-	new(UnitInstance u, IFmiComponent f,  Map<Scenario, List<PrecendenceNode>> scenarioNodesMap) {
+	new(UnitInstance u, IFmiComponent f,  Map<Scenario, List<PrecedenceNode>> scenarioNodesMap) {
 		super(f)
 		unit = u
 		instantiateAdaptations(unit, scenarioNodesMap)
@@ -38,11 +38,11 @@ class AdaptedFMUInstance extends FmuInstance {
 		outputPorts = unit.outputPorts
 	}
 	
-	new(UnitInstance unit, Map<Scenario, List<PrecendenceNode>> scenarioNodesMap) {
+	new(UnitInstance unit, Map<Scenario, List<PrecedenceNode>> scenarioNodesMap) {
 		this(unit, null, scenarioNodesMap)
 	}
 	
-	def instantiateAdaptations(UnitInstance unit, Map<Scenario, List<PrecendenceNode>> scenarioNodesMap) {
+	def instantiateAdaptations(UnitInstance unit, Map<Scenario, List<PrecedenceNode>> scenarioNodesMap) {
 		val unitAdaptations = unit.selectedAdaptations
 		
 		if (!unitAdaptations.empty){
@@ -98,7 +98,7 @@ class AdaptedFMUInstance extends FmuInstance {
 		
 	}
 	
-	def private addPowerPortAdaptations(PowerBondAdaptation adaptation, PortInstance inputPowerTerm, PortInstance dualPowerTerm, List<PrecendenceNode> siblings) {
+	def private addPowerPortAdaptations(PowerBondAdaptation adaptation, PortInstance inputPowerTerm, PortInstance dualPowerTerm, List<PrecedenceNode> siblings) {
 
 		var StoreAdaptedPort powerTermStorage
 		
@@ -131,7 +131,7 @@ class AdaptedFMUInstance extends FmuInstance {
 		return powerTermStorage
 	}
 	
-	def private executesBefore(PortInstance port, UnitInstance unit, List<PrecendenceNode> nodes) {
+	def private executesBefore(PortInstance port, UnitInstance unit, List<PrecedenceNode> nodes) {
 		nodes.indexOf(port) < nodes.indexOf(unit)
 	}
 	

+ 1 - 1
HintCOEngine/src/ua/ansymo/hintco/AdaptiveCosimRunner.xtend

@@ -28,7 +28,7 @@ class AdaptiveCosimRunner implements ICosimRunner, Closeable {
 		hardReset = hR
 	}
 	
-	override run(RootCandidateScenario rootScenario, Map<Scenario, List<PrecendenceNode>> scenarioNodesMap, String variantID) {
+	override run(RootCandidateScenario rootScenario, Map<Scenario, List<PrecedenceNode>> scenarioNodesMap, String variantID) {
 		Assert.isTrue(scenarioNodesMap.values.forall[sortedNodes | sortedNodes.forall[n1 | rootScenario.eAllContents.exists[n2 | n1===n2]]])
 		
 		val nodes = scenarioNodesMap.get(rootScenario)

+ 5 - 5
HintCOEngine/src/ua/ansymo/hintco/CandidatesGenerator.xtend

@@ -127,7 +127,7 @@ class CandidatesGenerator {
 		var numGenVariants = 0
 
 		// Create new constraint map and put it at the head of the queue.
-		val HashMap<PrecendenceNode, Set<PrecendenceNode>> localConstraints = newHashMap()
+		val HashMap<PrecedenceNode, Set<PrecedenceNode>> localConstraints = newHashMap()
 		constraints.push(localConstraints)
 
 		val n = ns.peek() // Head of the queue is the current element being visited.
@@ -344,8 +344,8 @@ class CandidatesGenerator {
 		val rootScenario = ModelQuery.findRootScenario(ns)
 		val scenarios = rootScenario.eAllContents.filter(HierarchicalCosimUnit).toList
 		for (scenario : scenarios) {
-			val List<PrecendenceNode> scenarioNodes = newLinkedList()
-			scenarioNodes.add(scenario as PrecendenceNode)
+			val List<PrecedenceNode> scenarioNodes = newLinkedList()
+			scenarioNodes.add(scenario as PrecedenceNode)
 			scenarioNodes.addAll(scenario.inputPorts)
 			scenarioNodes.addAll(scenario.outputPorts)
 
@@ -376,8 +376,8 @@ class CandidatesGenerator {
 	}
 
 	def private addConstraint(
-		PrecendenceNode src,
-		PrecendenceNode trg,
+		PrecedenceNode src,
+		PrecedenceNode trg,
 		ConstraintsStack constraints,
 		VariantDiagram n,
 		HintConfiguration cs

+ 1 - 1
HintCOEngine/src/ua/ansymo/hintco/ConstraintChecker.xtend

@@ -21,7 +21,7 @@ class ConstraintChecker implements IConstraintChecker {
 		return true
 	}
 	
-	override constraintIsFeasible(PrecendenceNode src, PrecendenceNode trg, VariantDiagram n, ConstraintsStack constraints, HintConfiguration cs) {
+	override constraintIsFeasible(PrecedenceNode src, PrecedenceNode trg, VariantDiagram n, ConstraintsStack constraints, HintConfiguration cs) {
 		/*
 		  * A constraint is not feasible adding it to the precedence graph causes a new cycle to be formed.
 		  */

+ 3 - 4
HintCOEngine/src/ua/ansymo/hintco/ConstraintsStack.xtend

@@ -3,11 +3,10 @@ package ua.ansymo.hintco
 import java.util.HashMap
 import java.util.LinkedList
 import java.util.Set
-import ua.ansymo.hintco.PrecendenceNode
 
-class ConstraintsStack extends LinkedList<HashMap<PrecendenceNode, Set<PrecendenceNode>>> {
+class ConstraintsStack extends LinkedList<HashMap<PrecedenceNode, Set<PrecedenceNode>>> {
 	
-	def stackContains(PrecendenceNode k, PrecendenceNode v){
+	def stackContains(PrecedenceNode k, PrecedenceNode v){
 		for (m : this) {
 			if (m.containsKey(k) && m.get(k).contains(v)){
 				return true
@@ -16,7 +15,7 @@ class ConstraintsStack extends LinkedList<HashMap<PrecendenceNode, Set<Precenden
 		return false
 	}
 	
-	def safeAdd(PrecendenceNode k, PrecendenceNode v){
+	def safeAdd(PrecedenceNode k, PrecedenceNode v){
 		if (! this.peek().containsKey(k) ){
 			this.peek().put(k, newHashSet())
 		}

+ 3 - 3
HintCOEngine/src/ua/ansymo/hintco/CosimRunUtils.xtend

@@ -15,7 +15,7 @@ class CosimRunUtils {
 	
 	static Logger logger = LoggerFactory.getLogger(typeof(CosimRunUtils))
 	
-	def static instantiateUnits(List<UnitInstance> units, Map<UnitInstance, IFmuInstance> fmuInstanceMap, IFmuLoader fmuLoader, Map<Scenario, List<PrecendenceNode>> scenarioNodesMap) {
+	def static instantiateUnits(List<UnitInstance> units, Map<UnitInstance, IFmuInstance> fmuInstanceMap, IFmuLoader fmuLoader, Map<Scenario, List<PrecedenceNode>> scenarioNodesMap) {
 		for (unit : units) {
 			val fmuInstance = fmuLoader.instantiate(unit, scenarioNodesMap)
 			logger.debug("Unit {} instantiated", unit)
@@ -77,7 +77,7 @@ class CosimRunUtils {
 		}
 	}
 	
-	def static resetUnits(List<UnitInstance> units, Map<UnitInstance, IFmuInstance> fmuInstanceMap, IFmuLoader fmuLoader, Map<Scenario, List<PrecendenceNode>> scenarioNodesMap, boolean hardReset) {
+	def static resetUnits(List<UnitInstance> units, Map<UnitInstance, IFmuInstance> fmuInstanceMap, IFmuLoader fmuLoader, Map<Scenario, List<PrecedenceNode>> scenarioNodesMap, boolean hardReset) {
 		for (unit : units) {
 			if (hardReset){
 				// Terminate Unit
@@ -149,7 +149,7 @@ class CosimRunUtils {
 		return outVals
 	}
 	
-	def static executeStep(Scenario scenario,  double time, double stepSize, List<PrecendenceNode> nodes, 
+	def static executeStep(Scenario scenario,  double time, double stepSize, List<PrecedenceNode> nodes, 
 							List<UnitInstance> units, Set<InputPortInstance> inPorts, 
 							Map<UnitInstance, IFmuInstance> fmuInstanceMap,
 							HashMap<OutputPortInstance, Double> replayValues

+ 1 - 2
HintCOEngine/src/ua/ansymo/hintco/FmuLoader.xtend

@@ -13,7 +13,6 @@ import org.slf4j.LoggerFactory
 import ua.ansymo.hintco.CosimUnitDeclaration
 import ua.ansymo.hintco.CosimUnitInstance
 import ua.ansymo.hintco.HierarchicalCosimUnit
-import ua.ansymo.hintco.PrecendenceNode
 import ua.ansymo.hintco.Scenario
 import ua.ansymo.hintco.UnitInstance
 
@@ -37,7 +36,7 @@ class FmuLoader implements IFmuLoader {
 		loadedFMUs.get(u)
 	}
 	
-	override instantiate(UnitInstance instance, Map<Scenario, List<PrecendenceNode>> scenarioNodesMap) {
+	override instantiate(UnitInstance instance, Map<Scenario, List<PrecedenceNode>> scenarioNodesMap) {
 		logger.debug("Instantiating {}.", instance.identifier)
 		
 		var AdaptedFMUInstance fmuInstance

+ 2 - 3
HintCOEngine/src/ua/ansymo/hintco/HierarchicalInstance.xtend

@@ -12,7 +12,6 @@ import ua.ansymo.hintco.HierarchicalCosimUnit
 import ua.ansymo.hintco.HierarchicalUnitPort
 import ua.ansymo.hintco.InputPortInstance
 import ua.ansymo.hintco.OutputPortInstance
-import ua.ansymo.hintco.PrecendenceNode
 import ua.ansymo.hintco.Scenario
 import ua.ansymo.hintco.UnitInstance
 
@@ -21,7 +20,7 @@ import static ua.ansymo.hintco.CosimRunUtils.*
 class HierarchicalInstance extends AdaptedFMUInstance {
 	
 	FmuLoader loader
-	List<PrecendenceNode> nodes
+	List<PrecedenceNode> nodes
 	HierarchicalCosimUnit unit
 	Map<UnitInstance, IFmuInstance> fmuInstanceMap = newHashMap()
 	
@@ -33,7 +32,7 @@ class HierarchicalInstance extends AdaptedFMUInstance {
 	
 	Set<InputPortInstance> inPorts
 	
-	new(HierarchicalCosimUnit u, Map<Scenario, List<PrecendenceNode>> scenarioNodesMap, FmuLoader l) {
+	new(HierarchicalCosimUnit u, Map<Scenario, List<PrecedenceNode>> scenarioNodesMap, FmuLoader l) {
 		super(u, scenarioNodesMap)
 		loader = l
 		unit = u

+ 1 - 2
HintCOEngine/src/ua/ansymo/hintco/IConstraintChecker.xtend

@@ -1,11 +1,10 @@
 package ua.ansymo.hintco
 
 import ua.ansymo.hintco.HintConfiguration
-import ua.ansymo.hintco.PrecendenceNode
 import ua.ansymo.hintco.VariantDiagram
 
 interface IConstraintChecker {
-	def boolean constraintIsFeasible(PrecendenceNode src, PrecendenceNode trg, VariantDiagram n, 
+	def boolean constraintIsFeasible(PrecedenceNode src, PrecedenceNode trg, VariantDiagram n, 
 						ConstraintsStack constraints, 
 						HintConfiguration cs)
 }

+ 1 - 2
HintCOEngine/src/ua/ansymo/hintco/ICosimRunner.xtend

@@ -2,11 +2,10 @@ package ua.ansymo.hintco
 
 import java.util.List
 import java.util.Map
-import ua.ansymo.hintco.PrecendenceNode
 import ua.ansymo.hintco.RootCandidateScenario
 import ua.ansymo.hintco.Scenario
 import java.io.Closeable
 
 interface ICosimRunner extends Closeable {
-	def void run(RootCandidateScenario rootScenario, Map<Scenario, List<PrecendenceNode>> scenarioNodesMap, String variantID)
+	def void run(RootCandidateScenario rootScenario, Map<Scenario, List<PrecedenceNode>> scenarioNodesMap, String variantID)
 }

+ 1 - 2
HintCOEngine/src/ua/ansymo/hintco/IFmuLoader.xtend

@@ -2,12 +2,11 @@ package ua.ansymo.hintco
 
 import java.util.List
 import java.util.Map
-import ua.ansymo.hintco.PrecendenceNode
 import ua.ansymo.hintco.Scenario
 import ua.ansymo.hintco.UnitInstance
 
 interface IFmuLoader {
-	def IFmuInstance instantiate(UnitInstance instance, Map<Scenario, List<PrecendenceNode>> scenarioNodesMap)
+	def IFmuInstance instantiate(UnitInstance instance, Map<Scenario, List<PrecedenceNode>> scenarioNodesMap)
 	
 	def void free()
 	

+ 10 - 10
HintCOEngine/src/ua/ansymo/hintco/ModelQuery.xtend

@@ -9,17 +9,17 @@ import java.util.HashSet
 class ModelQuery {
 	
 	def static precedes(HintConfiguration cs, String srcId, String trgId){
-		val nSrc = findIded(srcId, cs) as PrecendenceNode
+		val nSrc = findIded(srcId, cs) as PrecedenceNode
 		Assert.isTrue(nSrc !== null)
-		val nTrg = findIded(trgId, cs) as PrecendenceNode 
+		val nTrg = findIded(trgId, cs) as PrecedenceNode 
 		Assert.isTrue(nTrg !== null)
 		nSrc.precedes.contains(nTrg)
 	}
 	
-	def static boolean recPathExists(PrecendenceNode src,
-						PrecendenceNode trg, 
+	def static boolean recPathExists(PrecedenceNode src,
+						PrecedenceNode trg, 
 						ConstraintsStack constraints,
-						Set<PrecendenceNode> visited, 
+						Set<PrecedenceNode> visited, 
 						HintConfiguration cs){
 		/*
 		 * If src has been visited, return.
@@ -94,9 +94,9 @@ class ModelQuery {
 		return res
 	}
 	
-	def static comesBefore(String a, String b, List<PrecendenceNode> nodes, HintConfiguration cs) {
-		val nA = findIded(a, cs) as PrecendenceNode
-		val nB = findIded(b, cs) as PrecendenceNode
+	def static comesBefore(String a, String b, List<PrecedenceNode> nodes, HintConfiguration cs) {
+		val nA = findIded(a, cs) as PrecedenceNode
+		val nB = findIded(b, cs) as PrecedenceNode
 		val indexList = nodes.indexed
 		val indexOfA = indexList.findFirst([p | p.value===nA]).key
 		val indexOfB = indexList.findFirst([p | p.value===nB]).key
@@ -141,8 +141,8 @@ class ModelQuery {
 		res
 	}
 	
-	def static pathExists(PrecendenceNode src,
-						PrecendenceNode trg, 
+	def static pathExists(PrecedenceNode src,
+						PrecedenceNode trg, 
 						ConstraintsStack constraints,
 						HintConfiguration cs) {
 		recPathExists(src, trg, constraints, new HashSet(), cs)

+ 1 - 1
HintCOEngine/src/ua/ansymo/hintco/SingleCosimRunner.xtend

@@ -20,7 +20,7 @@ class SingleCosimRunner implements ICosimRunner {
 		fmuLoader = l
 	}
 	
-	override run(RootCandidateScenario rootScenario, Map<Scenario, List<PrecendenceNode>> scenarioNodesMap, String variantID) {
+	override run(RootCandidateScenario rootScenario, Map<Scenario, List<PrecedenceNode>> scenarioNodesMap, String variantID) {
 		Assert.isTrue(scenarioNodesMap.values.forall[sortedNodes | sortedNodes.forall[n1 | rootScenario.eAllContents.exists[n2 | n1===n2]]])
 		
 		val nodes = scenarioNodesMap.get(rootScenario)

+ 6 - 6
HintCOEngine/src/ua/ansymo/hintco/StrongCouplingRunner.xtend

@@ -51,7 +51,7 @@ class StrongCouplingRunner implements ICosimRunner {
 		this.hardReset = hardReset
 	}
 	
-	override run(RootCandidateScenario rootScenario, Map<Scenario, List<PrecendenceNode>> scenarioNodesMap, String variantID) {
+	override run(RootCandidateScenario rootScenario, Map<Scenario, List<PrecedenceNode>> scenarioNodesMap, String variantID) {
 		Assert.isTrue(scenarioNodesMap.values.forall[sortedNodes | sortedNodes.forall[n1 | rootScenario.eAllContents.exists[n2 | n1===n2]]])
 		
 		val nodes = scenarioNodesMap.get(rootScenario)
@@ -110,8 +110,8 @@ class StrongCouplingRunner implements ICosimRunner {
 						Set<OutputPortInstance> rollbackOutputPorts, 
 						HashMap<OutputPortInstance, Double>[] cosimSignals,
 						RootCandidateScenario rootScenario,
-						List<PrecendenceNode> nodes,
-						Map<Scenario, List<PrecendenceNode>> scenarioNodesMap
+						List<PrecedenceNode> nodes,
+						Map<Scenario, List<PrecedenceNode>> scenarioNodesMap
 	) {
 		if (stepToConverge == 0){
 			// Initialize cosim and record first outputs.
@@ -174,7 +174,7 @@ class StrongCouplingRunner implements ICosimRunner {
 						Set<OutputPortInstance> rollbackOutputPorts,
 						HashMap<OutputPortInstance, Double>[] cosimSignals,
 						RootCandidateScenario rootScenario,
-						List<PrecendenceNode> nodes) {
+						List<PrecedenceNode> nodes) {
 		val stepSize = rootScenario.stepSize
 		
 		val nonConvergedStep = convergedStep+1
@@ -199,7 +199,7 @@ class StrongCouplingRunner implements ICosimRunner {
 						List<OutputPortInstance> childOutputPorts,
 						HashMap<OutputPortInstance, Double>[] cosimSignals,
 						RootCandidateScenario rootScenario,
-						List<PrecendenceNode> nodes) {
+						List<PrecedenceNode> nodes) {
 		
 		setupExperiment(units, fmuInstanceMap)
 		intoInitMode(units, fmuInstanceMap)
@@ -228,7 +228,7 @@ class StrongCouplingRunner implements ICosimRunner {
 						Set<OutputPortInstance> rollbackOutputPorts, 
 						HashMap<OutputPortInstance, Double>[] cosimSignals,
 						RootCandidateScenario rootScenario,
-						List<PrecendenceNode> nodes) {
+						List<PrecedenceNode> nodes) {
 		// Since we stored only the output that needed to be replayed, in order to plot the final outputs we need to run a final co-sim.
 		
 		val outVals = newHashMap()

+ 4 - 5
HintCOEngine/src/ua/ansymo/hintco/VariantProcessor.xtend

@@ -35,7 +35,7 @@ class VariantProcessor implements IVariantProcessor {
 	}
 	
 	def private computeHierarchicalTopologicalSort(RootCandidateScenario scenario){
-		val Map<Scenario, List<PrecendenceNode>> result = newHashMap()
+		val Map<Scenario, List<PrecedenceNode>> result = newHashMap()
 		
 		result.put(scenario, computeTopologicalSort(scenario))
 		
@@ -56,9 +56,8 @@ class VariantProcessor implements IVariantProcessor {
 		 */
 		 
 		 // Use child nodes of the scenario (and HierarchicalPorts only, because the grand child nodes will be topologically sorted recursively
-		 // TODO Rename PrecendenceNode
-		 val Set<PrecendenceNode> unSortedNodes = getScenarioNodesToBeSorted(scenario)
-		 val Map<PrecendenceNode, Boolean> inSorted = new HashMap(unSortedNodes.size)
+		 val Set<PrecedenceNode> unSortedNodes = getScenarioNodesToBeSorted(scenario)
+		 val Map<PrecedenceNode, Boolean> inSorted = new HashMap(unSortedNodes.size)
 		 unSortedNodes.forEach[n | inSorted.put(n, false)]
 		 val sortedNodes = newLinkedList()
 		 val candidates = newLinkedList()
@@ -86,7 +85,7 @@ class VariantProcessor implements IVariantProcessor {
 	}
 	
 	def getScenarioNodesToBeSorted(Scenario scenario) {
-		val internal_nodes = scenario.cosimunits.flatMap[u | #[u as PrecendenceNode] + u.ports].toSet
+		val internal_nodes = scenario.cosimunits.flatMap[u | #[u as PrecedenceNode] + u.ports].toSet
 		if (scenario instanceof HierarchicalCosimUnit){
 			internal_nodes.addAll(scenario.ports)
 		}

+ 4 - 4
HintCOEngine/test/ua/ansymo/hintco/test/AdaptedFMUTest.xtend

@@ -28,7 +28,6 @@ import ua.ansymo.hintco.IOutputProcessor
 import ua.ansymo.hintco.MathUtils
 import ua.ansymo.hintco.ModelStorage
 import ua.ansymo.hintco.OutputPortInstance
-import ua.ansymo.hintco.PrecendenceNode
 import ua.ansymo.hintco.RootCandidateScenario
 import ua.ansymo.hintco.Scenario
 import ua.ansymo.hintco.SingleCosimRunner
@@ -37,6 +36,7 @@ import ua.ansymo.hintco.VariantProcessor
 import ua.ansymo.hintco.VariantValidator
 
 import static org.junit.Assert.*
+import ua.ansymo.hintco.PrecedenceNode
 
 class AdaptedFMUTest {
 	
@@ -52,7 +52,7 @@ class AdaptedFMUTest {
 		val numInnerSteps = new LinkedList()
 		
 		val mockLoader = new IFmuLoader{
-			override instantiate(UnitInstance u, Map<Scenario, List<PrecendenceNode>> scenarioNodesMap) {
+			override instantiate(UnitInstance u, Map<Scenario, List<PrecedenceNode>> scenarioNodesMap) {
 				assertTrue(u===source || u===sink)
 				if (u===source){
 					return new AdaptedFMUInstance(u, new MockSourceFmuInstance[t, H | 
@@ -98,7 +98,7 @@ class AdaptedFMUTest {
 		val numInnerSteps = new LinkedList()
 		
 		val mockLoader = new IFmuLoader{
-			override instantiate(UnitInstance u, Map<Scenario, List<PrecendenceNode>> scenarioNodesMap) {
+			override instantiate(UnitInstance u, Map<Scenario, List<PrecedenceNode>> scenarioNodesMap) {
 				assertTrue(u===source || u===sink)
 				if (u===source){
 					return new AdaptedFMUInstance(u, new MockSourceFmuInstance[t, H | 
@@ -145,7 +145,7 @@ class AdaptedFMUTest {
 		val numInnerSteps = new LinkedList()
 		
 		val mockLoader = new IFmuLoader{
-			override instantiate(UnitInstance u, Map<Scenario, List<PrecendenceNode>> scenarioNodesMap) {
+			override instantiate(UnitInstance u, Map<Scenario, List<PrecedenceNode>> scenarioNodesMap) {
 				assertTrue(u===source || u===sink)
 				if (u===source){
 					return new AdaptedFMUInstance(u, new MockSourceFmuInstance[t, H | 

+ 5 - 5
HintConfiguration.edit/plugin.properties

@@ -15,7 +15,6 @@ _UI_PropertyDescriptor_description = The {0} of the {1}
 _UI_IDed_type = IDed
 _UI_HintConfiguration_type = Hint Configuration
 _UI_VariantDiagram_type = Variant Diagram
-_UI_PrecendenceNode_type = Precendence Node
 _UI_RootCandidateScenario_type = Root Candidate Scenario
 _UI_Scenario_type = Scenario
 _UI_HierarchicalCosimUnit_type = Hierarchical Cosim Unit
@@ -52,10 +51,6 @@ _UI_HintConfiguration_nodes_feature = Nodes
 _UI_VariantDiagram_children_feature = Children
 _UI_VariantDiagram_alternative_feature = Alternative
 _UI_VariantDiagram_name_feature = Name
-_UI_PrecendenceNode_precedes_feature = Precedes
-_UI_PrecendenceNode_succeeds_feature = Succeeds
-_UI_PrecendenceNode_before_feature = Before
-_UI_PrecendenceNode_after_feature = After
 _UI_RootCandidateScenario_name_feature = Name
 _UI_RootCandidateScenario_stopTime_feature = Stop Time
 _UI_RootCandidateScenario_stepSize_feature = Step Size
@@ -101,3 +96,8 @@ _UI_OutputPortInstance_internalValueFrom_feature = Internal Value From
 _UI_RollbackInterpolationAdaptation_type = Rollback Interpolation Adaptation
 _UI_PortInstance_extrapolationCost_feature = Extrapolation Cost
 _UI_InputPortInstance_extrapolationCost_feature = Extrapolation Cost
+_UI_PrecedenceNode_type = Precedence Node
+_UI_PrecedenceNode_precedes_feature = Precedes
+_UI_PrecedenceNode_succeeds_feature = Succeeds
+_UI_PrecedenceNode_before_feature = Before
+_UI_PrecedenceNode_after_feature = After

+ 12 - 12
HintConfiguration.edit/src/ua/ansymo/hintco/provider/HierarchicalCosimUnitItemProvider.java

@@ -67,9 +67,9 @@ public class HierarchicalCosimUnitItemProvider extends ScenarioItemProvider {
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_PrecendenceNode_precedes_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_PrecendenceNode_precedes_feature", "_UI_PrecendenceNode_type"),
-				 HintcoPackage.Literals.PRECENDENCE_NODE__PRECEDES,
+				 getString("_UI_PrecedenceNode_precedes_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_PrecedenceNode_precedes_feature", "_UI_PrecedenceNode_type"),
+				 HintcoPackage.Literals.PRECEDENCE_NODE__PRECEDES,
 				 true,
 				 false,
 				 true,
@@ -89,9 +89,9 @@ public class HierarchicalCosimUnitItemProvider extends ScenarioItemProvider {
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_PrecendenceNode_succeeds_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_PrecendenceNode_succeeds_feature", "_UI_PrecendenceNode_type"),
-				 HintcoPackage.Literals.PRECENDENCE_NODE__SUCCEEDS,
+				 getString("_UI_PrecedenceNode_succeeds_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_PrecedenceNode_succeeds_feature", "_UI_PrecedenceNode_type"),
+				 HintcoPackage.Literals.PRECEDENCE_NODE__SUCCEEDS,
 				 true,
 				 false,
 				 true,
@@ -111,9 +111,9 @@ public class HierarchicalCosimUnitItemProvider extends ScenarioItemProvider {
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_PrecendenceNode_before_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_PrecendenceNode_before_feature", "_UI_PrecendenceNode_type"),
-				 HintcoPackage.Literals.PRECENDENCE_NODE__BEFORE,
+				 getString("_UI_PrecedenceNode_before_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_PrecedenceNode_before_feature", "_UI_PrecedenceNode_type"),
+				 HintcoPackage.Literals.PRECEDENCE_NODE__BEFORE,
 				 true,
 				 false,
 				 true,
@@ -133,9 +133,9 @@ public class HierarchicalCosimUnitItemProvider extends ScenarioItemProvider {
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_PrecendenceNode_after_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_PrecendenceNode_after_feature", "_UI_PrecendenceNode_type"),
-				 HintcoPackage.Literals.PRECENDENCE_NODE__AFTER,
+				 getString("_UI_PrecedenceNode_after_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_PrecedenceNode_after_feature", "_UI_PrecedenceNode_type"),
+				 HintcoPackage.Literals.PRECEDENCE_NODE__AFTER,
 				 true,
 				 false,
 				 true,

+ 1 - 1
HintConfiguration.edit/src/ua/ansymo/hintco/provider/PortInstanceItemProvider.java

@@ -26,7 +26,7 @@ import ua.ansymo.hintco.PortInstance;
  * <!-- end-user-doc -->
  * @generated
  */
-public class PortInstanceItemProvider extends PrecendenceNodeItemProvider {
+public class PortInstanceItemProvider extends PrecedenceNodeItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->

+ 0 - 204
HintConfiguration.edit/src/ua/ansymo/hintco/provider/PrecendenceNodeItemProvider.java

@@ -1,204 +0,0 @@
-/**
- */
-package ua.ansymo.hintco.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-import ua.ansymo.hintco.HintcoPackage;
-
-/**
- * This is the item provider adapter for a {@link ua.ansymo.hintco.PrecendenceNode} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PrecendenceNodeItemProvider 
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PrecendenceNodeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addPrecedesPropertyDescriptor(object);
-			addSucceedsPropertyDescriptor(object);
-			addBeforePropertyDescriptor(object);
-			addAfterPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Precedes feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addPrecedesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_PrecendenceNode_precedes_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_PrecendenceNode_precedes_feature", "_UI_PrecendenceNode_type"),
-				 HintcoPackage.Literals.PRECENDENCE_NODE__PRECEDES,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Succeeds feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSucceedsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_PrecendenceNode_succeeds_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_PrecendenceNode_succeeds_feature", "_UI_PrecendenceNode_type"),
-				 HintcoPackage.Literals.PRECENDENCE_NODE__SUCCEEDS,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Before feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addBeforePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_PrecendenceNode_before_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_PrecendenceNode_before_feature", "_UI_PrecendenceNode_type"),
-				 HintcoPackage.Literals.PRECENDENCE_NODE__BEFORE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the After feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAfterPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_PrecendenceNode_after_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_PrecendenceNode_after_feature", "_UI_PrecendenceNode_type"),
-				 HintcoPackage.Literals.PRECENDENCE_NODE__AFTER,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_PrecendenceNode_type");
-	}
-
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return HintConfigurationEditPlugin.INSTANCE;
-	}
-
-}

+ 12 - 12
HintConfiguration.edit/src/ua/ansymo/hintco/provider/UnitInstanceItemProvider.java

@@ -67,9 +67,9 @@ public class UnitInstanceItemProvider extends IDedItemProvider {
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_PrecendenceNode_precedes_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_PrecendenceNode_precedes_feature", "_UI_PrecendenceNode_type"),
-				 HintcoPackage.Literals.PRECENDENCE_NODE__PRECEDES,
+				 getString("_UI_PrecedenceNode_precedes_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_PrecedenceNode_precedes_feature", "_UI_PrecedenceNode_type"),
+				 HintcoPackage.Literals.PRECEDENCE_NODE__PRECEDES,
 				 true,
 				 false,
 				 true,
@@ -89,9 +89,9 @@ public class UnitInstanceItemProvider extends IDedItemProvider {
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_PrecendenceNode_succeeds_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_PrecendenceNode_succeeds_feature", "_UI_PrecendenceNode_type"),
-				 HintcoPackage.Literals.PRECENDENCE_NODE__SUCCEEDS,
+				 getString("_UI_PrecedenceNode_succeeds_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_PrecedenceNode_succeeds_feature", "_UI_PrecedenceNode_type"),
+				 HintcoPackage.Literals.PRECEDENCE_NODE__SUCCEEDS,
 				 true,
 				 false,
 				 true,
@@ -111,9 +111,9 @@ public class UnitInstanceItemProvider extends IDedItemProvider {
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_PrecendenceNode_before_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_PrecendenceNode_before_feature", "_UI_PrecendenceNode_type"),
-				 HintcoPackage.Literals.PRECENDENCE_NODE__BEFORE,
+				 getString("_UI_PrecedenceNode_before_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_PrecedenceNode_before_feature", "_UI_PrecedenceNode_type"),
+				 HintcoPackage.Literals.PRECEDENCE_NODE__BEFORE,
 				 true,
 				 false,
 				 true,
@@ -133,9 +133,9 @@ public class UnitInstanceItemProvider extends IDedItemProvider {
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_PrecendenceNode_after_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_PrecendenceNode_after_feature", "_UI_PrecendenceNode_type"),
-				 HintcoPackage.Literals.PRECENDENCE_NODE__AFTER,
+				 getString("_UI_PrecedenceNode_after_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_PrecedenceNode_after_feature", "_UI_PrecedenceNode_type"),
+				 HintcoPackage.Literals.PRECEDENCE_NODE__AFTER,
 				 true,
 				 false,
 				 true,

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 5 - 5
HintConfiguration/model/HintConfiguration.genmodel


+ 7 - 7
HintConfiguration/model/HintConfiguration.xcore

@@ -41,11 +41,11 @@ class VariantDiagram extends IDed {
 	}
 }
 
-abstract class PrecendenceNode {
-	refers PrecendenceNode[] precedes opposite succeeds
-	refers PrecendenceNode[] succeeds opposite precedes
-	refers PrecendenceNode before opposite after
-	refers PrecendenceNode after opposite before
+abstract class PrecedenceNode {
+	refers PrecedenceNode[] precedes opposite succeeds
+	refers PrecedenceNode[] succeeds opposite precedes
+	refers PrecedenceNode before opposite after
+	refers PrecedenceNode after opposite before
 }
 
 class RootCandidateScenario extends IDed, Alternative, Scenario {
@@ -73,7 +73,7 @@ class CosimUnitDeclaration extends IDed {
 	String guid
 }
 
-abstract class UnitInstance extends IDed,PrecendenceNode{
+abstract class UnitInstance extends IDed,PrecedenceNode{
 	refers Scenario scenario opposite cosimunits
 	contains UnitAdaptation adaptation opposite unit
 	contains PortInstance[] ports opposite unit
@@ -108,7 +108,7 @@ class CosimUnitInstance extends UnitInstance {
 	refers CosimUnitDeclaration[1] declaration
 }
 
-abstract class PortInstance extends PrecendenceNode,IDed {
+abstract class PortInstance extends PrecedenceNode,IDed {
 	refers UnitInstance unit opposite ports
 	contains PortAdaptation adaptation opposite port
 	

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 9 - 9
HintConfiguration/model/hintco.ecore


+ 53 - 53
HintConfiguration/src-gen/ua/ansymo/hintco/HintcoPackage.java

@@ -225,14 +225,14 @@ public interface HintcoPackage extends EPackage {
 	int VARIANT_DIAGRAM_OPERATION_COUNT = IDED_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link ua.ansymo.hintco.impl.PrecendenceNodeImpl <em>Precendence Node</em>}' class.
+	 * The meta object id for the '{@link ua.ansymo.hintco.impl.PrecedenceNodeImpl <em>Precedence Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ua.ansymo.hintco.impl.PrecendenceNodeImpl
-	 * @see ua.ansymo.hintco.impl.HintcoPackageImpl#getPrecendenceNode()
+	 * @see ua.ansymo.hintco.impl.PrecedenceNodeImpl
+	 * @see ua.ansymo.hintco.impl.HintcoPackageImpl#getPrecedenceNode()
 	 * @generated
 	 */
-	int PRECENDENCE_NODE = 3;
+	int PRECEDENCE_NODE = 3;
 
 	/**
 	 * The feature id for the '<em><b>Precedes</b></em>' reference list.
@@ -241,7 +241,7 @@ public interface HintcoPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PRECENDENCE_NODE__PRECEDES = 0;
+	int PRECEDENCE_NODE__PRECEDES = 0;
 
 	/**
 	 * The feature id for the '<em><b>Succeeds</b></em>' reference list.
@@ -250,7 +250,7 @@ public interface HintcoPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PRECENDENCE_NODE__SUCCEEDS = 1;
+	int PRECEDENCE_NODE__SUCCEEDS = 1;
 
 	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference.
@@ -259,7 +259,7 @@ public interface HintcoPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PRECENDENCE_NODE__BEFORE = 2;
+	int PRECEDENCE_NODE__BEFORE = 2;
 
 	/**
 	 * The feature id for the '<em><b>After</b></em>' reference.
@@ -268,25 +268,25 @@ public interface HintcoPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PRECENDENCE_NODE__AFTER = 3;
+	int PRECEDENCE_NODE__AFTER = 3;
 
 	/**
-	 * The number of structural features of the '<em>Precendence Node</em>' class.
+	 * The number of structural features of the '<em>Precedence Node</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int PRECENDENCE_NODE_FEATURE_COUNT = 4;
+	int PRECEDENCE_NODE_FEATURE_COUNT = 4;
 
 	/**
-	 * The number of operations of the '<em>Precendence Node</em>' class.
+	 * The number of operations of the '<em>Precedence Node</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int PRECENDENCE_NODE_OPERATION_COUNT = 0;
+	int PRECEDENCE_NODE_OPERATION_COUNT = 0;
 
 	/**
 	 * The meta object id for the '{@link ua.ansymo.hintco.impl.RootCandidateScenarioImpl <em>Root Candidate Scenario</em>}' class.
@@ -959,7 +959,7 @@ public interface HintcoPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PORT_INSTANCE__PRECEDES = PRECENDENCE_NODE__PRECEDES;
+	int PORT_INSTANCE__PRECEDES = PRECEDENCE_NODE__PRECEDES;
 
 	/**
 	 * The feature id for the '<em><b>Succeeds</b></em>' reference list.
@@ -968,7 +968,7 @@ public interface HintcoPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PORT_INSTANCE__SUCCEEDS = PRECENDENCE_NODE__SUCCEEDS;
+	int PORT_INSTANCE__SUCCEEDS = PRECEDENCE_NODE__SUCCEEDS;
 
 	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference.
@@ -977,7 +977,7 @@ public interface HintcoPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PORT_INSTANCE__BEFORE = PRECENDENCE_NODE__BEFORE;
+	int PORT_INSTANCE__BEFORE = PRECEDENCE_NODE__BEFORE;
 
 	/**
 	 * The feature id for the '<em><b>After</b></em>' reference.
@@ -986,7 +986,7 @@ public interface HintcoPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PORT_INSTANCE__AFTER = PRECENDENCE_NODE__AFTER;
+	int PORT_INSTANCE__AFTER = PRECEDENCE_NODE__AFTER;
 
 	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
@@ -995,7 +995,7 @@ public interface HintcoPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PORT_INSTANCE__IDENTIFIER = PRECENDENCE_NODE_FEATURE_COUNT + 0;
+	int PORT_INSTANCE__IDENTIFIER = PRECEDENCE_NODE_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Unit</b></em>' container reference.
@@ -1004,7 +1004,7 @@ public interface HintcoPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PORT_INSTANCE__UNIT = PRECENDENCE_NODE_FEATURE_COUNT + 1;
+	int PORT_INSTANCE__UNIT = PRECEDENCE_NODE_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Adaptation</b></em>' containment reference.
@@ -1013,7 +1013,7 @@ public interface HintcoPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PORT_INSTANCE__ADAPTATION = PRECENDENCE_NODE_FEATURE_COUNT + 2;
+	int PORT_INSTANCE__ADAPTATION = PRECEDENCE_NODE_FEATURE_COUNT + 2;
 
 	/**
 	 * The number of structural features of the '<em>Port Instance</em>' class.
@@ -1022,7 +1022,7 @@ public interface HintcoPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PORT_INSTANCE_FEATURE_COUNT = PRECENDENCE_NODE_FEATURE_COUNT + 3;
+	int PORT_INSTANCE_FEATURE_COUNT = PRECEDENCE_NODE_FEATURE_COUNT + 3;
 
 	/**
 	 * The operation id for the '<em>Selected Adaptations</em>' operation.
@@ -1031,7 +1031,7 @@ public interface HintcoPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PORT_INSTANCE___SELECTED_ADAPTATIONS = PRECENDENCE_NODE_OPERATION_COUNT + 0;
+	int PORT_INSTANCE___SELECTED_ADAPTATIONS = PRECEDENCE_NODE_OPERATION_COUNT + 0;
 
 	/**
 	 * The operation id for the '<em>Is Input</em>' operation.
@@ -1040,7 +1040,7 @@ public interface HintcoPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PORT_INSTANCE___IS_INPUT = PRECENDENCE_NODE_OPERATION_COUNT + 1;
+	int PORT_INSTANCE___IS_INPUT = PRECEDENCE_NODE_OPERATION_COUNT + 1;
 
 	/**
 	 * The operation id for the '<em>Gets Value From</em>' operation.
@@ -1049,7 +1049,7 @@ public interface HintcoPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PORT_INSTANCE___GETS_VALUE_FROM__PORTINSTANCE = PRECENDENCE_NODE_OPERATION_COUNT + 2;
+	int PORT_INSTANCE___GETS_VALUE_FROM__PORTINSTANCE = PRECEDENCE_NODE_OPERATION_COUNT + 2;
 
 	/**
 	 * The operation id for the '<em>To String</em>' operation.
@@ -1058,7 +1058,7 @@ public interface HintcoPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PORT_INSTANCE___TO_STRING = PRECENDENCE_NODE_OPERATION_COUNT + 3;
+	int PORT_INSTANCE___TO_STRING = PRECEDENCE_NODE_OPERATION_COUNT + 3;
 
 	/**
 	 * The number of operations of the '<em>Port Instance</em>' class.
@@ -1067,7 +1067,7 @@ public interface HintcoPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PORT_INSTANCE_OPERATION_COUNT = PRECENDENCE_NODE_OPERATION_COUNT + 4;
+	int PORT_INSTANCE_OPERATION_COUNT = PRECEDENCE_NODE_OPERATION_COUNT + 4;
 
 	/**
 	 * The meta object id for the '{@link ua.ansymo.hintco.impl.InputPortInstanceImpl <em>Input Port Instance</em>}' class.
@@ -3033,58 +3033,58 @@ public interface HintcoPackage extends EPackage {
 	EAttribute getVariantDiagram_Name();
 
 	/**
-	 * Returns the meta object for class '{@link ua.ansymo.hintco.PrecendenceNode <em>Precendence Node</em>}'.
+	 * Returns the meta object for class '{@link ua.ansymo.hintco.PrecedenceNode <em>Precedence Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Precendence Node</em>'.
-	 * @see ua.ansymo.hintco.PrecendenceNode
+	 * @return the meta object for class '<em>Precedence Node</em>'.
+	 * @see ua.ansymo.hintco.PrecedenceNode
 	 * @generated
 	 */
-	EClass getPrecendenceNode();
+	EClass getPrecedenceNode();
 
 	/**
-	 * Returns the meta object for the reference list '{@link ua.ansymo.hintco.PrecendenceNode#getPrecedes <em>Precedes</em>}'.
+	 * Returns the meta object for the reference list '{@link ua.ansymo.hintco.PrecedenceNode#getPrecedes <em>Precedes</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Precedes</em>'.
-	 * @see ua.ansymo.hintco.PrecendenceNode#getPrecedes()
-	 * @see #getPrecendenceNode()
+	 * @see ua.ansymo.hintco.PrecedenceNode#getPrecedes()
+	 * @see #getPrecedenceNode()
 	 * @generated
 	 */
-	EReference getPrecendenceNode_Precedes();
+	EReference getPrecedenceNode_Precedes();
 
 	/**
-	 * Returns the meta object for the reference list '{@link ua.ansymo.hintco.PrecendenceNode#getSucceeds <em>Succeeds</em>}'.
+	 * Returns the meta object for the reference list '{@link ua.ansymo.hintco.PrecedenceNode#getSucceeds <em>Succeeds</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Succeeds</em>'.
-	 * @see ua.ansymo.hintco.PrecendenceNode#getSucceeds()
-	 * @see #getPrecendenceNode()
+	 * @see ua.ansymo.hintco.PrecedenceNode#getSucceeds()
+	 * @see #getPrecedenceNode()
 	 * @generated
 	 */
-	EReference getPrecendenceNode_Succeeds();
+	EReference getPrecedenceNode_Succeeds();
 
 	/**
-	 * Returns the meta object for the reference '{@link ua.ansymo.hintco.PrecendenceNode#getBefore <em>Before</em>}'.
+	 * Returns the meta object for the reference '{@link ua.ansymo.hintco.PrecedenceNode#getBefore <em>Before</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Before</em>'.
-	 * @see ua.ansymo.hintco.PrecendenceNode#getBefore()
-	 * @see #getPrecendenceNode()
+	 * @see ua.ansymo.hintco.PrecedenceNode#getBefore()
+	 * @see #getPrecedenceNode()
 	 * @generated
 	 */
-	EReference getPrecendenceNode_Before();
+	EReference getPrecedenceNode_Before();
 
 	/**
-	 * Returns the meta object for the reference '{@link ua.ansymo.hintco.PrecendenceNode#getAfter <em>After</em>}'.
+	 * Returns the meta object for the reference '{@link ua.ansymo.hintco.PrecedenceNode#getAfter <em>After</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>After</em>'.
-	 * @see ua.ansymo.hintco.PrecendenceNode#getAfter()
-	 * @see #getPrecendenceNode()
+	 * @see ua.ansymo.hintco.PrecedenceNode#getAfter()
+	 * @see #getPrecedenceNode()
 	 * @generated
 	 */
-	EReference getPrecendenceNode_After();
+	EReference getPrecedenceNode_After();
 
 	/**
 	 * Returns the meta object for class '{@link ua.ansymo.hintco.RootCandidateScenario <em>Root Candidate Scenario</em>}'.
@@ -4094,14 +4094,14 @@ public interface HintcoPackage extends EPackage {
 		EAttribute VARIANT_DIAGRAM__NAME = eINSTANCE.getVariantDiagram_Name();
 
 		/**
-		 * The meta object literal for the '{@link ua.ansymo.hintco.impl.PrecendenceNodeImpl <em>Precendence Node</em>}' class.
+		 * The meta object literal for the '{@link ua.ansymo.hintco.impl.PrecedenceNodeImpl <em>Precedence Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ua.ansymo.hintco.impl.PrecendenceNodeImpl
-		 * @see ua.ansymo.hintco.impl.HintcoPackageImpl#getPrecendenceNode()
+		 * @see ua.ansymo.hintco.impl.PrecedenceNodeImpl
+		 * @see ua.ansymo.hintco.impl.HintcoPackageImpl#getPrecedenceNode()
 		 * @generated
 		 */
-		EClass PRECENDENCE_NODE = eINSTANCE.getPrecendenceNode();
+		EClass PRECEDENCE_NODE = eINSTANCE.getPrecedenceNode();
 
 		/**
 		 * The meta object literal for the '<em><b>Precedes</b></em>' reference list feature.
@@ -4109,7 +4109,7 @@ public interface HintcoPackage extends EPackage {
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference PRECENDENCE_NODE__PRECEDES = eINSTANCE.getPrecendenceNode_Precedes();
+		EReference PRECEDENCE_NODE__PRECEDES = eINSTANCE.getPrecedenceNode_Precedes();
 
 		/**
 		 * The meta object literal for the '<em><b>Succeeds</b></em>' reference list feature.
@@ -4117,7 +4117,7 @@ public interface HintcoPackage extends EPackage {
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference PRECENDENCE_NODE__SUCCEEDS = eINSTANCE.getPrecendenceNode_Succeeds();
+		EReference PRECEDENCE_NODE__SUCCEEDS = eINSTANCE.getPrecedenceNode_Succeeds();
 
 		/**
 		 * The meta object literal for the '<em><b>Before</b></em>' reference feature.
@@ -4125,7 +4125,7 @@ public interface HintcoPackage extends EPackage {
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference PRECENDENCE_NODE__BEFORE = eINSTANCE.getPrecendenceNode_Before();
+		EReference PRECEDENCE_NODE__BEFORE = eINSTANCE.getPrecedenceNode_Before();
 
 		/**
 		 * The meta object literal for the '<em><b>After</b></em>' reference feature.
@@ -4133,7 +4133,7 @@ public interface HintcoPackage extends EPackage {
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference PRECENDENCE_NODE__AFTER = eINSTANCE.getPrecendenceNode_After();
+		EReference PRECEDENCE_NODE__AFTER = eINSTANCE.getPrecedenceNode_After();
 
 		/**
 		 * The meta object literal for the '{@link ua.ansymo.hintco.impl.RootCandidateScenarioImpl <em>Root Candidate Scenario</em>}' class.

+ 1 - 1
HintConfiguration/src-gen/ua/ansymo/hintco/PortInstance.java

@@ -21,7 +21,7 @@ import org.eclipse.emf.common.util.EList;
  * @model abstract="true"
  * @generated
  */
-public interface PortInstance extends PrecendenceNode, IDed {
+public interface PortInstance extends PrecedenceNode, IDed {
 	/**
 	 * Returns the value of the '<em><b>Unit</b></em>' container reference.
 	 * It is bidirectional and its opposite is '{@link ua.ansymo.hintco.UnitInstance#getPorts <em>Ports</em>}'.

+ 32 - 32
HintConfiguration/src-gen/ua/ansymo/hintco/PrecendenceNode.java

@@ -8,28 +8,28 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Precendence Node</b></em>'.
+ * A representation of the model object '<em><b>Precedence Node</b></em>'.
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ua.ansymo.hintco.PrecendenceNode#getPrecedes <em>Precedes</em>}</li>
- *   <li>{@link ua.ansymo.hintco.PrecendenceNode#getSucceeds <em>Succeeds</em>}</li>
- *   <li>{@link ua.ansymo.hintco.PrecendenceNode#getBefore <em>Before</em>}</li>
- *   <li>{@link ua.ansymo.hintco.PrecendenceNode#getAfter <em>After</em>}</li>
+ *   <li>{@link ua.ansymo.hintco.PrecedenceNode#getPrecedes <em>Precedes</em>}</li>
+ *   <li>{@link ua.ansymo.hintco.PrecedenceNode#getSucceeds <em>Succeeds</em>}</li>
+ *   <li>{@link ua.ansymo.hintco.PrecedenceNode#getBefore <em>Before</em>}</li>
+ *   <li>{@link ua.ansymo.hintco.PrecedenceNode#getAfter <em>After</em>}</li>
  * </ul>
  *
- * @see ua.ansymo.hintco.HintcoPackage#getPrecendenceNode()
+ * @see ua.ansymo.hintco.HintcoPackage#getPrecedenceNode()
  * @model abstract="true"
  * @generated
  */
-public interface PrecendenceNode extends EObject {
+public interface PrecedenceNode extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Precedes</b></em>' reference list.
-	 * The list contents are of type {@link ua.ansymo.hintco.PrecendenceNode}.
-	 * It is bidirectional and its opposite is '{@link ua.ansymo.hintco.PrecendenceNode#getSucceeds <em>Succeeds</em>}'.
+	 * The list contents are of type {@link ua.ansymo.hintco.PrecedenceNode}.
+	 * It is bidirectional and its opposite is '{@link ua.ansymo.hintco.PrecedenceNode#getSucceeds <em>Succeeds</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Precedes</em>' reference list isn't clear,
@@ -37,17 +37,17 @@ public interface PrecendenceNode extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Precedes</em>' reference list.
-	 * @see ua.ansymo.hintco.HintcoPackage#getPrecendenceNode_Precedes()
-	 * @see ua.ansymo.hintco.PrecendenceNode#getSucceeds
+	 * @see ua.ansymo.hintco.HintcoPackage#getPrecedenceNode_Precedes()
+	 * @see ua.ansymo.hintco.PrecedenceNode#getSucceeds
 	 * @model opposite="succeeds"
 	 * @generated
 	 */
-	EList<PrecendenceNode> getPrecedes();
+	EList<PrecedenceNode> getPrecedes();
 
 	/**
 	 * Returns the value of the '<em><b>Succeeds</b></em>' reference list.
-	 * The list contents are of type {@link ua.ansymo.hintco.PrecendenceNode}.
-	 * It is bidirectional and its opposite is '{@link ua.ansymo.hintco.PrecendenceNode#getPrecedes <em>Precedes</em>}'.
+	 * The list contents are of type {@link ua.ansymo.hintco.PrecedenceNode}.
+	 * It is bidirectional and its opposite is '{@link ua.ansymo.hintco.PrecedenceNode#getPrecedes <em>Precedes</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Succeeds</em>' reference list isn't clear,
@@ -55,16 +55,16 @@ public interface PrecendenceNode extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Succeeds</em>' reference list.
-	 * @see ua.ansymo.hintco.HintcoPackage#getPrecendenceNode_Succeeds()
-	 * @see ua.ansymo.hintco.PrecendenceNode#getPrecedes
+	 * @see ua.ansymo.hintco.HintcoPackage#getPrecedenceNode_Succeeds()
+	 * @see ua.ansymo.hintco.PrecedenceNode#getPrecedes
 	 * @model opposite="precedes"
 	 * @generated
 	 */
-	EList<PrecendenceNode> getSucceeds();
+	EList<PrecedenceNode> getSucceeds();
 
 	/**
 	 * Returns the value of the '<em><b>Before</b></em>' reference.
-	 * It is bidirectional and its opposite is '{@link ua.ansymo.hintco.PrecendenceNode#getAfter <em>After</em>}'.
+	 * It is bidirectional and its opposite is '{@link ua.ansymo.hintco.PrecedenceNode#getAfter <em>After</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Before</em>' reference isn't clear,
@@ -72,27 +72,27 @@ public interface PrecendenceNode extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Before</em>' reference.
-	 * @see #setBefore(PrecendenceNode)
-	 * @see ua.ansymo.hintco.HintcoPackage#getPrecendenceNode_Before()
-	 * @see ua.ansymo.hintco.PrecendenceNode#getAfter
+	 * @see #setBefore(PrecedenceNode)
+	 * @see ua.ansymo.hintco.HintcoPackage#getPrecedenceNode_Before()
+	 * @see ua.ansymo.hintco.PrecedenceNode#getAfter
 	 * @model opposite="after"
 	 * @generated
 	 */
-	PrecendenceNode getBefore();
+	PrecedenceNode getBefore();
 
 	/**
-	 * Sets the value of the '{@link ua.ansymo.hintco.PrecendenceNode#getBefore <em>Before</em>}' reference.
+	 * Sets the value of the '{@link ua.ansymo.hintco.PrecedenceNode#getBefore <em>Before</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Before</em>' reference.
 	 * @see #getBefore()
 	 * @generated
 	 */
-	void setBefore(PrecendenceNode value);
+	void setBefore(PrecedenceNode value);
 
 	/**
 	 * Returns the value of the '<em><b>After</b></em>' reference.
-	 * It is bidirectional and its opposite is '{@link ua.ansymo.hintco.PrecendenceNode#getBefore <em>Before</em>}'.
+	 * It is bidirectional and its opposite is '{@link ua.ansymo.hintco.PrecedenceNode#getBefore <em>Before</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>After</em>' reference isn't clear,
@@ -100,22 +100,22 @@ public interface PrecendenceNode extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>After</em>' reference.
-	 * @see #setAfter(PrecendenceNode)
-	 * @see ua.ansymo.hintco.HintcoPackage#getPrecendenceNode_After()
-	 * @see ua.ansymo.hintco.PrecendenceNode#getBefore
+	 * @see #setAfter(PrecedenceNode)
+	 * @see ua.ansymo.hintco.HintcoPackage#getPrecedenceNode_After()
+	 * @see ua.ansymo.hintco.PrecedenceNode#getBefore
 	 * @model opposite="before"
 	 * @generated
 	 */
-	PrecendenceNode getAfter();
+	PrecedenceNode getAfter();
 
 	/**
-	 * Sets the value of the '{@link ua.ansymo.hintco.PrecendenceNode#getAfter <em>After</em>}' reference.
+	 * Sets the value of the '{@link ua.ansymo.hintco.PrecedenceNode#getAfter <em>After</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>After</em>' reference.
 	 * @see #getAfter()
 	 * @generated
 	 */
-	void setAfter(PrecendenceNode value);
+	void setAfter(PrecedenceNode value);
 
-} // PrecendenceNode
+} // PrecedenceNode

+ 1 - 1
HintConfiguration/src-gen/ua/ansymo/hintco/UnitInstance.java

@@ -22,7 +22,7 @@ import org.eclipse.emf.common.util.EList;
  * @model abstract="true"
  * @generated
  */
-public interface UnitInstance extends IDed, PrecendenceNode {
+public interface UnitInstance extends IDed, PrecedenceNode {
 	/**
 	 * Returns the value of the '<em><b>Scenario</b></em>' container reference.
 	 * It is bidirectional and its opposite is '{@link ua.ansymo.hintco.Scenario#getCosimunits <em>Cosimunits</em>}'.

+ 46 - 46
HintConfiguration/src-gen/ua/ansymo/hintco/impl/HierarchicalCosimUnitImpl.java

@@ -36,7 +36,7 @@ import ua.ansymo.hintco.HintcoPackage;
 import ua.ansymo.hintco.InputPortInstance;
 import ua.ansymo.hintco.OutputPortInstance;
 import ua.ansymo.hintco.PortInstance;
-import ua.ansymo.hintco.PrecendenceNode;
+import ua.ansymo.hintco.PrecedenceNode;
 import ua.ansymo.hintco.Scenario;
 import ua.ansymo.hintco.UnitAdaptation;
 import ua.ansymo.hintco.UnitInstance;
@@ -69,7 +69,7 @@ public class HierarchicalCosimUnitImpl extends ScenarioImpl implements Hierarchi
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<PrecendenceNode> precedes;
+	protected EList<PrecedenceNode> precedes;
 
 	/**
 	 * The cached value of the '{@link #getSucceeds() <em>Succeeds</em>}' reference list.
@@ -79,7 +79,7 @@ public class HierarchicalCosimUnitImpl extends ScenarioImpl implements Hierarchi
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<PrecendenceNode> succeeds;
+	protected EList<PrecedenceNode> succeeds;
 
 	/**
 	 * The cached value of the '{@link #getBefore() <em>Before</em>}' reference.
@@ -89,7 +89,7 @@ public class HierarchicalCosimUnitImpl extends ScenarioImpl implements Hierarchi
 	 * @generated
 	 * @ordered
 	 */
-	protected PrecendenceNode before;
+	protected PrecedenceNode before;
 
 	/**
 	 * The cached value of the '{@link #getAfter() <em>After</em>}' reference.
@@ -99,7 +99,7 @@ public class HierarchicalCosimUnitImpl extends ScenarioImpl implements Hierarchi
 	 * @generated
 	 * @ordered
 	 */
-	protected PrecendenceNode after;
+	protected PrecedenceNode after;
 
 	/**
 	 * The cached value of the '{@link #getAdaptation() <em>Adaptation</em>}' containment reference.
@@ -145,9 +145,9 @@ public class HierarchicalCosimUnitImpl extends ScenarioImpl implements Hierarchi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<PrecendenceNode> getPrecedes() {
+	public EList<PrecedenceNode> getPrecedes() {
 		if (precedes == null) {
-			precedes = new EObjectWithInverseResolvingEList.ManyInverse<PrecendenceNode>(PrecendenceNode.class, this, HintcoPackage.HIERARCHICAL_COSIM_UNIT__PRECEDES, HintcoPackage.PRECENDENCE_NODE__SUCCEEDS);
+			precedes = new EObjectWithInverseResolvingEList.ManyInverse<PrecedenceNode>(PrecedenceNode.class, this, HintcoPackage.HIERARCHICAL_COSIM_UNIT__PRECEDES, HintcoPackage.PRECEDENCE_NODE__SUCCEEDS);
 		}
 		return precedes;
 	}
@@ -157,9 +157,9 @@ public class HierarchicalCosimUnitImpl extends ScenarioImpl implements Hierarchi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<PrecendenceNode> getSucceeds() {
+	public EList<PrecedenceNode> getSucceeds() {
 		if (succeeds == null) {
-			succeeds = new EObjectWithInverseResolvingEList.ManyInverse<PrecendenceNode>(PrecendenceNode.class, this, HintcoPackage.HIERARCHICAL_COSIM_UNIT__SUCCEEDS, HintcoPackage.PRECENDENCE_NODE__PRECEDES);
+			succeeds = new EObjectWithInverseResolvingEList.ManyInverse<PrecedenceNode>(PrecedenceNode.class, this, HintcoPackage.HIERARCHICAL_COSIM_UNIT__SUCCEEDS, HintcoPackage.PRECEDENCE_NODE__PRECEDES);
 		}
 		return succeeds;
 	}
@@ -169,10 +169,10 @@ public class HierarchicalCosimUnitImpl extends ScenarioImpl implements Hierarchi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public PrecendenceNode getBefore() {
+	public PrecedenceNode getBefore() {
 		if (before != null && before.eIsProxy()) {
 			InternalEObject oldBefore = (InternalEObject)before;
-			before = (PrecendenceNode)eResolveProxy(oldBefore);
+			before = (PrecedenceNode)eResolveProxy(oldBefore);
 			if (before != oldBefore) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HintcoPackage.HIERARCHICAL_COSIM_UNIT__BEFORE, oldBefore, before));
@@ -186,7 +186,7 @@ public class HierarchicalCosimUnitImpl extends ScenarioImpl implements Hierarchi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public PrecendenceNode basicGetBefore() {
+	public PrecedenceNode basicGetBefore() {
 		return before;
 	}
 
@@ -195,8 +195,8 @@ public class HierarchicalCosimUnitImpl extends ScenarioImpl implements Hierarchi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain basicSetBefore(PrecendenceNode newBefore, NotificationChain msgs) {
-		PrecendenceNode oldBefore = before;
+	public NotificationChain basicSetBefore(PrecedenceNode newBefore, NotificationChain msgs) {
+		PrecedenceNode oldBefore = before;
 		before = newBefore;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HintcoPackage.HIERARCHICAL_COSIM_UNIT__BEFORE, oldBefore, newBefore);
@@ -210,13 +210,13 @@ public class HierarchicalCosimUnitImpl extends ScenarioImpl implements Hierarchi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setBefore(PrecendenceNode newBefore) {
+	public void setBefore(PrecedenceNode newBefore) {
 		if (newBefore != before) {
 			NotificationChain msgs = null;
 			if (before != null)
-				msgs = ((InternalEObject)before).eInverseRemove(this, HintcoPackage.PRECENDENCE_NODE__AFTER, PrecendenceNode.class, msgs);
+				msgs = ((InternalEObject)before).eInverseRemove(this, HintcoPackage.PRECEDENCE_NODE__AFTER, PrecedenceNode.class, msgs);
 			if (newBefore != null)
-				msgs = ((InternalEObject)newBefore).eInverseAdd(this, HintcoPackage.PRECENDENCE_NODE__AFTER, PrecendenceNode.class, msgs);
+				msgs = ((InternalEObject)newBefore).eInverseAdd(this, HintcoPackage.PRECEDENCE_NODE__AFTER, PrecedenceNode.class, msgs);
 			msgs = basicSetBefore(newBefore, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
@@ -229,10 +229,10 @@ public class HierarchicalCosimUnitImpl extends ScenarioImpl implements Hierarchi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public PrecendenceNode getAfter() {
+	public PrecedenceNode getAfter() {
 		if (after != null && after.eIsProxy()) {
 			InternalEObject oldAfter = (InternalEObject)after;
-			after = (PrecendenceNode)eResolveProxy(oldAfter);
+			after = (PrecedenceNode)eResolveProxy(oldAfter);
 			if (after != oldAfter) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HintcoPackage.HIERARCHICAL_COSIM_UNIT__AFTER, oldAfter, after));
@@ -246,7 +246,7 @@ public class HierarchicalCosimUnitImpl extends ScenarioImpl implements Hierarchi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public PrecendenceNode basicGetAfter() {
+	public PrecedenceNode basicGetAfter() {
 		return after;
 	}
 
@@ -255,8 +255,8 @@ public class HierarchicalCosimUnitImpl extends ScenarioImpl implements Hierarchi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain basicSetAfter(PrecendenceNode newAfter, NotificationChain msgs) {
-		PrecendenceNode oldAfter = after;
+	public NotificationChain basicSetAfter(PrecedenceNode newAfter, NotificationChain msgs) {
+		PrecedenceNode oldAfter = after;
 		after = newAfter;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HintcoPackage.HIERARCHICAL_COSIM_UNIT__AFTER, oldAfter, newAfter);
@@ -270,13 +270,13 @@ public class HierarchicalCosimUnitImpl extends ScenarioImpl implements Hierarchi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setAfter(PrecendenceNode newAfter) {
+	public void setAfter(PrecedenceNode newAfter) {
 		if (newAfter != after) {
 			NotificationChain msgs = null;
 			if (after != null)
-				msgs = ((InternalEObject)after).eInverseRemove(this, HintcoPackage.PRECENDENCE_NODE__BEFORE, PrecendenceNode.class, msgs);
+				msgs = ((InternalEObject)after).eInverseRemove(this, HintcoPackage.PRECEDENCE_NODE__BEFORE, PrecedenceNode.class, msgs);
 			if (newAfter != null)
-				msgs = ((InternalEObject)newAfter).eInverseAdd(this, HintcoPackage.PRECENDENCE_NODE__BEFORE, PrecendenceNode.class, msgs);
+				msgs = ((InternalEObject)newAfter).eInverseAdd(this, HintcoPackage.PRECEDENCE_NODE__BEFORE, PrecedenceNode.class, msgs);
 			msgs = basicSetAfter(newAfter, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
@@ -481,12 +481,12 @@ public class HierarchicalCosimUnitImpl extends ScenarioImpl implements Hierarchi
 				return ((InternalEList<InternalEObject>)(InternalEList<?>)getSucceeds()).basicAdd(otherEnd, msgs);
 			case HintcoPackage.HIERARCHICAL_COSIM_UNIT__BEFORE:
 				if (before != null)
-					msgs = ((InternalEObject)before).eInverseRemove(this, HintcoPackage.PRECENDENCE_NODE__AFTER, PrecendenceNode.class, msgs);
-				return basicSetBefore((PrecendenceNode)otherEnd, msgs);
+					msgs = ((InternalEObject)before).eInverseRemove(this, HintcoPackage.PRECEDENCE_NODE__AFTER, PrecedenceNode.class, msgs);
+				return basicSetBefore((PrecedenceNode)otherEnd, msgs);
 			case HintcoPackage.HIERARCHICAL_COSIM_UNIT__AFTER:
 				if (after != null)
-					msgs = ((InternalEObject)after).eInverseRemove(this, HintcoPackage.PRECENDENCE_NODE__BEFORE, PrecendenceNode.class, msgs);
-				return basicSetAfter((PrecendenceNode)otherEnd, msgs);
+					msgs = ((InternalEObject)after).eInverseRemove(this, HintcoPackage.PRECEDENCE_NODE__BEFORE, PrecedenceNode.class, msgs);
+				return basicSetAfter((PrecedenceNode)otherEnd, msgs);
 			case HintcoPackage.HIERARCHICAL_COSIM_UNIT__SCENARIO:
 				if (eInternalContainer() != null)
 					msgs = eBasicRemoveFromContainer(msgs);
@@ -581,17 +581,17 @@ public class HierarchicalCosimUnitImpl extends ScenarioImpl implements Hierarchi
 		switch (featureID) {
 			case HintcoPackage.HIERARCHICAL_COSIM_UNIT__PRECEDES:
 				getPrecedes().clear();
-				getPrecedes().addAll((Collection<? extends PrecendenceNode>)newValue);
+				getPrecedes().addAll((Collection<? extends PrecedenceNode>)newValue);
 				return;
 			case HintcoPackage.HIERARCHICAL_COSIM_UNIT__SUCCEEDS:
 				getSucceeds().clear();
-				getSucceeds().addAll((Collection<? extends PrecendenceNode>)newValue);
+				getSucceeds().addAll((Collection<? extends PrecedenceNode>)newValue);
 				return;
 			case HintcoPackage.HIERARCHICAL_COSIM_UNIT__BEFORE:
-				setBefore((PrecendenceNode)newValue);
+				setBefore((PrecedenceNode)newValue);
 				return;
 			case HintcoPackage.HIERARCHICAL_COSIM_UNIT__AFTER:
-				setAfter((PrecendenceNode)newValue);
+				setAfter((PrecedenceNode)newValue);
 				return;
 			case HintcoPackage.HIERARCHICAL_COSIM_UNIT__SCENARIO:
 				setScenario((Scenario)newValue);
@@ -622,10 +622,10 @@ public class HierarchicalCosimUnitImpl extends ScenarioImpl implements Hierarchi
 				getSucceeds().clear();
 				return;
 			case HintcoPackage.HIERARCHICAL_COSIM_UNIT__BEFORE:
-				setBefore((PrecendenceNode)null);
+				setBefore((PrecedenceNode)null);
 				return;
 			case HintcoPackage.HIERARCHICAL_COSIM_UNIT__AFTER:
-				setAfter((PrecendenceNode)null);
+				setAfter((PrecedenceNode)null);
 				return;
 			case HintcoPackage.HIERARCHICAL_COSIM_UNIT__SCENARIO:
 				setScenario((Scenario)null);
@@ -673,12 +673,12 @@ public class HierarchicalCosimUnitImpl extends ScenarioImpl implements Hierarchi
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == PrecendenceNode.class) {
+		if (baseClass == PrecedenceNode.class) {
 			switch (derivedFeatureID) {
-				case HintcoPackage.HIERARCHICAL_COSIM_UNIT__PRECEDES: return HintcoPackage.PRECENDENCE_NODE__PRECEDES;
-				case HintcoPackage.HIERARCHICAL_COSIM_UNIT__SUCCEEDS: return HintcoPackage.PRECENDENCE_NODE__SUCCEEDS;
-				case HintcoPackage.HIERARCHICAL_COSIM_UNIT__BEFORE: return HintcoPackage.PRECENDENCE_NODE__BEFORE;
-				case HintcoPackage.HIERARCHICAL_COSIM_UNIT__AFTER: return HintcoPackage.PRECENDENCE_NODE__AFTER;
+				case HintcoPackage.HIERARCHICAL_COSIM_UNIT__PRECEDES: return HintcoPackage.PRECEDENCE_NODE__PRECEDES;
+				case HintcoPackage.HIERARCHICAL_COSIM_UNIT__SUCCEEDS: return HintcoPackage.PRECEDENCE_NODE__SUCCEEDS;
+				case HintcoPackage.HIERARCHICAL_COSIM_UNIT__BEFORE: return HintcoPackage.PRECEDENCE_NODE__BEFORE;
+				case HintcoPackage.HIERARCHICAL_COSIM_UNIT__AFTER: return HintcoPackage.PRECEDENCE_NODE__AFTER;
 				default: return -1;
 			}
 		}
@@ -700,12 +700,12 @@ public class HierarchicalCosimUnitImpl extends ScenarioImpl implements Hierarchi
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == PrecendenceNode.class) {
+		if (baseClass == PrecedenceNode.class) {
 			switch (baseFeatureID) {
-				case HintcoPackage.PRECENDENCE_NODE__PRECEDES: return HintcoPackage.HIERARCHICAL_COSIM_UNIT__PRECEDES;
-				case HintcoPackage.PRECENDENCE_NODE__SUCCEEDS: return HintcoPackage.HIERARCHICAL_COSIM_UNIT__SUCCEEDS;
-				case HintcoPackage.PRECENDENCE_NODE__BEFORE: return HintcoPackage.HIERARCHICAL_COSIM_UNIT__BEFORE;
-				case HintcoPackage.PRECENDENCE_NODE__AFTER: return HintcoPackage.HIERARCHICAL_COSIM_UNIT__AFTER;
+				case HintcoPackage.PRECEDENCE_NODE__PRECEDES: return HintcoPackage.HIERARCHICAL_COSIM_UNIT__PRECEDES;
+				case HintcoPackage.PRECEDENCE_NODE__SUCCEEDS: return HintcoPackage.HIERARCHICAL_COSIM_UNIT__SUCCEEDS;
+				case HintcoPackage.PRECEDENCE_NODE__BEFORE: return HintcoPackage.HIERARCHICAL_COSIM_UNIT__BEFORE;
+				case HintcoPackage.PRECEDENCE_NODE__AFTER: return HintcoPackage.HIERARCHICAL_COSIM_UNIT__AFTER;
 				default: return -1;
 			}
 		}
@@ -727,7 +727,7 @@ public class HierarchicalCosimUnitImpl extends ScenarioImpl implements Hierarchi
 	 */
 	@Override
 	public int eDerivedOperationID(int baseOperationID, Class<?> baseClass) {
-		if (baseClass == PrecendenceNode.class) {
+		if (baseClass == PrecedenceNode.class) {
 			switch (baseOperationID) {
 				default: return -1;
 			}

+ 24 - 24
HintConfiguration/src-gen/ua/ansymo/hintco/impl/HintcoPackageImpl.java

@@ -33,7 +33,7 @@ import ua.ansymo.hintco.OutputPortInstance;
 import ua.ansymo.hintco.PortAdaptation;
 import ua.ansymo.hintco.PortInstance;
 import ua.ansymo.hintco.PowerBondAdaptation;
-import ua.ansymo.hintco.PrecendenceNode;
+import ua.ansymo.hintco.PrecedenceNode;
 import ua.ansymo.hintco.RollbackInterpolationAdaptation;
 import ua.ansymo.hintco.RootCandidateScenario;
 import ua.ansymo.hintco.Scenario;
@@ -76,7 +76,7 @@ public class HintcoPackageImpl extends EPackageImpl implements HintcoPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass precendenceNodeEClass = null;
+	private EClass precedenceNodeEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -421,8 +421,8 @@ public class HintcoPackageImpl extends EPackageImpl implements HintcoPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EClass getPrecendenceNode() {
-		return precendenceNodeEClass;
+	public EClass getPrecedenceNode() {
+		return precedenceNodeEClass;
 	}
 
 	/**
@@ -430,8 +430,8 @@ public class HintcoPackageImpl extends EPackageImpl implements HintcoPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getPrecendenceNode_Precedes() {
-		return (EReference)precendenceNodeEClass.getEStructuralFeatures().get(0);
+	public EReference getPrecedenceNode_Precedes() {
+		return (EReference)precedenceNodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -439,8 +439,8 @@ public class HintcoPackageImpl extends EPackageImpl implements HintcoPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getPrecendenceNode_Succeeds() {
-		return (EReference)precendenceNodeEClass.getEStructuralFeatures().get(1);
+	public EReference getPrecedenceNode_Succeeds() {
+		return (EReference)precedenceNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -448,8 +448,8 @@ public class HintcoPackageImpl extends EPackageImpl implements HintcoPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getPrecendenceNode_Before() {
-		return (EReference)precendenceNodeEClass.getEStructuralFeatures().get(2);
+	public EReference getPrecedenceNode_Before() {
+		return (EReference)precedenceNodeEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -457,8 +457,8 @@ public class HintcoPackageImpl extends EPackageImpl implements HintcoPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getPrecendenceNode_After() {
-		return (EReference)precendenceNodeEClass.getEStructuralFeatures().get(3);
+	public EReference getPrecedenceNode_After() {
+		return (EReference)precedenceNodeEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -1268,11 +1268,11 @@ public class HintcoPackageImpl extends EPackageImpl implements HintcoPackage {
 		createEReference(variantDiagramEClass, VARIANT_DIAGRAM__ALTERNATIVE);
 		createEAttribute(variantDiagramEClass, VARIANT_DIAGRAM__NAME);
 
-		precendenceNodeEClass = createEClass(PRECENDENCE_NODE);
-		createEReference(precendenceNodeEClass, PRECENDENCE_NODE__PRECEDES);
-		createEReference(precendenceNodeEClass, PRECENDENCE_NODE__SUCCEEDS);
-		createEReference(precendenceNodeEClass, PRECENDENCE_NODE__BEFORE);
-		createEReference(precendenceNodeEClass, PRECENDENCE_NODE__AFTER);
+		precedenceNodeEClass = createEClass(PRECEDENCE_NODE);
+		createEReference(precedenceNodeEClass, PRECEDENCE_NODE__PRECEDES);
+		createEReference(precedenceNodeEClass, PRECEDENCE_NODE__SUCCEEDS);
+		createEReference(precedenceNodeEClass, PRECEDENCE_NODE__BEFORE);
+		createEReference(precedenceNodeEClass, PRECEDENCE_NODE__AFTER);
 
 		rootCandidateScenarioEClass = createEClass(ROOT_CANDIDATE_SCENARIO);
 		createEAttribute(rootCandidateScenarioEClass, ROOT_CANDIDATE_SCENARIO__NAME);
@@ -1426,9 +1426,9 @@ public class HintcoPackageImpl extends EPackageImpl implements HintcoPackage {
 		hierarchicalCosimUnitEClass.getESuperTypes().add(this.getUnitInstance());
 		cosimUnitDeclarationEClass.getESuperTypes().add(this.getIDed());
 		unitInstanceEClass.getESuperTypes().add(this.getIDed());
-		unitInstanceEClass.getESuperTypes().add(this.getPrecendenceNode());
+		unitInstanceEClass.getESuperTypes().add(this.getPrecedenceNode());
 		cosimUnitInstanceEClass.getESuperTypes().add(this.getUnitInstance());
-		portInstanceEClass.getESuperTypes().add(this.getPrecendenceNode());
+		portInstanceEClass.getESuperTypes().add(this.getPrecedenceNode());
 		portInstanceEClass.getESuperTypes().add(this.getIDed());
 		hierarchicalUnitPortEClass.getESuperTypes().add(this.getInputPortInstance());
 		hierarchicalUnitPortEClass.getESuperTypes().add(this.getOutputPortInstance());
@@ -1463,11 +1463,11 @@ public class HintcoPackageImpl extends EPackageImpl implements HintcoPackage {
 		initEReference(getVariantDiagram_Alternative(), this.getAlternative(), null, "alternative", null, 0, 1, VariantDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getVariantDiagram_Name(), theEcorePackage.getEString(), "name", null, 0, 1, VariantDiagram.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
-		initEClass(precendenceNodeEClass, PrecendenceNode.class, "PrecendenceNode", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPrecendenceNode_Precedes(), this.getPrecendenceNode(), this.getPrecendenceNode_Succeeds(), "precedes", null, 0, -1, PrecendenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPrecendenceNode_Succeeds(), this.getPrecendenceNode(), this.getPrecendenceNode_Precedes(), "succeeds", null, 0, -1, PrecendenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPrecendenceNode_Before(), this.getPrecendenceNode(), this.getPrecendenceNode_After(), "before", null, 0, 1, PrecendenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPrecendenceNode_After(), this.getPrecendenceNode(), this.getPrecendenceNode_Before(), "after", null, 0, 1, PrecendenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEClass(precedenceNodeEClass, PrecedenceNode.class, "PrecedenceNode", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getPrecedenceNode_Precedes(), this.getPrecedenceNode(), this.getPrecedenceNode_Succeeds(), "precedes", null, 0, -1, PrecedenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getPrecedenceNode_Succeeds(), this.getPrecedenceNode(), this.getPrecedenceNode_Precedes(), "succeeds", null, 0, -1, PrecedenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getPrecedenceNode_Before(), this.getPrecedenceNode(), this.getPrecedenceNode_After(), "before", null, 0, 1, PrecedenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getPrecedenceNode_After(), this.getPrecedenceNode(), this.getPrecedenceNode_Before(), "after", null, 0, 1, PrecedenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(rootCandidateScenarioEClass, RootCandidateScenario.class, "RootCandidateScenario", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getRootCandidateScenario_Name(), theEcorePackage.getEString(), "name", null, 0, 1, RootCandidateScenario.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);

+ 1 - 1
HintConfiguration/src-gen/ua/ansymo/hintco/impl/PortInstanceImpl.java

@@ -39,7 +39,7 @@ import ua.ansymo.hintco.UnitInstance;
  *
  * @generated
  */
-public abstract class PortInstanceImpl extends PrecendenceNodeImpl implements PortInstance {
+public abstract class PortInstanceImpl extends PrecedenceNodeImpl implements PortInstance {
 	/**
 	 * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->

+ 74 - 74
HintConfiguration/src-gen/ua/ansymo/hintco/impl/PrecendenceNodeImpl.java

@@ -19,25 +19,25 @@ import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
 import ua.ansymo.hintco.HintcoPackage;
-import ua.ansymo.hintco.PrecendenceNode;
+import ua.ansymo.hintco.PrecedenceNode;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Precendence Node</b></em>'.
+ * An implementation of the model object '<em><b>Precedence Node</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ua.ansymo.hintco.impl.PrecendenceNodeImpl#getPrecedes <em>Precedes</em>}</li>
- *   <li>{@link ua.ansymo.hintco.impl.PrecendenceNodeImpl#getSucceeds <em>Succeeds</em>}</li>
- *   <li>{@link ua.ansymo.hintco.impl.PrecendenceNodeImpl#getBefore <em>Before</em>}</li>
- *   <li>{@link ua.ansymo.hintco.impl.PrecendenceNodeImpl#getAfter <em>After</em>}</li>
+ *   <li>{@link ua.ansymo.hintco.impl.PrecedenceNodeImpl#getPrecedes <em>Precedes</em>}</li>
+ *   <li>{@link ua.ansymo.hintco.impl.PrecedenceNodeImpl#getSucceeds <em>Succeeds</em>}</li>
+ *   <li>{@link ua.ansymo.hintco.impl.PrecedenceNodeImpl#getBefore <em>Before</em>}</li>
+ *   <li>{@link ua.ansymo.hintco.impl.PrecedenceNodeImpl#getAfter <em>After</em>}</li>
  * </ul>
  *
  * @generated
  */
-public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container implements PrecendenceNode {
+public abstract class PrecedenceNodeImpl extends MinimalEObjectImpl.Container implements PrecedenceNode {
 	/**
 	 * The cached value of the '{@link #getPrecedes() <em>Precedes</em>}' reference list.
 	 * <!-- begin-user-doc -->
@@ -46,7 +46,7 @@ public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container i
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<PrecendenceNode> precedes;
+	protected EList<PrecedenceNode> precedes;
 
 	/**
 	 * The cached value of the '{@link #getSucceeds() <em>Succeeds</em>}' reference list.
@@ -56,7 +56,7 @@ public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container i
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<PrecendenceNode> succeeds;
+	protected EList<PrecedenceNode> succeeds;
 
 	/**
 	 * The cached value of the '{@link #getBefore() <em>Before</em>}' reference.
@@ -66,7 +66,7 @@ public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container i
 	 * @generated
 	 * @ordered
 	 */
-	protected PrecendenceNode before;
+	protected PrecedenceNode before;
 
 	/**
 	 * The cached value of the '{@link #getAfter() <em>After</em>}' reference.
@@ -76,14 +76,14 @@ public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container i
 	 * @generated
 	 * @ordered
 	 */
-	protected PrecendenceNode after;
+	protected PrecedenceNode after;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected PrecendenceNodeImpl() {
+	protected PrecedenceNodeImpl() {
 		super();
 	}
 
@@ -94,7 +94,7 @@ public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container i
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return HintcoPackage.Literals.PRECENDENCE_NODE;
+		return HintcoPackage.Literals.PRECEDENCE_NODE;
 	}
 
 	/**
@@ -102,9 +102,9 @@ public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container i
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<PrecendenceNode> getPrecedes() {
+	public EList<PrecedenceNode> getPrecedes() {
 		if (precedes == null) {
-			precedes = new EObjectWithInverseResolvingEList.ManyInverse<PrecendenceNode>(PrecendenceNode.class, this, HintcoPackage.PRECENDENCE_NODE__PRECEDES, HintcoPackage.PRECENDENCE_NODE__SUCCEEDS);
+			precedes = new EObjectWithInverseResolvingEList.ManyInverse<PrecedenceNode>(PrecedenceNode.class, this, HintcoPackage.PRECEDENCE_NODE__PRECEDES, HintcoPackage.PRECEDENCE_NODE__SUCCEEDS);
 		}
 		return precedes;
 	}
@@ -114,9 +114,9 @@ public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container i
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<PrecendenceNode> getSucceeds() {
+	public EList<PrecedenceNode> getSucceeds() {
 		if (succeeds == null) {
-			succeeds = new EObjectWithInverseResolvingEList.ManyInverse<PrecendenceNode>(PrecendenceNode.class, this, HintcoPackage.PRECENDENCE_NODE__SUCCEEDS, HintcoPackage.PRECENDENCE_NODE__PRECEDES);
+			succeeds = new EObjectWithInverseResolvingEList.ManyInverse<PrecedenceNode>(PrecedenceNode.class, this, HintcoPackage.PRECEDENCE_NODE__SUCCEEDS, HintcoPackage.PRECEDENCE_NODE__PRECEDES);
 		}
 		return succeeds;
 	}
@@ -126,13 +126,13 @@ public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container i
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public PrecendenceNode getBefore() {
+	public PrecedenceNode getBefore() {
 		if (before != null && before.eIsProxy()) {
 			InternalEObject oldBefore = (InternalEObject)before;
-			before = (PrecendenceNode)eResolveProxy(oldBefore);
+			before = (PrecedenceNode)eResolveProxy(oldBefore);
 			if (before != oldBefore) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HintcoPackage.PRECENDENCE_NODE__BEFORE, oldBefore, before));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HintcoPackage.PRECEDENCE_NODE__BEFORE, oldBefore, before));
 			}
 		}
 		return before;
@@ -143,7 +143,7 @@ public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container i
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public PrecendenceNode basicGetBefore() {
+	public PrecedenceNode basicGetBefore() {
 		return before;
 	}
 
@@ -152,11 +152,11 @@ public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container i
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain basicSetBefore(PrecendenceNode newBefore, NotificationChain msgs) {
-		PrecendenceNode oldBefore = before;
+	public NotificationChain basicSetBefore(PrecedenceNode newBefore, NotificationChain msgs) {
+		PrecedenceNode oldBefore = before;
 		before = newBefore;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HintcoPackage.PRECENDENCE_NODE__BEFORE, oldBefore, newBefore);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HintcoPackage.PRECEDENCE_NODE__BEFORE, oldBefore, newBefore);
 			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
@@ -167,18 +167,18 @@ public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container i
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setBefore(PrecendenceNode newBefore) {
+	public void setBefore(PrecedenceNode newBefore) {
 		if (newBefore != before) {
 			NotificationChain msgs = null;
 			if (before != null)
-				msgs = ((InternalEObject)before).eInverseRemove(this, HintcoPackage.PRECENDENCE_NODE__AFTER, PrecendenceNode.class, msgs);
+				msgs = ((InternalEObject)before).eInverseRemove(this, HintcoPackage.PRECEDENCE_NODE__AFTER, PrecedenceNode.class, msgs);
 			if (newBefore != null)
-				msgs = ((InternalEObject)newBefore).eInverseAdd(this, HintcoPackage.PRECENDENCE_NODE__AFTER, PrecendenceNode.class, msgs);
+				msgs = ((InternalEObject)newBefore).eInverseAdd(this, HintcoPackage.PRECEDENCE_NODE__AFTER, PrecedenceNode.class, msgs);
 			msgs = basicSetBefore(newBefore, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HintcoPackage.PRECENDENCE_NODE__BEFORE, newBefore, newBefore));
+			eNotify(new ENotificationImpl(this, Notification.SET, HintcoPackage.PRECEDENCE_NODE__BEFORE, newBefore, newBefore));
 	}
 
 	/**
@@ -186,13 +186,13 @@ public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container i
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public PrecendenceNode getAfter() {
+	public PrecedenceNode getAfter() {
 		if (after != null && after.eIsProxy()) {
 			InternalEObject oldAfter = (InternalEObject)after;
-			after = (PrecendenceNode)eResolveProxy(oldAfter);
+			after = (PrecedenceNode)eResolveProxy(oldAfter);
 			if (after != oldAfter) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HintcoPackage.PRECENDENCE_NODE__AFTER, oldAfter, after));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HintcoPackage.PRECEDENCE_NODE__AFTER, oldAfter, after));
 			}
 		}
 		return after;
@@ -203,7 +203,7 @@ public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container i
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public PrecendenceNode basicGetAfter() {
+	public PrecedenceNode basicGetAfter() {
 		return after;
 	}
 
@@ -212,11 +212,11 @@ public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container i
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain basicSetAfter(PrecendenceNode newAfter, NotificationChain msgs) {
-		PrecendenceNode oldAfter = after;
+	public NotificationChain basicSetAfter(PrecedenceNode newAfter, NotificationChain msgs) {
+		PrecedenceNode oldAfter = after;
 		after = newAfter;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HintcoPackage.PRECENDENCE_NODE__AFTER, oldAfter, newAfter);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HintcoPackage.PRECEDENCE_NODE__AFTER, oldAfter, newAfter);
 			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
@@ -227,18 +227,18 @@ public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container i
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setAfter(PrecendenceNode newAfter) {
+	public void setAfter(PrecedenceNode newAfter) {
 		if (newAfter != after) {
 			NotificationChain msgs = null;
 			if (after != null)
-				msgs = ((InternalEObject)after).eInverseRemove(this, HintcoPackage.PRECENDENCE_NODE__BEFORE, PrecendenceNode.class, msgs);
+				msgs = ((InternalEObject)after).eInverseRemove(this, HintcoPackage.PRECEDENCE_NODE__BEFORE, PrecedenceNode.class, msgs);
 			if (newAfter != null)
-				msgs = ((InternalEObject)newAfter).eInverseAdd(this, HintcoPackage.PRECENDENCE_NODE__BEFORE, PrecendenceNode.class, msgs);
+				msgs = ((InternalEObject)newAfter).eInverseAdd(this, HintcoPackage.PRECEDENCE_NODE__BEFORE, PrecedenceNode.class, msgs);
 			msgs = basicSetAfter(newAfter, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HintcoPackage.PRECENDENCE_NODE__AFTER, newAfter, newAfter));
+			eNotify(new ENotificationImpl(this, Notification.SET, HintcoPackage.PRECEDENCE_NODE__AFTER, newAfter, newAfter));
 	}
 
 	/**
@@ -250,18 +250,18 @@ public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container i
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case HintcoPackage.PRECENDENCE_NODE__PRECEDES:
+			case HintcoPackage.PRECEDENCE_NODE__PRECEDES:
 				return ((InternalEList<InternalEObject>)(InternalEList<?>)getPrecedes()).basicAdd(otherEnd, msgs);
-			case HintcoPackage.PRECENDENCE_NODE__SUCCEEDS:
+			case HintcoPackage.PRECEDENCE_NODE__SUCCEEDS:
 				return ((InternalEList<InternalEObject>)(InternalEList<?>)getSucceeds()).basicAdd(otherEnd, msgs);
-			case HintcoPackage.PRECENDENCE_NODE__BEFORE:
+			case HintcoPackage.PRECEDENCE_NODE__BEFORE:
 				if (before != null)
-					msgs = ((InternalEObject)before).eInverseRemove(this, HintcoPackage.PRECENDENCE_NODE__AFTER, PrecendenceNode.class, msgs);
-				return basicSetBefore((PrecendenceNode)otherEnd, msgs);
-			case HintcoPackage.PRECENDENCE_NODE__AFTER:
+					msgs = ((InternalEObject)before).eInverseRemove(this, HintcoPackage.PRECEDENCE_NODE__AFTER, PrecedenceNode.class, msgs);
+				return basicSetBefore((PrecedenceNode)otherEnd, msgs);
+			case HintcoPackage.PRECEDENCE_NODE__AFTER:
 				if (after != null)
-					msgs = ((InternalEObject)after).eInverseRemove(this, HintcoPackage.PRECENDENCE_NODE__BEFORE, PrecendenceNode.class, msgs);
-				return basicSetAfter((PrecendenceNode)otherEnd, msgs);
+					msgs = ((InternalEObject)after).eInverseRemove(this, HintcoPackage.PRECEDENCE_NODE__BEFORE, PrecedenceNode.class, msgs);
+				return basicSetAfter((PrecedenceNode)otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -274,13 +274,13 @@ public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container i
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case HintcoPackage.PRECENDENCE_NODE__PRECEDES:
+			case HintcoPackage.PRECEDENCE_NODE__PRECEDES:
 				return ((InternalEList<?>)getPrecedes()).basicRemove(otherEnd, msgs);
-			case HintcoPackage.PRECENDENCE_NODE__SUCCEEDS:
+			case HintcoPackage.PRECEDENCE_NODE__SUCCEEDS:
 				return ((InternalEList<?>)getSucceeds()).basicRemove(otherEnd, msgs);
-			case HintcoPackage.PRECENDENCE_NODE__BEFORE:
+			case HintcoPackage.PRECEDENCE_NODE__BEFORE:
 				return basicSetBefore(null, msgs);
-			case HintcoPackage.PRECENDENCE_NODE__AFTER:
+			case HintcoPackage.PRECEDENCE_NODE__AFTER:
 				return basicSetAfter(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -294,14 +294,14 @@ public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container i
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HintcoPackage.PRECENDENCE_NODE__PRECEDES:
+			case HintcoPackage.PRECEDENCE_NODE__PRECEDES:
 				return getPrecedes();
-			case HintcoPackage.PRECENDENCE_NODE__SUCCEEDS:
+			case HintcoPackage.PRECEDENCE_NODE__SUCCEEDS:
 				return getSucceeds();
-			case HintcoPackage.PRECENDENCE_NODE__BEFORE:
+			case HintcoPackage.PRECEDENCE_NODE__BEFORE:
 				if (resolve) return getBefore();
 				return basicGetBefore();
-			case HintcoPackage.PRECENDENCE_NODE__AFTER:
+			case HintcoPackage.PRECEDENCE_NODE__AFTER:
 				if (resolve) return getAfter();
 				return basicGetAfter();
 		}
@@ -317,19 +317,19 @@ public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container i
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HintcoPackage.PRECENDENCE_NODE__PRECEDES:
+			case HintcoPackage.PRECEDENCE_NODE__PRECEDES:
 				getPrecedes().clear();
-				getPrecedes().addAll((Collection<? extends PrecendenceNode>)newValue);
+				getPrecedes().addAll((Collection<? extends PrecedenceNode>)newValue);
 				return;
-			case HintcoPackage.PRECENDENCE_NODE__SUCCEEDS:
+			case HintcoPackage.PRECEDENCE_NODE__SUCCEEDS:
 				getSucceeds().clear();
-				getSucceeds().addAll((Collection<? extends PrecendenceNode>)newValue);
+				getSucceeds().addAll((Collection<? extends PrecedenceNode>)newValue);
 				return;
-			case HintcoPackage.PRECENDENCE_NODE__BEFORE:
-				setBefore((PrecendenceNode)newValue);
+			case HintcoPackage.PRECEDENCE_NODE__BEFORE:
+				setBefore((PrecedenceNode)newValue);
 				return;
-			case HintcoPackage.PRECENDENCE_NODE__AFTER:
-				setAfter((PrecendenceNode)newValue);
+			case HintcoPackage.PRECEDENCE_NODE__AFTER:
+				setAfter((PrecedenceNode)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -343,17 +343,17 @@ public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container i
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HintcoPackage.PRECENDENCE_NODE__PRECEDES:
+			case HintcoPackage.PRECEDENCE_NODE__PRECEDES:
 				getPrecedes().clear();
 				return;
-			case HintcoPackage.PRECENDENCE_NODE__SUCCEEDS:
+			case HintcoPackage.PRECEDENCE_NODE__SUCCEEDS:
 				getSucceeds().clear();
 				return;
-			case HintcoPackage.PRECENDENCE_NODE__BEFORE:
-				setBefore((PrecendenceNode)null);
+			case HintcoPackage.PRECEDENCE_NODE__BEFORE:
+				setBefore((PrecedenceNode)null);
 				return;
-			case HintcoPackage.PRECENDENCE_NODE__AFTER:
-				setAfter((PrecendenceNode)null);
+			case HintcoPackage.PRECEDENCE_NODE__AFTER:
+				setAfter((PrecedenceNode)null);
 				return;
 		}
 		super.eUnset(featureID);
@@ -367,16 +367,16 @@ public abstract class PrecendenceNodeImpl extends MinimalEObjectImpl.Container i
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HintcoPackage.PRECENDENCE_NODE__PRECEDES:
+			case HintcoPackage.PRECEDENCE_NODE__PRECEDES:
 				return precedes != null && !precedes.isEmpty();
-			case HintcoPackage.PRECENDENCE_NODE__SUCCEEDS:
+			case HintcoPackage.PRECEDENCE_NODE__SUCCEEDS:
 				return succeeds != null && !succeeds.isEmpty();
-			case HintcoPackage.PRECENDENCE_NODE__BEFORE:
+			case HintcoPackage.PRECEDENCE_NODE__BEFORE:
 				return before != null;
-			case HintcoPackage.PRECENDENCE_NODE__AFTER:
+			case HintcoPackage.PRECEDENCE_NODE__AFTER:
 				return after != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //PrecendenceNodeImpl
+} //PrecedenceNodeImpl

+ 45 - 45
HintConfiguration/src-gen/ua/ansymo/hintco/impl/UnitInstanceImpl.java

@@ -34,7 +34,7 @@ import ua.ansymo.hintco.HintcoPackage;
 import ua.ansymo.hintco.InputPortInstance;
 import ua.ansymo.hintco.OutputPortInstance;
 import ua.ansymo.hintco.PortInstance;
-import ua.ansymo.hintco.PrecendenceNode;
+import ua.ansymo.hintco.PrecedenceNode;
 import ua.ansymo.hintco.Scenario;
 import ua.ansymo.hintco.UnitAdaptation;
 import ua.ansymo.hintco.UnitInstance;
@@ -67,7 +67,7 @@ public abstract class UnitInstanceImpl extends IDedImpl implements UnitInstance
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<PrecendenceNode> precedes;
+	protected EList<PrecedenceNode> precedes;
 
 	/**
 	 * The cached value of the '{@link #getSucceeds() <em>Succeeds</em>}' reference list.
@@ -77,7 +77,7 @@ public abstract class UnitInstanceImpl extends IDedImpl implements UnitInstance
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<PrecendenceNode> succeeds;
+	protected EList<PrecedenceNode> succeeds;
 
 	/**
 	 * The cached value of the '{@link #getBefore() <em>Before</em>}' reference.
@@ -87,7 +87,7 @@ public abstract class UnitInstanceImpl extends IDedImpl implements UnitInstance
 	 * @generated
 	 * @ordered
 	 */
-	protected PrecendenceNode before;
+	protected PrecedenceNode before;
 
 	/**
 	 * The cached value of the '{@link #getAfter() <em>After</em>}' reference.
@@ -97,7 +97,7 @@ public abstract class UnitInstanceImpl extends IDedImpl implements UnitInstance
 	 * @generated
 	 * @ordered
 	 */
-	protected PrecendenceNode after;
+	protected PrecedenceNode after;
 
 	/**
 	 * The cached value of the '{@link #getAdaptation() <em>Adaptation</em>}' containment reference.
@@ -143,9 +143,9 @@ public abstract class UnitInstanceImpl extends IDedImpl implements UnitInstance
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<PrecendenceNode> getPrecedes() {
+	public EList<PrecedenceNode> getPrecedes() {
 		if (precedes == null) {
-			precedes = new EObjectWithInverseResolvingEList.ManyInverse<PrecendenceNode>(PrecendenceNode.class, this, HintcoPackage.UNIT_INSTANCE__PRECEDES, HintcoPackage.PRECENDENCE_NODE__SUCCEEDS);
+			precedes = new EObjectWithInverseResolvingEList.ManyInverse<PrecedenceNode>(PrecedenceNode.class, this, HintcoPackage.UNIT_INSTANCE__PRECEDES, HintcoPackage.PRECEDENCE_NODE__SUCCEEDS);
 		}
 		return precedes;
 	}
@@ -155,9 +155,9 @@ public abstract class UnitInstanceImpl extends IDedImpl implements UnitInstance
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<PrecendenceNode> getSucceeds() {
+	public EList<PrecedenceNode> getSucceeds() {
 		if (succeeds == null) {
-			succeeds = new EObjectWithInverseResolvingEList.ManyInverse<PrecendenceNode>(PrecendenceNode.class, this, HintcoPackage.UNIT_INSTANCE__SUCCEEDS, HintcoPackage.PRECENDENCE_NODE__PRECEDES);
+			succeeds = new EObjectWithInverseResolvingEList.ManyInverse<PrecedenceNode>(PrecedenceNode.class, this, HintcoPackage.UNIT_INSTANCE__SUCCEEDS, HintcoPackage.PRECEDENCE_NODE__PRECEDES);
 		}
 		return succeeds;
 	}
@@ -167,10 +167,10 @@ public abstract class UnitInstanceImpl extends IDedImpl implements UnitInstance
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public PrecendenceNode getBefore() {
+	public PrecedenceNode getBefore() {
 		if (before != null && before.eIsProxy()) {
 			InternalEObject oldBefore = (InternalEObject)before;
-			before = (PrecendenceNode)eResolveProxy(oldBefore);
+			before = (PrecedenceNode)eResolveProxy(oldBefore);
 			if (before != oldBefore) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HintcoPackage.UNIT_INSTANCE__BEFORE, oldBefore, before));
@@ -184,7 +184,7 @@ public abstract class UnitInstanceImpl extends IDedImpl implements UnitInstance
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public PrecendenceNode basicGetBefore() {
+	public PrecedenceNode basicGetBefore() {
 		return before;
 	}
 
@@ -193,8 +193,8 @@ public abstract class UnitInstanceImpl extends IDedImpl implements UnitInstance
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain basicSetBefore(PrecendenceNode newBefore, NotificationChain msgs) {
-		PrecendenceNode oldBefore = before;
+	public NotificationChain basicSetBefore(PrecedenceNode newBefore, NotificationChain msgs) {
+		PrecedenceNode oldBefore = before;
 		before = newBefore;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HintcoPackage.UNIT_INSTANCE__BEFORE, oldBefore, newBefore);
@@ -208,13 +208,13 @@ public abstract class UnitInstanceImpl extends IDedImpl implements UnitInstance
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setBefore(PrecendenceNode newBefore) {
+	public void setBefore(PrecedenceNode newBefore) {
 		if (newBefore != before) {
 			NotificationChain msgs = null;
 			if (before != null)
-				msgs = ((InternalEObject)before).eInverseRemove(this, HintcoPackage.PRECENDENCE_NODE__AFTER, PrecendenceNode.class, msgs);
+				msgs = ((InternalEObject)before).eInverseRemove(this, HintcoPackage.PRECEDENCE_NODE__AFTER, PrecedenceNode.class, msgs);
 			if (newBefore != null)
-				msgs = ((InternalEObject)newBefore).eInverseAdd(this, HintcoPackage.PRECENDENCE_NODE__AFTER, PrecendenceNode.class, msgs);
+				msgs = ((InternalEObject)newBefore).eInverseAdd(this, HintcoPackage.PRECEDENCE_NODE__AFTER, PrecedenceNode.class, msgs);
 			msgs = basicSetBefore(newBefore, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
@@ -227,10 +227,10 @@ public abstract class UnitInstanceImpl extends IDedImpl implements UnitInstance
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public PrecendenceNode getAfter() {
+	public PrecedenceNode getAfter() {
 		if (after != null && after.eIsProxy()) {
 			InternalEObject oldAfter = (InternalEObject)after;
-			after = (PrecendenceNode)eResolveProxy(oldAfter);
+			after = (PrecedenceNode)eResolveProxy(oldAfter);
 			if (after != oldAfter) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HintcoPackage.UNIT_INSTANCE__AFTER, oldAfter, after));
@@ -244,7 +244,7 @@ public abstract class UnitInstanceImpl extends IDedImpl implements UnitInstance
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public PrecendenceNode basicGetAfter() {
+	public PrecedenceNode basicGetAfter() {
 		return after;
 	}
 
@@ -253,8 +253,8 @@ public abstract class UnitInstanceImpl extends IDedImpl implements UnitInstance
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain basicSetAfter(PrecendenceNode newAfter, NotificationChain msgs) {
-		PrecendenceNode oldAfter = after;
+	public NotificationChain basicSetAfter(PrecedenceNode newAfter, NotificationChain msgs) {
+		PrecedenceNode oldAfter = after;
 		after = newAfter;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HintcoPackage.UNIT_INSTANCE__AFTER, oldAfter, newAfter);
@@ -268,13 +268,13 @@ public abstract class UnitInstanceImpl extends IDedImpl implements UnitInstance
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setAfter(PrecendenceNode newAfter) {
+	public void setAfter(PrecedenceNode newAfter) {
 		if (newAfter != after) {
 			NotificationChain msgs = null;
 			if (after != null)
-				msgs = ((InternalEObject)after).eInverseRemove(this, HintcoPackage.PRECENDENCE_NODE__BEFORE, PrecendenceNode.class, msgs);
+				msgs = ((InternalEObject)after).eInverseRemove(this, HintcoPackage.PRECEDENCE_NODE__BEFORE, PrecedenceNode.class, msgs);
 			if (newAfter != null)
-				msgs = ((InternalEObject)newAfter).eInverseAdd(this, HintcoPackage.PRECENDENCE_NODE__BEFORE, PrecendenceNode.class, msgs);
+				msgs = ((InternalEObject)newAfter).eInverseAdd(this, HintcoPackage.PRECEDENCE_NODE__BEFORE, PrecedenceNode.class, msgs);
 			msgs = basicSetAfter(newAfter, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
@@ -465,12 +465,12 @@ public abstract class UnitInstanceImpl extends IDedImpl implements UnitInstance
 				return ((InternalEList<InternalEObject>)(InternalEList<?>)getSucceeds()).basicAdd(otherEnd, msgs);
 			case HintcoPackage.UNIT_INSTANCE__BEFORE:
 				if (before != null)
-					msgs = ((InternalEObject)before).eInverseRemove(this, HintcoPackage.PRECENDENCE_NODE__AFTER, PrecendenceNode.class, msgs);
-				return basicSetBefore((PrecendenceNode)otherEnd, msgs);
+					msgs = ((InternalEObject)before).eInverseRemove(this, HintcoPackage.PRECEDENCE_NODE__AFTER, PrecedenceNode.class, msgs);
+				return basicSetBefore((PrecedenceNode)otherEnd, msgs);
 			case HintcoPackage.UNIT_INSTANCE__AFTER:
 				if (after != null)
-					msgs = ((InternalEObject)after).eInverseRemove(this, HintcoPackage.PRECENDENCE_NODE__BEFORE, PrecendenceNode.class, msgs);
-				return basicSetAfter((PrecendenceNode)otherEnd, msgs);
+					msgs = ((InternalEObject)after).eInverseRemove(this, HintcoPackage.PRECEDENCE_NODE__BEFORE, PrecedenceNode.class, msgs);
+				return basicSetAfter((PrecedenceNode)otherEnd, msgs);
 			case HintcoPackage.UNIT_INSTANCE__SCENARIO:
 				if (eInternalContainer() != null)
 					msgs = eBasicRemoveFromContainer(msgs);
@@ -565,17 +565,17 @@ public abstract class UnitInstanceImpl extends IDedImpl implements UnitInstance
 		switch (featureID) {
 			case HintcoPackage.UNIT_INSTANCE__PRECEDES:
 				getPrecedes().clear();
-				getPrecedes().addAll((Collection<? extends PrecendenceNode>)newValue);
+				getPrecedes().addAll((Collection<? extends PrecedenceNode>)newValue);
 				return;
 			case HintcoPackage.UNIT_INSTANCE__SUCCEEDS:
 				getSucceeds().clear();
-				getSucceeds().addAll((Collection<? extends PrecendenceNode>)newValue);
+				getSucceeds().addAll((Collection<? extends PrecedenceNode>)newValue);
 				return;
 			case HintcoPackage.UNIT_INSTANCE__BEFORE:
-				setBefore((PrecendenceNode)newValue);
+				setBefore((PrecedenceNode)newValue);
 				return;
 			case HintcoPackage.UNIT_INSTANCE__AFTER:
-				setAfter((PrecendenceNode)newValue);
+				setAfter((PrecedenceNode)newValue);
 				return;
 			case HintcoPackage.UNIT_INSTANCE__SCENARIO:
 				setScenario((Scenario)newValue);
@@ -606,10 +606,10 @@ public abstract class UnitInstanceImpl extends IDedImpl implements UnitInstance
 				getSucceeds().clear();
 				return;
 			case HintcoPackage.UNIT_INSTANCE__BEFORE:
-				setBefore((PrecendenceNode)null);
+				setBefore((PrecedenceNode)null);
 				return;
 			case HintcoPackage.UNIT_INSTANCE__AFTER:
-				setAfter((PrecendenceNode)null);
+				setAfter((PrecedenceNode)null);
 				return;
 			case HintcoPackage.UNIT_INSTANCE__SCENARIO:
 				setScenario((Scenario)null);
@@ -657,12 +657,12 @@ public abstract class UnitInstanceImpl extends IDedImpl implements UnitInstance
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == PrecendenceNode.class) {
+		if (baseClass == PrecedenceNode.class) {
 			switch (derivedFeatureID) {
-				case HintcoPackage.UNIT_INSTANCE__PRECEDES: return HintcoPackage.PRECENDENCE_NODE__PRECEDES;
-				case HintcoPackage.UNIT_INSTANCE__SUCCEEDS: return HintcoPackage.PRECENDENCE_NODE__SUCCEEDS;
-				case HintcoPackage.UNIT_INSTANCE__BEFORE: return HintcoPackage.PRECENDENCE_NODE__BEFORE;
-				case HintcoPackage.UNIT_INSTANCE__AFTER: return HintcoPackage.PRECENDENCE_NODE__AFTER;
+				case HintcoPackage.UNIT_INSTANCE__PRECEDES: return HintcoPackage.PRECEDENCE_NODE__PRECEDES;
+				case HintcoPackage.UNIT_INSTANCE__SUCCEEDS: return HintcoPackage.PRECEDENCE_NODE__SUCCEEDS;
+				case HintcoPackage.UNIT_INSTANCE__BEFORE: return HintcoPackage.PRECEDENCE_NODE__BEFORE;
+				case HintcoPackage.UNIT_INSTANCE__AFTER: return HintcoPackage.PRECEDENCE_NODE__AFTER;
 				default: return -1;
 			}
 		}
@@ -676,12 +676,12 @@ public abstract class UnitInstanceImpl extends IDedImpl implements UnitInstance
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == PrecendenceNode.class) {
+		if (baseClass == PrecedenceNode.class) {
 			switch (baseFeatureID) {
-				case HintcoPackage.PRECENDENCE_NODE__PRECEDES: return HintcoPackage.UNIT_INSTANCE__PRECEDES;
-				case HintcoPackage.PRECENDENCE_NODE__SUCCEEDS: return HintcoPackage.UNIT_INSTANCE__SUCCEEDS;
-				case HintcoPackage.PRECENDENCE_NODE__BEFORE: return HintcoPackage.UNIT_INSTANCE__BEFORE;
-				case HintcoPackage.PRECENDENCE_NODE__AFTER: return HintcoPackage.UNIT_INSTANCE__AFTER;
+				case HintcoPackage.PRECEDENCE_NODE__PRECEDES: return HintcoPackage.UNIT_INSTANCE__PRECEDES;
+				case HintcoPackage.PRECEDENCE_NODE__SUCCEEDS: return HintcoPackage.UNIT_INSTANCE__SUCCEEDS;
+				case HintcoPackage.PRECEDENCE_NODE__BEFORE: return HintcoPackage.UNIT_INSTANCE__BEFORE;
+				case HintcoPackage.PRECEDENCE_NODE__AFTER: return HintcoPackage.UNIT_INSTANCE__AFTER;
 				default: return -1;
 			}
 		}

+ 5 - 5
HintConfiguration/src-gen/ua/ansymo/hintco/util/HintcoAdapterFactory.java

@@ -80,8 +80,8 @@ public class HintcoAdapterFactory extends AdapterFactoryImpl {
 				return createVariantDiagramAdapter();
 			}
 			@Override
-			public Adapter casePrecendenceNode(PrecendenceNode object) {
-				return createPrecendenceNodeAdapter();
+			public Adapter casePrecedenceNode(PrecedenceNode object) {
+				return createPrecedenceNodeAdapter();
 			}
 			@Override
 			public Adapter caseRootCandidateScenario(RootCandidateScenario object) {
@@ -242,16 +242,16 @@ public class HintcoAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ua.ansymo.hintco.PrecendenceNode <em>Precendence Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link ua.ansymo.hintco.PrecedenceNode <em>Precedence Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ua.ansymo.hintco.PrecendenceNode
+	 * @see ua.ansymo.hintco.PrecedenceNode
 	 * @generated
 	 */
-	public Adapter createPrecendenceNodeAdapter() {
+	public Adapter createPrecedenceNodeAdapter() {
 		return null;
 	}
 

+ 13 - 13
HintConfiguration/src-gen/ua/ansymo/hintco/util/HintcoSwitch.java

@@ -85,9 +85,9 @@ public class HintcoSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case HintcoPackage.PRECENDENCE_NODE: {
-				PrecendenceNode precendenceNode = (PrecendenceNode)theEObject;
-				T result = casePrecendenceNode(precendenceNode);
+			case HintcoPackage.PRECEDENCE_NODE: {
+				PrecedenceNode precedenceNode = (PrecedenceNode)theEObject;
+				T result = casePrecedenceNode(precedenceNode);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -113,7 +113,7 @@ public class HintcoSwitch<T> extends Switch<T> {
 				if (result == null) result = caseScenario(hierarchicalCosimUnit);
 				if (result == null) result = caseUnitInstance(hierarchicalCosimUnit);
 				if (result == null) result = caseIDed(hierarchicalCosimUnit);
-				if (result == null) result = casePrecendenceNode(hierarchicalCosimUnit);
+				if (result == null) result = casePrecedenceNode(hierarchicalCosimUnit);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -128,7 +128,7 @@ public class HintcoSwitch<T> extends Switch<T> {
 				UnitInstance unitInstance = (UnitInstance)theEObject;
 				T result = caseUnitInstance(unitInstance);
 				if (result == null) result = caseIDed(unitInstance);
-				if (result == null) result = casePrecendenceNode(unitInstance);
+				if (result == null) result = casePrecedenceNode(unitInstance);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -137,14 +137,14 @@ public class HintcoSwitch<T> extends Switch<T> {
 				T result = caseCosimUnitInstance(cosimUnitInstance);
 				if (result == null) result = caseUnitInstance(cosimUnitInstance);
 				if (result == null) result = caseIDed(cosimUnitInstance);
-				if (result == null) result = casePrecendenceNode(cosimUnitInstance);
+				if (result == null) result = casePrecedenceNode(cosimUnitInstance);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
 			case HintcoPackage.PORT_INSTANCE: {
 				PortInstance portInstance = (PortInstance)theEObject;
 				T result = casePortInstance(portInstance);
-				if (result == null) result = casePrecendenceNode(portInstance);
+				if (result == null) result = casePrecedenceNode(portInstance);
 				if (result == null) result = caseIDed(portInstance);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -155,7 +155,7 @@ public class HintcoSwitch<T> extends Switch<T> {
 				if (result == null) result = caseInputPortInstance(hierarchicalUnitPort);
 				if (result == null) result = caseOutputPortInstance(hierarchicalUnitPort);
 				if (result == null) result = casePortInstance(hierarchicalUnitPort);
-				if (result == null) result = casePrecendenceNode(hierarchicalUnitPort);
+				if (result == null) result = casePrecedenceNode(hierarchicalUnitPort);
 				if (result == null) result = caseIDed(hierarchicalUnitPort);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -164,7 +164,7 @@ public class HintcoSwitch<T> extends Switch<T> {
 				InputPortInstance inputPortInstance = (InputPortInstance)theEObject;
 				T result = caseInputPortInstance(inputPortInstance);
 				if (result == null) result = casePortInstance(inputPortInstance);
-				if (result == null) result = casePrecendenceNode(inputPortInstance);
+				if (result == null) result = casePrecedenceNode(inputPortInstance);
 				if (result == null) result = caseIDed(inputPortInstance);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -173,7 +173,7 @@ public class HintcoSwitch<T> extends Switch<T> {
 				OutputPortInstance outputPortInstance = (OutputPortInstance)theEObject;
 				T result = caseOutputPortInstance(outputPortInstance);
 				if (result == null) result = casePortInstance(outputPortInstance);
-				if (result == null) result = casePrecendenceNode(outputPortInstance);
+				if (result == null) result = casePrecedenceNode(outputPortInstance);
 				if (result == null) result = caseIDed(outputPortInstance);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
@@ -353,17 +353,17 @@ public class HintcoSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Precendence Node</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Precedence Node</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Precendence Node</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Precedence Node</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T casePrecendenceNode(PrecendenceNode object) {
+	public T casePrecedenceNode(PrecedenceNode object) {
 		return null;
 	}