take care of some warnings and empty lines

DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical/src/be/uantwerpen/ansymo/semanticadaptation/cg/canonical/SemanticAdaptationCanonicalGenerator.xtend

@@ -51,7 +51,6 @@ import org.eclipse.emf.common.util.URI
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.xtext.EcoreUtil2
 import org.eclipse.xtext.generator.IFileSystemAccess2
-import org.eclipse.xtext.generator.IGeneratorContext
 import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.CurrentTime
 
 /**
@@ -571,7 +570,6 @@ class SemanticAdaptationCanonicalGenerator {
 		val internalPort2ExternalPortBindings = new HashMap<Port, Port>()
 		
 		for (port : getAllInnerFMUInputPortDeclarations(sa)){
-			var parentFMU = port.eContainer as InnerFMU
 			Log.println("Checking if port " + port.qualifiedName + " is bound to an external port.")
 			val externalPort = findExternalPortByTargetDependency(sa.inports, port)
 			if (externalPort !== null){

DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical/src/be/uantwerpen/ansymo/semanticadaptation/cg/canonical/graph/DirectedGraph.java

@@ -8,8 +8,6 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
 
-import org.eclipse.xtext.util.Strings;
-
 /*****************************************************************************
  * File: DirectedGraph.java
  * Author: Keith Schwarz (htiek@cs.stanford.edu)

DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.chain/src/be/uantwerpen/ansymo/semanticadaptation/cg/chain/SemanticAdaptationChainGenerator.xtend

@@ -10,7 +10,6 @@ import be.uantwerpen.ansymo.semanticadaptation.log.Log
 import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.Adaptation
 import org.eclipse.emf.common.util.URI
 import org.eclipse.xtext.generator.IFileSystemAccess2
-import org.eclipse.xtext.generator.IGeneratorContext
 
 class SemanticAdaptationChainGenerator extends SemanticAdaptationCustomGenerator {
 	

DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/src/be/uantwerpen/ansymo/semanticadaptation/cg/cpp/tests/CgCppAutoTest.xtend

@@ -16,7 +16,6 @@ import java.util.List
 import java.util.regex.Pattern
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.resource.ResourceSet
-import org.eclipse.xtext.generator.IGeneratorContext
 import org.eclipse.xtext.generator.InMemoryFileSystemAccess
 import org.eclipse.xtext.testing.InjectWith
 import org.eclipse.xtext.testing.util.ParseHelper

DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/src/be/uantwerpen/ansymo/semanticadaptation/cg/cpp/tests/CgCppBasicTest.xtend

@@ -31,7 +31,6 @@ import org.junit.BeforeClass
 import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.eclipse.xtext.generator.IGeneratorContext
 
 @RunWith(XtextRunner)
 @InjectWith(SemanticAdaptationInjectorProvider)
@@ -112,7 +111,6 @@ class CgCppBasicTest extends AbstractSemanticAdaptationTest {
 		val correctFileDirectory = new File(directory + File.separator + "correct");
 
 		val fsa = new InMemoryFileSystemAccess()
-		val IGeneratorContext ctxt = null;
 		val cppGen = new CppGenerator();
 		cppGen.doGenerate(model.eResource, fsa);
 
@@ -162,7 +160,6 @@ class CgCppBasicTest extends AbstractSemanticAdaptationTest {
 		__assertNoParseErrors(model, filename)
 
 		val fsa = new InMemoryFileSystemAccess();
-		val IGeneratorContext ctxt = null;
 		val cppGen = new CppGenerator();
 		cppGen.doGenerate(model.eResource, fsa);
 

DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp/src/be/uantwerpen/ansymo/semanticadaptation/cg/cpp/generation/ControlConditionSwitch.xtend

@@ -16,7 +16,6 @@ import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.DoStepFun
 import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.GetNextInternalTimeStep
 import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.Rollback
 import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.SaveState
-import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.StepSize
 import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.Variable
 import java.util.LinkedHashMap
 
@@ -52,7 +51,7 @@ class ControlConditionSwitch extends RulesConditionSwitch {
 		return retVal;
 	}
 
-	public def LinkedHashMap<String, GlobalInOutVariable> getGlobalVars(ControlRuleBlock object) {
+	def LinkedHashMap<String, GlobalInOutVariable> getGlobalVars(ControlRuleBlock object) {
 		if (object.globalCtrlVars !== null) {
 			this.globalDeclaration = true;
 			for (gVar : object.globalCtrlVars)

DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp/src/be/uantwerpen/ansymo/semanticadaptation/cg/cpp/generation/CppGenerator.xtend

@@ -10,7 +10,6 @@ import be.uantwerpen.ansymo.semanticadaptation.cg.cpp.data.SVCausality
 import be.uantwerpen.ansymo.semanticadaptation.cg.cpp.data.SVType
 import be.uantwerpen.ansymo.semanticadaptation.cg.cpp.data.ScalarVariable
 import be.uantwerpen.ansymo.semanticadaptation.cg.cpp.exceptions.IncorrectAmountOfElementsException
-import be.uantwerpen.ansymo.semanticadaptation.generator.SemanticAdaptationGenerator
 import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.Adaptation
 import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.ControlRuleBlock
 import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.Declaration
@@ -34,8 +33,8 @@ import org.eclipse.emf.common.util.URI
 import org.eclipse.emf.common.CommonPlugin
 
 class CppGenerator {
-	private var IFileSystemAccess2 fsa;
-	private List<File> resourcePaths = newArrayList();
+	var IFileSystemAccess2 fsa;
+	List<File> resourcePaths = newArrayList();
 
 	def void doGenerate(Resource resource, IFileSystemAccess2 fsa) {
 		Log.push("CppGenerator.doGenerate")
@@ -96,7 +95,7 @@ class CppGenerator {
 				Log.push("Loading fmu " + fmu.path)
 				val fmuFile = getFMUFile(fmu.path, adaptationFolderURI)
 				this.resourcePaths.add(fmuFile);
-				md = new ModelDescription(fmu.name, fmu.type.name, fmuFile);
+				md = new ModelDescription(fmu.name, fmuFile);
 	
 				innerFMUsData.add(new InnerFMUData(fmu.name, fmu.path, md.guid));
 				val LinkedHashMap<String, MappedScalarVariable> mSV = newLinkedHashMap();
@@ -453,24 +452,12 @@ class CppGenerator {
 			-> 
 			'''
 			fmi2FMUstate «saName»::getInternalFMUState()
-   
 						
 			{
 				InternalState* s = new InternalState();
 				*s = this->internalState;
 				return s;
 			}
-					
-	
-					
-	
-				   
-	
-					   
-	
-					
-	
-					  
 			
 			void «saName»::setInternalFMUState(fmi2FMUstate state)
 			{
@@ -495,15 +482,6 @@ class CppGenerator {
 															
 			return '''
 				«include»
-											   
-   
-								   
-						
-					 
-					
-	
-						
-						 
 				
 				namespace adaptation 
 				{
@@ -526,37 +504,6 @@ class CppGenerator {
 				}
 				
 			'''
-	
-
-   
-	
-								   
-																									   
-																												 
-			 
-			   
-	
-						 
-	 
-					
-	 
-					
-	 
-					 
-	 
-					 
-	 
-					
-	 
-						
-	 
-					 
-	 
-					   
-	
-	 
-	
-	  
 		}
 
 		/*
@@ -568,23 +515,9 @@ class CppGenerator {
 			LinkedHashMap<String, GlobalInOutVariable> globalVariables, ArrayList<InnerFMUData> fmus,
 			Collection<ScalarVariable> sVars, String stateFunctions) {
 			return '''
-
-	
-				
 					#ifndef SRC_«adapClassName.toUpperCase»_H
 					#define SRC_«adapClassName.toUpperCase»_H
-			   
-				
-	
-   
-													 
-		
-													   
-									  
-														
-								 
-																																												 
-				
+					
 					#include "SemanticAdaptation.h"
 					#include "HyfMath.h"
 					#include <memory>
@@ -595,18 +528,8 @@ class CppGenerator {
 					
 					namespace adaptation
 					{
-			 
-																																																																		  
-						 
-									
-	   
-																					   
-																						
-																						   
-																						   
-						
 						«fmusDefines»
-						
+
 						«SADefines»
 					
 						class «adapClassName» : public SemanticAdaptation<«adapClassName»>, public enable_shared_from_this<«adapClassName»>
@@ -620,26 +543,11 @@ class CppGenerator {
 								void setFmiValue(fmi2ValueReference id, bool value);
 								void setFmiValue(fmi2ValueReference id, double value);
 								void setFmiValue(fmi2ValueReference id, string value);
-					
-													
-	   
-													 
-	   
-						 
-											  
-				 
-							
 								int getFmiValueInteger(fmi2ValueReference id);
 								bool getFmiValueBoolean(fmi2ValueReference id);
 								double getFmiValueReal(fmi2ValueReference id);
 								string getFmiValueString(fmi2ValueReference id);
-								
-				  
-				  
-								
-				  
-				  
-								
+
 							protected:
 								«stateFunctions»
 								
@@ -690,50 +598,8 @@ class CppGenerator {
 			var ArrayList<String> initialisations = newArrayList();
 			if (reactiveOrDealyed == ReactiveOrDelayed.DELAYED) {
 				initialisations.add('''this->reactiveness = ReactiveOrDelayed::Delayed;''');
-   
-
 			} else if (reactiveOrDealyed == ReactiveOrDelayed.REACTIVE) {
-																										  
-												 
 				initialisations.add('''this->reactiveness = ReactiveOrDelayed::Reactive;''');
-   
-					
-					
-										  
-			   
-						  
-															   
-														 
-																 
-								  
-																																													
-	
-											 
-									  
-												   
-		
-   
-			
-																																							   
-																																											   
-	   
-				  
-			  
-			   
-				
-											 
-									  
-												   
-		
-   
-			
-																																							   
-																																											   
-	   
-				  
-			  
-			   
-				
 			}
 
 			if (machineType == MooreOrMealy.MOORE) {
@@ -806,9 +672,6 @@ class CppGenerator {
 					cpp.add(
 						'''
 							«functionSignature»
-	   
-												
-				  
 							{
 								«Utilities.getDebug(functionSignature)»
 								switch (id)
@@ -823,12 +686,7 @@ class CppGenerator {
 									{
 										«functionReturn»;
 									}
-				  
-				
-		 
-							
 								}
-								
 							}
 						'''
 					);
@@ -885,22 +743,9 @@ class CppGenerator {
 						}
 					'''
 				);
-	
-   
-
-						
 			}
-
 			return cpp.join("\n");
 		}
-	
-															 
-													  
-											 
-																					 
-								  
-		   
-														   
 
 		/*
 		 * Compiles the source file function executeInternalControlFlow.
@@ -914,32 +759,11 @@ class CppGenerator {
    
 			var cpp = "";
    
-			val visitor = new ControlConditionSwitch(adaptationClassName, adaptationName, mSVars, SASVs, params, inVars,
-																																								  
-																																												 
-				 
-		   
-				   
-				 
-		  
-		  
-		 
-			   
-	  
-	   
-				outVars, crtlVars);
+			val visitor = new ControlConditionSwitch(adaptationClassName, adaptationName, 
+									mSVars, SASVs, params, inVars, outVars, crtlVars
+			);
 			if (crtlRuleBlock !== null)
 				cpp += visitor.doSwitch(crtlRuleBlock).code;
-										 
-  
-				 
-		  
-		  
-		 
-			   
-	  
-	   
-	 
 
 			return new InOutRulesBlockResult(cpp, visitor.functionSignatures);
 		}
@@ -951,27 +775,11 @@ class CppGenerator {
 		def String removeEmptyArgumentParenthesis(String content) {
 			return content.substring(0, content.length - 2);
 		}
-	
-																											  
-																								   
-																								   
-																										
-														
-  
-											 
 		
 		def String removeArgumentParenthesis(String content) {
 			val startParen = content.indexOf('(');
-							 
-											   
-			
 			return content.substring(0,startParen);
 		}
-
-										
-  
- 
- 
  
 		/*
 		 * Calculates necessary information on global in/out variables
@@ -981,10 +789,6 @@ class CppGenerator {
 
 			val visitor = new RulesConditionSwitch("", "", "", null, null, params, null, null, null)
 	  
-														 
-	 
-	 
-	  
 			return visitor.getGlobalVars(gVars);
 		}
 
@@ -1013,57 +817,7 @@ class CppGenerator {
 						outVars, crtlVars)
 				else
 					new OutRulesConditionSwitch(adaptationClassName, adaptationName, mSVars, SASVs, params, inVars,
-											 
-  
- 
-											  
-															  
-  
- 
- 
-   
-																			  
-																										
-											  
-	
-												  
-					
-						
-							 
-						
-																												  
-												
-													
-													
-													 
-																												  
-												
-													
-													
-													 
 						outVars, crtlVars);
-
-	
-   
-																			  
-																										
-											  
-	
-												  
-					
-						
-							 
-						
-																												  
-												
-													
-													
-													 
-													  
-							
-	 
-  
-	
  
 			val functionName = "create" + ioType + "Rules()";
 			var String cpp = "";

DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp/src/be/uantwerpen/ansymo/semanticadaptation/cg/cpp/generation/InRulesConditionSwitch.xtend

@@ -12,7 +12,7 @@ import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.Port
 
 class InRulesConditionSwitch extends RulesConditionSwitch {
 
-	private Boolean inOutputFunction = false;
+	Boolean inOutputFunction = false;
 
 	new(
 		String adaptationClassName,
@@ -27,7 +27,7 @@ class InRulesConditionSwitch extends RulesConditionSwitch {
 		super(adaptationClassName, adaptationName, "in_rule_", mSVars, SASVs, params, inVars, outVars, crtlVars);
 	}
 
-	public def LinkedHashMap<String, GlobalInOutVariable> getGlobalVars(InRulesBlock object) {
+	def LinkedHashMap<String, GlobalInOutVariable> getGlobalVars(InRulesBlock object) {
 		if (object.globalInVars !== null) {
 			this.globalDeclaration = true;
 			for (gVar : object.globalInVars)

DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp/src/be/uantwerpen/ansymo/semanticadaptation/cg/cpp/generation/ModelDescription.xtend

@@ -20,18 +20,15 @@ import org.w3c.dom.Document
 import org.w3c.dom.NodeList
 
 class ModelDescription {
-	private final Document md;
-	private final String name;
-	private final String type;
+	final Document md;
+	final String name;
 	//Get rid of these. We need more information anyways.
-	private var LinkedHashMap<String, Pair<String, Integer>> svDefs = newLinkedHashMap();
-	private var LinkedHashMap<String, ScalarVariable> svs = newLinkedHashMap();
-	private var String guid;
+	var LinkedHashMap<String, Pair<String, Integer>> svDefs = newLinkedHashMap();
+	var LinkedHashMap<String, ScalarVariable> svs = newLinkedHashMap();
+	var String guid;
 
-	new(String name, String type, File path) {
+	new(String name, File path) {
 		this.name = name;
-		this.type = type;
-		
 		
 		var ZipFile fmu = new ZipFile(path);
 		var Enumeration<? extends ZipEntry> entries = fmu.entries();
@@ -98,15 +95,15 @@ class ModelDescription {
 		}
 	}
 
-	public def getName() {
+	def getName() {
 		return this.name;
 	}
 
-	public def getSvDef() {
+	def getSvDef() {
 		return this.svDefs;
 	}
 
-	public def getSv() { return this.svs; }
+	def getSv() { return this.svs; }
 
-	public def getGuid() { return this.guid; }
+	def getGuid() { return this.guid; }
 }

DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp/src/be/uantwerpen/ansymo/semanticadaptation/cg/cpp/generation/OutRulesConditionSwitch.xtend

@@ -8,7 +8,7 @@ import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.Port
 import java.util.LinkedHashMap
 import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.OutRulesBlock
 
-public class OutRulesConditionSwitch extends RulesConditionSwitch {
+class OutRulesConditionSwitch extends RulesConditionSwitch {
 	new(String adaptationClassName, String adaptationName,
 		LinkedHashMap<String, LinkedHashMap<String, MappedScalarVariable>> mSVars,
 		LinkedHashMap<String, SAScalarVariable> SASVs, LinkedHashMap<String, GlobalInOutVariable> params,
@@ -17,7 +17,7 @@ public class OutRulesConditionSwitch extends RulesConditionSwitch {
 		super(adaptationClassName, adaptationName, "out_rule_", mSVars, SASVs, params, inVars, outVars, crtlVars);
 	}
 
-	public def LinkedHashMap<String, GlobalInOutVariable> getGlobalVars(OutRulesBlock object) {
+	def LinkedHashMap<String, GlobalInOutVariable> getGlobalVars(OutRulesBlock object) {
 		if (object.globalOutVars !== null) {
 			this.globalDeclaration = true;
 			for (gVar : object.globalOutVars)

DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp/src/be/uantwerpen/ansymo/semanticadaptation/cg/cpp/generation/RulesConditionSwitch.xtend

@@ -99,14 +99,14 @@ class RulesConditionSwitch extends BasicConditionSwitch {
 	 * This function adds a header style function signature to the list <i>functionsignatures</i> 
 	 * and returns the source style function signature
 	 */
