Skip to content

Navigation Menu

Appearance settings

View all features
- BY COMPANY SIZE
  Enterprises
  Small and medium teams
  Startups
  Nonprofits
- BY USE CASE
  App Modernization
  DevSecOps
  DevOps
  CI/CD
  View all use cases
- BY INDUSTRY
  Healthcare
  Financial services
  Manufacturing
  Government
  View all industries
View all solutions
- EXPLORE BY TOPIC
  AI
  Software Development
  DevOps
  Security
  View all topics
- EXPLORE BY TYPE
  Customer stories
  Events & webinars
  Ebooks & reports
  Business insights
  GitHub Skills
- SUPPORT & SERVICES
  Documentation
  Customer support
  Community forum
  Trust center
  Partners
- COMMUNITY
  GitHub SponsorsFund open source developers
- PROGRAMS
  Security Lab
  Maintainer Community
  Accelerator
  Archive Program
- REPOSITORIES
  Topics
  Trending
  Collections
- ENTERPRISE SOLUTIONS
  Enterprise platformAI-powered developer platform
- AVAILABLE ADD-ONS
  GitHub Advanced SecurityEnterprise-grade security features
  Copilot for BusinessEnterprise-grade AI features
  Premium SupportEnterprise-grade 24/7 support
Pricing

Search code, repositories, users, issues, pull requests...

Search

Clear

Search syntax tips

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our documentation.

Appearance settings

You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session.

Dismiss alert

CLIMADA-project / climada_python Public

Notifications You must be signed in to change notification settings
Fork 149
Star 419

Code
Issues 91
Pull requests 11
Discussions
Actions
Projects
Wiki
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Discussions
Actions
Projects
Wiki
Security
Insights

Improve lines disaggregation method #679

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

Merged

chahank merged 23 commits into develop from feature/improve_lines_disagg

Mar 27, 2023

Merged

Improve lines disaggregation method #679

chahank merged 23 commits into develop from feature/improve_lines_disagg

Mar 27, 2023

Conversation 25 Commits 23 Checks 0 Files changed

Uh oh!

There was an error while loading. Please reload this page.

Conversation

Copy link

Member

chahank commented Mar 23, 2023 •

edited by peanutfun

Loading

Changes proposed in this PR:

The method to disaggregate lines was updated to better conserve the total length of all lines on average.
Accordingly, some of the tests were adapted.

PR Author Checklist

Read the Contribution Guide
Correct target branch selected (if unsure, select develop)
Descriptive pull request title added
Source branch up-to-date with target branch
Documentation updated
Tests updated
Tests passing
No new linter issues
Changelog updated

PR Reviewer Checklist

Read the Contribution Guide
CLIMADA Reviewer Checklist passed
Tests passing
No new linter issues

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions


          Improve lines disaggregation method

ac5ad25

chahank requested review from Evelyn-M and peanutfun

March 23, 2023 08:49

chahank commented

View reviewed changes

climada/util/lines_polys_handler.py Outdated Show resolved Hide resolved

Uh oh!

There was an error while loading. Please reload this page.

peanutfun requested changes

View reviewed changes

Copy link

Member

peanutfun left a comment

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

I am confused. What's the improvement of _line_fraction over linspace?

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

climada/util/lines_polys_handler.py Outdated Show resolved Hide resolved

Uh oh!

There was an error while loading. Please reload this page.

climada/util/lines_polys_handler.py Show resolved Hide resolved

Uh oh!

There was an error while loading. Please reload this page.

climada/util/lines_polys_handler.py Outdated Show resolved Hide resolved

Uh oh!

There was an error while loading. Please reload this page.

peanutfun and others added 7 commits

March 23, 2023 11:51


          Remove 'math' import from climada/util/lines_polys_handler.py

9602faf

Co-authored-by: Chahan M. Kropf <chahan.kropf@usys.ethz.ch>


          Add test for _line_fractions

0bbd090


          Update climada/util/lines_polys_handler.py

6ce2bc9

Co-authored-by: Lukas Riedel <34276446+peanutfun@users.noreply.github.com>


          Update climada/util/lines_polys_handler.py

581bf51

Co-authored-by: Lukas Riedel <34276446+peanutfun@users.noreply.github.com>


          Add changelog note

a0819c2


          Merge branch 'feature/improve_lines_disagg' of https://github.com/CLI…

e957605

…MADA-project/climada_python into feature/improve_lines_disagg


          Add warning if the resolution is much larger than the line lengths

be99126

peanutfun reviewed

View reviewed changes

climada/util/lines_polys_handler.py Show resolved Hide resolved

Uh oh!

There was an error while loading. Please reload this page.

peanutfun reviewed

View reviewed changes

climada/util/lines_polys_handler.py Outdated Show resolved Hide resolved

Uh oh!

There was an error while loading. Please reload this page.

peanutfun reviewed

View reviewed changes

climada/util/lines_polys_handler.py Show resolved Hide resolved

Uh oh!

There was an error while loading. Please reload this page.

peanutfun reviewed

View reviewed changes

climada/util/test/test_lines_polys_handler.py Outdated Show resolved Hide resolved

Uh oh!

There was an error while loading. Please reload this page.

peanutfun reviewed

View reviewed changes

climada/util/test/test_lines_polys_handler.py Show resolved Hide resolved

Uh oh!

There was an error while loading. Please reload this page.

Chahan Kropf added 2 commits

March 23, 2023 14:27


          Improve logging msg

b9e6e1d


          Update warning comment

4c606e5

chahank force-pushed the feature/improve_lines_disagg branch from 43dcc40 to 4c606e5 Compare

March 23, 2023 13:33

Chahan Kropf added 8 commits

March 23, 2023 15:38


          Add test for different base length

312a417


          Add test for average length convergence

e8cfc9d


          Make more precise length approximation test

b91074c


          Add test for line resolution warning

408dc42


          Update point on line to equal segments length

40c268c


          Update basic test for equal length segments

3d5d9b9


          Updated "integrated" impact tests to equal line segments

1e5d05c


          Merge remote-tracking branch 'origin/develop' into feature/improve_li…

dab13a9

…nes_disagg

chahank commented

View reviewed changes

climada/util/lines_polys_handler.py Outdated Show resolved Hide resolved

Uh oh!

There was an error while loading. Please reload this page.


          Improve code cosmetics

0339c12

Chahan Kropf added 3 commits

March 27, 2023 16:41


          Improve test cosmetics

98c89ce


          Remove legacy code

18848d1


          Add link to PR on changelog

c986b77

peanutfun reviewed

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

Uh oh!

There was an error while loading. Please reload this page.

peanutfun reviewed

View reviewed changes

climada/util/lines_polys_handler.py Show resolved Hide resolved

Uh oh!

There was an error while loading. Please reload this page.

peanutfun reviewed

View reviewed changes

climada/util/test/test_lines_polys_handler.py Outdated Show resolved Hide resolved

Uh oh!

There was an error while loading. Please reload this page.


          Add test for exact warning message

1d7f053

Copy link

Member Author

chahank commented Mar 27, 2023

Thanks @peanutfun !

peanutfun reacted with hooray emoji

All reactions

🎉 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

chahank merged commit 912127e into develop

leonie-villiger deleted the feature/improve_lines_disagg branch

April 20, 2023 06:08

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

peanutfun peanutfun requested changes

Evelyn-M Awaiting requested review from Evelyn-M

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

3 participants

Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.

Footer

© 2026 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Community
Docs
Contact

You can’t perform that action at this time.