Commit 776dffd5 authored by Nicola Gatto's avatar Nicola Gatto
Browse files

Merge branch 'master' into implement-ddpg

# Conflicts:
#	pom.xml
#	src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/CNNArch2Gluon.java
#	src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/CNNTrain2Gluon.java
#	src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/ReinforcementConfigurationData.java
#	src/main/resources/templates/gluon/CNNCreator.ftl
#	src/main/resources/templates/gluon/reinforcement/Trainer.ftl
#	src/main/resources/templates/gluon/reinforcement/agent/Agent.ftl
#	src/main/resources/templates/gluon/reinforcement/agent/ReplayMemory.ftl
#	src/main/resources/templates/gluon/reinforcement/environment/Environment.ftl
#	src/main/resources/templates/gluon/reinforcement/util/Util.ftl
#	src/test/java/de/monticore/lang/monticar/cnnarch/gluongenerator/GenerationTest.java
#	src/test/java/de/monticore/lang/monticar/cnnarch/gluongenerator/IntegrationPythonWrapperTest.java
#	src/test/resources/target_code/ReinforcementConfig1/CNNTrainer_reinforcementConfig1.py
#	src/test/resources/target_code/ReinforcementConfig1/reinforcement_learning/agent.py
#	src/test/resources/target_code/ReinforcementConfig1/reinforcement_learning/environment.py
#	src/test/resources/target_code/ReinforcementConfig1/reinforcement_learning/replay_memory.py
#	src/test/resources/target_code/ReinforcementConfig1/reinforcement_learning/util.py
#	src/test/resources/target_code/ReinforcementConfig2/CNNTrainer_reinforcementConfig2.py
#	src/test/resources/target_code/ReinforcementConfig2/reinforcement_learning/agent.py
#	src/test/resources/target_code/ReinforcementConfig2/reinforcement_learning/environment.py
#	src/test/resources/target_code/ReinforcementConfig2/reinforcement_learning/replay_memory.py
#	src/test/resources/target_code/ReinforcementConfig2/reinforcement_learning/util.py
#	src/test/resources/valid_tests/ReinforcementConfig1.cnnt
#	src/test/resources/valid_tests/ReinforcementConfig2.cnnt
parents f297e3f1 736a2256
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment