Commit c071482b authored by Pawel Sznajder's avatar Pawel Sznajder
Browse files

Rename GaussLegendre to GL to match the same convention for integration

module naming #24
(modification agreed with Herve during his stay in Warsaw)
parent 18c84074
...@@ -31,7 +31,7 @@ public: ...@@ -31,7 +31,7 @@ public:
UNDEFINED = 0, //!< Undefined type. UNDEFINED = 0, //!< Undefined type.
TRAPEZOIDAL = 1, //!< Trapezoidal method with a fixed number of equidistant steps. TRAPEZOIDAL = 1, //!< Trapezoidal method with a fixed number of equidistant steps.
TRAPEZOIDALLOG = 2, //!< Trapezoidal method with a fixed number with equidistantly distributed steps in [ln(min), ln(max)] range. TRAPEZOIDALLOG = 2, //!< Trapezoidal method with a fixed number with equidistantly distributed steps in [ln(min), ln(max)] range.
GaussLegendre = 3, //!< Gauss-Legendre method with a fixed number of steps. GL = 3, //!< Gauss-Legendre method with a fixed number of steps.
DEXP = 4, //!< Adaptive double exponential method. DEXP = 4, //!< Adaptive double exponential method.
GK21_ADAPTIVE = 5 //!< Adaptive Gauss-Kronrod method with 21 point rules. GK21_ADAPTIVE = 5 //!< Adaptive Gauss-Kronrod method with 21 point rules.
}; };
......
...@@ -41,7 +41,7 @@ Integrator1D* Integrator1D::newIntegrator( ...@@ -41,7 +41,7 @@ Integrator1D* Integrator1D::newIntegrator(
case IntegratorType1D::TRAPEZOIDALLOG: case IntegratorType1D::TRAPEZOIDALLOG:
return new TrapezoidalLogIntegrator1D(); return new TrapezoidalLogIntegrator1D();
break; break;
case IntegratorType1D::GaussLegendre: case IntegratorType1D::GL:
return new GaussLegendreIntegrator1D(); return new GaussLegendreIntegrator1D();
break; break;
case IntegratorType1D::DEXP: case IntegratorType1D::DEXP:
......
...@@ -22,8 +22,8 @@ IntegratorType1D::IntegratorType1D(const std::string& integratorType1DString) { ...@@ -22,8 +22,8 @@ IntegratorType1D::IntegratorType1D(const std::string& integratorType1DString) {
"TRAPEZOIDALLOG")) { "TRAPEZOIDALLOG")) {
m_type = IntegratorType1D::TRAPEZOIDALLOG; m_type = IntegratorType1D::TRAPEZOIDALLOG;
} else if (ElemUtils::StringUtils::equals(integratorType1DString, } else if (ElemUtils::StringUtils::equals(integratorType1DString,
"GaussLegendre")) { "GL")) {
m_type = IntegratorType1D::GaussLegendre; m_type = IntegratorType1D::GL;
} else if (ElemUtils::StringUtils::equals(integratorType1DString, "DEXP")) { } else if (ElemUtils::StringUtils::equals(integratorType1DString, "DEXP")) {
m_type = IntegratorType1D::DEXP; m_type = IntegratorType1D::DEXP;
} else if (ElemUtils::StringUtils::equals(integratorType1DString, } else if (ElemUtils::StringUtils::equals(integratorType1DString,
...@@ -52,8 +52,8 @@ std::string IntegratorType1D::toString() const { ...@@ -52,8 +52,8 @@ std::string IntegratorType1D::toString() const {
case TRAPEZOIDALLOG: case TRAPEZOIDALLOG:
return "TRAPEZOIDALLOG"; return "TRAPEZOIDALLOG";
break; break;
case GaussLegendre: case GL:
return "Gauss-Legendre"; return "GL";
break; break;
case DEXP: case DEXP:
return "DEXP"; return "DEXP";
...@@ -74,7 +74,7 @@ std::string IntegratorType1D::getShortName() { ...@@ -74,7 +74,7 @@ std::string IntegratorType1D::getShortName() {
case TRAPEZOIDALLOG: case TRAPEZOIDALLOG:
return "TRAPEZOIDALLOG"; return "TRAPEZOIDALLOG";
break; break;
case GaussLegendre: case GL:
return "GL"; return "GL";
break; break;
case DEXP: case DEXP:
......
Supports Markdown
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