Replaced dependency to CNNArch2MXNet with dependency to CNNArch2X

pom.xml

@@ -17,7 +17,7 @@
     <!-- .. SE-Libraries .................................................. -->
       <CNNArch.version>0.3.1-SNAPSHOT</CNNArch.version>
       <CNNTrain.version>0.3.2-SNAPSHOT</CNNTrain.version>
-      <CNNArch2MXNet.version>0.2.16-SNAPSHOT</CNNArch2MXNet.version>
+      <CNNArch2X.version>0.0.1-SNAPSHOT</CNNArch2X.version>
       <embedded-montiarc-math-opt-generator>0.1.4</embedded-montiarc-math-opt-generator>
       <EMADL2PythonWrapper.version>0.0.1</EMADL2PythonWrapper.version>
     
@@ -63,8 +63,8 @@
 
         <dependency>
             <groupId>de.monticore.lang.monticar</groupId>
-            <artifactId>cnnarch-mxnet-generator</artifactId>
-            <version>${CNNArch2MXNet.version}</version>
+            <artifactId>cnnarch-generator</artifactId>
+            <version>${CNNArch2X.version}</version>
         </dependency>
 
         <dependency>

src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/CNNArch2Gluon.java

@@ -21,17 +21,17 @@
 package de.monticore.lang.monticar.cnnarch.gluongenerator;
 
 import de.monticore.lang.monticar.cnnarch._symboltable.IOSymbol;
-import de.monticore.lang.monticar.cnnarch.mxnetgenerator.CNNArch2MxNet;
-import de.monticore.lang.monticar.cnnarch.mxnetgenerator.Target;
+import de.monticore.lang.monticar.cnnarch.generator.CNNArchGenerator;
+import de.monticore.lang.monticar.cnnarch.generator.Target;
+import de.monticore.lang.monticar.cnnarch.generator.TemplateConfiguration;
 
 import de.monticore.lang.monticar.cnnarch._symboltable.ArchitectureSymbol;
