Merge branch 'develop' into 'master'

Develop

See merge request !29

pom.xml

@@ -18,7 +18,7 @@
 
     <groupId>de.monticore.lang.monticar</groupId>
     <artifactId>cnn-train</artifactId>
-    <version>0.3.11-SNAPSHOT</version>
+    <version>0.3.12-SNAPSHOT</version>
 
     <!-- == PROJECT DEPENDENCIES ============================================= -->
 

src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4

@@ -73,6 +73,7 @@ grammar CNNTrain extends de.monticore.lang.monticar.Common2, de.monticore.Number
                                          | inv:"inv"
                                          | poly:"poly"
                                          | sigmoid:"sigmoid");
+                                         
     TrainContextValue implements ConfigValue = (cpu:"cpu" | gpu:"gpu");
 
     interface OptimizerParamEntry extends Entry;
@@ -135,6 +136,8 @@ grammar CNNTrain extends de.monticore.lang.monticar.Common2, de.monticore.Number
     interface AdamEntry extends OptimizerParamEntry;
     AdamOptimizer implements OptimizerValue = name:"adam" ("{" params:AdamEntry* "}")?;
 
+    AdamWOptimizer implements OptimizerValue = name:"adamw" ("{" params:AdamEntry* "}")?;
+
     interface RmsPropEntry extends OptimizerParamEntry;
     RmsPropOptimizer implements OptimizerValue = name:"rmsprop" ("{" params:RmsPropEntry* "}")?;