From c39a6d5b633d50a68f13575974a019d10d05d564 Mon Sep 17 00:00:00 2001 From: Clint Daniels Date: Sun, 2 Jun 2019 08:25:23 -0700 Subject: [PATCH 1/2] Integers here can overflow can overflow the buffer_size calculation on line 159 without warning. --- activitysim/abm/tables/skims.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activitysim/abm/tables/skims.py b/activitysim/abm/tables/skims.py index 6cb20edc6e..3a2245278c 100644 --- a/activitysim/abm/tables/skims.py +++ b/activitysim/abm/tables/skims.py @@ -149,7 +149,7 @@ def block_name(block): def buffers_for_skims(skim_info, shared=False): skim_dtype = skim_info['dtype'] - omx_shape = skim_info['omx_shape'] + omx_shape = [np.float64(x) for x in skim_info['omx_shape']] blocks = skim_info['blocks'] skim_buffers = {} From 87b45e9f841c1175240858a908601495ecedb13f Mon Sep 17 00:00:00 2001 From: Blake Rosenthal Date: Tue, 9 Jul 2019 15:34:30 -0700 Subject: [PATCH 2/2] Allow inject.add_table to replace existing --- activitysim/core/inject.py | 9 ++++++--- setup.py | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/activitysim/core/inject.py b/activitysim/core/inject.py index d4975d14b0..6e97d2c12e 100644 --- a/activitysim/core/inject.py +++ b/activitysim/core/inject.py @@ -84,9 +84,12 @@ def add_step(name, func): return orca.add_step(name, func) -def add_table(table_name, table): - - if orca.is_table(table_name) and orca.table_type(table_name) == 'dataframe': +def add_table(table_name, table, replace=False): + """ + Add new table and raise assertion error if the table already exists. + Silently replace if replace=True. + """ + if not replace and orca.is_table(table_name) and orca.table_type(table_name) == 'dataframe': logger.warning("inject add_table replacing existing table %s" % table_name) assert False diff --git a/setup.py b/setup.py index 2e96d4ee05..f616a4ddc4 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setup( name='activitysim', - version='0.9', + version='0.9.1', description='Activity-Based Travel Modeling', author='contributing authors', author_email='ben.stabler@rsginc.com',