From e2c29491a1b13673c66a466dff305bd7dac00911 Mon Sep 17 00:00:00 2001
From: Svetlana <svetlana.pavlirskaya@rwth-aachen.de>
Date: Fri, 13 Apr 2018 20:07:55 +0200
Subject: [PATCH] Reinitialize generator to clean up instance.

---
 TorcsEMAMGenerator/experiments.iml                       | 5 +++--
 .../de/monticore/lang/monticar/torcs_dl/Experiments.java | 9 ++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/TorcsEMAMGenerator/experiments.iml b/TorcsEMAMGenerator/experiments.iml
index 498fe8d..a5f4d0f 100644
--- a/TorcsEMAMGenerator/experiments.iml
+++ b/TorcsEMAMGenerator/experiments.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -12,6 +12,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: de.monticore.lang.monticar:common-monticar:0.0.11-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: de.monticore.lang.monticar:embedded-montiarc:0.0.11c-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: org.antlr:antlr4-runtime:4.7.1" level="project" />
     <orderEntry type="library" name="Maven: de.monticore.lang:Tagging:0.0.1" level="project" />
@@ -49,7 +50,7 @@
     <orderEntry type="library" name="Maven: org.codehaus.groovy:groovy:2.3.7" level="project" />
     <orderEntry type="library" name="Maven: jline:jline:2.12" level="project" />
     <orderEntry type="library" name="Maven: de.monticore.lang:NumberUnit:0.0.10-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: de.monticore.lang.monticar:common-monticar:0.0.11-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: de.monticore.lang.monticar:common-monticar:0.0.10-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.2" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.2" level="project" />
     <orderEntry type="library" name="Maven: org.jscience:jscience:4.3.1" level="project" />
diff --git a/TorcsEMAMGenerator/src/main/java/de/monticore/lang/monticar/torcs_dl/Experiments.java b/TorcsEMAMGenerator/src/main/java/de/monticore/lang/monticar/torcs_dl/Experiments.java
index 6a86b2e..82d3023 100644
--- a/TorcsEMAMGenerator/src/main/java/de/monticore/lang/monticar/torcs_dl/Experiments.java
+++ b/TorcsEMAMGenerator/src/main/java/de/monticore/lang/monticar/torcs_dl/Experiments.java
@@ -37,11 +37,6 @@ public class Experiments {
         TaggingResolver taggingResolver = createSymTabAndTaggingResolver(MODELS_PATH);
         RosToEmamTagSchema.registerTagTypes(taggingResolver);
 
-        MiddlewareGenerator middlewareGenerator = new MiddlewareGenerator();
-
-        middlewareGenerator.add(new CPPGenImpl(), "cpp");
-        middlewareGenerator.add(new RosCppGenImpl(), "roscpp");
-
         LinkedList<String> inputs = new LinkedList<String>();
         inputs.add("Imagepreprocessing");
         inputs.add("Featureextraction");
@@ -56,6 +51,10 @@ public class Experiments {
 
                 TagHelper.resolveTags(taggingResolver, componentInstanceSymbol);
 
+                MiddlewareGenerator middlewareGenerator = new MiddlewareGenerator();
+
+                middlewareGenerator.add(new CPPGenImpl(), "cpp");
+                middlewareGenerator.add(new RosCppGenImpl(), "roscpp");
                 middlewareGenerator.setGenerationTargetPath(TARGET_PATH_GENERATED +inpu);
                 middlewareGenerator.generate(componentInstanceSymbol, taggingResolver);
 
-- 
GitLab