-	public def String createFunctionSignature(String functionName, String type, int count,
+	def String createFunctionSignature(String functionName, String type, int count,
 		List<String> functionSignatures) {
 		val functionSignature = this.functionPrefix + functionName + count + "(double dt, double H, double h)";
 		functionSignatures.add(type + " " + functionSignature);
 		return type + " " + this.adaptationClassName + "::" + functionSignature;
 	}
 
-	public def getDataRuleCount() { return this.count; }
+	def getDataRuleCount() { return this.count; }
 
 	def void incrementCount() {
 		this.count++;
@@ -115,7 +115,7 @@ class RulesConditionSwitch extends BasicConditionSwitch {
 	/*
 	 * COMPILATION FUNCTIONS
 	 */
-	public def Pair<String, LinkedHashMap<String, GlobalInOutVariable>> getGlobalVars(EList<Declaration> gVars) {
+	def Pair<String, LinkedHashMap<String, GlobalInOutVariable>> getGlobalVars(EList<Declaration> gVars) {
 
 		// Get the global variables added to globalVars
 		this.globalDeclaration = true;

DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.log/src/be/uantwerpen/ansymo/semanticadaptation/log/Log.xtend

@@ -11,7 +11,7 @@ class Log {
 	
 	var c = 0
 	
-	private static Logger logger;
+	static Logger logger;
 	
 	protected new() {
 		LogManager.resetConfiguration();

DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation/src/be/uantwerpen/ansymo/semanticadaptation/formatting2/SemanticAdaptationFormatter.xtend

@@ -3,6 +3,7 @@
  */
 package be.uantwerpen.ansymo.semanticadaptation.formatting2
 
+import be.uantwerpen.ansymo.semanticadaptation.log.Log
 import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.Adaptation
 import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.CompositeOutputFunction
 import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.CustomControlRule
@@ -10,7 +11,6 @@ import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.DataRule
 import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.SemanticAdaptation
 import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.StateTransitionFunction
 import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.Statement
-import be.uantwerpen.ansymo.semanticadaptation.log.Log
 import org.eclipse.xtext.formatting2.AbstractFormatter2
 import org.eclipse.xtext.formatting2.IFormattableDocument
 

DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation/src/be/uantwerpen/ansymo/semanticadaptation/scoping/SemanticAdaptationScopeProvider.xtend

@@ -325,8 +325,7 @@ class SemanticAdaptationScopeProvider extends AbstractDeclarativeScopeProvider
 	
 	
 	
-	@Inject
-	private IGlobalScopeProvider globalScopeProvider;
+	@Inject IGlobalScopeProvider globalScopeProvider;
 
 	def protected IScope getGlobalScope(Resource context, EReference reference) {
 		return getGlobalScope(context, reference, null);
@@ -336,7 +335,7 @@ class SemanticAdaptationScopeProvider extends AbstractDeclarativeScopeProvider
 		return wrap(globalScopeProvider.getScope(context, reference, filter));
 	}
 	
-	private IScopeWrapper scopeWrapper;
+	IScopeWrapper scopeWrapper;
 	
 	override setWrapper(IScopeWrapper wrapper) {
 		this.scopeWrapper = wrapper;