[All] Code cleaning of multiple classes #1116
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hugtalbot
added
pr: clean
hugtalbot
reviewed
Jul 30, 2019
| @@ -496,27 +496,27 @@ void HexahedronCompositeFEMForceFieldAndMass<T>::computeMechanicalMatricesByCond | |||
|
|
|||
|
|
|||
|
|
|||
| _weights.resize( this->_nbVirtualFinerLevels.getValue() ); | |||
| int finestLevel = this->_sparseGrid->getNbVirtualFinerLevels()-this->_nbVirtualFinerLevels.getValue(); | |||
| _weights.resize( this->d_nbVirtualFinerLevels.getValue() ); | |||
There was a problem hiding this comment.
To be picky, internal variable of a class (like _weights or _finalWeights here) are named m_* (e.g. m_weights)
|
Very nice work @Wall-E-76 ! Impressive ! |
guparan
added
pr: status wip
by adding the SOFA_GENERAL_ENGINE_API in front of the class def
|
[ci-build][with-all-tests] |
|
TODO was to bring TriangleInfo, TriangleState, EdgeInfo, VertexInfo back in TriangularFEMForceFieldOptim.h @marques-bruno seems to have done the jobs! 👍 |
hugtalbot
added
pr: status to review
|
Actually @Wall-E-76 did the TODO, thanks @Wall-E-76 👍 |
guparan
added
pr: status ready
epernod
reviewed
Sep 9, 2019
| @@ -107,7 +107,7 @@ void TCapsuleModel<sofa::defaulttype::StdRigidTypes<3,MyReal> >::init() | |||
| _mstate = dynamic_cast< core::behavior::MechanicalState<DataTypes>* > (getContext()->getMechanicalState()); | |||
| if (_mstate==NULL) | |||
| { | |||
| serr<<"TCapsuleModel requires a Rigid Mechanical Model" << sendl; | |||
| msg_warning()<<"TCapsuleModel requires a Rigid Mechanical Model" << msgendl; | |||
There was a problem hiding this comment.
I think it is a msg_error, as the component init failed and so it is not usable.
| this->Inherited::init(); | ||
|
|
||
| _topology = this->getContext()->getMeshTopology(); | ||
|
|
||
| if (_topology->getNbTriangles()==0) | ||
| { | ||
| serr << "ERROR(FastTriangularBendingSprings): object must have a Triangular Set Topology."<<sendl; | ||
| msg_error() << "ERROR(FastTriangularBendingSprings): object must have a Triangular Set Topology."<<msgendl; |
There was a problem hiding this comment.
the Error() can be remove as well as the msgendl
| protected: | ||
| NonUniformHexahedronFEMForceFieldAndMass(); | ||
|
|
||
| public: | ||
|
|
||
| void init() override; | ||
| void reinit() override { serr<<"WARNING : non-uniform mechanical properties can't be updated, changes on mechanical properties (young, poisson, density) are not taken into account."<<sendl; } | ||
| void reinit() override { msg_warning()<<"WARNING : non-uniform mechanical properties can't be updated, changes on mechanical properties (young, poisson, density) are not taken into account."<<msgendl; } |
| template <class DataTypes> | ||
| void HexahedronCompositeFEMForceFieldAndMass<DataTypes>::reinit() | ||
| { | ||
| msg_warning()<<"WARNING : composite mechanical properties can't be updated, changes on mechanical properties (young, poisson, density) are not taken into account."<<msgendl; |
|
sorry for late review, just added some small picky comments. |
|
Done, time to move on with the PR! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Code cleaning of multiple classes, by :
One commit for one or two clean classes.
This PR:
Reviewers will merge only if all these checks are true.