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

Fix CLSCP-SO bugs and add tests #316

Merged
merged 3 commits into from
Dec 19, 2022
Merged

Fix CLSCP-SO bugs and add tests #316

merged 3 commits into from
Dec 19, 2022

Conversation

jGaboardi
Copy link
Member

This PR:

@jGaboardi jGaboardi added bug Something isn't working locate labels Dec 18, 2022
@jGaboardi jGaboardi self-assigned this Dec 18, 2022
@codecov
Copy link

codecov bot commented Dec 18, 2022

Codecov Report

Merging #316 (5b52189) into main (10535e6) will increase coverage by 0.5%.
The diff coverage is 100.0%.

Impacted file tree graph

@@           Coverage Diff           @@
##            main    #316     +/-   ##
=======================================
+ Coverage   73.3%   73.8%   +0.5%     
=======================================
  Files         23      23             
  Lines       2452    2456      +4     
  Branches     475     476      +1     
=======================================
+ Hits        1797    1812     +15     
+ Misses       591     579     -12     
- Partials      64      65      +1
Impacted Files Coverage Δ
spopt/locate/base.py 93.0% <100.0%> (+4.5%) ⬆️
spopt/locate/coverage.py 95.5% <100.0%> (+1.9%) ⬆️

sjsrey
sjsrey reviewed Dec 18, 2022
View reviewed changes
spopt/locate/coverage.py
facility_capacity_arr,
demand_quantity_arr,
r_fac,
r_cli,
)

FacilityModelBuilder.add_client_demand_satisfaction_constraint(
lscp, lscp.problem, r_cli, r_fac
lscp, lscp.problem, lscp.aij, r_cli, r_fac
Copy link
Member

Choose a reason for hiding this comment

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

is it redundant to pass in lscp, lscp.problem, lscp.aij as separate args, when the latter two are attributes/members of the former?

Copy link
Member Author

Choose a reason for hiding this comment

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

This is a very good point. I'd say let's open an issue to standard are streamline variable & constraint creation. Then we can merge this PR in and work on that after?

Copy link
Member Author

Choose a reason for hiding this comment

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

xref #317

Copy link
Member Author

Choose a reason for hiding this comment

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

So I'll go ahead with the merge and get to work on #317.

sjsrey
sjsrey reviewed Dec 18, 2022
View reviewed changes
Copy link
Member

@sjsrey sjsrey left a comment

Choose a reason for hiding this comment

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

Looks good. One question for my education more than anything.

@jGaboardi jGaboardi mentioned this pull request Dec 18, 2022
Closed
@jGaboardi jGaboardi merged commit 8e6b192 into pysal:main Dec 19, 2022
@jGaboardi jGaboardi deleted the CLSCP_serv_bug branch December 19, 2022 18:44
@jGaboardi jGaboardi mentioned this pull request Dec 22, 2022
Closed
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sjsrey sjsrey sjsrey left review comments

@ljwolf ljwolf Awaiting requested review from ljwolf

@gegen07 gegen07 Awaiting requested review from gegen07

Assignees

@jGaboardi jGaboardi

Labels
bug Something isn't working locate
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

raise if demand > capacity in CLSCP-SO [BUG] service radius threshold not respected in CLSCP-SO
2 participants
@jGaboardi @sjsrey