Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[0.1.dev19] update model.run to handle list of output tables #69

Merged
merged 3 commits into from
Dec 6, 2018
Merged

[0.1.dev19] update model.run to handle list of output tables #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ce38a9
update model.run to handle list of output tables
mxndrwgrdnr Dec 6, 2018
2ebc4ef
forgot to re-implement orca.get_table on the table
mxndrwgrdnr Dec 6, 2018
411fdbf
version bump
mxndrwgrdnr Dec 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

setup(
name='urbansim_templates',
version='0.1.dev18',
version='0.1.dev19',
description='UrbanSim extension for managing model steps',
author='UrbanSim Inc.',
author_email='info@urbansim.com',
Expand Down
2 changes: 1 addition & 1 deletion urbansim_templates/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = __version__ = '0.1.dev18'
version = __version__ = '0.1.dev19'
18 changes: 12 additions & 6 deletions urbansim_templates/models/large_multinomial_logit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ class LargeMultinomialLogitStep(TemplateStep):
def __init__(self, choosers=None, alternatives=None, model_expression=None,
choice_column=None, chooser_filters=None, chooser_sample_size=None,
alt_filters=None, alt_sample_size=None, out_choosers=None,
out_alternatives=None, out_column=None, out_chooser_filters=None,
out_alt_filters=None, constrained_choices=False, alt_capacity=None,
chooser_size=None, max_iter=None, name=None, tags=[]):
out_alternatives=None, out_column=None,
out_chooser_filters=None, out_alt_filters=None, constrained_choices=False,
alt_capacity=None, chooser_size=None, max_iter=None, name=None, tags=[]):

self._listeners = []

Expand Down Expand Up @@ -323,6 +323,7 @@ def out_alternatives(self):
def out_alternatives(self, value):
self.__out_alternatives = self._normalize_table_param(value)
self.send_to_listeners('out_alternatives', value)


@property
def out_column(self):
Expand Down Expand Up @@ -522,10 +523,15 @@ def probs(mct):

# Update Orca
if self.out_choosers is not None:
table = orca.get_table(self.out_choosers)
table = self.out_choosers
else:
table = orca.get_table(self.choosers)

table = self.choosers

if isinstance(table, list):
table = table[0]

table = orca.get_table(table)

if self.out_column is not None:
column = self.out_column
else:
Expand Down