Skip to content

[behavior] Rename epsilon by energyWeight #344

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

Open
EulalieCoevoet wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[behavior] Rename epsilon by energyWeight #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/SoftRobots/component/behavior/SoftRobotsBaseConstraint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ SoftRobotsBaseConstraint::SoftRobotsBaseConstraint()
, m_hasLambdaMin(false)
, m_hasLambdaEqual(false)
, m_hasLambdaInit(false)
, m_hasEpsilon(false)
, m_hasEnergyWeight(false)
{
d_constraintIndex.setReadOnly(true);
}
Expand Down Expand Up @@ -83,9 +83,9 @@ bool SoftRobotsBaseConstraint::hasLambdaInit() const
}


bool SoftRobotsBaseConstraint::hasEpsilon() const
bool SoftRobotsBaseConstraint::hasEnergyWeight() const
{
return m_hasEpsilon;
return m_hasEnergyWeight;
}


Expand Down Expand Up @@ -127,9 +127,9 @@ SReal SoftRobotsBaseConstraint::getLambdaInit(const size_t i) const
}


SReal SoftRobotsBaseConstraint::getEpsilon() const
SReal SoftRobotsBaseConstraint::getEnergyWeight() const
{
return m_epsilon;
return m_energyWeight;
}


Expand Down
8 changes: 4 additions & 4 deletions src/SoftRobots/component/behavior/SoftRobotsBaseConstraint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class SOFA_SOFTROBOTS_API SoftRobotsBaseConstraint : public sofa::core::behavior


/// Returns if the constraint has an epsilon value that can be used to prioritize the constraint (for actuator with inverse problem)
bool hasEpsilon() const;
bool hasEnergyWeight() const;


/// Accessor to maximum value of delta
Expand All @@ -110,7 +110,7 @@ class SOFA_SOFTROBOTS_API SoftRobotsBaseConstraint : public sofa::core::behavior


/// Accessor to epsilon value that can be used to prioritize the constraint (for actuator with inverse problem)
SReal getEpsilon() const;
SReal getEnergyWeight() const;



Expand Down Expand Up @@ -148,7 +148,7 @@ class SOFA_SOFTROBOTS_API SoftRobotsBaseConstraint : public sofa::core::behavior
bool m_hasLambdaEqual;
bool m_hasLambdaInit;

bool m_hasEpsilon;
bool m_hasEnergyWeight;

vector<double> m_deltaMax;
vector<double> m_deltaMin;
Expand All @@ -159,7 +159,7 @@ class SOFA_SOFTROBOTS_API SoftRobotsBaseConstraint : public sofa::core::behavior
vector<double> m_lambdaEqual;
vector<double> m_lambdaInit;

double m_epsilon;
double m_energyWeight;
};

} // namespace
Loading