diff --git a/run_scripts/manual_carla.py b/run_scripts/manual_carla.py index 04604910c909f146fd6288ef003e5de4d2d84e20..3836c48ddef51f6712feb01a4d4b8d5ddf75ea2a 100644 --- a/run_scripts/manual_carla.py +++ b/run_scripts/manual_carla.py @@ -7,16 +7,36 @@ from carla_environment import CarlaEnvironment c = ew.Config() -c.name = '2' +c.name = '4' c.render = True c.env_type = 'Carla' -c.net_layout = [256, 128, 128] +c.net_layout = [128, 32] c.eps_decay = 0.9995 c.learn_rate= 0.001 c.run_episodes = 100 c.save_to = 'test/' -c.load_from = 'Carla_1_256__128__128_0.9995_0.001_1' +c.load_from = 'Carla_2_256__128__128_0.9995_0.001_1DBL' c.load_mem = True +c.load_ann = True + +o = copy.deepcopy(c) +o.name = 'JTAP_5' +o.render = True +o.learn = True +o.env_type = 'Carla' +o.net_layout = [128, 32, 32] +o.save_to = 'test/' +o.load_from = 'Carla_JTAP_4_128__32__32_0.9999_0.0005_1' +o.load_mem = True +o.load_ann = False +o.learn_offline = True +o.offline_epochs = 1500 +o.learn_iterations = 1 +o.offline_validate_every_x_iteration = -1 +o.learn_online = True +o.eps_decay = 0.9999 +o.learn_rate= 0.0005 +o.run_episodes = 500 # t = copy.deepcopy(c) @@ -37,8 +57,27 @@ c.load_mem = True # t.learn_iterations = 100 # t.offline_validate_every_x_iteration = -1 -configuration = c -configuration.env = CarlaEnvironment(render=configuration.render, manual=True) +configuration = o +configuration.env = CarlaEnvironment(render=configuration.render, manual=False) configuration.conf_to_name() -configuration.agent = DQAgent(configuration) +configuration.agent = QAgent(configuration) main.run(configuration) + +# o = copy.deepcopy(c) +# o.name = '5D' +# o.render = True +# o.learn = False +# o.env_type = 'Carla' +# o.net_layout = [1024, 512, 256] +# o.save_to = 'test/' +# o.load_from = 'Carla_01D_1024__512__512_0.9991_0.00025_1DBLoffline' +# o.load_mem = True +# o.load_ann = True +# o.learn_offline = False +# o.offline_epochs = 1000 +# o.learn_iterations = 1 +# o.offline_validate_every_x_iteration = -1 +# o.learn_online = True +# o.eps_decay = 0.9991 +# o.learn_rate= 0.0005 +# o.run_episodes = 20 \ No newline at end of file