Skip to content

Conversation

@fscottfoti
Copy link
Contributor

This is the code required to get the workplace location model to work. It is now up-to-date with the external OMX code and is working and ready to merge.

does not include size variables but DOES include the omx/skim data which is the hard/new part
Conflicts:
	activitysim/activitysim.py
	activitysim/defaults/variables.py

Also importing omx from external library and have tested the models to make sure they are working (they are)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is still pulling omx from activitysim.

it looks like I still had .pyc files lying around so it was still using the activitysim omx file - now using the right one and made a couple of small changes to use it
@coveralls
Copy link

Coverage Status

Coverage decreased (-3.32%) to 40.0% when pulling 76bcc72 on workplace-location into 8811879 on master.

fscottfoti added a commit that referenced this pull request Feb 20, 2015
@fscottfoti fscottfoti merged commit b3272dd into master Feb 20, 2015
@fscottfoti fscottfoti deleted the workplace-location branch February 20, 2015 00:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants