move link files to matrices data subfolders

RSGInc · Mar 11, 2016 · d9fbd9b · d9fbd9b
1 parent 059b53c
commit d9fbd9b
Show file tree

Hide file tree

Showing 9 changed files with 40,913 additions and 7 deletions.
diff --git a/bca4abm/processors/link.py b/bca4abm/processors/link.py
@@ -70,9 +70,9 @@ def eval_link_spec(link_spec, link_file_name, data_dir, link_file_column_map,
 
     for scenario in ['base', 'build']:
 
-        link_data_dir = os.path.join(data_dir, scenario)
+        link_data_subdir = 'base-matrices' if scenario == 'base' else 'build-matrices'
 
-        links_df = read_csv_file(link_data_dir,
+        links_df = read_csv_file(data_dir=os.path.join(data_dir, link_data_subdir),
                                  file_name=link_file_name,
                                  column_map=link_file_column_map)
 

diff --git a/bca4abm/tests/data/base/link_ampk.csv → ...bm/tests/data/base-matrices/link_ampk.csv b/bca4abm/tests/data/base/link_ampk.csv → ...bm/tests/data/base-matrices/link_ampk.csv
diff --git a/bca4abm/tests/data/base/link_daily.csv → ...m/tests/data/base-matrices/link_daily.csv b/bca4abm/tests/data/base/link_daily.csv → ...m/tests/data/base-matrices/link_daily.csv
diff --git a/bca4abm/tests/data/build-matrices/link_ampk.csv b/bca4abm/tests/data/build-matrices/link_ampk.csv
diff --git a/bca4abm/tests/data/build-matrices/link_daily.csv b/bca4abm/tests/data/build-matrices/link_daily.csv
diff --git a/bca4abm/tests/data/persons.csv b/bca4abm/tests/data/persons.csv
@@ -19,8 +19,8 @@ hhno,pno,pptyp,pagey,pgend,pwtyp,ptpass,ppaidprk,expfactor
 80,1,2,47,2,2,0,0,10000
 80,2,4,48,1,0,0,1,10000
 80,3,7,14,2,0,0,1,10000
-#80,4,7,10,2,0,0,1,10000
-80,4,7,90,2,0,0,1,10000
+80,4,7,10,2,0,0,1,10000
+#80,4,7,90,2,0,0,1,10000
 90,1,2,37,2,2,0,1,10000
 90,2,1,37,1,1,0,0,10000
 90,3,7,6,1,0,0,1,10000

diff --git a/devtools/harness.py b/devtools/harness.py
@@ -35,7 +35,7 @@
 # orca.run(['auto_ownership_processor'])
 orca.run(['physical_activity_processor'])
 #orca.run(['aggregate_trips_processor'])
-#orca.run(['link_daily_processor'])
+orca.run(['link_daily_processor'])
 #orca.run(['link_processor'])
 
 orca.run(['write_results'])

diff --git a/doc/~$bca4abm-sample-data.xlsx b/doc/~$bca4abm-sample-data.xlsx
diff --git a/example/data/persons.csv b/example/data/persons.csv
@@ -19,8 +19,7 @@ hhno,pno,pptyp,pagey,pgend,pwtyp,ptpass,ppaidprk,expfactor
 80,1,2,47,2,2,0,0,10000
 80,2,4,48,1,0,0,1,10000
 80,3,7,14,2,0,0,1,10000
-#80,4,7,10,2,0,0,1,10000
-80,4,7,90,2,0,0,1,10000
+80,4,7,10,2,0,0,1,10000
 90,1,2,37,2,2,0,1,10000
 90,2,1,37,1,1,0,0,10000
 90,3,7,6,1,0,0,1,10000