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

Replace minorCutoff with scaled distance between objects #115

Merged
merged 2 commits into from
Feb 15, 2022
Merged

Replace minorCutoff with scaled distance between objects #115

merged 2 commits into from
Feb 15, 2022

Conversation

FG-TUM
Copy link
Collaborator

@FG-TUM FG-TUM commented Feb 15, 2022

Description

  • changed last distance check in LJFunctor
  • adapted input and its propagation
  • adapted tests
  • new test for two factors

Related Pull Requests

Resolved Issues

How Has This Been Tested?

Please describe the tests that you ran to verify your changes.

  • new CollisionFunctorTest::CollisionDistanceFactorTest

@FG-TUM
replace minorCutoff with scaled distance between objects
4316512 
    - changed last distance check in LJFunctor
    - adapted input and its propagation
    - adapted tests
    - new test for two factors
@FG-TUM FG-TUM requested a review from gomezzz February 15, 2022 17:38
gomezzz
gomezzz approved these changes Feb 15, 2022
View reviewed changes
Copy link
Collaborator

@gomezzz gomezzz left a comment

Choose a reason for hiding this comment

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

Minor comments, feel free to merge after

cfg/default_cfg.yaml Outdated Show resolved Hide resolved
src/ladds/CollisionFunctor.cpp Show resolved Hide resolved
src/ladds/CollisionFunctor.h Outdated Show resolved Hide resolved
Base automatically changed from mergeBranch to main February 15, 2022 21:38
@FG-TUM FG-TUM merged commit 00a939b into main Feb 15, 2022
@FG-TUM FG-TUM deleted the radiusBasedConjunctions branch February 15, 2022 22:13
@FG-TUM FG-TUM mentioned this pull request Feb 18, 2022
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gomezzz gomezzz gomezzz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Switch conjunction tracking cutoff to radius-based
2 participants
@FG-TUM @gomezzz