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

[SofaRigid] Clean JointSpringFF #850

Merged
merged 8 commits into from
Jan 31, 2019
Merged

[SofaRigid] Clean JointSpringFF #850

merged 8 commits into from
Jan 31, 2019

Conversation

VannesteFelix
Copy link
Contributor

Cleaning of JointSpringFF according to SOFA conventions

This PR:

  • builds with SUCCESS for all platforms on the CI.
  • does not generate new warnings.
  • does not generate new unit test failures.
  • does not generate new scene test failures.
  • does not break API compatibility.
  • is more than 1 week old (or has fast-merge label).

Reviewers will merge only if all these checks are true.

@damienmarchal
Copy link
Contributor

[ci-build][with-scene-tests]

@damienmarchal damienmarchal added pr: clean Cleaning the code pr: status to review To notify reviewers to review this pull-request labels Dec 5, 2018
epernod
epernod reviewed Dec 11, 2018
View reviewed changes
Copy link
Contributor

@epernod epernod left a comment •
edited
Loading

Choose a reason for hiding this comment

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

If I get it you move the definition of a spring inside a class and use it inside JointSpringFF ?
Do you think this can be factorized with other springFF?

epernod
epernod requested changes Dec 11, 2018
View reviewed changes
Copy link
Contributor

@epernod epernod left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Also could you check the CI, several tests are broken:
https://ci.inria.fr/sofa-ci-dev/job/sofa-framework/job/PR-850/CI_CONFIG=ubuntu_gcc-5.4,CI_PLUGINS=options,CI_TYPE=release/2/warnings4Result/

@epernod
Copy link
Contributor

epernod commented Dec 12, 2018 •
edited
Loading

https://ci.inria.fr/sofa-ci-dev/job/sofa-framework/job/PR-850/CI_CONFIG=ubuntu_gcc-5.4,CI_PLUGINS=options,CI_TYPE=release/2/ warnings4Result/package.-377079774/

+

see BUILD_URL/artifact/parent_dir/build/scene-tests/examples/Components/constraint/FixedLMConstraint.scn/output.txt

=

https://ci.inria.fr/sofa-ci-dev/job/sofa-framework/job/PR-850/CI_CONFIG=ubuntu_gcc-5.4,CI_PLUGINS=options,CI_TYPE=release/2//artifact/parent_dir/build/scene-tests/examples/Components/forcefield/JointSpringForceField.scn/output.txt

@guparan guparan added pr: status wip Development in the pull-request is still in progress and removed pr: status to review To notify reviewers to review this pull-request labels Dec 12, 2018
@damienmarchal damienmarchal added pr: status to review To notify reviewers to review this pull-request and removed pr: status wip Development in the pull-request is still in progress labels Jan 11, 2019
@damienmarchal
Copy link
Contributor

[ci-build][with-scene-tests]

@hugtalbot
Copy link
Contributor

[ci-build][with-scene-tests][with-regression-tests]

@guparan guparan added pr: status wip Development in the pull-request is still in progress and removed pr: status to review To notify reviewers to review this pull-request labels Jan 16, 2019
@VannesteFelix
Copy link
Contributor Author

@guparan & @epernod is ok for you now ?

@damienmarchal
Copy link
Contributor

Did this one ready ? What is missing ?

@marques-bruno
Copy link
Member

I think it's just that it's never been changed back to to_review after @VannesteFelix's changes..
We didn't discuss it this morning at the dev meeting.
@guparan @epernod?

@marques-bruno marques-bruno added the pr: status to review To notify reviewers to review this pull-request label Jan 30, 2019
@marques-bruno marques-bruno removed the pr: status wip Development in the pull-request is still in progress label Jan 30, 2019
@guparan
Copy link
Contributor

guparan commented Jan 31, 2019

Ready!

@guparan guparan added pr: status ready Approved a pull-request, ready to be squashed and removed pr: status to review To notify reviewers to review this pull-request labels Jan 31, 2019
@guparan guparan merged commit 0e53edc into sofa-framework:master Jan 31, 2019
@damienmarchal damienmarchal deleted the cleaning_JointSprintFF branch February 25, 2019 09:13
@guparan guparan added this to the v19.06 milestone Jun 20, 2019
@guparan guparan changed the title [JointSpringFF] Clean component [SofaRigid] Clean JointSpringFF Jun 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@damienmarchal damienmarchal damienmarchal left review comments

@epernod epernod epernod requested changes

@guparan guparan guparan approved these changes

Assignees
No one assigned
Labels
pr: clean Cleaning the code pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Milestone
v19.06
Development

Successfully merging this pull request may close these issues.
6 participants
@VannesteFelix @damienmarchal @epernod @hugtalbot @marques-bruno @guparan