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.

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

fix max_distance bugs #390

Merged
merged 6 commits into from
Feb 13, 2025
Merged

fix max_distance bugs #390

merged 6 commits into from
Feb 13, 2025

Conversation

obucklin
Copy link
Contributor

@obucklin obucklin commented Feb 11, 2025

Bug fixes after adding max_distance to joint rules.

What type of change is this?

  • Bug fix in a backwards-compatible manner.
  • New feature in a backwards-compatible manner.
  • Breaking change: bug fix or new feature that involve incompatible API changes.
  • Other (e.g. doc update, configuration, etc)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

  • I added a line to the CHANGELOG.md file in the Unreleased section under the most fitting heading (e.g. Added, Changed, Removed).
  • I ran all tests on my computer and it's all green (i.e. invoke test).
  • I ran lint on my computer and there are no errors (i.e. invoke lint).
  • I added new functions/classes and made them available on a second-level import, e.g. compas_timber.datastructures.Beam.
  • I have added tests that prove my fix is effective or that my feature works.
  • I have added necessary documentation (if appropriate)

if not pta: # segments are parallel
dists = []
for pair in [(segment_a[0], segment_b[0]), (segment_a[1], segment_b[0]), (segment_b[0], segment_a[1]), (segment_b[1], segment_a[1])]:
"""gets shortest distance between all 4 possible pairs of endpoints. only for L/I_Topo. T_Topology cannot have paralell segments"""
Copy link
Contributor

Choose a reason for hiding this comment

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

please use # for in-code comments

Copy link
Contributor

Choose a reason for hiding this comment

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

if possible, try to use something from https://docs.python.org/3/library/itertools.html here instead. would make for a more readable code.

@@ -91,23 +91,24 @@ def joints_from_beams_and_rules(elements, rules, max_distance=TOL.absolute):
element_pairs = solver.find_intersecting_pairs(elements, rtree=True, max_distance=max_rule_distance)
joint_defs = []
unmatched_pairs = []
compliant_direct_rules = []
for rule in direct_rules:
if rule.comply(rule.elements, model_max_distance=max_distance): # see if pair complies with max distance
Copy link
Contributor

@chenkasirer chenkasirer Feb 11, 2025

Choose a reason for hiding this comment

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

if rule already contains the elements, why do they need to be passed from the outside?

Copy link
Contributor

@chenkasirer chenkasirer left a comment

Choose a reason for hiding this comment

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

lgtm

@chenkasirer chenkasirer merged commit 04bca37 into main Feb 13, 2025
14 checks passed
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