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

[all] Sofa defrost sprint week2 #884

Merged
merged 8 commits into from
Jan 21, 2019

Conversation

damienmarchal
Copy link
Contributor

@damienmarchal damienmarchal commented Jan 11, 2019

CHANGELOG:

  • [cmake] rename FindThread.cmake into FindSofaThread.cmake because otherwise there is "collision" with the FindThreads.cmake provided by recent version of boost.
  • [all] My usuall cleaning PR (when I put my brain in automated mode to):
    • move some code from .h to .cpp
    • use msg_* API
    • remove commented code
    • group protected/public/ in .h
    • add override on virtual constructor
    • replace some NULL by nullptr (but I would like someone try clang-tidy to do that

Nothing should be broken with the change (expect your branches with a lot of divergence)


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.

FindThreads.cmake collide with the FindThreads.cmake provided in boost.
(I don't know if any module in our codebase do find_package(FindThread))
@damienmarchal damienmarchal added pr: status to review To notify reviewers to review this pull-request refactoring Refactor code labels Jan 11, 2019
My usuall cleaning PR (when I put my brain in automated mode to):
- move some code from .h to .cpp
- use msg_* API
- remove commented code
- group protected/public/ in .h
- add override on virtual constructor
- replace some NULL by nullptr (but I would like someone try clang-tidy to do that

All that is very minor and shouldn't break anything.
@hugtalbot hugtalbot changed the title Sofa defrost sprint week2 [all] Sofa defrost sprint week2 Jan 14, 2019
if (!isActive())
return;
if (mstate)
{
// serr << "ProjectiveConstraintSet<DataTypes>::projectResponse(const MechanicalParams* mparams, MultiVecDerivId dxId) " << this->getName() << " has mstate " << sendl;

projectResponse(mparams, *dxId[mstate.get(mparams)].write());
}
else serr << "ProjectiveConstraintSet<DataTypes>::projectResponse(const MechanicalParams* mparams, MultiVecDerivId dxId), no mstate for " << this->getName() << sendl;
Copy link
Member

Choose a reason for hiding this comment

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

clean: replacing serr with msg_*

@marques-bruno marques-bruno 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 16, 2019
BaseConstraintCorrection::BaseConstraintCorrection(){}
BaseConstraintCorrection::~BaseConstraintCorrection(){}

void BaseConstraintCorrection::rebuildSystem(double /*massFactor*/, double /*forceFactor*/){}
Copy link
Member

Choose a reason for hiding this comment

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

minor comment: use SOFA_UNUSED instead of commenting out variable names

@marques-bruno
Copy link
Member

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

@hugtalbot hugtalbot merged commit 916c994 into sofa-framework:master Jan 21, 2019
obj->parse(arg);
}
virtual void init(void) override;
virtual void handleEvent( core::objectmodel::Event* event ) override;
Copy link
Contributor

Choose a reason for hiding this comment

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

Why setting those as private? @damienmarchal

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Mistake.

Copy link
Contributor

Choose a reason for hiding this comment

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

ok I will correct it in #899

@damienmarchal damienmarchal deleted the sofa_defrostSprintWeek2 branch February 25, 2019 09:08
@guparan guparan added this to the v19.06 milestone Jun 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr: status ready Approved a pull-request, ready to be squashed refactoring Refactor code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants