Skip to content
  • Nicola Gatto's avatar
    Merge branch 'master' into develop · 18373198
    Nicola Gatto authored
    # Conflicts:
    #	src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4
    #	src/main/java/de/monticore/lang/monticar/cnntrain/_cocos/CNNTrainConfigurationSymbolChecker.java
    #	src/main/java/de/monticore/lang/monticar/cnntrain/_cocos/CNNTrainConfigurationSymbolCoCo.java
    #	src/main/java/de/monticore/lang/monticar/cnntrain/_cocos/CNNTrainConfigurationSymbolCoCo.java~Integrate TD3 Algorithm and Gaussian Noise
    #	src/main/java/de/monticore/lang/monticar/cnntrain/_cocos/CheckActorCriticRequiresCriticNetwork.java
    #	src/main/java/de/monticore/lang/monticar/cnntrain/_cocos/CheckCriticNetworkHasExactlyAOneDimensionalOutput.java
    #	src/main/java/de/monticore/lang/monticar/cnntrain/_cocos/CheckCriticNetworkInputs.java
    #	src/main/java/de/monticore/lang/monticar/cnntrain/_cocos/CheckOUParameterDimensionEqualsActionDimension.java
    #	src/main/java/de/monticore/lang/monticar/cnntrain/_cocos/CheckTrainedRlNetworkHasExactlyOneInput.java
    #	src/main/java/de/monticore/lang/monticar/cnntrain/_cocos/CheckTrainedRlNetworkHasExactlyOneOutput.java
    #	src/main/java/de/monticore/lang/monticar/cnntrain/_symboltable/NNArchitectureSymbol.java
    #	src/main/java/de/monticore/lang/monticar/cnntrain/_symboltable/NNArchitectureSymbolKind.java
    #	src/main/java/de/monticore/lang/monticar/cnntrain/annotations/TrainedArchitecture.java
    #	src/main/java/de/monticore/lang/monticar/cnntrain/helper/ConfigEntryNameConstants.java
    #	src/test/java/de/monticore/lang/monticar/cnntrain/cocos/AllCoCoTest.java
    #	src/test/resources/invalid_cocos_tests/CheckRLAlgorithmParameter4.cnnt
    #	src/test/resources/valid_tests/TD3Config.cnnt
    18373198