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

add predefined facility fulfillment option #2

Closed
wants to merge 33 commits into from
Closed

add predefined facility fulfillment option #2

wants to merge 33 commits into from

Conversation

rongboxu
Copy link

@rongboxu rongboxu commented Apr 2, 2023

No description provided.

github-actions bot and others added 11 commits February 25, 2023 14:57
@github-actions @jGaboardi
[Bot] Update Versioneer (pysal#345)
9246839 
Co-authored-by: jGaboardi <[email protected]>
@jGaboardi
Overhaul repo infrastructure (pysal#353)
151f5cb 
* ruff-en code base

* remove versioneer

* adopt pyproject.toml

* clean up envs, etc.

* update codecov

* test again master and main libpysal (temp)

* only test dev against libpysal@main

* update other dev pins

* add mapclassify, etc. to dev env

* ensure all deps are installed in dev

* re-ruff repo

* ruff based on py39

* ruff based on py38

* resolve typing issues <3.9 [1]

* resolve typing issues <3.9 [2]

* address review comments
@pre-commit-ci
[pre-commit.ci] pre-commit autoupdate (pysal#355)
d7c6c40 
updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.252 → v0.0.254](astral-sh/ruff-pre-commit@v0.0.252...v0.0.254)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@pre-commit-ci
[pre-commit.ci] pre-commit autoupdate (pysal#357)
b77b992 
updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.254 → v0.0.255](astral-sh/ruff-pre-commit@v0.0.254...v0.0.255)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@pre-commit-ci
[pre-commit.ci] pre-commit autoupdate (pysal#359)
af3dca5 
updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.255 → v0.0.257](astral-sh/ruff-pre-commit@v0.0.255...v0.0.257)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@rongboxu
add predefined facility fulfillment option
67aaaff
@jGaboardi
address new ruff failures (pysal#360)
c66cf64 
* address new ruff failures

* proper stacklevel

* update precommit

* revisit stacklevels
@pre-commit-ci
[pre-commit.ci] pre-commit autoupdate (pysal#365)
26b7bfe 
updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.261 → v0.0.262](astral-sh/ruff-pre-commit@v0.0.261...v0.0.262)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@pre-commit-ci
[pre-commit.ci] pre-commit autoupdate (pysal#367)
bc47a15 
updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.262 → v0.0.263](astral-sh/ruff-pre-commit@v0.0.262...v0.0.263)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@pre-commit-ci
[pre-commit.ci] pre-commit autoupdate (pysal#371)
21efef3 
updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.263 → v0.0.269](astral-sh/ruff-pre-commit@v0.0.263...v0.0.269)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@rongboxu
add fulfillment of the capacity in geodataframe part
3a02a31
@rongboxu
Copy link
Author

@ljwolf Hi Levi! I am currently rechecking the code changed in the fulfillment of predefined facility's capacity. The problem is that I find it's hard to separate my code from yours because the options I added are based on the predefined facility section you wrote earlier. In this case, maybe I should still make a pull request directly to you?

@ljwolf
Copy link
Owner

ljwolf commented May 24, 2023

Hey! It's ok to open a new PR directly to pysal/spopt with your extra changes. That PR will have both what I've done and what you've added to it. That's totally ok.

What @jGaboardi wanted is to have your name on the PR as the contributor, instead of mine, regardless of the authors of the individual commits 😄

Does that make sense?

@rongboxu
Copy link
Author

Oh Thank you!!! Now I understand! I will open a new PR when I finish this part!

rongboxu and others added 15 commits May 25, 2023 15:26
@rongboxu
modify the predefined facility conditions
c1c4908
@rongboxu
modify the description of some errors
a3871e2
@rongboxu
add the data for the test of capacitated p median
3a5a6bf
@rongboxu
Create test_c_p_median.py
43b13a2
@jGaboardi
shapely>=2 & other minimum version deps (pysal#377)
0ce3b84 
* shapely & geopandas version bump

* try resolve windows pytest failure

* channel-priority no longer a valid micromamba arg

* try w/0 min geopandas pin

* drop 3.8 support

* only use pins in min CI env

* bump min scipy

* bump min scikit-learn

* bump min shapely==2.0.1

* py38-MIN ci resolved

* pin pandas in 38
@rongboxu
consider the condition that demand value is over 1
d6ffb59
@rongboxu
add the synthetic case for capacitated p median test
6b9b7bf
@pre-commit-ci
[pre-commit.ci] pre-commit autoupdate (pysal#378)
936c710 
updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.269 → v0.0.270](astral-sh/ruff-pre-commit@v0.0.269...v0.0.270)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@rongboxu
Merge branch 'main' into main
bc75cde
@rongboxu
modify the code format
e1492b2
@rongboxu
Merge branch 'main' of https://github.com/rongboxu/spopt
88f878c
@rongboxu
modify mistakes in the p_median.py
eb44862
@rongboxu
revert the previous edits in coverage.py
1e3c727
@rongboxu
fix linting errors
96183c8
@rongboxu
add Church & Murray Business Site Selection to refs
7ee6421
@jGaboardi jGaboardi mentioned this pull request Jun 14, 2023
Merged
@ljwolf
Copy link
Owner

ljwolf commented Aug 16, 2023

I think this should be closed in favour of pysal#387

@ljwolf ljwolf closed this Aug 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rongboxu @ljwolf @jGaboardi