Skip to content

Conversation

@jpn--
Copy link
Member

@jpn-- jpn-- commented Sep 6, 2022

Adds compatability for Sharrow in 2 and 3 zone systems.

Note: tests for sandag xborder model do not pass due to pre-existing problems, see #598

jpn-- added 30 commits April 1, 2022 11:34
…rrow-2

# Conflicts:
#	.gitignore
#	activitysim/benchmarking/asv.conf.json
#	activitysim/benchmarking/benchmarks/mtc1full.py
#	activitysim/benchmarking/benchmarks/sandag_example.py
#	activitysim/benchmarking/componentwise.py
#	activitysim/cli/benchmark.py
#	activitysim/cli/create.py
#	activitysim/cli/main.py
#	activitysim/cli/run.py
#	activitysim/core/pipeline.py
#	conda-environments/activitysim-dev.yml
#	conda-environments/activitysim-test-larch.yml
#	conda-environments/activitysim-test.yml
#	setup.py
jpn-- added 27 commits August 22, 2022 20:02
…3z-i

# Conflicts:
#	.github/workflows/core_tests.yml
#	.gitignore
#	.pre-commit-config.yaml
#	activitysim/__main__.py
#	conda-environments/docbuild.yml
#	conda-environments/github-actions-tests.yml
#	docs/dev-guide/index.rst
#	docs/examples.rst
#	docs/gettingstarted.rst
#	docs/index.rst
#	docs/users-guide/index.rst
#	pyproject.toml
# Conflicts:
#	HOW_TO_RELEASE.md
#	conda-environments/activitysim-test-larch.yml
#	conda-environments/activitysim-test.yml
#	docs/development.rst
#	docs/examples.rst

[makedocs]
# Conflicts:
#	activitysim/__init__.py

[makedocs]
and update sharrow to 2.2.4
np.int deprecated
sandag xborder taz list missing
@jpn--
Copy link
Member Author

jpn-- commented Sep 19, 2022

Close in favor of the sharrow-comprehensive PR #601

@jpn-- jpn-- closed this Sep 19, 2022
@wusun2
Copy link

wusun2 commented Mar 30, 2023

@dhensle , is the xborder model bug fixed? Looks this is a problem when we plug in Sharrow?

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.

2 participants