Updated folder names and folder paths code

ssm-lab · Aug 9, 2024 · 68ab330 · 68ab330
1 parent 4e47773
commit 68ab330
Show file tree

Hide file tree

Showing 149 changed files with 13 additions and 13 deletions.
diff --git 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 → 01-expsetup/advice-12x12-seed63-all.txt b/expsetup/advice-12x12-seed63-all.txt → 01-expsetup/advice-12x12-seed63-all.txt
diff --git a/...advice-12x12-seed63-coop10-A1-topleft.txt → ...advice-12x12-seed63-coop10-A1-topleft.txt b/...advice-12x12-seed63-coop10-A1-topleft.txt → ...advice-12x12-seed63-coop10-A1-topleft.txt
diff --git a/...dvice-12x12-seed63-coop10-A1-topright.txt → ...dvice-12x12-seed63-coop10-A1-topright.txt b/...dvice-12x12-seed63-coop10-A1-topright.txt → ...dvice-12x12-seed63-coop10-A1-topright.txt
diff --git a/...ice-12x12-seed63-coop10-A2-bottomleft.txt → ...ice-12x12-seed63-coop10-A2-bottomleft.txt b/...ice-12x12-seed63-coop10-A2-bottomleft.txt → ...ice-12x12-seed63-coop10-A2-bottomleft.txt
diff --git a/...ce-12x12-seed63-coop10-A2-bottomright.txt → ...ce-12x12-seed63-coop10-A2-bottomright.txt b/...ce-12x12-seed63-coop10-A2-bottomright.txt → ...ce-12x12-seed63-coop10-A2-bottomright.txt
diff --git a/.../advice-12x12-seed63-coop5-A1-topleft.txt → .../advice-12x12-seed63-coop5-A1-topleft.txt b/.../advice-12x12-seed63-coop5-A1-topleft.txt → .../advice-12x12-seed63-coop5-A1-topleft.txt
diff --git a/...advice-12x12-seed63-coop5-A1-topright.txt → ...advice-12x12-seed63-coop5-A1-topright.txt b/...advice-12x12-seed63-coop5-A1-topright.txt → ...advice-12x12-seed63-coop5-A1-topright.txt
diff --git a/...vice-12x12-seed63-coop5-A2-bottomleft.txt → ...vice-12x12-seed63-coop5-A2-bottomleft.txt b/...vice-12x12-seed63-coop5-A2-bottomleft.txt → ...vice-12x12-seed63-coop5-A2-bottomleft.txt
diff --git a/...ice-12x12-seed63-coop5-A2-bottomright.txt → ...ice-12x12-seed63-coop5-A2-bottomright.txt b/...ice-12x12-seed63-coop5-A2-bottomright.txt → ...ice-12x12-seed63-coop5-A2-bottomright.txt
diff --git a/expsetup/advice-12x12-seed63-holes.txt → 01-expsetup/advice-12x12-seed63-holes.txt b/expsetup/advice-12x12-seed63-holes.txt → 01-expsetup/advice-12x12-seed63-holes.txt
diff --git a/expsetup/advice-12x12-seed63-human10.txt → 01-expsetup/advice-12x12-seed63-human10.txt b/expsetup/advice-12x12-seed63-human10.txt → 01-expsetup/advice-12x12-seed63-human10.txt
diff --git a/expsetup/advice-12x12-seed63-human5.txt → 01-expsetup/advice-12x12-seed63-human5.txt b/expsetup/advice-12x12-seed63-human5.txt → 01-expsetup/advice-12x12-seed63-human5.txt
diff --git a/expsetup/lake-12x12-seed63.png → 01-expsetup/lake-12x12-seed63.png b/expsetup/lake-12x12-seed63.png → 01-expsetup/lake-12x12-seed63.png
diff --git a/expsetup/lake-12x12-seed63.xlsx → 01-expsetup/lake-12x12-seed63.xlsx b/expsetup/lake-12x12-seed63.xlsx → 01-expsetup/lake-12x12-seed63.xlsx
diff --git a/maps/default.png → 02-maps/default.png b/maps/default.png → 02-maps/default.png
diff --git a/maps/lake-12x12-seed63.png → 02-maps/lake-12x12-seed63.png b/maps/lake-12x12-seed63.png → 02-maps/lake-12x12-seed63.png
diff --git a/input/advice-12x12-seed63-all.txt → 03-input/advice-12x12-seed63-all.txt b/input/advice-12x12-seed63-all.txt → 03-input/advice-12x12-seed63-all.txt
diff --git a/...advice-12x12-seed63-coop10-A1-topleft.txt → ...advice-12x12-seed63-coop10-A1-topleft.txt b/...advice-12x12-seed63-coop10-A1-topleft.txt → ...advice-12x12-seed63-coop10-A1-topleft.txt
diff --git a/...dvice-12x12-seed63-coop10-A1-topright.txt → ...dvice-12x12-seed63-coop10-A1-topright.txt b/...dvice-12x12-seed63-coop10-A1-topright.txt → ...dvice-12x12-seed63-coop10-A1-topright.txt
diff --git a/...ice-12x12-seed63-coop10-A2-bottomleft.txt → ...ice-12x12-seed63-coop10-A2-bottomleft.txt b/...ice-12x12-seed63-coop10-A2-bottomleft.txt → ...ice-12x12-seed63-coop10-A2-bottomleft.txt
diff --git a/...ce-12x12-seed63-coop10-A2-bottomright.txt → ...ce-12x12-seed63-coop10-A2-bottomright.txt b/...ce-12x12-seed63-coop10-A2-bottomright.txt → ...ce-12x12-seed63-coop10-A2-bottomright.txt
diff --git a/.../advice-12x12-seed63-coop5-A1-topleft.txt → .../advice-12x12-seed63-coop5-A1-topleft.txt b/.../advice-12x12-seed63-coop5-A1-topleft.txt → .../advice-12x12-seed63-coop5-A1-topleft.txt
diff --git a/...advice-12x12-seed63-coop5-A1-topright.txt → ...advice-12x12-seed63-coop5-A1-topright.txt b/...advice-12x12-seed63-coop5-A1-topright.txt → ...advice-12x12-seed63-coop5-A1-topright.txt
diff --git a/...vice-12x12-seed63-coop5-A2-bottomleft.txt → ...vice-12x12-seed63-coop5-A2-bottomleft.txt b/...vice-12x12-seed63-coop5-A2-bottomleft.txt → ...vice-12x12-seed63-coop5-A2-bottomleft.txt
diff --git a/...ice-12x12-seed63-coop5-A2-bottomright.txt → ...ice-12x12-seed63-coop5-A2-bottomright.txt b/...ice-12x12-seed63-coop5-A2-bottomright.txt → ...ice-12x12-seed63-coop5-A2-bottomright.txt
diff --git a/input/advice-12x12-seed63-holes.txt → 03-input/advice-12x12-seed63-holes.txt b/input/advice-12x12-seed63-holes.txt → 03-input/advice-12x12-seed63-holes.txt
diff --git a/input/advice-12x12-seed63-human10.txt → 03-input/advice-12x12-seed63-human10.txt b/input/advice-12x12-seed63-human10.txt → 03-input/advice-12x12-seed63-human10.txt
diff --git a/input/advice-12x12-seed63-human5.txt → 03-input/advice-12x12-seed63-human5.txt b/input/advice-12x12-seed63-human5.txt → 03-input/advice-12x12-seed63-human5.txt
diff --git a/input/lake-12x12-seed63.png → 03-input/lake-12x12-seed63.png b/input/lake-12x12-seed63.png → 03-input/lake-12x12-seed63.png
diff --git a/input/lake-12x12-seed63.xlsx → 03-input/lake-12x12-seed63.xlsx b/input/lake-12x12-seed63.xlsx → 03-input/lake-12x12-seed63.xlsx
diff --git a/src/__init__.py → 04-src/__init__.py b/src/__init__.py → 04-src/__init__.py
diff --git a/src/advice_parser.py → 04-src/advice_parser.py b/src/advice_parser.py → 04-src/advice_parser.py
diff --git a/src/advice_tools.py → 04-src/advice_tools.py b/src/advice_tools.py → 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 → 04-src/analysis.py b/src/analysis.py → 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 → 04-src/map_tools.py b/src/map_tools.py → 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 → 04-src/model.py b/src/model.py → 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 → 04-src/runner.py b/src/runner.py → 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 → 04-src/sl.py b/src/sl.py → 04-src/sl.py
diff --git a/...op10-topleft-bottomright/12x12-seed63.csv → ...op10-topleft-bottomright/12x12-seed63.csv b/...op10-topleft-bottomright/12x12-seed63.csv → ...op10-topleft-bottomright/12x12-seed63.csv
diff --git a/...op10-topright-bottomleft/12x12-seed63.csv → ...op10-topright-bottomleft/12x12-seed63.csv b/...op10-topright-bottomleft/12x12-seed63.csv → ...op10-topright-bottomleft/12x12-seed63.csv
diff --git a/...oop5-topleft-bottomright/12x12-seed63.csv → ...oop5-topleft-bottomright/12x12-seed63.csv b/...oop5-topleft-bottomright/12x12-seed63.csv → ...oop5-topleft-bottomright/12x12-seed63.csv
diff --git a/...oop5-topright-bottomleft/12x12-seed63.csv → ...oop5-topright-bottomleft/12x12-seed63.csv b/...oop5-topright-bottomleft/12x12-seed63.csv → ...oop5-topright-bottomleft/12x12-seed63.csv
diff --git a/...ice-synthetic-all/12x12-seed63-u-0.01.csv → ...ice-synthetic-all/12x12-seed63-u-0.01.csv b/...ice-synthetic-all/12x12-seed63-u-0.01.csv → ...ice-synthetic-all/12x12-seed63-u-0.01.csv
diff --git a/...vice-synthetic-all/12x12-seed63-u-0.2.csv → ...vice-synthetic-all/12x12-seed63-u-0.2.csv b/...vice-synthetic-all/12x12-seed63-u-0.2.csv → ...vice-synthetic-all/12x12-seed63-u-0.2.csv
diff --git a/...vice-synthetic-all/12x12-seed63-u-0.4.csv → ...vice-synthetic-all/12x12-seed63-u-0.4.csv b/...vice-synthetic-all/12x12-seed63-u-0.4.csv → ...vice-synthetic-all/12x12-seed63-u-0.4.csv
diff --git a/...vice-synthetic-all/12x12-seed63-u-0.6.csv → ...vice-synthetic-all/12x12-seed63-u-0.6.csv b/...vice-synthetic-all/12x12-seed63-u-0.6.csv → ...vice-synthetic-all/12x12-seed63-u-0.6.csv
diff --git a/...vice-synthetic-all/12x12-seed63-u-0.8.csv → ...vice-synthetic-all/12x12-seed63-u-0.8.csv b/...vice-synthetic-all/12x12-seed63-u-0.8.csv → ...vice-synthetic-all/12x12-seed63-u-0.8.csv
diff --git a/...e-synthetic-holes/12x12-seed63-u-0.01.csv → ...e-synthetic-holes/12x12-seed63-u-0.01.csv b/...e-synthetic-holes/12x12-seed63-u-0.01.csv → ...e-synthetic-holes/12x12-seed63-u-0.01.csv
diff --git a/...ce-synthetic-holes/12x12-seed63-u-0.2.csv → ...ce-synthetic-holes/12x12-seed63-u-0.2.csv b/...ce-synthetic-holes/12x12-seed63-u-0.2.csv → ...ce-synthetic-holes/12x12-seed63-u-0.2.csv
diff --git a/...ce-synthetic-holes/12x12-seed63-u-0.4.csv → ...ce-synthetic-holes/12x12-seed63-u-0.4.csv b/...ce-synthetic-holes/12x12-seed63-u-0.4.csv → ...ce-synthetic-holes/12x12-seed63-u-0.4.csv
diff --git a/...ce-synthetic-holes/12x12-seed63-u-0.6.csv → ...ce-synthetic-holes/12x12-seed63-u-0.6.csv b/...ce-synthetic-holes/12x12-seed63-u-0.6.csv → ...ce-synthetic-holes/12x12-seed63-u-0.6.csv
diff --git a/...ce-synthetic-holes/12x12-seed63-u-0.8.csv → ...ce-synthetic-holes/12x12-seed63-u-0.8.csv b/...ce-synthetic-holes/12x12-seed63-u-0.8.csv → ...ce-synthetic-holes/12x12-seed63-u-0.8.csv
diff --git a/...synthetic-human10/12x12-seed63-u-0.01.csv → ...synthetic-human10/12x12-seed63-u-0.01.csv b/...synthetic-human10/12x12-seed63-u-0.01.csv → ...synthetic-human10/12x12-seed63-u-0.01.csv
diff --git a/...-synthetic-human10/12x12-seed63-u-0.2.csv → ...-synthetic-human10/12x12-seed63-u-0.2.csv b/...-synthetic-human10/12x12-seed63-u-0.2.csv → ...-synthetic-human10/12x12-seed63-u-0.2.csv
diff --git a/...-synthetic-human10/12x12-seed63-u-0.4.csv → ...-synthetic-human10/12x12-seed63-u-0.4.csv b/...-synthetic-human10/12x12-seed63-u-0.4.csv → ...-synthetic-human10/12x12-seed63-u-0.4.csv
diff --git a/...-synthetic-human10/12x12-seed63-u-0.6.csv → ...-synthetic-human10/12x12-seed63-u-0.6.csv b/...-synthetic-human10/12x12-seed63-u-0.6.csv → ...-synthetic-human10/12x12-seed63-u-0.6.csv
diff --git a/...-synthetic-human10/12x12-seed63-u-0.8.csv → ...-synthetic-human10/12x12-seed63-u-0.8.csv b/...-synthetic-human10/12x12-seed63-u-0.8.csv → ...-synthetic-human10/12x12-seed63-u-0.8.csv
diff --git a/...-synthetic-human5/12x12-seed63-u-0.01.csv → ...-synthetic-human5/12x12-seed63-u-0.01.csv b/...-synthetic-human5/12x12-seed63-u-0.01.csv → ...-synthetic-human5/12x12-seed63-u-0.01.csv
diff --git a/...e-synthetic-human5/12x12-seed63-u-0.2.csv → ...e-synthetic-human5/12x12-seed63-u-0.2.csv b/...e-synthetic-human5/12x12-seed63-u-0.2.csv → ...e-synthetic-human5/12x12-seed63-u-0.2.csv
diff --git a/...e-synthetic-human5/12x12-seed63-u-0.4.csv → ...e-synthetic-human5/12x12-seed63-u-0.4.csv b/...e-synthetic-human5/12x12-seed63-u-0.4.csv → ...e-synthetic-human5/12x12-seed63-u-0.4.csv
diff --git a/...e-synthetic-human5/12x12-seed63-u-0.6.csv → ...e-synthetic-human5/12x12-seed63-u-0.6.csv b/...e-synthetic-human5/12x12-seed63-u-0.6.csv → ...e-synthetic-human5/12x12-seed63-u-0.6.csv
diff --git a/...e-synthetic-human5/12x12-seed63-u-0.8.csv → ...e-synthetic-human5/12x12-seed63-u-0.8.csv b/...e-synthetic-human5/12x12-seed63-u-0.8.csv → ...e-synthetic-human5/12x12-seed63-u-0.8.csv
diff --git a/...000/policy_data/noadvice/12x12-seed63.csv → ...000/policy_data/noadvice/12x12-seed63.csv b/...000/policy_data/noadvice/12x12-seed63.csv → ...000/policy_data/noadvice/12x12-seed63.csv
diff --git a/...10000/policy_data/random/12x12-seed63.csv → ...10000/policy_data/random/12x12-seed63.csv b/...10000/policy_data/random/12x12-seed63.csv → ...10000/policy_data/random/12x12-seed63.csv
diff --git a/...op10-topleft-bottomright/12x12-seed63.csv → ...op10-topleft-bottomright/12x12-seed63.csv b/...op10-topleft-bottomright/12x12-seed63.csv → ...op10-topleft-bottomright/12x12-seed63.csv
diff --git a/...op10-topright-bottomleft/12x12-seed63.csv → ...op10-topright-bottomleft/12x12-seed63.csv b/...op10-topright-bottomleft/12x12-seed63.csv → ...op10-topright-bottomleft/12x12-seed63.csv
diff --git a/...oop5-topleft-bottomright/12x12-seed63.csv → ...oop5-topleft-bottomright/12x12-seed63.csv b/...oop5-topleft-bottomright/12x12-seed63.csv → ...oop5-topleft-bottomright/12x12-seed63.csv
diff --git a/...oop5-topright-bottomleft/12x12-seed63.csv → ...oop5-topright-bottomleft/12x12-seed63.csv b/...oop5-topright-bottomleft/12x12-seed63.csv → ...oop5-topright-bottomleft/12x12-seed63.csv
diff --git a/...ice-synthetic-all/12x12-seed63-u-0.01.csv → ...ice-synthetic-all/12x12-seed63-u-0.01.csv b/...ice-synthetic-all/12x12-seed63-u-0.01.csv → ...ice-synthetic-all/12x12-seed63-u-0.01.csv
diff --git a/...vice-synthetic-all/12x12-seed63-u-0.2.csv → ...vice-synthetic-all/12x12-seed63-u-0.2.csv b/...vice-synthetic-all/12x12-seed63-u-0.2.csv → ...vice-synthetic-all/12x12-seed63-u-0.2.csv
diff --git a/...vice-synthetic-all/12x12-seed63-u-0.4.csv → ...vice-synthetic-all/12x12-seed63-u-0.4.csv b/...vice-synthetic-all/12x12-seed63-u-0.4.csv → ...vice-synthetic-all/12x12-seed63-u-0.4.csv
diff --git a/...vice-synthetic-all/12x12-seed63-u-0.6.csv → ...vice-synthetic-all/12x12-seed63-u-0.6.csv b/...vice-synthetic-all/12x12-seed63-u-0.6.csv → ...vice-synthetic-all/12x12-seed63-u-0.6.csv
diff --git a/...vice-synthetic-all/12x12-seed63-u-0.8.csv → ...vice-synthetic-all/12x12-seed63-u-0.8.csv b/...vice-synthetic-all/12x12-seed63-u-0.8.csv → ...vice-synthetic-all/12x12-seed63-u-0.8.csv
diff --git a/...e-synthetic-holes/12x12-seed63-u-0.01.csv → ...e-synthetic-holes/12x12-seed63-u-0.01.csv b/...e-synthetic-holes/12x12-seed63-u-0.01.csv → ...e-synthetic-holes/12x12-seed63-u-0.01.csv
diff --git a/...ce-synthetic-holes/12x12-seed63-u-0.2.csv → ...ce-synthetic-holes/12x12-seed63-u-0.2.csv b/...ce-synthetic-holes/12x12-seed63-u-0.2.csv → ...ce-synthetic-holes/12x12-seed63-u-0.2.csv
diff --git a/...ce-synthetic-holes/12x12-seed63-u-0.4.csv → ...ce-synthetic-holes/12x12-seed63-u-0.4.csv b/...ce-synthetic-holes/12x12-seed63-u-0.4.csv → ...ce-synthetic-holes/12x12-seed63-u-0.4.csv
diff --git a/...ce-synthetic-holes/12x12-seed63-u-0.6.csv → ...ce-synthetic-holes/12x12-seed63-u-0.6.csv b/...ce-synthetic-holes/12x12-seed63-u-0.6.csv → ...ce-synthetic-holes/12x12-seed63-u-0.6.csv
diff --git a/...ce-synthetic-holes/12x12-seed63-u-0.8.csv → ...ce-synthetic-holes/12x12-seed63-u-0.8.csv b/...ce-synthetic-holes/12x12-seed63-u-0.8.csv → ...ce-synthetic-holes/12x12-seed63-u-0.8.csv
diff --git a/...synthetic-human10/12x12-seed63-u-0.01.csv → ...synthetic-human10/12x12-seed63-u-0.01.csv b/...synthetic-human10/12x12-seed63-u-0.01.csv → ...synthetic-human10/12x12-seed63-u-0.01.csv
diff --git a/...-synthetic-human10/12x12-seed63-u-0.2.csv → ...-synthetic-human10/12x12-seed63-u-0.2.csv b/...-synthetic-human10/12x12-seed63-u-0.2.csv → ...-synthetic-human10/12x12-seed63-u-0.2.csv
diff --git a/...-synthetic-human10/12x12-seed63-u-0.4.csv → ...-synthetic-human10/12x12-seed63-u-0.4.csv b/...-synthetic-human10/12x12-seed63-u-0.4.csv → ...-synthetic-human10/12x12-seed63-u-0.4.csv
diff --git a/...-synthetic-human10/12x12-seed63-u-0.6.csv → ...-synthetic-human10/12x12-seed63-u-0.6.csv b/...-synthetic-human10/12x12-seed63-u-0.6.csv → ...-synthetic-human10/12x12-seed63-u-0.6.csv
diff --git a/...-synthetic-human10/12x12-seed63-u-0.8.csv → ...-synthetic-human10/12x12-seed63-u-0.8.csv b/...-synthetic-human10/12x12-seed63-u-0.8.csv → ...-synthetic-human10/12x12-seed63-u-0.8.csv
diff --git a/...-synthetic-human5/12x12-seed63-u-0.01.csv → ...-synthetic-human5/12x12-seed63-u-0.01.csv b/...-synthetic-human5/12x12-seed63-u-0.01.csv → ...-synthetic-human5/12x12-seed63-u-0.01.csv
diff --git a/...e-synthetic-human5/12x12-seed63-u-0.2.csv → ...e-synthetic-human5/12x12-seed63-u-0.2.csv b/...e-synthetic-human5/12x12-seed63-u-0.2.csv → ...e-synthetic-human5/12x12-seed63-u-0.2.csv
diff --git a/...e-synthetic-human5/12x12-seed63-u-0.4.csv → ...e-synthetic-human5/12x12-seed63-u-0.4.csv b/...e-synthetic-human5/12x12-seed63-u-0.4.csv → ...e-synthetic-human5/12x12-seed63-u-0.4.csv
diff --git a/...e-synthetic-human5/12x12-seed63-u-0.6.csv → ...e-synthetic-human5/12x12-seed63-u-0.6.csv b/...e-synthetic-human5/12x12-seed63-u-0.6.csv → ...e-synthetic-human5/12x12-seed63-u-0.6.csv
diff --git a/...e-synthetic-human5/12x12-seed63-u-0.8.csv → ...e-synthetic-human5/12x12-seed63-u-0.8.csv b/...e-synthetic-human5/12x12-seed63-u-0.8.csv → ...e-synthetic-human5/12x12-seed63-u-0.8.csv
diff --git a/...000/reward_data/noadvice/12x12-seed63.csv → ...000/reward_data/noadvice/12x12-seed63.csv b/...000/reward_data/noadvice/12x12-seed63.csv → ...000/reward_data/noadvice/12x12-seed63.csv
diff --git a/...10000/reward_data/random/12x12-seed63.csv → ...10000/reward_data/random/12x12-seed63.csv b/...10000/reward_data/random/12x12-seed63.csv → ...10000/reward_data/random/12x12-seed63.csv
diff --git a/experiments/README.md → 05-experiments/README.md b/experiments/README.md → 05-experiments/README.md
diff --git a/...ll/cumulative_reward-all-10000-linear.pdf → ...ll/cumulative_reward-all-10000-linear.pdf b/...ll/cumulative_reward-all-10000-linear.pdf → ...ll/cumulative_reward-all-10000-linear.pdf
diff --git a/...d/all/cumulative_reward-all-10000-log.pdf → ...d/all/cumulative_reward-all-10000-log.pdf b/...d/all/cumulative_reward-all-10000-log.pdf → ...d/all/cumulative_reward-all-10000-log.pdf
diff --git a/...cumulative_reward-coop10-10000-linear.pdf → ...cumulative_reward-coop10-10000-linear.pdf b/...cumulative_reward-coop10-10000-linear.pdf → ...cumulative_reward-coop10-10000-linear.pdf
diff --git a/...10/cumulative_reward-coop10-10000-log.pdf → ...10/cumulative_reward-coop10-10000-log.pdf b/...10/cumulative_reward-coop10-10000-log.pdf → ...10/cumulative_reward-coop10-10000-log.pdf
diff --git a/.../cumulative_reward-coop5-10000-linear.pdf → .../cumulative_reward-coop5-10000-linear.pdf b/.../cumulative_reward-coop5-10000-linear.pdf → .../cumulative_reward-coop5-10000-linear.pdf
diff --git a/...op5/cumulative_reward-coop5-10000-log.pdf → ...op5/cumulative_reward-coop5-10000-log.pdf b/...op5/cumulative_reward-coop5-10000-log.pdf → ...op5/cumulative_reward-coop5-10000-log.pdf
diff --git a/.../cumulative_reward-holes-10000-linear.pdf → .../cumulative_reward-holes-10000-linear.pdf b/.../cumulative_reward-holes-10000-linear.pdf → .../cumulative_reward-holes-10000-linear.pdf
diff --git a/...les/cumulative_reward-holes-10000-log.pdf → ...les/cumulative_reward-holes-10000-log.pdf b/...les/cumulative_reward-holes-10000-log.pdf → ...les/cumulative_reward-holes-10000-log.pdf
diff --git a/...umulative_reward-human10-10000-linear.pdf → ...umulative_reward-human10-10000-linear.pdf b/...umulative_reward-human10-10000-linear.pdf → ...umulative_reward-human10-10000-linear.pdf
diff --git a/...0/cumulative_reward-human10-10000-log.pdf → ...0/cumulative_reward-human10-10000-log.pdf b/...0/cumulative_reward-human10-10000-log.pdf → ...0/cumulative_reward-human10-10000-log.pdf
diff --git a/...cumulative_reward-human5-10000-linear.pdf → ...cumulative_reward-human5-10000-linear.pdf b/...cumulative_reward-human5-10000-linear.pdf → ...cumulative_reward-human5-10000-linear.pdf
diff --git a/...n5/cumulative_reward-human5-10000-log.pdf → ...n5/cumulative_reward-human5-10000-log.pdf b/...n5/cumulative_reward-human5-10000-log.pdf → ...n5/cumulative_reward-human5-10000-log.pdf
diff --git a/...tmaps/all/heatmap-all-advice_00-10000.pdf → ...tmaps/all/heatmap-all-advice_00-10000.pdf b/...tmaps/all/heatmap-all-advice_00-10000.pdf → ...tmaps/all/heatmap-all-advice_00-10000.pdf
diff --git a/...tmaps/all/heatmap-all-advice_02-10000.pdf → ...tmaps/all/heatmap-all-advice_02-10000.pdf b/...tmaps/all/heatmap-all-advice_02-10000.pdf → ...tmaps/all/heatmap-all-advice_02-10000.pdf
diff --git a/...tmaps/all/heatmap-all-advice_04-10000.pdf → ...tmaps/all/heatmap-all-advice_04-10000.pdf b/...tmaps/all/heatmap-all-advice_04-10000.pdf → ...tmaps/all/heatmap-all-advice_04-10000.pdf
diff --git a/...tmaps/all/heatmap-all-advice_06-10000.pdf → ...tmaps/all/heatmap-all-advice_06-10000.pdf b/...tmaps/all/heatmap-all-advice_06-10000.pdf → ...tmaps/all/heatmap-all-advice_06-10000.pdf
diff --git a/...tmaps/all/heatmap-all-advice_08-10000.pdf → ...tmaps/all/heatmap-all-advice_08-10000.pdf b/...tmaps/all/heatmap-all-advice_08-10000.pdf → ...tmaps/all/heatmap-all-advice_08-10000.pdf
diff --git a/...tmaps/all/heatmap-all-no_advice-10000.pdf → ...tmaps/all/heatmap-all-no_advice-10000.pdf b/...tmaps/all/heatmap-all-no_advice-10000.pdf → ...tmaps/all/heatmap-all-no_advice-10000.pdf
diff --git a/...heatmaps/all/heatmap-all-random-10000.pdf → ...heatmaps/all/heatmap-all-random-10000.pdf b/...heatmaps/all/heatmap-all-random-10000.pdf → ...heatmaps/all/heatmap-all-random-10000.pdf
diff --git a/...coop10-coop_topleft_bottomright-10000.pdf → ...coop10-coop_topleft_bottomright-10000.pdf b/...coop10-coop_topleft_bottomright-10000.pdf → ...coop10-coop_topleft_bottomright-10000.pdf
diff --git a/...coop10-coop_topright_bottomleft-10000.pdf → ...coop10-coop_topright_bottomleft-10000.pdf b/...coop10-coop_topright_bottomleft-10000.pdf → ...coop10-coop_topright_bottomleft-10000.pdf
diff --git a/...coop10/heatmap-coop10-no_advice-10000.pdf → ...coop10/heatmap-coop10-no_advice-10000.pdf b/...coop10/heatmap-coop10-no_advice-10000.pdf → ...coop10/heatmap-coop10-no_advice-10000.pdf
diff --git a/...ps/coop10/heatmap-coop10-random-10000.pdf → ...ps/coop10/heatmap-coop10-random-10000.pdf b/...ps/coop10/heatmap-coop10-random-10000.pdf → ...ps/coop10/heatmap-coop10-random-10000.pdf
diff --git a/...-coop5-coop_topleft_bottomright-10000.pdf → ...-coop5-coop_topleft_bottomright-10000.pdf b/...-coop5-coop_topleft_bottomright-10000.pdf → ...-coop5-coop_topleft_bottomright-10000.pdf
diff --git a/...-coop5-coop_topright_bottomleft-10000.pdf → ...-coop5-coop_topright_bottomleft-10000.pdf b/...-coop5-coop_topright_bottomleft-10000.pdf → ...-coop5-coop_topright_bottomleft-10000.pdf
diff --git a/...s/coop5/heatmap-coop5-no_advice-10000.pdf → ...s/coop5/heatmap-coop5-no_advice-10000.pdf b/...s/coop5/heatmap-coop5-no_advice-10000.pdf → ...s/coop5/heatmap-coop5-no_advice-10000.pdf
diff --git a/...maps/coop5/heatmap-coop5-random-10000.pdf → ...maps/coop5/heatmap-coop5-random-10000.pdf b/...maps/coop5/heatmap-coop5-random-10000.pdf → ...maps/coop5/heatmap-coop5-random-10000.pdf
diff --git a/...s/holes/heatmap-holes-advice_00-10000.pdf → ...s/holes/heatmap-holes-advice_00-10000.pdf b/...s/holes/heatmap-holes-advice_00-10000.pdf → ...s/holes/heatmap-holes-advice_00-10000.pdf
diff --git a/...s/holes/heatmap-holes-advice_02-10000.pdf → ...s/holes/heatmap-holes-advice_02-10000.pdf b/...s/holes/heatmap-holes-advice_02-10000.pdf → ...s/holes/heatmap-holes-advice_02-10000.pdf
diff --git a/...s/holes/heatmap-holes-advice_04-10000.pdf → ...s/holes/heatmap-holes-advice_04-10000.pdf b/...s/holes/heatmap-holes-advice_04-10000.pdf → ...s/holes/heatmap-holes-advice_04-10000.pdf
diff --git a/...s/holes/heatmap-holes-advice_06-10000.pdf → ...s/holes/heatmap-holes-advice_06-10000.pdf b/...s/holes/heatmap-holes-advice_06-10000.pdf → ...s/holes/heatmap-holes-advice_06-10000.pdf
diff --git a/...s/holes/heatmap-holes-advice_08-10000.pdf → ...s/holes/heatmap-holes-advice_08-10000.pdf b/...s/holes/heatmap-holes-advice_08-10000.pdf → ...s/holes/heatmap-holes-advice_08-10000.pdf
diff --git a/...s/holes/heatmap-holes-no_advice-10000.pdf → ...s/holes/heatmap-holes-no_advice-10000.pdf b/...s/holes/heatmap-holes-no_advice-10000.pdf → ...s/holes/heatmap-holes-no_advice-10000.pdf
diff --git a/...maps/holes/heatmap-holes-random-10000.pdf → ...maps/holes/heatmap-holes-random-10000.pdf b/...maps/holes/heatmap-holes-random-10000.pdf → ...maps/holes/heatmap-holes-random-10000.pdf
diff --git a/...man10/heatmap-human10-advice_00-10000.pdf → ...man10/heatmap-human10-advice_00-10000.pdf b/...man10/heatmap-human10-advice_00-10000.pdf → ...man10/heatmap-human10-advice_00-10000.pdf
diff --git a/...man10/heatmap-human10-advice_02-10000.pdf → ...man10/heatmap-human10-advice_02-10000.pdf b/...man10/heatmap-human10-advice_02-10000.pdf → ...man10/heatmap-human10-advice_02-10000.pdf
diff --git a/...man10/heatmap-human10-advice_04-10000.pdf → ...man10/heatmap-human10-advice_04-10000.pdf b/...man10/heatmap-human10-advice_04-10000.pdf → ...man10/heatmap-human10-advice_04-10000.pdf
diff --git a/...man10/heatmap-human10-advice_06-10000.pdf → ...man10/heatmap-human10-advice_06-10000.pdf b/...man10/heatmap-human10-advice_06-10000.pdf → ...man10/heatmap-human10-advice_06-10000.pdf
diff --git a/...man10/heatmap-human10-advice_08-10000.pdf → ...man10/heatmap-human10-advice_08-10000.pdf b/...man10/heatmap-human10-advice_08-10000.pdf → ...man10/heatmap-human10-advice_08-10000.pdf
diff --git a/...man10/heatmap-human10-no_advice-10000.pdf → ...man10/heatmap-human10-no_advice-10000.pdf b/...man10/heatmap-human10-no_advice-10000.pdf → ...man10/heatmap-human10-no_advice-10000.pdf
diff --git a/.../human10/heatmap-human10-random-10000.pdf → .../human10/heatmap-human10-random-10000.pdf b/.../human10/heatmap-human10-random-10000.pdf → .../human10/heatmap-human10-random-10000.pdf
diff --git a/...human5/heatmap-human5-advice_00-10000.pdf → ...human5/heatmap-human5-advice_00-10000.pdf b/...human5/heatmap-human5-advice_00-10000.pdf → ...human5/heatmap-human5-advice_00-10000.pdf
diff --git a/...human5/heatmap-human5-advice_02-10000.pdf → ...human5/heatmap-human5-advice_02-10000.pdf b/...human5/heatmap-human5-advice_02-10000.pdf → ...human5/heatmap-human5-advice_02-10000.pdf
diff --git a/...human5/heatmap-human5-advice_04-10000.pdf → ...human5/heatmap-human5-advice_04-10000.pdf b/...human5/heatmap-human5-advice_04-10000.pdf → ...human5/heatmap-human5-advice_04-10000.pdf
diff --git a/...human5/heatmap-human5-advice_06-10000.pdf → ...human5/heatmap-human5-advice_06-10000.pdf b/...human5/heatmap-human5-advice_06-10000.pdf → ...human5/heatmap-human5-advice_06-10000.pdf
diff --git a/...human5/heatmap-human5-advice_08-10000.pdf → ...human5/heatmap-human5-advice_08-10000.pdf b/...human5/heatmap-human5-advice_08-10000.pdf → ...human5/heatmap-human5-advice_08-10000.pdf
diff --git a/...human5/heatmap-human5-no_advice-10000.pdf → ...human5/heatmap-human5-no_advice-10000.pdf b/...human5/heatmap-human5-no_advice-10000.pdf → ...human5/heatmap-human5-no_advice-10000.pdf
diff --git a/...ps/human5/heatmap-human5-random-10000.pdf → ...ps/human5/heatmap-human5-random-10000.pdf b/...ps/human5/heatmap-human5-random-10000.pdf → ...ps/human5/heatmap-human5-random-10000.pdf
diff --git a/tests/__init__.py → 07-tests/__init__.py b/tests/__init__.py → 07-tests/__init__.py
diff --git a/tests/grid_tests.py → 07-tests/grid_tests.py b/tests/grid_tests.py → 07-tests/grid_tests.py
diff --git a/tests/model_tests.py → 07-tests/model_tests.py b/tests/model_tests.py → 07-tests/model_tests.py
diff --git a/tests/opinion_parser_tests.py → 07-tests/opinion_parser_tests.py b/tests/opinion_parser_tests.py → 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 → 07-tests/runner_tests.py b/tests/runner_tests.py → 07-tests/runner_tests.py
diff --git a/tests/sl_tests.py → 07-tests/sl_tests.py b/tests/sl_tests.py → 07-tests/sl_tests.py
diff --git a/tests/test_suite.py → 07-tests/test_suite.py b/tests/test_suite.py → 07-tests/test_suite.py
diff --git a/tests/validinput.txt → 07-tests/validinput.txt b/tests/validinput.txt → 07-tests/validinput.txt
diff --git 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'