From 68ab33097f013ec566934094f5eda3a656c489cd Mon Sep 17 00:00:00 2001 From: dagenaik Date: Fri, 9 Aug 2024 03:35:19 -0400 Subject: [PATCH] Updated folder names and folder paths code --- .github/workflows/ci.yaml | 4 ++-- .../advice-12x12-seed63-all.txt | 0 .../advice-12x12-seed63-coop10-A1-topleft.txt | 0 .../advice-12x12-seed63-coop10-A1-topright.txt | 0 .../advice-12x12-seed63-coop10-A2-bottomleft.txt | 0 .../advice-12x12-seed63-coop10-A2-bottomright.txt | 0 .../advice-12x12-seed63-coop5-A1-topleft.txt | 0 .../advice-12x12-seed63-coop5-A1-topright.txt | 0 .../advice-12x12-seed63-coop5-A2-bottomleft.txt | 0 .../advice-12x12-seed63-coop5-A2-bottomright.txt | 0 .../advice-12x12-seed63-holes.txt | 0 .../advice-12x12-seed63-human10.txt | 0 .../advice-12x12-seed63-human5.txt | 0 {expsetup => 01-expsetup}/lake-12x12-seed63.png | Bin {expsetup => 01-expsetup}/lake-12x12-seed63.xlsx | Bin {maps => 02-maps}/default.png | Bin {maps => 02-maps}/lake-12x12-seed63.png | Bin {input => 03-input}/advice-12x12-seed63-all.txt | 0 .../advice-12x12-seed63-coop10-A1-topleft.txt | 0 .../advice-12x12-seed63-coop10-A1-topright.txt | 0 .../advice-12x12-seed63-coop10-A2-bottomleft.txt | 0 .../advice-12x12-seed63-coop10-A2-bottomright.txt | 0 .../advice-12x12-seed63-coop5-A1-topleft.txt | 0 .../advice-12x12-seed63-coop5-A1-topright.txt | 0 .../advice-12x12-seed63-coop5-A2-bottomleft.txt | 0 .../advice-12x12-seed63-coop5-A2-bottomright.txt | 0 {input => 03-input}/advice-12x12-seed63-holes.txt | 0 {input => 03-input}/advice-12x12-seed63-human10.txt | 0 {input => 03-input}/advice-12x12-seed63-human5.txt | 0 {input => 03-input}/lake-12x12-seed63.png | Bin {input => 03-input}/lake-12x12-seed63.xlsx | Bin {src => 04-src}/__init__.py | 0 {src => 04-src}/advice_parser.py | 0 {src => 04-src}/advice_tools.py | 2 +- {src => 04-src}/analysis.py | 4 ++-- {src => 04-src}/map_tools.py | 2 +- {src => 04-src}/model.py | 2 +- {src => 04-src}/runner.py | 8 ++++---- {src => 04-src}/sl.py | 0 .../12x12-seed63.csv | 0 .../12x12-seed63.csv | 0 .../12x12-seed63.csv | 0 .../12x12-seed63.csv | 0 .../advice-synthetic-all/12x12-seed63-u-0.01.csv | 0 .../advice-synthetic-all/12x12-seed63-u-0.2.csv | 0 .../advice-synthetic-all/12x12-seed63-u-0.4.csv | 0 .../advice-synthetic-all/12x12-seed63-u-0.6.csv | 0 .../advice-synthetic-all/12x12-seed63-u-0.8.csv | 0 .../advice-synthetic-holes/12x12-seed63-u-0.01.csv | 0 .../advice-synthetic-holes/12x12-seed63-u-0.2.csv | 0 .../advice-synthetic-holes/12x12-seed63-u-0.4.csv | 0 .../advice-synthetic-holes/12x12-seed63-u-0.6.csv | 0 .../advice-synthetic-holes/12x12-seed63-u-0.8.csv | 0 .../12x12-seed63-u-0.01.csv | 0 .../advice-synthetic-human10/12x12-seed63-u-0.2.csv | 0 .../advice-synthetic-human10/12x12-seed63-u-0.4.csv | 0 .../advice-synthetic-human10/12x12-seed63-u-0.6.csv | 0 .../advice-synthetic-human10/12x12-seed63-u-0.8.csv | 0 .../advice-synthetic-human5/12x12-seed63-u-0.01.csv | 0 .../advice-synthetic-human5/12x12-seed63-u-0.2.csv | 0 .../advice-synthetic-human5/12x12-seed63-u-0.4.csv | 0 .../advice-synthetic-human5/12x12-seed63-u-0.6.csv | 0 .../advice-synthetic-human5/12x12-seed63-u-0.8.csv | 0 .../04/10000/policy_data/noadvice/12x12-seed63.csv | 0 .../04/10000/policy_data/random/12x12-seed63.csv | 0 .../12x12-seed63.csv | 0 .../12x12-seed63.csv | 0 .../12x12-seed63.csv | 0 .../12x12-seed63.csv | 0 .../advice-synthetic-all/12x12-seed63-u-0.01.csv | 0 .../advice-synthetic-all/12x12-seed63-u-0.2.csv | 0 .../advice-synthetic-all/12x12-seed63-u-0.4.csv | 0 .../advice-synthetic-all/12x12-seed63-u-0.6.csv | 0 .../advice-synthetic-all/12x12-seed63-u-0.8.csv | 0 .../advice-synthetic-holes/12x12-seed63-u-0.01.csv | 0 .../advice-synthetic-holes/12x12-seed63-u-0.2.csv | 0 .../advice-synthetic-holes/12x12-seed63-u-0.4.csv | 0 .../advice-synthetic-holes/12x12-seed63-u-0.6.csv | 0 .../advice-synthetic-holes/12x12-seed63-u-0.8.csv | 0 .../12x12-seed63-u-0.01.csv | 0 .../advice-synthetic-human10/12x12-seed63-u-0.2.csv | 0 .../advice-synthetic-human10/12x12-seed63-u-0.4.csv | 0 .../advice-synthetic-human10/12x12-seed63-u-0.6.csv | 0 .../advice-synthetic-human10/12x12-seed63-u-0.8.csv | 0 .../advice-synthetic-human5/12x12-seed63-u-0.01.csv | 0 .../advice-synthetic-human5/12x12-seed63-u-0.2.csv | 0 .../advice-synthetic-human5/12x12-seed63-u-0.4.csv | 0 .../advice-synthetic-human5/12x12-seed63-u-0.6.csv | 0 .../advice-synthetic-human5/12x12-seed63-u-0.8.csv | 0 .../04/10000/reward_data/noadvice/12x12-seed63.csv | 0 .../04/10000/reward_data/random/12x12-seed63.csv | 0 {experiments => 05-experiments}/README.md | 0 .../all/cumulative_reward-all-10000-linear.pdf | Bin .../all/cumulative_reward-all-10000-log.pdf | Bin .../cumulative_reward-coop10-10000-linear.pdf | Bin .../coop10/cumulative_reward-coop10-10000-log.pdf | Bin .../coop5/cumulative_reward-coop5-10000-linear.pdf | Bin .../coop5/cumulative_reward-coop5-10000-log.pdf | Bin .../holes/cumulative_reward-holes-10000-linear.pdf | Bin .../holes/cumulative_reward-holes-10000-log.pdf | Bin .../cumulative_reward-human10-10000-linear.pdf | Bin .../human10/cumulative_reward-human10-10000-log.pdf | Bin .../cumulative_reward-human5-10000-linear.pdf | Bin .../human5/cumulative_reward-human5-10000-log.pdf | Bin .../heatmaps/all/heatmap-all-advice_00-10000.pdf | Bin .../heatmaps/all/heatmap-all-advice_02-10000.pdf | Bin .../heatmaps/all/heatmap-all-advice_04-10000.pdf | Bin .../heatmaps/all/heatmap-all-advice_06-10000.pdf | Bin .../heatmaps/all/heatmap-all-advice_08-10000.pdf | Bin .../heatmaps/all/heatmap-all-no_advice-10000.pdf | Bin .../heatmaps/all/heatmap-all-random-10000.pdf | Bin ...eatmap-coop10-coop_topleft_bottomright-10000.pdf | Bin ...eatmap-coop10-coop_topright_bottomleft-10000.pdf | Bin .../coop10/heatmap-coop10-no_advice-10000.pdf | Bin .../heatmaps/coop10/heatmap-coop10-random-10000.pdf | Bin ...heatmap-coop5-coop_topleft_bottomright-10000.pdf | Bin ...heatmap-coop5-coop_topright_bottomleft-10000.pdf | Bin .../coop5/heatmap-coop5-no_advice-10000.pdf | Bin .../heatmaps/coop5/heatmap-coop5-random-10000.pdf | Bin .../holes/heatmap-holes-advice_00-10000.pdf | Bin .../holes/heatmap-holes-advice_02-10000.pdf | Bin .../holes/heatmap-holes-advice_04-10000.pdf | Bin .../holes/heatmap-holes-advice_06-10000.pdf | Bin .../holes/heatmap-holes-advice_08-10000.pdf | Bin .../holes/heatmap-holes-no_advice-10000.pdf | Bin .../heatmaps/holes/heatmap-holes-random-10000.pdf | Bin .../human10/heatmap-human10-advice_00-10000.pdf | Bin .../human10/heatmap-human10-advice_02-10000.pdf | Bin .../human10/heatmap-human10-advice_04-10000.pdf | Bin .../human10/heatmap-human10-advice_06-10000.pdf | Bin .../human10/heatmap-human10-advice_08-10000.pdf | Bin .../human10/heatmap-human10-no_advice-10000.pdf | Bin .../human10/heatmap-human10-random-10000.pdf | Bin .../human5/heatmap-human5-advice_00-10000.pdf | Bin .../human5/heatmap-human5-advice_02-10000.pdf | Bin .../human5/heatmap-human5-advice_04-10000.pdf | Bin .../human5/heatmap-human5-advice_06-10000.pdf | Bin .../human5/heatmap-human5-advice_08-10000.pdf | Bin .../human5/heatmap-human5-no_advice-10000.pdf | Bin .../heatmaps/human5/heatmap-human5-random-10000.pdf | Bin {tests => 07-tests}/__init__.py | 0 {tests => 07-tests}/grid_tests.py | 0 {tests => 07-tests}/model_tests.py | 0 {tests => 07-tests}/opinion_parser_tests.py | 2 +- {tests => 07-tests}/runner_tests.py | 0 {tests => 07-tests}/sl_tests.py | 0 {tests => 07-tests}/test_suite.py | 0 {tests => 07-tests}/validinput.txt | 0 setup.py | 2 +- 149 files changed, 13 insertions(+), 13 deletions(-) rename {expsetup => 01-expsetup}/advice-12x12-seed63-all.txt (100%) rename {expsetup => 01-expsetup}/advice-12x12-seed63-coop10-A1-topleft.txt (100%) rename {expsetup => 01-expsetup}/advice-12x12-seed63-coop10-A1-topright.txt (100%) rename {expsetup => 01-expsetup}/advice-12x12-seed63-coop10-A2-bottomleft.txt (100%) rename {expsetup => 01-expsetup}/advice-12x12-seed63-coop10-A2-bottomright.txt (100%) rename {expsetup => 01-expsetup}/advice-12x12-seed63-coop5-A1-topleft.txt (100%) rename {expsetup => 01-expsetup}/advice-12x12-seed63-coop5-A1-topright.txt (100%) rename {expsetup => 01-expsetup}/advice-12x12-seed63-coop5-A2-bottomleft.txt (100%) rename {expsetup => 01-expsetup}/advice-12x12-seed63-coop5-A2-bottomright.txt (100%) rename {expsetup => 01-expsetup}/advice-12x12-seed63-holes.txt (100%) rename {expsetup => 01-expsetup}/advice-12x12-seed63-human10.txt (100%) rename {expsetup => 01-expsetup}/advice-12x12-seed63-human5.txt (100%) rename {expsetup => 01-expsetup}/lake-12x12-seed63.png (100%) rename {expsetup => 01-expsetup}/lake-12x12-seed63.xlsx (100%) rename {maps => 02-maps}/default.png (100%) rename {maps => 02-maps}/lake-12x12-seed63.png (100%) rename {input => 03-input}/advice-12x12-seed63-all.txt (100%) rename {input => 03-input}/advice-12x12-seed63-coop10-A1-topleft.txt (100%) rename {input => 03-input}/advice-12x12-seed63-coop10-A1-topright.txt (100%) rename {input => 03-input}/advice-12x12-seed63-coop10-A2-bottomleft.txt (100%) rename {input => 03-input}/advice-12x12-seed63-coop10-A2-bottomright.txt (100%) rename {input => 03-input}/advice-12x12-seed63-coop5-A1-topleft.txt (100%) rename {input => 03-input}/advice-12x12-seed63-coop5-A1-topright.txt (100%) rename {input => 03-input}/advice-12x12-seed63-coop5-A2-bottomleft.txt (100%) rename {input => 03-input}/advice-12x12-seed63-coop5-A2-bottomright.txt (100%) rename {input => 03-input}/advice-12x12-seed63-holes.txt (100%) rename {input => 03-input}/advice-12x12-seed63-human10.txt (100%) rename {input => 03-input}/advice-12x12-seed63-human5.txt (100%) rename {input => 03-input}/lake-12x12-seed63.png (100%) rename {input => 03-input}/lake-12x12-seed63.xlsx (100%) rename {src => 04-src}/__init__.py (100%) rename {src => 04-src}/advice_parser.py (100%) rename {src => 04-src}/advice_tools.py (99%) rename {src => 04-src}/analysis.py (99%) rename {src => 04-src}/map_tools.py (99%) rename {src => 04-src}/model.py (98%) rename {src => 04-src}/runner.py (99%) rename {src => 04-src}/sl.py (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-coop10-topleft-bottomright/12x12-seed63.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-coop10-topright-bottomleft/12x12-seed63.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-coop5-topleft-bottomright/12x12-seed63.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-coop5-topright-bottomleft/12x12-seed63.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.01.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.2.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.4.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.6.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.8.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.01.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.2.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.4.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.6.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.8.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.01.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.2.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.4.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.6.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.8.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.01.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.2.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.4.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.6.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.8.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/noadvice/12x12-seed63.csv (100%) rename {experiments => 05-experiments}/04/10000/policy_data/random/12x12-seed63.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-coop10-topleft-bottomright/12x12-seed63.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-coop10-topright-bottomleft/12x12-seed63.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-coop5-topleft-bottomright/12x12-seed63.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-coop5-topright-bottomleft/12x12-seed63.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.01.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.2.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.4.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.6.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.8.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.01.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.2.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.4.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.6.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.8.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.01.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.2.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.4.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.6.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.8.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.01.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.2.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.4.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.6.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.8.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/noadvice/12x12-seed63.csv (100%) rename {experiments => 05-experiments}/04/10000/reward_data/random/12x12-seed63.csv (100%) rename {experiments => 05-experiments}/README.md (100%) rename {analysis-output => 06-analysis-output}/cumulative_reward/all/cumulative_reward-all-10000-linear.pdf (100%) rename {analysis-output => 06-analysis-output}/cumulative_reward/all/cumulative_reward-all-10000-log.pdf (100%) rename {analysis-output => 06-analysis-output}/cumulative_reward/coop10/cumulative_reward-coop10-10000-linear.pdf (100%) rename {analysis-output => 06-analysis-output}/cumulative_reward/coop10/cumulative_reward-coop10-10000-log.pdf (100%) rename {analysis-output => 06-analysis-output}/cumulative_reward/coop5/cumulative_reward-coop5-10000-linear.pdf (100%) rename {analysis-output => 06-analysis-output}/cumulative_reward/coop5/cumulative_reward-coop5-10000-log.pdf (100%) rename {analysis-output => 06-analysis-output}/cumulative_reward/holes/cumulative_reward-holes-10000-linear.pdf (100%) rename {analysis-output => 06-analysis-output}/cumulative_reward/holes/cumulative_reward-holes-10000-log.pdf (100%) rename {analysis-output => 06-analysis-output}/cumulative_reward/human10/cumulative_reward-human10-10000-linear.pdf (100%) rename {analysis-output => 06-analysis-output}/cumulative_reward/human10/cumulative_reward-human10-10000-log.pdf (100%) rename {analysis-output => 06-analysis-output}/cumulative_reward/human5/cumulative_reward-human5-10000-linear.pdf (100%) rename {analysis-output => 06-analysis-output}/cumulative_reward/human5/cumulative_reward-human5-10000-log.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/all/heatmap-all-advice_00-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/all/heatmap-all-advice_02-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/all/heatmap-all-advice_04-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/all/heatmap-all-advice_06-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/all/heatmap-all-advice_08-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/all/heatmap-all-no_advice-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/all/heatmap-all-random-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/coop10/heatmap-coop10-coop_topleft_bottomright-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/coop10/heatmap-coop10-coop_topright_bottomleft-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/coop10/heatmap-coop10-no_advice-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/coop10/heatmap-coop10-random-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/coop5/heatmap-coop5-coop_topleft_bottomright-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/coop5/heatmap-coop5-coop_topright_bottomleft-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/coop5/heatmap-coop5-no_advice-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/coop5/heatmap-coop5-random-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/holes/heatmap-holes-advice_00-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/holes/heatmap-holes-advice_02-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/holes/heatmap-holes-advice_04-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/holes/heatmap-holes-advice_06-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/holes/heatmap-holes-advice_08-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/holes/heatmap-holes-no_advice-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/holes/heatmap-holes-random-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/human10/heatmap-human10-advice_00-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/human10/heatmap-human10-advice_02-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/human10/heatmap-human10-advice_04-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/human10/heatmap-human10-advice_06-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/human10/heatmap-human10-advice_08-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/human10/heatmap-human10-no_advice-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/human10/heatmap-human10-random-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/human5/heatmap-human5-advice_00-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/human5/heatmap-human5-advice_02-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/human5/heatmap-human5-advice_04-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/human5/heatmap-human5-advice_06-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/human5/heatmap-human5-advice_08-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/human5/heatmap-human5-no_advice-10000.pdf (100%) rename {analysis-output => 06-analysis-output}/heatmaps/human5/heatmap-human5-random-10000.pdf (100%) rename {tests => 07-tests}/__init__.py (100%) rename {tests => 07-tests}/grid_tests.py (100%) rename {tests => 07-tests}/model_tests.py (100%) rename {tests => 07-tests}/opinion_parser_tests.py (91%) rename {tests => 07-tests}/runner_tests.py (100%) rename {tests => 07-tests}/sl_tests.py (100%) rename {tests => 07-tests}/test_suite.py (100%) rename {tests => 07-tests}/validinput.txt (100%) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3e30eea..05aec45 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,4 +1,4 @@ -name: Unit tests +name: Unit 07-tests on: push: @@ -26,7 +26,7 @@ jobs: python -m pip install --upgrade pip pip install -r requirements.txt pip install -e $GITHUB_WORKSPACE - - name: Unit tests + - name: Unit 07-tests run: | python -m tests.grid_tests python -m tests.model_tests diff --git a/expsetup/advice-12x12-seed63-all.txt b/01-expsetup/advice-12x12-seed63-all.txt similarity index 100% rename from expsetup/advice-12x12-seed63-all.txt rename to 01-expsetup/advice-12x12-seed63-all.txt diff --git a/expsetup/advice-12x12-seed63-coop10-A1-topleft.txt b/01-expsetup/advice-12x12-seed63-coop10-A1-topleft.txt similarity index 100% rename from expsetup/advice-12x12-seed63-coop10-A1-topleft.txt rename to 01-expsetup/advice-12x12-seed63-coop10-A1-topleft.txt diff --git a/expsetup/advice-12x12-seed63-coop10-A1-topright.txt b/01-expsetup/advice-12x12-seed63-coop10-A1-topright.txt similarity index 100% rename from expsetup/advice-12x12-seed63-coop10-A1-topright.txt rename to 01-expsetup/advice-12x12-seed63-coop10-A1-topright.txt diff --git a/expsetup/advice-12x12-seed63-coop10-A2-bottomleft.txt b/01-expsetup/advice-12x12-seed63-coop10-A2-bottomleft.txt similarity index 100% rename from expsetup/advice-12x12-seed63-coop10-A2-bottomleft.txt rename to 01-expsetup/advice-12x12-seed63-coop10-A2-bottomleft.txt diff --git a/expsetup/advice-12x12-seed63-coop10-A2-bottomright.txt b/01-expsetup/advice-12x12-seed63-coop10-A2-bottomright.txt similarity index 100% rename from expsetup/advice-12x12-seed63-coop10-A2-bottomright.txt rename to 01-expsetup/advice-12x12-seed63-coop10-A2-bottomright.txt diff --git a/expsetup/advice-12x12-seed63-coop5-A1-topleft.txt b/01-expsetup/advice-12x12-seed63-coop5-A1-topleft.txt similarity index 100% rename from expsetup/advice-12x12-seed63-coop5-A1-topleft.txt rename to 01-expsetup/advice-12x12-seed63-coop5-A1-topleft.txt diff --git a/expsetup/advice-12x12-seed63-coop5-A1-topright.txt b/01-expsetup/advice-12x12-seed63-coop5-A1-topright.txt similarity index 100% rename from expsetup/advice-12x12-seed63-coop5-A1-topright.txt rename to 01-expsetup/advice-12x12-seed63-coop5-A1-topright.txt diff --git a/expsetup/advice-12x12-seed63-coop5-A2-bottomleft.txt b/01-expsetup/advice-12x12-seed63-coop5-A2-bottomleft.txt similarity index 100% rename from expsetup/advice-12x12-seed63-coop5-A2-bottomleft.txt rename to 01-expsetup/advice-12x12-seed63-coop5-A2-bottomleft.txt diff --git a/expsetup/advice-12x12-seed63-coop5-A2-bottomright.txt b/01-expsetup/advice-12x12-seed63-coop5-A2-bottomright.txt similarity index 100% rename from expsetup/advice-12x12-seed63-coop5-A2-bottomright.txt rename to 01-expsetup/advice-12x12-seed63-coop5-A2-bottomright.txt diff --git a/expsetup/advice-12x12-seed63-holes.txt b/01-expsetup/advice-12x12-seed63-holes.txt similarity index 100% rename from expsetup/advice-12x12-seed63-holes.txt rename to 01-expsetup/advice-12x12-seed63-holes.txt diff --git a/expsetup/advice-12x12-seed63-human10.txt b/01-expsetup/advice-12x12-seed63-human10.txt similarity index 100% rename from expsetup/advice-12x12-seed63-human10.txt rename to 01-expsetup/advice-12x12-seed63-human10.txt diff --git a/expsetup/advice-12x12-seed63-human5.txt b/01-expsetup/advice-12x12-seed63-human5.txt similarity index 100% rename from expsetup/advice-12x12-seed63-human5.txt rename to 01-expsetup/advice-12x12-seed63-human5.txt diff --git a/expsetup/lake-12x12-seed63.png b/01-expsetup/lake-12x12-seed63.png similarity index 100% rename from expsetup/lake-12x12-seed63.png rename to 01-expsetup/lake-12x12-seed63.png diff --git a/expsetup/lake-12x12-seed63.xlsx b/01-expsetup/lake-12x12-seed63.xlsx similarity index 100% rename from expsetup/lake-12x12-seed63.xlsx rename to 01-expsetup/lake-12x12-seed63.xlsx diff --git a/maps/default.png b/02-maps/default.png similarity index 100% rename from maps/default.png rename to 02-maps/default.png diff --git a/maps/lake-12x12-seed63.png b/02-maps/lake-12x12-seed63.png similarity index 100% rename from maps/lake-12x12-seed63.png rename to 02-maps/lake-12x12-seed63.png diff --git a/input/advice-12x12-seed63-all.txt b/03-input/advice-12x12-seed63-all.txt similarity index 100% rename from input/advice-12x12-seed63-all.txt rename to 03-input/advice-12x12-seed63-all.txt diff --git a/input/advice-12x12-seed63-coop10-A1-topleft.txt b/03-input/advice-12x12-seed63-coop10-A1-topleft.txt similarity index 100% rename from input/advice-12x12-seed63-coop10-A1-topleft.txt rename to 03-input/advice-12x12-seed63-coop10-A1-topleft.txt diff --git a/input/advice-12x12-seed63-coop10-A1-topright.txt b/03-input/advice-12x12-seed63-coop10-A1-topright.txt similarity index 100% rename from input/advice-12x12-seed63-coop10-A1-topright.txt rename to 03-input/advice-12x12-seed63-coop10-A1-topright.txt diff --git a/input/advice-12x12-seed63-coop10-A2-bottomleft.txt b/03-input/advice-12x12-seed63-coop10-A2-bottomleft.txt similarity index 100% rename from input/advice-12x12-seed63-coop10-A2-bottomleft.txt rename to 03-input/advice-12x12-seed63-coop10-A2-bottomleft.txt diff --git a/input/advice-12x12-seed63-coop10-A2-bottomright.txt b/03-input/advice-12x12-seed63-coop10-A2-bottomright.txt similarity index 100% rename from input/advice-12x12-seed63-coop10-A2-bottomright.txt rename to 03-input/advice-12x12-seed63-coop10-A2-bottomright.txt diff --git a/input/advice-12x12-seed63-coop5-A1-topleft.txt b/03-input/advice-12x12-seed63-coop5-A1-topleft.txt similarity index 100% rename from input/advice-12x12-seed63-coop5-A1-topleft.txt rename to 03-input/advice-12x12-seed63-coop5-A1-topleft.txt diff --git a/input/advice-12x12-seed63-coop5-A1-topright.txt b/03-input/advice-12x12-seed63-coop5-A1-topright.txt similarity index 100% rename from input/advice-12x12-seed63-coop5-A1-topright.txt rename to 03-input/advice-12x12-seed63-coop5-A1-topright.txt diff --git a/input/advice-12x12-seed63-coop5-A2-bottomleft.txt b/03-input/advice-12x12-seed63-coop5-A2-bottomleft.txt similarity index 100% rename from input/advice-12x12-seed63-coop5-A2-bottomleft.txt rename to 03-input/advice-12x12-seed63-coop5-A2-bottomleft.txt diff --git a/input/advice-12x12-seed63-coop5-A2-bottomright.txt b/03-input/advice-12x12-seed63-coop5-A2-bottomright.txt similarity index 100% rename from input/advice-12x12-seed63-coop5-A2-bottomright.txt rename to 03-input/advice-12x12-seed63-coop5-A2-bottomright.txt diff --git a/input/advice-12x12-seed63-holes.txt b/03-input/advice-12x12-seed63-holes.txt similarity index 100% rename from input/advice-12x12-seed63-holes.txt rename to 03-input/advice-12x12-seed63-holes.txt diff --git a/input/advice-12x12-seed63-human10.txt b/03-input/advice-12x12-seed63-human10.txt similarity index 100% rename from input/advice-12x12-seed63-human10.txt rename to 03-input/advice-12x12-seed63-human10.txt diff --git a/input/advice-12x12-seed63-human5.txt b/03-input/advice-12x12-seed63-human5.txt similarity index 100% rename from input/advice-12x12-seed63-human5.txt rename to 03-input/advice-12x12-seed63-human5.txt diff --git a/input/lake-12x12-seed63.png b/03-input/lake-12x12-seed63.png similarity index 100% rename from input/lake-12x12-seed63.png rename to 03-input/lake-12x12-seed63.png diff --git a/input/lake-12x12-seed63.xlsx b/03-input/lake-12x12-seed63.xlsx similarity index 100% rename from input/lake-12x12-seed63.xlsx rename to 03-input/lake-12x12-seed63.xlsx diff --git a/src/__init__.py b/04-src/__init__.py similarity index 100% rename from src/__init__.py rename to 04-src/__init__.py diff --git a/src/advice_parser.py b/04-src/advice_parser.py similarity index 100% rename from src/advice_parser.py rename to 04-src/advice_parser.py diff --git a/src/advice_tools.py b/04-src/advice_tools.py similarity index 99% rename from src/advice_tools.py rename to 04-src/advice_tools.py index f85c08b..06312f3 100644 --- a/src/advice_tools.py +++ b/04-src/advice_tools.py @@ -11,7 +11,7 @@ def __init__(self, size, seed): self._size = size self._seed = seed - self._MAPS_PATH = './maps' + self._MAPS_PATH = './02-maps' self._facts = self.parse_map() self._advice = self.generate_advice_from_facts() diff --git a/src/analysis.py b/04-src/analysis.py similarity index 99% rename from src/analysis.py rename to 04-src/analysis.py index 11620c9..6e51b19 100644 --- a/src/analysis.py +++ b/04-src/analysis.py @@ -18,8 +18,8 @@ filename = f'{size}x{size}-seed{seed}' inputFolder = f'./experiments/{name}' -resultsPath = './analysis-output' -experiments_input_path = './input' +resultsPath = './06-analysis-output' +experiments_input_path = './03-input' class DataKind(Enum): diff --git a/src/map_tools.py b/04-src/map_tools.py similarity index 99% rename from src/map_tools.py rename to 04-src/map_tools.py index 95057f2..8c6a3f1 100644 --- a/src/map_tools.py +++ b/04-src/map_tools.py @@ -181,7 +181,7 @@ def render_map_from_description(self, map_desc, imgfile): options = parser.parse_args() - map_tools = MapTools('./maps') + map_tools = MapTools('./02-maps') if(options.default): map_tools.render_default_map() else: diff --git a/src/model.py b/04-src/model.py similarity index 98% rename from src/model.py rename to 04-src/model.py index f935740..598a5d3 100644 --- a/src/model.py +++ b/04-src/model.py @@ -96,7 +96,7 @@ def __init__(self, map_size: int, advice_list: list): self.advice_list = advice_list def __str__(self): - return f'Advisor input with {len(self.advice_list)} pieces of advice.' + return f'Advisor 03-input with {len(self.advice_list)} pieces of advice.' """ Advice: Value of a cell diff --git a/src/runner.py b/04-src/runner.py similarity index 99% rename from src/runner.py rename to 04-src/runner.py index 2b092b1..bc33fc4 100644 --- a/src/runner.py +++ b/04-src/runner.py @@ -30,8 +30,8 @@ def __init__(self, size, seed, numexperiments, maxepisodes, log_level=logging.IN self._GAMMA = 1 #File paths - self._INPUT_PATH = './input' - self._reward_results_PATH = './experiments' + self._INPUT_PATH = './03-input' + self._reward_results_PATH = './05-experiments' self._FILE_PATTERN = f'{size}x{size}-seed{seed}' self._MAP_NAME = f'{size}x{size}' @@ -175,7 +175,7 @@ def discrete_policy_grad(self, max_episodes, advice=None, is_random=False): policy = self.get_default_policy(environment) if advice: original_policy = policy - #logging.info(f'\t\t\t Shaping policy with advisor input at u={advice.u}') #TODO does not work with coop + #logging.info(f'\t\t\t Shaping policy with advisor 03-input at u={advice.u}') #TODO does not work with coop policy = self.shape_policy(policy, advice) #if advice.u==1.0: # TODO does not work with coop # assert np.array_equal(original_policy, policy) @@ -317,7 +317,7 @@ def run_experiment_coop(self, max_episodes, quota, advisor1_position, advisor2_p logging.info(f'====== COOP ADVISED AGENT WITH {max_episodes} EPISODES ======') logging.info(f'QUOTA: {quota} ** ADVISOR1: {advisor1_position} ** ADVISOR2: {advisor2_position}') - # get advisor input + # get advisor 03-input advisor1_id = "A1" advisor2_id = "A2" diff --git a/src/sl.py b/04-src/sl.py similarity index 100% rename from src/sl.py rename to 04-src/sl.py diff --git a/experiments/04/10000/policy_data/advice-coop10-topleft-bottomright/12x12-seed63.csv b/05-experiments/04/10000/policy_data/advice-coop10-topleft-bottomright/12x12-seed63.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-coop10-topleft-bottomright/12x12-seed63.csv rename to 05-experiments/04/10000/policy_data/advice-coop10-topleft-bottomright/12x12-seed63.csv diff --git a/experiments/04/10000/policy_data/advice-coop10-topright-bottomleft/12x12-seed63.csv b/05-experiments/04/10000/policy_data/advice-coop10-topright-bottomleft/12x12-seed63.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-coop10-topright-bottomleft/12x12-seed63.csv rename to 05-experiments/04/10000/policy_data/advice-coop10-topright-bottomleft/12x12-seed63.csv diff --git a/experiments/04/10000/policy_data/advice-coop5-topleft-bottomright/12x12-seed63.csv b/05-experiments/04/10000/policy_data/advice-coop5-topleft-bottomright/12x12-seed63.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-coop5-topleft-bottomright/12x12-seed63.csv rename to 05-experiments/04/10000/policy_data/advice-coop5-topleft-bottomright/12x12-seed63.csv diff --git a/experiments/04/10000/policy_data/advice-coop5-topright-bottomleft/12x12-seed63.csv b/05-experiments/04/10000/policy_data/advice-coop5-topright-bottomleft/12x12-seed63.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-coop5-topright-bottomleft/12x12-seed63.csv rename to 05-experiments/04/10000/policy_data/advice-coop5-topright-bottomleft/12x12-seed63.csv diff --git a/experiments/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.01.csv b/05-experiments/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.01.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.01.csv rename to 05-experiments/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.01.csv diff --git a/experiments/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.2.csv b/05-experiments/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.2.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.2.csv rename to 05-experiments/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.2.csv diff --git a/experiments/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.4.csv b/05-experiments/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.4.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.4.csv rename to 05-experiments/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.4.csv diff --git a/experiments/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.6.csv b/05-experiments/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.6.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.6.csv rename to 05-experiments/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.6.csv diff --git a/experiments/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.8.csv b/05-experiments/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.8.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.8.csv rename to 05-experiments/04/10000/policy_data/advice-synthetic-all/12x12-seed63-u-0.8.csv diff --git a/experiments/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.01.csv b/05-experiments/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.01.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.01.csv rename to 05-experiments/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.01.csv diff --git a/experiments/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.2.csv b/05-experiments/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.2.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.2.csv rename to 05-experiments/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.2.csv diff --git a/experiments/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.4.csv b/05-experiments/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.4.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.4.csv rename to 05-experiments/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.4.csv diff --git a/experiments/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.6.csv b/05-experiments/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.6.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.6.csv rename to 05-experiments/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.6.csv diff --git a/experiments/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.8.csv b/05-experiments/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.8.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.8.csv rename to 05-experiments/04/10000/policy_data/advice-synthetic-holes/12x12-seed63-u-0.8.csv diff --git a/experiments/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.01.csv b/05-experiments/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.01.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.01.csv rename to 05-experiments/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.01.csv diff --git a/experiments/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.2.csv b/05-experiments/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.2.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.2.csv rename to 05-experiments/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.2.csv diff --git a/experiments/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.4.csv b/05-experiments/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.4.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.4.csv rename to 05-experiments/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.4.csv diff --git a/experiments/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.6.csv b/05-experiments/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.6.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.6.csv rename to 05-experiments/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.6.csv diff --git a/experiments/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.8.csv b/05-experiments/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.8.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.8.csv rename to 05-experiments/04/10000/policy_data/advice-synthetic-human10/12x12-seed63-u-0.8.csv diff --git a/experiments/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.01.csv b/05-experiments/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.01.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.01.csv rename to 05-experiments/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.01.csv diff --git a/experiments/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.2.csv b/05-experiments/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.2.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.2.csv rename to 05-experiments/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.2.csv diff --git a/experiments/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.4.csv b/05-experiments/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.4.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.4.csv rename to 05-experiments/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.4.csv diff --git a/experiments/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.6.csv b/05-experiments/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.6.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.6.csv rename to 05-experiments/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.6.csv diff --git a/experiments/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.8.csv b/05-experiments/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.8.csv similarity index 100% rename from experiments/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.8.csv rename to 05-experiments/04/10000/policy_data/advice-synthetic-human5/12x12-seed63-u-0.8.csv diff --git a/experiments/04/10000/policy_data/noadvice/12x12-seed63.csv b/05-experiments/04/10000/policy_data/noadvice/12x12-seed63.csv similarity index 100% rename from experiments/04/10000/policy_data/noadvice/12x12-seed63.csv rename to 05-experiments/04/10000/policy_data/noadvice/12x12-seed63.csv diff --git a/experiments/04/10000/policy_data/random/12x12-seed63.csv b/05-experiments/04/10000/policy_data/random/12x12-seed63.csv similarity index 100% rename from experiments/04/10000/policy_data/random/12x12-seed63.csv rename to 05-experiments/04/10000/policy_data/random/12x12-seed63.csv diff --git a/experiments/04/10000/reward_data/advice-coop10-topleft-bottomright/12x12-seed63.csv b/05-experiments/04/10000/reward_data/advice-coop10-topleft-bottomright/12x12-seed63.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-coop10-topleft-bottomright/12x12-seed63.csv rename to 05-experiments/04/10000/reward_data/advice-coop10-topleft-bottomright/12x12-seed63.csv diff --git a/experiments/04/10000/reward_data/advice-coop10-topright-bottomleft/12x12-seed63.csv b/05-experiments/04/10000/reward_data/advice-coop10-topright-bottomleft/12x12-seed63.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-coop10-topright-bottomleft/12x12-seed63.csv rename to 05-experiments/04/10000/reward_data/advice-coop10-topright-bottomleft/12x12-seed63.csv diff --git a/experiments/04/10000/reward_data/advice-coop5-topleft-bottomright/12x12-seed63.csv b/05-experiments/04/10000/reward_data/advice-coop5-topleft-bottomright/12x12-seed63.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-coop5-topleft-bottomright/12x12-seed63.csv rename to 05-experiments/04/10000/reward_data/advice-coop5-topleft-bottomright/12x12-seed63.csv diff --git a/experiments/04/10000/reward_data/advice-coop5-topright-bottomleft/12x12-seed63.csv b/05-experiments/04/10000/reward_data/advice-coop5-topright-bottomleft/12x12-seed63.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-coop5-topright-bottomleft/12x12-seed63.csv rename to 05-experiments/04/10000/reward_data/advice-coop5-topright-bottomleft/12x12-seed63.csv diff --git a/experiments/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.01.csv b/05-experiments/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.01.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.01.csv rename to 05-experiments/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.01.csv diff --git a/experiments/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.2.csv b/05-experiments/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.2.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.2.csv rename to 05-experiments/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.2.csv diff --git a/experiments/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.4.csv b/05-experiments/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.4.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.4.csv rename to 05-experiments/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.4.csv diff --git a/experiments/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.6.csv b/05-experiments/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.6.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.6.csv rename to 05-experiments/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.6.csv diff --git a/experiments/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.8.csv b/05-experiments/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.8.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.8.csv rename to 05-experiments/04/10000/reward_data/advice-synthetic-all/12x12-seed63-u-0.8.csv diff --git a/experiments/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.01.csv b/05-experiments/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.01.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.01.csv rename to 05-experiments/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.01.csv diff --git a/experiments/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.2.csv b/05-experiments/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.2.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.2.csv rename to 05-experiments/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.2.csv diff --git a/experiments/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.4.csv b/05-experiments/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.4.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.4.csv rename to 05-experiments/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.4.csv diff --git a/experiments/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.6.csv b/05-experiments/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.6.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.6.csv rename to 05-experiments/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.6.csv diff --git a/experiments/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.8.csv b/05-experiments/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.8.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.8.csv rename to 05-experiments/04/10000/reward_data/advice-synthetic-holes/12x12-seed63-u-0.8.csv diff --git a/experiments/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.01.csv b/05-experiments/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.01.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.01.csv rename to 05-experiments/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.01.csv diff --git a/experiments/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.2.csv b/05-experiments/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.2.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.2.csv rename to 05-experiments/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.2.csv diff --git a/experiments/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.4.csv b/05-experiments/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.4.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.4.csv rename to 05-experiments/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.4.csv diff --git a/experiments/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.6.csv b/05-experiments/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.6.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.6.csv rename to 05-experiments/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.6.csv diff --git a/experiments/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.8.csv b/05-experiments/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.8.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.8.csv rename to 05-experiments/04/10000/reward_data/advice-synthetic-human10/12x12-seed63-u-0.8.csv diff --git a/experiments/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.01.csv b/05-experiments/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.01.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.01.csv rename to 05-experiments/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.01.csv diff --git a/experiments/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.2.csv b/05-experiments/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.2.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.2.csv rename to 05-experiments/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.2.csv diff --git a/experiments/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.4.csv b/05-experiments/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.4.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.4.csv rename to 05-experiments/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.4.csv diff --git a/experiments/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.6.csv b/05-experiments/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.6.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.6.csv rename to 05-experiments/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.6.csv diff --git a/experiments/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.8.csv b/05-experiments/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.8.csv similarity index 100% rename from experiments/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.8.csv rename to 05-experiments/04/10000/reward_data/advice-synthetic-human5/12x12-seed63-u-0.8.csv diff --git a/experiments/04/10000/reward_data/noadvice/12x12-seed63.csv b/05-experiments/04/10000/reward_data/noadvice/12x12-seed63.csv similarity index 100% rename from experiments/04/10000/reward_data/noadvice/12x12-seed63.csv rename to 05-experiments/04/10000/reward_data/noadvice/12x12-seed63.csv diff --git a/experiments/04/10000/reward_data/random/12x12-seed63.csv b/05-experiments/04/10000/reward_data/random/12x12-seed63.csv similarity index 100% rename from experiments/04/10000/reward_data/random/12x12-seed63.csv rename to 05-experiments/04/10000/reward_data/random/12x12-seed63.csv diff --git a/experiments/README.md b/05-experiments/README.md similarity index 100% rename from experiments/README.md rename to 05-experiments/README.md diff --git a/analysis-output/cumulative_reward/all/cumulative_reward-all-10000-linear.pdf b/06-analysis-output/cumulative_reward/all/cumulative_reward-all-10000-linear.pdf similarity index 100% rename from analysis-output/cumulative_reward/all/cumulative_reward-all-10000-linear.pdf rename to 06-analysis-output/cumulative_reward/all/cumulative_reward-all-10000-linear.pdf diff --git a/analysis-output/cumulative_reward/all/cumulative_reward-all-10000-log.pdf b/06-analysis-output/cumulative_reward/all/cumulative_reward-all-10000-log.pdf similarity index 100% rename from analysis-output/cumulative_reward/all/cumulative_reward-all-10000-log.pdf rename to 06-analysis-output/cumulative_reward/all/cumulative_reward-all-10000-log.pdf diff --git a/analysis-output/cumulative_reward/coop10/cumulative_reward-coop10-10000-linear.pdf b/06-analysis-output/cumulative_reward/coop10/cumulative_reward-coop10-10000-linear.pdf similarity index 100% rename from analysis-output/cumulative_reward/coop10/cumulative_reward-coop10-10000-linear.pdf rename to 06-analysis-output/cumulative_reward/coop10/cumulative_reward-coop10-10000-linear.pdf diff --git a/analysis-output/cumulative_reward/coop10/cumulative_reward-coop10-10000-log.pdf b/06-analysis-output/cumulative_reward/coop10/cumulative_reward-coop10-10000-log.pdf similarity index 100% rename from analysis-output/cumulative_reward/coop10/cumulative_reward-coop10-10000-log.pdf rename to 06-analysis-output/cumulative_reward/coop10/cumulative_reward-coop10-10000-log.pdf diff --git a/analysis-output/cumulative_reward/coop5/cumulative_reward-coop5-10000-linear.pdf b/06-analysis-output/cumulative_reward/coop5/cumulative_reward-coop5-10000-linear.pdf similarity index 100% rename from analysis-output/cumulative_reward/coop5/cumulative_reward-coop5-10000-linear.pdf rename to 06-analysis-output/cumulative_reward/coop5/cumulative_reward-coop5-10000-linear.pdf diff --git a/analysis-output/cumulative_reward/coop5/cumulative_reward-coop5-10000-log.pdf b/06-analysis-output/cumulative_reward/coop5/cumulative_reward-coop5-10000-log.pdf similarity index 100% rename from analysis-output/cumulative_reward/coop5/cumulative_reward-coop5-10000-log.pdf rename to 06-analysis-output/cumulative_reward/coop5/cumulative_reward-coop5-10000-log.pdf diff --git a/analysis-output/cumulative_reward/holes/cumulative_reward-holes-10000-linear.pdf b/06-analysis-output/cumulative_reward/holes/cumulative_reward-holes-10000-linear.pdf similarity index 100% rename from analysis-output/cumulative_reward/holes/cumulative_reward-holes-10000-linear.pdf rename to 06-analysis-output/cumulative_reward/holes/cumulative_reward-holes-10000-linear.pdf diff --git a/analysis-output/cumulative_reward/holes/cumulative_reward-holes-10000-log.pdf b/06-analysis-output/cumulative_reward/holes/cumulative_reward-holes-10000-log.pdf similarity index 100% rename from analysis-output/cumulative_reward/holes/cumulative_reward-holes-10000-log.pdf rename to 06-analysis-output/cumulative_reward/holes/cumulative_reward-holes-10000-log.pdf diff --git a/analysis-output/cumulative_reward/human10/cumulative_reward-human10-10000-linear.pdf b/06-analysis-output/cumulative_reward/human10/cumulative_reward-human10-10000-linear.pdf similarity index 100% rename from analysis-output/cumulative_reward/human10/cumulative_reward-human10-10000-linear.pdf rename to 06-analysis-output/cumulative_reward/human10/cumulative_reward-human10-10000-linear.pdf diff --git a/analysis-output/cumulative_reward/human10/cumulative_reward-human10-10000-log.pdf b/06-analysis-output/cumulative_reward/human10/cumulative_reward-human10-10000-log.pdf similarity index 100% rename from analysis-output/cumulative_reward/human10/cumulative_reward-human10-10000-log.pdf rename to 06-analysis-output/cumulative_reward/human10/cumulative_reward-human10-10000-log.pdf diff --git a/analysis-output/cumulative_reward/human5/cumulative_reward-human5-10000-linear.pdf b/06-analysis-output/cumulative_reward/human5/cumulative_reward-human5-10000-linear.pdf similarity index 100% rename from analysis-output/cumulative_reward/human5/cumulative_reward-human5-10000-linear.pdf rename to 06-analysis-output/cumulative_reward/human5/cumulative_reward-human5-10000-linear.pdf diff --git a/analysis-output/cumulative_reward/human5/cumulative_reward-human5-10000-log.pdf b/06-analysis-output/cumulative_reward/human5/cumulative_reward-human5-10000-log.pdf similarity index 100% rename from analysis-output/cumulative_reward/human5/cumulative_reward-human5-10000-log.pdf rename to 06-analysis-output/cumulative_reward/human5/cumulative_reward-human5-10000-log.pdf diff --git a/analysis-output/heatmaps/all/heatmap-all-advice_00-10000.pdf b/06-analysis-output/heatmaps/all/heatmap-all-advice_00-10000.pdf similarity index 100% rename from analysis-output/heatmaps/all/heatmap-all-advice_00-10000.pdf rename to 06-analysis-output/heatmaps/all/heatmap-all-advice_00-10000.pdf diff --git a/analysis-output/heatmaps/all/heatmap-all-advice_02-10000.pdf b/06-analysis-output/heatmaps/all/heatmap-all-advice_02-10000.pdf similarity index 100% rename from analysis-output/heatmaps/all/heatmap-all-advice_02-10000.pdf rename to 06-analysis-output/heatmaps/all/heatmap-all-advice_02-10000.pdf diff --git a/analysis-output/heatmaps/all/heatmap-all-advice_04-10000.pdf b/06-analysis-output/heatmaps/all/heatmap-all-advice_04-10000.pdf similarity index 100% rename from analysis-output/heatmaps/all/heatmap-all-advice_04-10000.pdf rename to 06-analysis-output/heatmaps/all/heatmap-all-advice_04-10000.pdf diff --git a/analysis-output/heatmaps/all/heatmap-all-advice_06-10000.pdf b/06-analysis-output/heatmaps/all/heatmap-all-advice_06-10000.pdf similarity index 100% rename from analysis-output/heatmaps/all/heatmap-all-advice_06-10000.pdf rename to 06-analysis-output/heatmaps/all/heatmap-all-advice_06-10000.pdf diff --git a/analysis-output/heatmaps/all/heatmap-all-advice_08-10000.pdf b/06-analysis-output/heatmaps/all/heatmap-all-advice_08-10000.pdf similarity index 100% rename from analysis-output/heatmaps/all/heatmap-all-advice_08-10000.pdf rename to 06-analysis-output/heatmaps/all/heatmap-all-advice_08-10000.pdf diff --git a/analysis-output/heatmaps/all/heatmap-all-no_advice-10000.pdf b/06-analysis-output/heatmaps/all/heatmap-all-no_advice-10000.pdf similarity index 100% rename from analysis-output/heatmaps/all/heatmap-all-no_advice-10000.pdf rename to 06-analysis-output/heatmaps/all/heatmap-all-no_advice-10000.pdf diff --git a/analysis-output/heatmaps/all/heatmap-all-random-10000.pdf b/06-analysis-output/heatmaps/all/heatmap-all-random-10000.pdf similarity index 100% rename from analysis-output/heatmaps/all/heatmap-all-random-10000.pdf rename to 06-analysis-output/heatmaps/all/heatmap-all-random-10000.pdf diff --git a/analysis-output/heatmaps/coop10/heatmap-coop10-coop_topleft_bottomright-10000.pdf b/06-analysis-output/heatmaps/coop10/heatmap-coop10-coop_topleft_bottomright-10000.pdf similarity index 100% rename from analysis-output/heatmaps/coop10/heatmap-coop10-coop_topleft_bottomright-10000.pdf rename to 06-analysis-output/heatmaps/coop10/heatmap-coop10-coop_topleft_bottomright-10000.pdf diff --git a/analysis-output/heatmaps/coop10/heatmap-coop10-coop_topright_bottomleft-10000.pdf b/06-analysis-output/heatmaps/coop10/heatmap-coop10-coop_topright_bottomleft-10000.pdf similarity index 100% rename from analysis-output/heatmaps/coop10/heatmap-coop10-coop_topright_bottomleft-10000.pdf rename to 06-analysis-output/heatmaps/coop10/heatmap-coop10-coop_topright_bottomleft-10000.pdf diff --git a/analysis-output/heatmaps/coop10/heatmap-coop10-no_advice-10000.pdf b/06-analysis-output/heatmaps/coop10/heatmap-coop10-no_advice-10000.pdf similarity index 100% rename from analysis-output/heatmaps/coop10/heatmap-coop10-no_advice-10000.pdf rename to 06-analysis-output/heatmaps/coop10/heatmap-coop10-no_advice-10000.pdf diff --git a/analysis-output/heatmaps/coop10/heatmap-coop10-random-10000.pdf b/06-analysis-output/heatmaps/coop10/heatmap-coop10-random-10000.pdf similarity index 100% rename from analysis-output/heatmaps/coop10/heatmap-coop10-random-10000.pdf rename to 06-analysis-output/heatmaps/coop10/heatmap-coop10-random-10000.pdf diff --git a/analysis-output/heatmaps/coop5/heatmap-coop5-coop_topleft_bottomright-10000.pdf b/06-analysis-output/heatmaps/coop5/heatmap-coop5-coop_topleft_bottomright-10000.pdf similarity index 100% rename from analysis-output/heatmaps/coop5/heatmap-coop5-coop_topleft_bottomright-10000.pdf rename to 06-analysis-output/heatmaps/coop5/heatmap-coop5-coop_topleft_bottomright-10000.pdf diff --git a/analysis-output/heatmaps/coop5/heatmap-coop5-coop_topright_bottomleft-10000.pdf b/06-analysis-output/heatmaps/coop5/heatmap-coop5-coop_topright_bottomleft-10000.pdf similarity index 100% rename from analysis-output/heatmaps/coop5/heatmap-coop5-coop_topright_bottomleft-10000.pdf rename to 06-analysis-output/heatmaps/coop5/heatmap-coop5-coop_topright_bottomleft-10000.pdf diff --git a/analysis-output/heatmaps/coop5/heatmap-coop5-no_advice-10000.pdf b/06-analysis-output/heatmaps/coop5/heatmap-coop5-no_advice-10000.pdf similarity index 100% rename from analysis-output/heatmaps/coop5/heatmap-coop5-no_advice-10000.pdf rename to 06-analysis-output/heatmaps/coop5/heatmap-coop5-no_advice-10000.pdf diff --git a/analysis-output/heatmaps/coop5/heatmap-coop5-random-10000.pdf b/06-analysis-output/heatmaps/coop5/heatmap-coop5-random-10000.pdf similarity index 100% rename from analysis-output/heatmaps/coop5/heatmap-coop5-random-10000.pdf rename to 06-analysis-output/heatmaps/coop5/heatmap-coop5-random-10000.pdf diff --git a/analysis-output/heatmaps/holes/heatmap-holes-advice_00-10000.pdf b/06-analysis-output/heatmaps/holes/heatmap-holes-advice_00-10000.pdf similarity index 100% rename from analysis-output/heatmaps/holes/heatmap-holes-advice_00-10000.pdf rename to 06-analysis-output/heatmaps/holes/heatmap-holes-advice_00-10000.pdf diff --git a/analysis-output/heatmaps/holes/heatmap-holes-advice_02-10000.pdf b/06-analysis-output/heatmaps/holes/heatmap-holes-advice_02-10000.pdf similarity index 100% rename from analysis-output/heatmaps/holes/heatmap-holes-advice_02-10000.pdf rename to 06-analysis-output/heatmaps/holes/heatmap-holes-advice_02-10000.pdf diff --git a/analysis-output/heatmaps/holes/heatmap-holes-advice_04-10000.pdf b/06-analysis-output/heatmaps/holes/heatmap-holes-advice_04-10000.pdf similarity index 100% rename from analysis-output/heatmaps/holes/heatmap-holes-advice_04-10000.pdf rename to 06-analysis-output/heatmaps/holes/heatmap-holes-advice_04-10000.pdf diff --git a/analysis-output/heatmaps/holes/heatmap-holes-advice_06-10000.pdf b/06-analysis-output/heatmaps/holes/heatmap-holes-advice_06-10000.pdf similarity index 100% rename from analysis-output/heatmaps/holes/heatmap-holes-advice_06-10000.pdf rename to 06-analysis-output/heatmaps/holes/heatmap-holes-advice_06-10000.pdf diff --git a/analysis-output/heatmaps/holes/heatmap-holes-advice_08-10000.pdf b/06-analysis-output/heatmaps/holes/heatmap-holes-advice_08-10000.pdf similarity index 100% rename from analysis-output/heatmaps/holes/heatmap-holes-advice_08-10000.pdf rename to 06-analysis-output/heatmaps/holes/heatmap-holes-advice_08-10000.pdf diff --git a/analysis-output/heatmaps/holes/heatmap-holes-no_advice-10000.pdf b/06-analysis-output/heatmaps/holes/heatmap-holes-no_advice-10000.pdf similarity index 100% rename from analysis-output/heatmaps/holes/heatmap-holes-no_advice-10000.pdf rename to 06-analysis-output/heatmaps/holes/heatmap-holes-no_advice-10000.pdf diff --git a/analysis-output/heatmaps/holes/heatmap-holes-random-10000.pdf b/06-analysis-output/heatmaps/holes/heatmap-holes-random-10000.pdf similarity index 100% rename from analysis-output/heatmaps/holes/heatmap-holes-random-10000.pdf rename to 06-analysis-output/heatmaps/holes/heatmap-holes-random-10000.pdf diff --git a/analysis-output/heatmaps/human10/heatmap-human10-advice_00-10000.pdf b/06-analysis-output/heatmaps/human10/heatmap-human10-advice_00-10000.pdf similarity index 100% rename from analysis-output/heatmaps/human10/heatmap-human10-advice_00-10000.pdf rename to 06-analysis-output/heatmaps/human10/heatmap-human10-advice_00-10000.pdf diff --git a/analysis-output/heatmaps/human10/heatmap-human10-advice_02-10000.pdf b/06-analysis-output/heatmaps/human10/heatmap-human10-advice_02-10000.pdf similarity index 100% rename from analysis-output/heatmaps/human10/heatmap-human10-advice_02-10000.pdf rename to 06-analysis-output/heatmaps/human10/heatmap-human10-advice_02-10000.pdf diff --git a/analysis-output/heatmaps/human10/heatmap-human10-advice_04-10000.pdf b/06-analysis-output/heatmaps/human10/heatmap-human10-advice_04-10000.pdf similarity index 100% rename from analysis-output/heatmaps/human10/heatmap-human10-advice_04-10000.pdf rename to 06-analysis-output/heatmaps/human10/heatmap-human10-advice_04-10000.pdf diff --git a/analysis-output/heatmaps/human10/heatmap-human10-advice_06-10000.pdf b/06-analysis-output/heatmaps/human10/heatmap-human10-advice_06-10000.pdf similarity index 100% rename from analysis-output/heatmaps/human10/heatmap-human10-advice_06-10000.pdf rename to 06-analysis-output/heatmaps/human10/heatmap-human10-advice_06-10000.pdf diff --git a/analysis-output/heatmaps/human10/heatmap-human10-advice_08-10000.pdf b/06-analysis-output/heatmaps/human10/heatmap-human10-advice_08-10000.pdf similarity index 100% rename from analysis-output/heatmaps/human10/heatmap-human10-advice_08-10000.pdf rename to 06-analysis-output/heatmaps/human10/heatmap-human10-advice_08-10000.pdf diff --git a/analysis-output/heatmaps/human10/heatmap-human10-no_advice-10000.pdf b/06-analysis-output/heatmaps/human10/heatmap-human10-no_advice-10000.pdf similarity index 100% rename from analysis-output/heatmaps/human10/heatmap-human10-no_advice-10000.pdf rename to 06-analysis-output/heatmaps/human10/heatmap-human10-no_advice-10000.pdf diff --git a/analysis-output/heatmaps/human10/heatmap-human10-random-10000.pdf b/06-analysis-output/heatmaps/human10/heatmap-human10-random-10000.pdf similarity index 100% rename from analysis-output/heatmaps/human10/heatmap-human10-random-10000.pdf rename to 06-analysis-output/heatmaps/human10/heatmap-human10-random-10000.pdf diff --git a/analysis-output/heatmaps/human5/heatmap-human5-advice_00-10000.pdf b/06-analysis-output/heatmaps/human5/heatmap-human5-advice_00-10000.pdf similarity index 100% rename from analysis-output/heatmaps/human5/heatmap-human5-advice_00-10000.pdf rename to 06-analysis-output/heatmaps/human5/heatmap-human5-advice_00-10000.pdf diff --git a/analysis-output/heatmaps/human5/heatmap-human5-advice_02-10000.pdf b/06-analysis-output/heatmaps/human5/heatmap-human5-advice_02-10000.pdf similarity index 100% rename from analysis-output/heatmaps/human5/heatmap-human5-advice_02-10000.pdf rename to 06-analysis-output/heatmaps/human5/heatmap-human5-advice_02-10000.pdf diff --git a/analysis-output/heatmaps/human5/heatmap-human5-advice_04-10000.pdf b/06-analysis-output/heatmaps/human5/heatmap-human5-advice_04-10000.pdf similarity index 100% rename from analysis-output/heatmaps/human5/heatmap-human5-advice_04-10000.pdf rename to 06-analysis-output/heatmaps/human5/heatmap-human5-advice_04-10000.pdf diff --git a/analysis-output/heatmaps/human5/heatmap-human5-advice_06-10000.pdf b/06-analysis-output/heatmaps/human5/heatmap-human5-advice_06-10000.pdf similarity index 100% rename from analysis-output/heatmaps/human5/heatmap-human5-advice_06-10000.pdf rename to 06-analysis-output/heatmaps/human5/heatmap-human5-advice_06-10000.pdf diff --git a/analysis-output/heatmaps/human5/heatmap-human5-advice_08-10000.pdf b/06-analysis-output/heatmaps/human5/heatmap-human5-advice_08-10000.pdf similarity index 100% rename from analysis-output/heatmaps/human5/heatmap-human5-advice_08-10000.pdf rename to 06-analysis-output/heatmaps/human5/heatmap-human5-advice_08-10000.pdf diff --git a/analysis-output/heatmaps/human5/heatmap-human5-no_advice-10000.pdf b/06-analysis-output/heatmaps/human5/heatmap-human5-no_advice-10000.pdf similarity index 100% rename from analysis-output/heatmaps/human5/heatmap-human5-no_advice-10000.pdf rename to 06-analysis-output/heatmaps/human5/heatmap-human5-no_advice-10000.pdf diff --git a/analysis-output/heatmaps/human5/heatmap-human5-random-10000.pdf b/06-analysis-output/heatmaps/human5/heatmap-human5-random-10000.pdf similarity index 100% rename from analysis-output/heatmaps/human5/heatmap-human5-random-10000.pdf rename to 06-analysis-output/heatmaps/human5/heatmap-human5-random-10000.pdf diff --git a/tests/__init__.py b/07-tests/__init__.py similarity index 100% rename from tests/__init__.py rename to 07-tests/__init__.py diff --git a/tests/grid_tests.py b/07-tests/grid_tests.py similarity index 100% rename from tests/grid_tests.py rename to 07-tests/grid_tests.py diff --git a/tests/model_tests.py b/07-tests/model_tests.py similarity index 100% rename from tests/model_tests.py rename to 07-tests/model_tests.py diff --git a/tests/opinion_parser_tests.py b/07-tests/opinion_parser_tests.py similarity index 91% rename from tests/opinion_parser_tests.py rename to 07-tests/opinion_parser_tests.py index 425219b..727c243 100644 --- a/tests/opinion_parser_tests.py +++ b/07-tests/opinion_parser_tests.py @@ -12,7 +12,7 @@ def tearDown(self): del(self._parser) def testValidInput(self): - file = os.path.abspath("tests/validinput.txt") + file = os.path.abspath("07-tests/validinput.txt") with open(file, 'r') as f: lines = len(f.readlines()) diff --git a/tests/runner_tests.py b/07-tests/runner_tests.py similarity index 100% rename from tests/runner_tests.py rename to 07-tests/runner_tests.py diff --git a/tests/sl_tests.py b/07-tests/sl_tests.py similarity index 100% rename from tests/sl_tests.py rename to 07-tests/sl_tests.py diff --git a/tests/test_suite.py b/07-tests/test_suite.py similarity index 100% rename from tests/test_suite.py rename to 07-tests/test_suite.py diff --git a/tests/validinput.txt b/07-tests/validinput.txt similarity index 100% rename from tests/validinput.txt rename to 07-tests/validinput.txt diff --git a/setup.py b/setup.py index c70f485..6af6f84 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ version='0.1', author='Kyanna Dagenais, Istvan David', url='https://www.python.org/sigs/distutils-sig/', - packages=['src'], + packages=['04-src'], include_package_data=True, install_requires=[], license='GNU General Public License v3.0'