Liebe Gitlab-Nutzer, lieber Gitlab-Nutzer, es ist nun möglich sich mittels des ZIH-Logins/LDAP an unserem Dienst anzumelden. Ein Anmelden über dieses erzeugt ein neues Konto. Das alte Konto ist über den Reiter "Standard" erreichbar. Die Administratoren

Dear Gitlab user, it is now possible to log in to our service using the ZIH login/LDAP. Logging in via this will create a new account. The old account can be accessed via the "Standard" tab. The administrators

Commit 559ed207 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

namespace std error with function abs removed

parent 14f7c5d5
......@@ -304,13 +304,13 @@ public:
int operator()(const double& dist) const {
int result= lOuter;
if (abs(dist) < interfaceWidth)
if (std::abs(dist) < interfaceWidth)
result= lInterface; // auf dem Interface
else if (abs(dist) < fadeOutWidth+interfaceWidth && signInInnerDomain*dist < 0.0) {
double lambda = abs(dist)/fadeOutWidth - interfaceWidth/fadeOutWidth;
else if (std::abs(dist) < fadeOutWidth+interfaceWidth && signInInnerDomain*dist < 0.0) {
double lambda = std::abs(dist)/fadeOutWidth - interfaceWidth/fadeOutWidth;
result= static_cast<int>(floor(lambda*lInner+(1.0-lambda)*lInterface));
} else if (abs(dist) < fadeOutWidth+interfaceWidth && signInInnerDomain*dist > 0.0) {
double lambda = abs(dist)/fadeOutWidth - interfaceWidth/fadeOutWidth;
} else if (std::abs(dist) < fadeOutWidth+interfaceWidth && signInInnerDomain*dist > 0.0) {
double lambda = std::abs(dist)/fadeOutWidth - interfaceWidth/fadeOutWidth;
result= static_cast<int>(floor(lambda*lOuter+(1.0-lambda)*lInterface));
} else if (signInInnerDomain*dist < 0.0)
result= lInner;
......@@ -332,12 +332,12 @@ public:
int operator()(const std::vector<double>& means) const
{
double tol = means[0];
return (abs(means[1]-means[2]) > tol ? 0 : -1);
return (std::abs(means[1]-means[2]) > tol ? 0 : -1);
}
double indicator(const std::vector<double>& means) const
{
return abs(means[1]-means[2]);
return std::abs(means[1]-means[2]);
}
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment