Skip to content

Commit

Permalink
Merge pull request #1 from ActivitySim/master
Browse files Browse the repository at this point in the history
pull latest updates
  • Loading branch information
bstabler authored Oct 31, 2019
2 parents 367d414 + 09c3a9e commit e48aa39
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion activitysim/abm/tables/skims.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {}
Expand Down
9 changes: 6 additions & 3 deletions activitysim/core/inject.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit e48aa39

Please sign in to comment.