mp resume_after working with messy code

Author: toliwaga

activitysim/abm/models/accessibility.py

@@ -57,7 +57,7 @@ def __init__(self, skim_dict, orig_zones, dest_zones, transpose=False):
             # data = data[orig_map, :][:, dest_map]    # <- RIGHT
             # data = data[np.ix_(orig_map, dest_map)]  # <- ALSO RIGHT
 
-            skim_index = range(omx_shape.shape[0])
+            skim_index = range(omx_shape[0])
             orig_map = np.isin(skim_index, skim_dict.offset_mapper.map(orig_zones))
             dest_map = np.isin(skim_index, skim_dict.offset_mapper.map(dest_zones))
 

activitysim/abm/models/cdap.py

@@ -1,8 +1,8 @@
 # ActivitySim
 # See full license in LICENSE.txt.
 
+from __future__ import print_function
 import logging
-import os
 
 import pandas as pd
 
@@ -107,7 +107,8 @@ def cdap_simulate(persons_merged, persons, households,
     pipeline.replace_table("households", households)
 
     tracing.print_summary('cdap_activity', persons.cdap_activity, value_counts=True)
-    print pd.crosstab(persons.ptype, persons.cdap_activity, margins=True)
+    logger.info("cdap crosstabs:\n%s" %
+                pd.crosstab(persons.ptype, persons.cdap_activity, margins=True))
 
     if trace_hh_id:
 

activitysim/abm/models/initialize.py

@@ -107,3 +107,5 @@ def preload_injectables():
 
     if inject.get_injectable('skim_stack', None) is not None:
         t0 = tracing.print_elapsed_time("preload skim_stack", t0, debug=True)
+
+    return True

activitysim/abm/test/output/.gitignore

@@ -2,3 +2,4 @@
 *.log
 *.h5
 *.txt
+*.yaml

activitysim/core/config.py

@@ -94,7 +94,7 @@ def handle_standard_args(parser=None):
     parser.add_argument("-c", "--config", help="path to config dir", action='append')
     parser.add_argument("-o", "--output", help="path to output dir")
     parser.add_argument("-d", "--data", help="path to data dir")
-    parser.add_argument("-r", "--resume", help="resume after")
+    parser.add_argument("-r", "--resume", nargs='?', const='_', type=str, help="resume after")
     parser.add_argument("-m", "--multiprocess", type=str2bool, nargs='?', const=True,
                         help="run multiprocess (boolean flag, no arg defaults to true)")
 
@@ -133,9 +133,8 @@ def setting(key, default=None):
         s = inject.get_injectable(key, None)
 
         if s:
-            # fixme - when does this happen?
+            # this happens when handle_standard_args overrides a setting with an injectable
             logger.info("read setting %s from injectable" % key)
-            bug
 
     # otherwise fall back to supplied default
     if s is None:

activitysim/core/inject.py

@@ -1,7 +1,7 @@
 import logging
 
 import pandas as pd
-import orca
+from . import orca
 
 _DECORATED_STEPS = {}
 _DECORATED_TABLES = {}

activitysim/core/orca/__init__.py

@@ -0,0 +1,7 @@
+# Orca
+# Copyright (C) 2016 UrbanSim Inc.
+# See full license in LICENSE.
+
+from .orca import *
+
+version = __version__ = '1.5.1'