add skims file setting to make inputs more transparent

ActivitySim · Jun 23, 2016 · 7d3e7db · 7d3e7db
1 parent bf20848
commit 7d3e7db
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/activitysim/defaults/tables/skims.py b/activitysim/defaults/tables/skims.py
@@ -19,9 +19,9 @@
 
 # cache this so we don't open it again and again - skim code is not closing it....
 @orca.injectable(cache=True)
-def omx_file(data_dir):
+def omx_file(data_dir, settings):
     logger.debug("opening omx file")
-    return omx.openFile(os.path.join(data_dir, 'data', "nonmotskm.omx"))
+    return omx.openFile(os.path.join(data_dir, 'data', settings["skims_file"]))
 
 
 @orca.injectable()

diff --git a/example/configs/settings.yaml b/example/configs/settings.yaml
@@ -1,12 +1,15 @@
+#input data store and skims
 store: mtc_asim.h5
+skims_file: nonmotskm.omx
 
+#number of households to simulate
+households_sample_size: 1000
 
-# these are the defaults
-# preload_3d_skims: False
-
+#trace household id; comment out for no trace
 trace_hh_id: 961042
-households_sample_size: 1000
 
+#internal settings 
+preload_3d_skims: True
 chunk_size: 10000
 
 # area_types less than this are considered urban

diff --git a/sandbox/configs/settings.yaml b/sandbox/configs/settings.yaml
@@ -1,13 +1,16 @@
+#input data store and skims
 store: mtc_asim.h5
+skims_file: nonmotskm.omx
 
+#number of households to simulate
+households_sample_size: 1000
 
+#trace household id; comment out for no trace
 trace_hh_id: 961042
 
-# these are the defaults
-# preload_3d_skims: False
-
+#internal settings 
 preload_3d_skims: True
-households_sample_size: 1000
+chunk_size: 10000
 
 # area_types less than this are considered urban
 urban_threshold: 4