Merge branch 'develop' into 'master'

Develop

See merge request !12

src/main/java/de/monticore/lang/monticar/cnnarch/generator/ArchitectureElementData.java

@@ -196,7 +196,13 @@ public class ArchitectureElementData {
     }
 
     public List<Integer> getOutputShape(){
-        return getLayerSymbol().getIntTupleValue(AllPredefinedLayers.OUTPUT_SHAPE_NAME).get();
+        if (getLayerSymbol().getIntValue(AllPredefinedLayers.OUTPUT_SHAPE_NAME).isPresent()){
+            List<Integer> list = new ArrayList<>();
+            list.add((Integer) getLayerSymbol().getIntValue(AllPredefinedLayers.OUTPUT_SHAPE_NAME).get());
+            return list;
+        }else{
+            return getLayerSymbol().getIntTupleValue(AllPredefinedLayers.OUTPUT_SHAPE_NAME).get();
+        }
     }
 
     public int getScaleFactor(){
@@ -244,10 +250,6 @@ public class ArchitectureElementData {
 	public int getNumHeads(){
         return getLayerSymbol().getIntValue(AllPredefinedLayers.NUM_HEADS_NAME).get();
     }
-
-    public String getStoreDistMeasure(){
-        return getLayerSymbol().getStringValue(AllPredefinedLayers.STORE_DIST_MEASURE_NAME).get();
-    }
     
     public int getReplayInterval(){
         return getLayerSymbol().getIntValue(AllPredefinedLayers.REPLAY_INTERVAL_NAME).get();
@@ -265,8 +267,8 @@ public class ArchitectureElementData {
         return getLayerSymbol().getIntValue(AllPredefinedLayers.REPLAY_GRADIENT_STEPS_NAME).get();
     }
     
-    public double getReplayMemoryStoreProb(){
-        return getLayerSymbol().getDoubleValue(AllPredefinedLayers.REPLAY_MEMORY_STORE_PROB_NAME).get();
+    public double getMemoryStoreProb(){
+        return getLayerSymbol().getDoubleValue(AllPredefinedLayers.MEMORY_STORE_PROB_NAME).get();
     }
     
     public int getMaxStoredSamples(){
@@ -281,16 +283,16 @@ public class ArchitectureElementData {
         return getLayerSymbol().getBooleanValue(AllPredefinedLayers.USE_REPLAY_NAME).get();
     }
 
-    public boolean getUseLocalAdaption(){
-        return getLayerSymbol().getBooleanValue(AllPredefinedLayers.USE_LOCAL_ADAPTION_NAME).get();
+    public boolean getUseLocalAdaptation(){
+        return getLayerSymbol().getBooleanValue(AllPredefinedLayers.USE_LOCAL_ADAPTATION_NAME).get();
     }
 
-    public int getLocalAdaptionK(){
-        return getLayerSymbol().getIntValue(AllPredefinedLayers.LOCAL_ADAPTION_K_NAME).get();
+    public int getLocalAdaptationK(){
+        return getLayerSymbol().getIntValue(AllPredefinedLayers.LOCAL_ADAPTATION_K_NAME).get();
     }
 
-    public int getlocalAdaptionGradientSteps(){
-        return getLayerSymbol().getIntValue(AllPredefinedLayers.LOCAL_ADAPTION_GRADIENT_STEPS_NAME).get();
+    public int getlocalAdaptationGradientSteps(){
+        return getLayerSymbol().getIntValue(AllPredefinedLayers.LOCAL_ADAPTATION_GRADIENT_STEPS_NAME).get();
     }
 
     public String getQueryNetDir(){

src/main/java/de/monticore/lang/monticar/cnnarch/generator/TrainParamSupportChecker.java

@@ -52,8 +52,6 @@ public abstract class TrainParamSupportChecker implements CNNTrainVisitor {
 
     public void visit(ASTAdamOptimizer node){}
 
-    public void visit(ASTAdamWOptimizer node){}
-
     public void visit(ASTRmsPropOptimizer node){}
 
     public void visit(ASTAdaGradOptimizer node){}