-import de.monticore.lang.monticar.cnnarch.mxnetgenerator.TemplateConfiguration;
 import de.se_rwth.commons.logging.Log;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public class CNNArch2Gluon extends CNNArch2MxNet {
+public class CNNArch2Gluon extends CNNArchGenerator {
 
     public CNNArch2Gluon() {
         architectureSupportChecker = new CNNArch2GluonArchitectureSupportChecker();

src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/CNNArch2GluonArchitectureSupportChecker.java

 package de.monticore.lang.monticar.cnnarch.gluongenerator;
 
 import de.monticore.lang.monticar.cnnarch._symboltable.ArchitectureSymbol;
-import de.monticore.lang.monticar.cnnarch.mxnetgenerator.ArchitectureSupportChecker;
+import de.monticore.lang.monticar.cnnarch.generator.ArchitectureSupportChecker;
 
 public class CNNArch2GluonArchitectureSupportChecker extends ArchitectureSupportChecker {
 

src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/CNNArch2GluonCli.java

@@ -20,8 +20,8 @@
  */
 package de.monticore.lang.monticar.cnnarch.gluongenerator;
 
-import de.monticore.lang.monticar.cnnarch.CNNArchGenerator;
-import de.monticore.lang.monticar.cnnarch.mxnetgenerator.GenericCNNArchCli;
+import de.monticore.lang.monticar.cnnarch.generator.CNNArchGenerator;
+import de.monticore.lang.monticar.cnnarch.generator.GenericCNNArchCli;
 
 public class CNNArch2GluonCli {
     public static void main(String[] args) {

src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/CNNArch2GluonLayerSupportChecker.java

 package de.monticore.lang.monticar.cnnarch.gluongenerator;
 
 import de.monticore.lang.monticar.cnnarch.predefined.AllPredefinedLayers;
-import de.monticore.lang.monticar.cnnarch.mxnetgenerator.LayerSupportChecker;
+import de.monticore.lang.monticar.cnnarch.generator.LayerSupportChecker;
 
 public class CNNArch2GluonLayerSupportChecker extends LayerSupportChecker {
 

src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/CNNArch2GluonTemplateController.java

@@ -20,11 +20,11 @@
  */
 package de.monticore.lang.monticar.cnnarch.gluongenerator;
 
-import de.monticore.lang.monticar.cnnarch.mxnetgenerator.ArchitectureElementData;
-import de.monticore.lang.monticar.cnnarch.mxnetgenerator.CNNArchTemplateController;
+import de.monticore.lang.monticar.cnnarch.generator.ArchitectureElementData;
+import de.monticore.lang.monticar.cnnarch.generator.CNNArchTemplateController;
 
 import de.monticore.lang.monticar.cnnarch._symboltable.*;
-import de.monticore.lang.monticar.cnnarch.mxnetgenerator.TemplateConfiguration;
+import de.monticore.lang.monticar.cnnarch.generator.TemplateConfiguration;
 
 import java.io.Writer;
 import java.util.*;

src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/CNNTrain2Gluon.java

@@ -8,8 +8,8 @@ import de.monticore.lang.monticar.cnnarch.gluongenerator.reinforcement.RewardFun
 import de.monticore.lang.monticar.cnnarch.gluongenerator.reinforcement.RewardFunctionSourceGenerator;
 import de.monticore.lang.monticar.cnnarch.mxnetgenerator.ConfigurationData;
 
-import de.monticore.lang.monticar.cnnarch.mxnetgenerator.CNNTrain2MxNet;
-import de.monticore.lang.monticar.cnnarch.mxnetgenerator.TemplateConfiguration;
+import de.monticore.lang.monticar.cnnarch.generator.CNNTrainGenerator;
+import de.monticore.lang.monticar.cnnarch.generator.TemplateConfiguration;
 import de.monticore.lang.monticar.cnntrain._symboltable.ConfigurationSymbol;
 import de.monticore.lang.monticar.cnntrain._symboltable.LearningMethod;
 import de.monticore.lang.monticar.cnntrain._symboltable.RLAlgorithm;
@@ -31,7 +31,7 @@ import java.nio.file.Paths;
 import java.util.*;
 import java.util.stream.Collectors;
 
-public class CNNTrain2Gluon extends CNNTrain2MxNet {
+public class CNNTrain2Gluon extends CNNTrainGenerator {
     private static final String REINFORCEMENT_LEARNING_FRAMEWORK_MODULE = "reinforcement_learning";
 
     private final RewardFunctionSourceGenerator rewardFunctionSourceGenerator;

src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/GluonTemplateConfiguration.java

 package de.monticore.lang.monticar.cnnarch.gluongenerator;
 
-import de.monticore.lang.monticar.cnnarch.mxnetgenerator.TemplateConfiguration;
+import de.monticore.lang.monticar.cnnarch.generator.TemplateConfiguration;
 import freemarker.template.Configuration;
 
-/**
- *
- */
 public class GluonTemplateConfiguration extends TemplateConfiguration {
     private static Configuration configuration;
 

src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/ReinforcementConfigurationData.java

@@ -9,9 +9,6 @@ import de.monticore.lang.monticar.cnntrain.annotations.TrainedArchitecture;
 
 import java.util.*;
 
-/**
- *
- */
 public class ReinforcementConfigurationData extends ConfigurationData {
     private static final String AST_ENTRY_LEARNING_METHOD = "learning_method";
     private static final String AST_ENTRY_NUM_EPISODES = "num_episodes";

src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/reinforcement/critic/CriticNetworkGenerator.java

@@ -5,8 +5,8 @@ import de.monticore.lang.monticar.cnnarch._symboltable.*;
 import de.monticore.lang.monticar.cnnarch.gluongenerator.CNNArch2Gluon;
 import de.monticore.lang.monticar.cnnarch.gluongenerator.CNNArch2GluonArchitectureSupportChecker;
 import de.monticore.lang.monticar.cnnarch.gluongenerator.CNNArch2GluonLayerSupportChecker;
-import de.monticore.lang.monticar.cnnarch.mxnetgenerator.CNNArchSymbolCompiler;
-import de.monticore.lang.monticar.cnnarch.mxnetgenerator.TemplateConfiguration;
+import de.monticore.lang.monticar.cnnarch.generator.CNNArchSymbolCompiler;
+import de.monticore.lang.monticar.cnnarch.generator.TemplateConfiguration;
 import de.monticore.lang.monticar.cnntrain._symboltable.ConfigurationSymbol;
 import de.monticore.lang.monticar.cnntrain.annotations.Range;
 import de.monticore.lang.monticar.cnntrain.annotations.TrainedArchitecture;