diff --git a/hipparchus-core/src/main/java/org/hipparchus/analysis/differentiation/Derivative.java b/hipparchus-core/src/main/java/org/hipparchus/analysis/differentiation/Derivative.java index f6edf7297..b3cb69468 100644 --- a/hipparchus-core/src/main/java/org/hipparchus/analysis/differentiation/Derivative.java +++ b/hipparchus-core/src/main/java/org/hipparchus/analysis/differentiation/Derivative.java @@ -103,19 +103,19 @@ default T pow(T e) { /** {@inheritDoc} */ @Override default T cosh() { - return (exp().add(negate().exp())).divide(2); + return (exp().add(negate().exp())).half(); } /** {@inheritDoc} */ @Override default T sinh() { - return (exp().subtract(negate().exp())).divide(2); + return (exp().subtract(negate().exp())).half(); } /** {@inheritDoc} */ @Override default T acos() { - return asin().negate().add(getPi().divide(2)); + return asin().negate().add(getPi().half()); } /** {@inheritDoc} */ diff --git a/hipparchus-core/src/main/java/org/hipparchus/analysis/differentiation/FieldDerivative.java b/hipparchus-core/src/main/java/org/hipparchus/analysis/differentiation/FieldDerivative.java index 8b3a41266..72a39a021 100644 --- a/hipparchus-core/src/main/java/org/hipparchus/analysis/differentiation/FieldDerivative.java +++ b/hipparchus-core/src/main/java/org/hipparchus/analysis/differentiation/FieldDerivative.java @@ -115,19 +115,19 @@ default T pow(T e) { /** {@inheritDoc} */ @Override default T cosh() { - return (exp().add(negate().exp())).divide(2); + return (exp().add(negate().exp())).half(); } /** {@inheritDoc} */ @Override default T sinh() { - return (exp().subtract(negate().exp())).divide(2); + return (exp().subtract(negate().exp())).half(); } /** {@inheritDoc} */ @Override default T acos() { - return asin().negate().add(getPi().divide(2)); + return asin().negate().add(getPi().half()); } /** {@inheritDoc} */ diff --git a/hipparchus-core/src/main/java/org/hipparchus/analysis/differentiation/FieldDerivative1.java b/hipparchus-core/src/main/java/org/hipparchus/analysis/differentiation/FieldDerivative1.java index 758d7550d..7e4bc6697 100644 --- a/hipparchus-core/src/main/java/org/hipparchus/analysis/differentiation/FieldDerivative1.java +++ b/hipparchus-core/src/main/java/org/hipparchus/analysis/differentiation/FieldDerivative1.java @@ -50,7 +50,7 @@ default int getOrder() { @Override default T square() { final S f0 = getValue(); - return compose(f0.square(), f0.multiply(2)); + return compose(f0.square(), f0.twice()); } /** {@inheritDoc} */ diff --git a/hipparchus-core/src/main/java/org/hipparchus/analysis/differentiation/FieldUnivariateDerivative2.java b/hipparchus-core/src/main/java/org/hipparchus/analysis/differentiation/FieldUnivariateDerivative2.java index 73e48ba4c..41521ed5d 100644 --- a/hipparchus-core/src/main/java/org/hipparchus/analysis/differentiation/FieldUnivariateDerivative2.java +++ b/hipparchus-core/src/main/java/org/hipparchus/analysis/differentiation/FieldUnivariateDerivative2.java @@ -432,9 +432,9 @@ public FieldUnivariateDerivative2 compose(final T g0, final T g1, final T g2) @Override public FieldUnivariateDerivative2 sqrt() { final T s0 = FastMath.sqrt(f0); - final T s0twice = s0.multiply(2); + final T s0twice = s0.twice(); final T s1 = f1.divide(s0twice); - final T s2 = (f2.subtract(s1.square().multiply(2))).divide(s0twice); + final T s2 = (f2.subtract(s1.square().twice())).divide(s0twice); return new FieldUnivariateDerivative2<>(s0, s1, s2); } diff --git a/hipparchus-core/src/main/java/org/hipparchus/analysis/differentiation/SparseGradient.java b/hipparchus-core/src/main/java/org/hipparchus/analysis/differentiation/SparseGradient.java index 604abedac..3734ad91d 100644 --- a/hipparchus-core/src/main/java/org/hipparchus/analysis/differentiation/SparseGradient.java +++ b/hipparchus-core/src/main/java/org/hipparchus/analysis/differentiation/SparseGradient.java @@ -529,7 +529,7 @@ public SparseGradient atan2(final SparseGradient x) { if (x.value >= 0) { // compute atan2(y, x) = 2 atan(y / (r + x)) - a = divide(r.add(x)).atan().multiply(2); + a = divide(r.add(x)).atan().twice(); } else { diff --git a/hipparchus-core/src/main/java/org/hipparchus/analysis/interpolation/AkimaSplineInterpolator.java b/hipparchus-core/src/main/java/org/hipparchus/analysis/interpolation/AkimaSplineInterpolator.java index 38d5da2c2..c25eee16c 100644 --- a/hipparchus-core/src/main/java/org/hipparchus/analysis/interpolation/AkimaSplineInterpolator.java +++ b/hipparchus-core/src/main/java/org/hipparchus/analysis/interpolation/AkimaSplineInterpolator.java @@ -313,7 +313,7 @@ private > T differentiateThreePoint(T[] xvals, divide(t2.multiply(t2).subtract(t1.multiply(t2))); final T b = x1.subtract(x0).subtract(a.multiply(t1).multiply(t1)).divide(t1); - return a.multiply(t).multiply(2).add(b); + return a.multiply(t).twice().add(b); } /** diff --git a/hipparchus-core/src/main/java/org/hipparchus/analysis/interpolation/SplineInterpolator.java b/hipparchus-core/src/main/java/org/hipparchus/analysis/interpolation/SplineInterpolator.java index 7e49c455d..4dfb76482 100644 --- a/hipparchus-core/src/main/java/org/hipparchus/analysis/interpolation/SplineInterpolator.java +++ b/hipparchus-core/src/main/java/org/hipparchus/analysis/interpolation/SplineInterpolator.java @@ -192,7 +192,7 @@ public > FieldPolynomialSplineFunction inte mu[0] = field.getZero(); z[0] = field.getZero(); for (int i = 1; i < n; i++) { - final T g = x[i+1].subtract(x[i - 1]).multiply(2).subtract(h[i - 1].multiply(mu[i -1])); + final T g = x[i+1].subtract(x[i - 1]).twice().subtract(h[i - 1].multiply(mu[i -1])); mu[i] = h[i].divide(g); z[i] = y[i + 1].multiply(h[i - 1]). subtract(y[i].multiply(x[i + 1].subtract(x[i - 1]))). diff --git a/hipparchus-core/src/main/java/org/hipparchus/analysis/polynomials/SmoothStepFactory.java b/hipparchus-core/src/main/java/org/hipparchus/analysis/polynomials/SmoothStepFactory.java index dca7af349..62935a1fb 100644 --- a/hipparchus-core/src/main/java/org/hipparchus/analysis/polynomials/SmoothStepFactory.java +++ b/hipparchus-core/src/main/java/org/hipparchus/analysis/polynomials/SmoothStepFactory.java @@ -661,7 +661,7 @@ public T value(final T xNormalized) { checkBetweenZeroAndOneIncluded(xNormalized.getReal()); if (xNormalized.getReal() >= 0 && xNormalized.getReal() <= 0.5) { - return xNormalized.multiply(xNormalized).multiply(2.); + return xNormalized.multiply(xNormalized).twice(); } else { final T one = getField().getOne(); diff --git a/hipparchus-core/src/main/java/org/hipparchus/analysis/solvers/FieldBracketingNthOrderBrentSolver.java b/hipparchus-core/src/main/java/org/hipparchus/analysis/solvers/FieldBracketingNthOrderBrentSolver.java index 632669d49..87a68ff76 100644 --- a/hipparchus-core/src/main/java/org/hipparchus/analysis/solvers/FieldBracketingNthOrderBrentSolver.java +++ b/hipparchus-core/src/main/java/org/hipparchus/analysis/solvers/FieldBracketingNthOrderBrentSolver.java @@ -175,7 +175,7 @@ public T getFunctionValueAccuracy() { public T solve(final int maxEval, final CalculusFieldUnivariateFunction f, final T min, final T max, final AllowedSolution allowedSolution) throws MathIllegalArgumentException, NullArgumentException { - return solve(maxEval, f, min, max, min.add(max).divide(2), allowedSolution); + return solve(maxEval, f, min, max, min.add(max).half(), allowedSolution); } /** @@ -296,7 +296,7 @@ public Interval solveInterval(int maxEval, T maxX = absXA.subtract(absXB).getReal() < 0 ? absXB : absXA; T maxY = absYA.subtract(absYB).getReal() < 0 ? absYB : absYA; final T xTol = absoluteAccuracy.add(relativeAccuracy.multiply(maxX)); - final T midpoint = xA.add(xB.subtract(xA).divide(2)); + final T midpoint = xA.add(xB.subtract(xA).half()); if (xB.subtract(xA).subtract(xTol).getReal() <= 0 || maxY.subtract(functionValueAccuracy).getReal() < 0 || xA.equals(midpoint) || xB.equals(midpoint)) { @@ -349,7 +349,7 @@ public Interval solveInterval(int maxEval, if (Double.isNaN(nextX.getReal())) { // fall back to bisection - nextX = xA.add(xB.subtract(xA).divide(2)); + nextX = xA.add(xB.subtract(xA).half()); start = signChangeIndex - 1; end = signChangeIndex; } diff --git a/hipparchus-core/src/main/java/org/hipparchus/complex/Complex.java b/hipparchus-core/src/main/java/org/hipparchus/complex/Complex.java index 23038ab9d..1fb8285af 100644 --- a/hipparchus-core/src/main/java/org/hipparchus/complex/Complex.java +++ b/hipparchus-core/src/main/java/org/hipparchus/complex/Complex.java @@ -1183,7 +1183,7 @@ public Complex atan2(Complex x) { if (FastMath.copySign(1.0, x.real) >= 0) { // compute atan2(y, x) = 2 atan(y / (r + x)) - return divide(r.add(x)).atan().multiply(2); + return divide(r.add(x)).atan().twice(); } else { // compute atan2(y, x) = +/- pi - 2 atan(y / (r - x)) return divide(r.subtract(x)).atan().multiply(-2).add(FastMath.PI); diff --git a/hipparchus-core/src/main/java/org/hipparchus/complex/FieldComplex.java b/hipparchus-core/src/main/java/org/hipparchus/complex/FieldComplex.java index efeada4c1..4fe141d4f 100644 --- a/hipparchus-core/src/main/java/org/hipparchus/complex/FieldComplex.java +++ b/hipparchus-core/src/main/java/org/hipparchus/complex/FieldComplex.java @@ -1314,7 +1314,7 @@ public FieldComplex atan2(FieldComplex x) { if (x.real.getReal() >= 0) { // compute atan2(y, x) = 2 atan(y / (r + x)) - return divide(r.add(x)).atan().multiply(2); + return divide(r.add(x)).atan().twice(); } else { // compute atan2(y, x) = +/- pi - 2 atan(y / (r - x)) return divide(r.subtract(x)).atan().multiply(-2).add(x.real.getPi()); @@ -1458,9 +1458,9 @@ public FieldComplex sqrt() { T t = FastMath.sqrt((FastMath.abs(real).add(FastMath.hypot(real, imaginary))).multiply(0.5)); if (real.getReal() >= 0.0) { - return createComplex(t, imaginary.divide(t.multiply(2))); + return createComplex(t, imaginary.divide(t.twice())); } else { - return createComplex(FastMath.abs(imaginary).divide(t.multiply(2)), + return createComplex(FastMath.abs(imaginary).divide(t.twice()), FastMath.copySign(t, imaginary)); } } @@ -1553,8 +1553,8 @@ public FieldComplex tan() { return getMinusI(getPartsField()); } - final FieldSinCos sc2r = FastMath.sinCos(real.multiply(2)); - T imaginary2 = imaginary.multiply(2); + final FieldSinCos sc2r = FastMath.sinCos(real.twice()); + T imaginary2 = imaginary.twice(); T d = sc2r.cos().add(FastMath.cosh(imaginary2)); return createComplex(sc2r.sin().divide(d), FastMath.sinh(imaginary2).divide(d)); @@ -1603,8 +1603,8 @@ public FieldComplex tanh() { if (real.getReal() < -20.0) { return getMinusOne(getPartsField()); } - T real2 = real.multiply(2); - final FieldSinCos sc2i = FastMath.sinCos(imaginary.multiply(2)); + T real2 = real.twice(); + final FieldSinCos sc2i = FastMath.sinCos(imaginary.twice()); T d = FastMath.cosh(real2).add(sc2i.cos()); return createComplex(FastMath.sinh(real2).divide(d), sc2i.sin().divide(d)); diff --git a/hipparchus-core/src/main/java/org/hipparchus/dfp/Dfp.java b/hipparchus-core/src/main/java/org/hipparchus/dfp/Dfp.java index fca403184..e04a70015 100644 --- a/hipparchus-core/src/main/java/org/hipparchus/dfp/Dfp.java +++ b/hipparchus-core/src/main/java/org/hipparchus/dfp/Dfp.java @@ -2217,7 +2217,7 @@ public Dfp sqrt() { dx = newInstance(x); dx.sign = -1; dx = dx.add(this.divide(x)); - dx = dx.divide(2); + dx = dx.half(); ppx = px; px = x; x = x.add(dx); @@ -2609,7 +2609,7 @@ public double toDouble() { Dfp tempDfp = DfpMath.pow(getTwo(), exponent); while (tempDfp.lessThan(y) || tempDfp.equals(y)) { - tempDfp = tempDfp.multiply(2); + tempDfp = tempDfp.twice(); exponent++; } exponent--; @@ -2993,7 +2993,7 @@ public Dfp asinh() { */ @Override public Dfp atanh() { - return getOne().add(this).divide(getOne().subtract(this)).log().divide(2); + return getOne().add(this).divide(getOne().subtract(this)).log().half(); } /** {@inheritDoc} */ diff --git a/hipparchus-core/src/main/java/org/hipparchus/dfp/DfpMath.java b/hipparchus-core/src/main/java/org/hipparchus/dfp/DfpMath.java index e3617296a..bc7ca67f3 100644 --- a/hipparchus-core/src/main/java/org/hipparchus/dfp/DfpMath.java +++ b/hipparchus-core/src/main/java/org/hipparchus/dfp/DfpMath.java @@ -357,8 +357,8 @@ public static Dfp log(Dfp a) { spy[0] = a.newInstance("1.33333"); // Use spy[0] for comparison while (spx[0].add(spx[1]).greaterThan(spy[0])) { - spx[0] = spx[0].divide(2); - spx[1] = spx[1].divide(2); + spx[0] = spx[0].half(); + spx[1] = spx[1].half(); p2++; } @@ -742,7 +742,7 @@ public static Dfp sin(final Dfp a) { boolean neg = false; /* First reduce the argument to the range of +/- PI */ - Dfp x = a.remainder(pi.multiply(2)); + Dfp x = a.remainder(pi.twice()); /* if x < 0 then apply identity sin(-x) = -sin(x) */ /* This puts x in the range 0 < x < PI */ @@ -755,7 +755,7 @@ public static Dfp sin(final Dfp a) { * 0 < x < pi/2 */ - if (x.greaterThan(pi.divide(2))) { + if (x.greaterThan(pi.half())) { x = pi.subtract(x); } @@ -765,8 +765,8 @@ public static Dfp sin(final Dfp a) { } else { final Dfp[] c = new Dfp[2]; final Dfp[] piSplit = a.getField().getPiSplit(); - c[0] = piSplit[0].divide(2).subtract(x); - c[1] = piSplit[1].divide(2); + c[0] = piSplit[0].half().subtract(x); + c[1] = piSplit[1].half(); y = cosInternal(c); } @@ -788,7 +788,7 @@ public static Dfp cos(Dfp a) { boolean neg = false; /* First reduce the argument to the range of +/- PI */ - Dfp x = a.remainder(pi.multiply(2)); + Dfp x = a.remainder(pi.twice()); /* if x < 0 then apply identity cos(-x) = cos(x) */ /* This puts x in the range 0 < x < PI */ @@ -800,7 +800,7 @@ public static Dfp cos(Dfp a) { * 0 < x < pi/2 */ - if (x.greaterThan(pi.divide(2))) { + if (x.greaterThan(pi.half())) { x = pi.subtract(x); neg = true; } @@ -815,8 +815,8 @@ public static Dfp cos(Dfp a) { } else { final Dfp[] c = new Dfp[2]; final Dfp[] piSplit = a.getField().getPiSplit(); - c[0] = piSplit[0].divide(2).subtract(x); - c[1] = piSplit[1].divide(2); + c[0] = piSplit[0].half().subtract(x); + c[1] = piSplit[1].half(); y = sinInternal(c); } @@ -924,7 +924,7 @@ public static Dfp atan(final Dfp a) { } if (recp) { - y = piSplit[0].divide(2).subtract(y).add(piSplit[1].divide(2)); + y = piSplit[0].half().subtract(y).add(piSplit[1].half()); } if (neg) { diff --git a/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/carlson/RcFieldDuplication.java b/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/carlson/RcFieldDuplication.java index c637fdb9c..a13d459db 100644 --- a/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/carlson/RcFieldDuplication.java +++ b/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/carlson/RcFieldDuplication.java @@ -38,7 +38,7 @@ class RcFieldDuplication> extends FieldDuplica /** {@inheritDoc} */ @Override protected void initialMeanPoint(final T[] va) { - va[2] = va[0].add(va[1].multiply(2)).divide(3.0); + va[2] = va[0].add(va[1].twice()).divide(3.0); } /** {@inheritDoc} */ @@ -50,7 +50,7 @@ protected T convergenceCriterion(final T r, final T max) { /** {@inheritDoc} */ @Override protected void update(final int m, final T[] vaM, final T[] sqrtM, final double fourM) { - final T lambdaA = sqrtM[0].multiply(sqrtM[1]).multiply(2); + final T lambdaA = sqrtM[0].multiply(sqrtM[1]).twice(); final T lambdaB = vaM[1]; vaM[0] = vaM[0].linearCombination(0.25, vaM[0], 0.25, lambdaA, 0.25, lambdaB); // xₘ vaM[1] = vaM[1].linearCombination(0.25, vaM[1], 0.25, lambdaA, 0.25, lambdaB); // yₘ diff --git a/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/carlson/RjFieldDuplication.java b/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/carlson/RjFieldDuplication.java index 10dfe1028..e558fbc4b 100644 --- a/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/carlson/RjFieldDuplication.java +++ b/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/carlson/RjFieldDuplication.java @@ -48,7 +48,7 @@ class RjFieldDuplication> extends FieldDuplica /** {@inheritDoc} */ @Override protected void initialMeanPoint(final T[] va) { - va[4] = va[0].add(va[1]).add(va[2]).add(va[3].multiply(2)).divide(5.0); + va[4] = va[0].add(va[1]).add(va[2]).add(va[3].twice()).divide(5.0); } /** {@inheritDoc} */ @@ -69,7 +69,7 @@ protected void update(final int m, final T[] vaM, final T[] sqrtM, final double // equation A.3 in Carlson[2000] final T rM = sM.multiply(delta.divide(sM.multiply(sM).multiply(fourM)).add(1.0).sqrt().add(1.0)); sM = dM.multiply(rM).subtract(delta.divide(fourM * fourM)). - divide(dM.add(rM.divide(fourM)).multiply(2)); + divide(dM.add(rM.divide(fourM)).twice()); } // equation 2.19 in Carlson[1995] @@ -102,8 +102,8 @@ protected T evaluate(final T[] va0, final T aM, final double fourM) { final T xyz = bigX.multiply(bigY).multiply(bigZ); final T e2 = bigX.multiply(bigY.add(bigZ)).add(bigY.multiply(bigZ)). subtract(bigP.multiply(bigP).multiply(3)); - final T e3 = xyz.add(bigP.multiply(2).multiply(e2.add(bigP2.multiply(2)))); - final T e4 = xyz.multiply(2).add(bigP.multiply(e2.add(bigP2.multiply(3)))).multiply(bigP); + final T e3 = xyz.add(bigP.twice().multiply(e2.add(bigP2.twice()))); + final T e4 = xyz.twice().add(bigP.multiply(e2.add(bigP2.multiply(3)))).multiply(bigP); final T e5 = xyz.multiply(bigP2); final T e2e2 = e2.multiply(e2); diff --git a/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/jacobi/FieldJacobiElliptic.java b/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/jacobi/FieldJacobiElliptic.java index bb71857f8..6a2bcf435 100644 --- a/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/jacobi/FieldJacobiElliptic.java +++ b/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/jacobi/FieldJacobiElliptic.java @@ -398,7 +398,7 @@ private T arcpq(final T x, final T deltaQP, final T deltaRQ) { final T w = x2.subtract(1).negate().divide(deltaQP); final T rf = CarlsonEllipticIntegral.rF(x2, x.getField().getOne(), deltaRQ.multiply(w).add(1)); final T positive = w.sqrt().multiply(rf); - return x.getReal() < 0 ? LegendreEllipticIntegral.bigK(getM()).multiply(2).subtract(positive) : positive; + return x.getReal() < 0 ? LegendreEllipticIntegral.bigK(getM()).twice().subtract(positive) : positive; } /** Evaluate inverse of Jacobi elliptic function pq. @@ -425,7 +425,7 @@ private T arcpqNoDivision(final T x, final T deltaQP, final T deltaRQ) { final T rf = CarlsonEllipticIntegral.rF(x2.multiply(deltaQP), deltaQP, deltaRQ.multiply(wDeltaQP).add(deltaQP)); final T positive = wDeltaQP.sqrt().multiply(rf); return FastMath.copySign(1.0, x.getReal()) < 0 ? - LegendreEllipticIntegral.bigK(getM()).multiply(2).subtract(positive) : + LegendreEllipticIntegral.bigK(getM()).twice().subtract(positive) : positive; } diff --git a/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/jacobi/FieldJacobiTheta.java b/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/jacobi/FieldJacobiTheta.java index eb4e9e94e..fbe3a2886 100644 --- a/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/jacobi/FieldJacobiTheta.java +++ b/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/jacobi/FieldJacobiTheta.java @@ -110,10 +110,10 @@ public FieldTheta values(final T z) { } - return new FieldTheta<>(sum1.multiply(qFourth.multiply(2)), - sum2.multiply(qFourth.multiply(2)), - sum3.multiply(2).add(1), - sum4.multiply(2).add(1)); + return new FieldTheta<>(sum1.multiply(qFourth.twice()), + sum2.multiply(qFourth.twice()), + sum3.twice().add(1), + sum4.twice().add(1)); } diff --git a/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/jacobi/JacobiTheta.java b/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/jacobi/JacobiTheta.java index d973a74e1..a2dafce5d 100644 --- a/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/jacobi/JacobiTheta.java +++ b/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/jacobi/JacobiTheta.java @@ -109,8 +109,8 @@ public Theta values(final Complex z) { return new Theta(sum1.multiply(2 * qFourth), sum2.multiply(2 * qFourth), - sum3.multiply(2).add(1), - sum4.multiply(2).add(1)); + sum3.twice().add(1), + sum4.twice().add(1)); } diff --git a/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/legendre/LegendreEllipticIntegral.java b/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/legendre/LegendreEllipticIntegral.java index 59b4fec48..d88095808 100644 --- a/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/legendre/LegendreEllipticIntegral.java +++ b/hipparchus-core/src/main/java/org/hipparchus/special/elliptic/legendre/LegendreEllipticIntegral.java @@ -367,7 +367,7 @@ public static double bigE(final double m) { public static > T bigE(final T m) { final T zero = m.getField().getZero(); final T one = m.getField().getOne(); - return CarlsonEllipticIntegral.rG(zero, one.subtract(m), one).multiply(2); + return CarlsonEllipticIntegral.rG(zero, one.subtract(m), one).twice(); } /** Get the complete elliptic integral of the second kind E(m). @@ -390,7 +390,7 @@ public static > T bigE(final T m) { public static Complex bigE(final Complex m) { return CarlsonEllipticIntegral.rG(Complex.ZERO, Complex.ONE.subtract(m), - Complex.ONE).multiply(2); + Complex.ONE).twice(); } /** Get the complete elliptic integral of the second kind E(m). @@ -414,7 +414,7 @@ public static Complex bigE(final Complex m) { public static > FieldComplex bigE(final FieldComplex m) { final FieldComplex zero = m.getField().getZero(); final FieldComplex one = m.getField().getOne(); - return CarlsonEllipticIntegral.rG(zero, one.subtract(m), one).multiply(2); + return CarlsonEllipticIntegral.rG(zero, one.subtract(m), one).twice(); } /** Get the complete elliptic integral D(m) = [K(m) - E(m)]/m. diff --git a/hipparchus-core/src/test/java/org/hipparchus/analysis/FieldFunctionsTest.java b/hipparchus-core/src/test/java/org/hipparchus/analysis/FieldFunctionsTest.java index 736281819..34bc5eb4f 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/analysis/FieldFunctionsTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/analysis/FieldFunctionsTest.java @@ -30,11 +30,11 @@ class FieldFunctionsTest { void testScalarUnivariateFunctionConversion() { FieldUnivariateFunction f1 = new FieldUnivariateFunction() { public > T value(T x) { - return x.multiply(2); + return x.twice(); } }; CalculusFieldUnivariateFunction f1Converted = f1.toCalculusFieldUnivariateFunction(Binary64Field.getInstance()); - CalculusFieldUnivariateFunction f2 = x -> x.multiply(2); + CalculusFieldUnivariateFunction f2 = x -> x.twice(); for (double x = 0; x < 1; x += 0.01) { assertEquals(f2.value(new Binary64(x)).getReal(), @@ -47,11 +47,11 @@ public > T value(T x) { void testScalarMultivariateFunctionConversion() { FieldMultivariateFunction f1 = new FieldMultivariateFunction() { public > T value(@SuppressWarnings("unchecked") T... x) { - return x[0].multiply(2).add(x[1]); + return x[0].twice().add(x[1]); } }; CalculusFieldMultivariateFunction f1Converted = f1.toCalculusFieldMultivariateFunction(Binary64Field.getInstance()); - CalculusFieldMultivariateFunction f2 = x -> x[0].multiply(2).add(x[1]); + CalculusFieldMultivariateFunction f2 = x -> x[0].twice().add(x[1]); for (double x0 = 0; x0 < 1; x0 += 0.01) { for (double x1 = 0; x1 < 1; x1 += 0.01) { @@ -68,14 +68,14 @@ void testVectorUnivariateFunctionConversion() { public > T[] value(T x) { T[] y = MathArrays.buildArray(x.getField(), 3); y[0] = x.add(1); - y[1] = x.multiply(2); + y[1] = x.twice(); y[2] = x.square(); return y; } }; CalculusFieldUnivariateVectorFunction f1Converted = f1.toCalculusFieldUnivariateVectorFunction(Binary64Field.getInstance()); CalculusFieldUnivariateVectorFunction f2 = x -> new Binary64[] { - x.add(1), x.multiply(2), x.square() + x.add(1), x.twice(), x.square() }; for (double x = 0; x < 1; x += 0.01) { @@ -93,14 +93,14 @@ void testVectorMultivariateFunctionConversion() { public > T[] value(@SuppressWarnings("unchecked") T... x) { T[] y = MathArrays.buildArray(x[0].getField(), 3); y[0] = x[0].add(1); - y[1] = x[1].multiply(2); + y[1] = x[1].twice(); y[2] = x[0].multiply(x[1]); return y; } }; CalculusFieldMultivariateVectorFunction f1Converted = f1.toCalculusFieldMultivariateVectorFunction(Binary64Field.getInstance()); CalculusFieldMultivariateVectorFunction f2 = x -> new Binary64[] { - x[0].add(1), x[1].multiply(2), x[0].multiply(x[1]) + x[0].add(1), x[1].twice(), x[0].multiply(x[1]) }; for (double x0 = 0; x0 < 1; x0 += 0.01) { @@ -120,7 +120,7 @@ void testMatrixUnivariateFunctionConversion() { public > T[][] value(T x) { T[][] y = MathArrays.buildArray(x.getField(), 2, 2); y[0][0] = x.add(1); - y[0][1] = x.multiply(2); + y[0][1] = x.twice(); y[1][0] = x.square(); y[1][1] = x.sin(); return y; @@ -128,7 +128,7 @@ public > T[][] value(T x) { }; CalculusFieldUnivariateMatrixFunction f1Converted = f1.toCalculusFieldUnivariateMatrixFunction(Binary64Field.getInstance()); CalculusFieldUnivariateMatrixFunction f2 = x -> new Binary64[][] { - { x.add(1), x.multiply(2) }, + { x.add(1), x.twice() }, { x.square(), x.sin() } }; @@ -149,7 +149,7 @@ void testMatrixMultivariateFunctionConversion() { public > T[][] value(@SuppressWarnings("unchecked") T... x) { T[][] y = MathArrays.buildArray(x[0].getField(), 2, 2); y[0][0] = x[0].add(1); - y[0][1] = x[1].multiply(2); + y[0][1] = x[1].twice(); y[1][0] = x[0].multiply(x[1]); y[1][1] = x[1].sin(); return y; @@ -157,7 +157,7 @@ public > T[][] value(@SuppressWarnings("unchec }; CalculusFieldMultivariateMatrixFunction f1Converted = f1.toCalculusFieldMultivariateMatrixFunction(Binary64Field.getInstance()); CalculusFieldMultivariateMatrixFunction f2 = x -> new Binary64[][] { - { x[0].add(1), x[1].multiply(2) }, + { x[0].add(1), x[1].twice() }, { x[0].multiply(x[1]), x[1].sin() } }; diff --git a/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/DerivativeStructureTest.java b/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/DerivativeStructureTest.java index e34e20f3e..b973c1475 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/DerivativeStructureTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/DerivativeStructureTest.java @@ -2096,7 +2096,7 @@ void testDivisionVersusAlternativeImplementation() { void testReciprocalVersusAlternativeImplementation() { final DSFactory factory = new DSFactory(2, 15); final DerivativeStructure operand = factory.variable(0, 1.). - add(factory.variable(1, 0.).multiply(2.)); + add(factory.variable(1, 0.).twice()); compareReciprocalToVersionViaPower(operand, 1e-15); } diff --git a/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/FieldDerivativeStructureAbstractTest.java b/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/FieldDerivativeStructureAbstractTest.java index a8781edc0..36507cea1 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/FieldDerivativeStructureAbstractTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/FieldDerivativeStructureAbstractTest.java @@ -290,9 +290,9 @@ public void testFieldDivide() { public void testPrimitiveDivide() { for (int maxOrder = 1; maxOrder < 5; ++maxOrder) { final FDSFactory factory = buildFactory(3, maxOrder); - checkF0F1(factory.variable(0, 1.0).divide(2), 0.5, 0.5, 0.0, 0.0); - checkF0F1(factory.variable(1, 2.0).divide(2), 1.0, 0.0, 0.5, 0.0); - checkF0F1(factory.variable(2, 3.0).divide(2), 1.5, 0.0, 0.0, 0.5); + checkF0F1(factory.variable(0, 1.0).half(), 0.5, 0.5, 0.0, 0.0); + checkF0F1(factory.variable(1, 2.0).half(), 1.0, 0.0, 0.5, 0.0); + checkF0F1(factory.variable(2, 3.0).half(), 1.5, 0.0, 0.0, 0.5); } } diff --git a/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/FieldGradientAbstractTest.java b/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/FieldGradientAbstractTest.java index d7a23f705..2385e3cd0 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/FieldGradientAbstractTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/FieldGradientAbstractTest.java @@ -283,7 +283,7 @@ public void testArithmeticVsDS() { new FieldUnivariateFunction() { public > S value(S x) { final S y = x.add(3).multiply(x).subtract(5).multiply(0.5); - return y.negate().divide(4).divide(x).add(y).subtract(x).multiply(2).reciprocal(); + return y.negate().divide(4).divide(x).add(y).subtract(x).twice().reciprocal(); } }); } @@ -379,7 +379,7 @@ public void testHypotVsDS() { checkAgainstDS(x, new FieldUnivariateFunction() { public > S value(S x) { - return x.cos().multiply(5).hypot(x.sin().multiply(2)); + return x.cos().multiply(5).hypot(x.sin().twice()); } }); } @@ -391,7 +391,7 @@ public void testAtan2VsDS() { checkAgainstDS(x, new FieldUnivariateFunction() { public > S value(S x) { - return x.cos().multiply(5).atan2(x.sin().multiply(2)); + return x.cos().multiply(5).atan2(x.sin().twice()); } }); } diff --git a/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/FieldUnivariateDerivative1AbstractTest.java b/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/FieldUnivariateDerivative1AbstractTest.java index 84809eff3..843c0ccf7 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/FieldUnivariateDerivative1AbstractTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/FieldUnivariateDerivative1AbstractTest.java @@ -202,7 +202,7 @@ public void testArithmeticVsDS() { new FieldUnivariateFunction() { public > S value(S x) { final S y = x.add(3).multiply(x).subtract(5).multiply(0.5); - return y.negate().divide(4).divide(x).add(y).subtract(x).multiply(2).reciprocal(); + return y.negate().divide(4).divide(x).add(y).subtract(x).twice().reciprocal(); } }); } @@ -277,7 +277,7 @@ public void testHypotVsDS() { checkAgainstDS(x, new FieldUnivariateFunction() { public > S value(S x) { - return x.cos().multiply(5).hypot(x.sin().multiply(2)); + return x.cos().multiply(5).hypot(x.sin().twice()); } }); } @@ -289,7 +289,7 @@ public void testAtan2VsDS() { checkAgainstDS(x, new FieldUnivariateFunction() { public > S value(S x) { - return x.cos().multiply(5).atan2(x.sin().multiply(2)); + return x.cos().multiply(5).atan2(x.sin().twice()); } }); } diff --git a/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/FieldUnivariateDerivative2AbstractTest.java b/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/FieldUnivariateDerivative2AbstractTest.java index e15f840a1..9d495e833 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/FieldUnivariateDerivative2AbstractTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/FieldUnivariateDerivative2AbstractTest.java @@ -168,7 +168,7 @@ public void testArithmeticVsDS() { new FieldUnivariateFunction() { public > S value(S x) { final S y = x.add(3).multiply(x).subtract(5).multiply(0.5); - return y.negate().divide(4).divide(x).add(y).subtract(x).multiply(2).reciprocal(); + return y.negate().divide(4).divide(x).add(y).subtract(x).twice().reciprocal(); } }); } @@ -277,7 +277,7 @@ public void testHypotVsDS() { checkAgainstDS(x, new FieldUnivariateFunction() { public > S value(S x) { - return x.cos().multiply(5).hypot(x.sin().multiply(2)); + return x.cos().multiply(5).hypot(x.sin().twice()); } }); } @@ -289,7 +289,7 @@ public void testAtan2VsDS() { checkAgainstDS(x, new FieldUnivariateFunction() { public > S value(S x) { - return x.cos().multiply(5).atan2(x.sin().multiply(2)); + return x.cos().multiply(5).atan2(x.sin().twice()); } }); } diff --git a/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/FiniteDifferencesDifferentiatorTest.java b/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/FiniteDifferencesDifferentiatorTest.java index 7354ac844..80bf90597 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/FiniteDifferencesDifferentiatorTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/FiniteDifferencesDifferentiatorTest.java @@ -423,7 +423,7 @@ void testSeveralFreeParameters() { for (double y = -2; y < 2; y += 0.1) { DerivativeStructure dsX = factory.variable(0, x); DerivativeStructure dsY = factory.variable(1, y); - DerivativeStructure dsT = dsX.multiply(3).subtract(dsY.multiply(2)); + DerivativeStructure dsT = dsX.multiply(3).subtract(dsY.twice()); DerivativeStructure sRef = sine.value(dsT); DerivativeStructure s = f.value(dsT); for (int xOrder = 0; xOrder <= sRef.getOrder(); ++xOrder) { diff --git a/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/GradientTest.java b/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/GradientTest.java index 70914c62b..2c5cfe210 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/GradientTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/GradientTest.java @@ -269,7 +269,7 @@ void testArithmeticVsDS() { new FieldUnivariateFunction() { public > S value(S x) { final S y = x.add(3).multiply(x).subtract(5).multiply(0.5); - return y.negate().divide(4).divide(x).add(y).subtract(x).multiply(2).reciprocal(); + return y.negate().divide(4).divide(x).add(y).subtract(x).twice().reciprocal(); } }); } @@ -317,7 +317,7 @@ void testHypotVsDS() { checkAgainstDS(x, new FieldUnivariateFunction() { public > S value(S x) { - return x.cos().multiply(5).hypot(x.sin().multiply(2)); + return x.cos().multiply(5).hypot(x.sin().twice()); } }); } @@ -329,7 +329,7 @@ void testAtan2VsDS() { checkAgainstDS(x, new FieldUnivariateFunction() { public > S value(S x) { - return x.cos().multiply(5).atan2(x.sin().multiply(2)); + return x.cos().multiply(5).atan2(x.sin().twice()); } }); } diff --git a/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/UnivariateDerivativeAbstractTest.java b/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/UnivariateDerivativeAbstractTest.java index 5642e7908..00ee8097c 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/UnivariateDerivativeAbstractTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/UnivariateDerivativeAbstractTest.java @@ -128,7 +128,7 @@ public void testArithmeticVsDS() { new FieldUnivariateFunction() { public > S value(S x) { final S y = x.add(3).multiply(x).subtract(5).multiply(0.5); - return y.negate().divide(4).divide(x).add(y).subtract(x).multiply(2).reciprocal(); + return y.negate().divide(4).divide(x).add(y).subtract(x).twice().reciprocal(); } }); } @@ -203,7 +203,7 @@ public void testHypotVsDS() { checkAgainstDS(x, new FieldUnivariateFunction() { public > S value(S x) { - return x.cos().multiply(5).hypot(x.sin().multiply(2)); + return x.cos().multiply(5).hypot(x.sin().twice()); } }); } @@ -215,7 +215,7 @@ public void testAtan2VsDS() { checkAgainstDS(x, new FieldUnivariateFunction() { public > S value(S x) { - return x.cos().multiply(5).atan2(x.sin().multiply(2)); + return x.cos().multiply(5).atan2(x.sin().twice()); } }); } diff --git a/hipparchus-core/src/test/java/org/hipparchus/analysis/interpolation/AkimaSplineInterpolatorTest.java b/hipparchus-core/src/test/java/org/hipparchus/analysis/interpolation/AkimaSplineInterpolatorTest.java index 96b78f4bc..93607dd74 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/analysis/interpolation/AkimaSplineInterpolatorTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/analysis/interpolation/AkimaSplineInterpolatorTest.java @@ -244,7 +244,7 @@ void testInterpolateLineD64() final double interpolationTolerance = 1e-15; final double maxTolerance = 1e-15; - CalculusFieldUnivariateFunction f = x -> x.multiply(2).subtract(5); + CalculusFieldUnivariateFunction f = x -> x.twice().subtract(5); testInterpolation( minimumX, maximumX, numberOfElements, numberOfSamples, f, interpolationTolerance, maxTolerance ); diff --git a/hipparchus-core/src/test/java/org/hipparchus/analysis/interpolation/BilinearInterpolatorTest.java b/hipparchus-core/src/test/java/org/hipparchus/analysis/interpolation/BilinearInterpolatorTest.java index e427d24a6..60592870a 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/analysis/interpolation/BilinearInterpolatorTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/analysis/interpolation/BilinearInterpolatorTest.java @@ -75,7 +75,7 @@ void testLinear() { CalculusFieldBivariateFunction fT = new FieldBivariateFunction() { @Override public > T value(T x, T y) { - return x.multiply(2).subtract(y); + return x.twice().subtract(y); } }.toCalculusFieldBivariateFunction(Binary64Field.getInstance()); BilinearInterpolatingFunction bif = createInterpolatingFunction(xVal, yVal, f); diff --git a/hipparchus-core/src/test/java/org/hipparchus/analysis/interpolation/FieldBilinearInterpolatingFunctionTest.java b/hipparchus-core/src/test/java/org/hipparchus/analysis/interpolation/FieldBilinearInterpolatingFunctionTest.java index 8cd4ce49f..710be46a2 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/analysis/interpolation/FieldBilinearInterpolatingFunctionTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/analysis/interpolation/FieldBilinearInterpolatingFunctionTest.java @@ -73,7 +73,7 @@ void testLinear() { int ny = 15; UnivariateDerivative1[] yVal = createLinearGrid(yMin, yMax, ny, 2.0); - CalculusFieldBivariateFunction f = (x, y) -> x.multiply(2).subtract(y); + CalculusFieldBivariateFunction f = (x, y) -> x.twice().subtract(y); FieldBilinearInterpolatingFunction bif = createInterpolatingFunction(xVal, yVal, f); assertEquals(xMin, bif.getXInf().getValue(), 1.0e-15); diff --git a/hipparchus-core/src/test/java/org/hipparchus/analysis/interpolation/FieldHermiteInterpolatorTest.java b/hipparchus-core/src/test/java/org/hipparchus/analysis/interpolation/FieldHermiteInterpolatorTest.java index 2738be27a..ea50e7d61 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/analysis/interpolation/FieldHermiteInterpolatorTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/analysis/interpolation/FieldHermiteInterpolatorTest.java @@ -180,7 +180,7 @@ void testRandomPolynomialsFirstDerivative() { y[k].getReal(), 1.0e-8 * FastMath.abs(p[k].value(x.getReal()))); assertEquals(pPrime[k].value(x.getReal()), - yP[k].subtract(yM[k]).divide(h.multiply(2)).getReal(), + yP[k].subtract(yM[k]).divide(h.twice()).getReal(), 4.0e-8 * FastMath.abs(p[k].value(x.getReal()))); } } diff --git a/hipparchus-core/src/test/java/org/hipparchus/analysis/interpolation/PiecewiseBicubicSplineInterpolatingFunctionTest.java b/hipparchus-core/src/test/java/org/hipparchus/analysis/interpolation/PiecewiseBicubicSplineInterpolatingFunctionTest.java index f3f76cedd..045e1a272 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/analysis/interpolation/PiecewiseBicubicSplineInterpolatingFunctionTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/analysis/interpolation/PiecewiseBicubicSplineInterpolatingFunctionTest.java @@ -192,7 +192,7 @@ void testPlane() { // Function values BivariateFunction f = (x, y) -> 2 * x - 3 * y + 5; - CalculusFieldBivariateFunction fT = (x, y) -> x.multiply(2).subtract(y.multiply(3)).add(5); + CalculusFieldBivariateFunction fT = (x, y) -> x.twice().subtract(y.multiply(3)).add(5); testInterpolation(minimumX, maximumX, @@ -224,7 +224,7 @@ void testParabaloid() { // Function values BivariateFunction f = (x, y) -> 2 * x * x - 3 * y * y + 4 * x * y - 5; - CalculusFieldBivariateFunction fT = (x, y) -> x.square().multiply(2). + CalculusFieldBivariateFunction fT = (x, y) -> x.square().twice(). subtract(y.square().multiply(3)). add(x.multiply(y).multiply(4)). subtract(5); diff --git a/hipparchus-core/src/test/java/org/hipparchus/analysis/polynomials/FieldPolynomialFunctionLagrangeFormTest.java b/hipparchus-core/src/test/java/org/hipparchus/analysis/polynomials/FieldPolynomialFunctionLagrangeFormTest.java index 76aba7e31..c1661834f 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/analysis/polynomials/FieldPolynomialFunctionLagrangeFormTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/analysis/polynomials/FieldPolynomialFunctionLagrangeFormTest.java @@ -54,7 +54,7 @@ void testExceptionOrder() { void testGetter() { // GIVEN final Binary64Field field = Binary64Field.getInstance(); - Binary64[] x = { field.getOne(), field.getOne().multiply(2) }; + Binary64[] x = { field.getOne(), field.getOne().twice() }; Binary64[] y = { field.getOne().negate(), field.getOne().multiply(4.) }; final FieldPolynomialFunctionLagrangeForm lagrangeForm = new FieldPolynomialFunctionLagrangeForm<>(x, y); // WHEN & THEN @@ -70,7 +70,7 @@ void testGetter() { void testGetCoefficients() { // GIVEN final Binary64Field field = Binary64Field.getInstance(); - Binary64[] x = { field.getOne(), field.getOne().multiply(2) }; + Binary64[] x = { field.getOne(), field.getOne().twice() }; Binary64[] y = { field.getOne().negate(), field.getOne().multiply(4.) }; final FieldPolynomialFunctionLagrangeForm lagrangeForm = new FieldPolynomialFunctionLagrangeForm<>(x, y); // WHEN diff --git a/hipparchus-core/src/test/java/org/hipparchus/analysis/solvers/FieldBracketingNthOrderBrentSolverTest.java b/hipparchus-core/src/test/java/org/hipparchus/analysis/solvers/FieldBracketingNthOrderBrentSolverTest.java index a0084a583..e8b54adaa 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/analysis/solvers/FieldBracketingNthOrderBrentSolverTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/analysis/solvers/FieldBracketingNthOrderBrentSolverTest.java @@ -70,7 +70,7 @@ void testConvergenceOnFunctionAccuracy() { FieldUnivariateFunction f = new FieldUnivariateFunction() { public > T value(T x) { T one = x.getField().getOne(); - T oneHalf = one.divide(2); + T oneHalf = one.half(); T xMo = x.subtract(one); T xMh = x.subtract(oneHalf); T xPh = x.add(oneHalf); @@ -117,7 +117,7 @@ void testNeta() { for (AllowedSolution allowed : AllowedSolution.values()) { check(new CalculusFieldUnivariateFunction() { public Dfp value(Dfp x) { - return DfpMath.sin(x).subtract(x.divide(2)); + return DfpMath.sin(x).subtract(x.half()); } }, 200, -2.0, 2.0, allowed); @@ -164,7 +164,7 @@ private void check(CalculusFieldUnivariateFunction f, int maxEval, double m Dfp yResult = f.value(xResult); switch (allowedSolution) { case ANY_SIDE : - assertTrue(yResult.abs().lessThan(functionValueAccuracy.multiply(2))); + assertTrue(yResult.abs().lessThan(functionValueAccuracy.twice())); break; case LEFT_SIDE : { boolean increasing = f.value(xResult).add(absoluteAccuracy).greaterThan(yResult); diff --git a/hipparchus-core/src/test/java/org/hipparchus/complex/FieldComplexTest.java b/hipparchus-core/src/test/java/org/hipparchus/complex/FieldComplexTest.java index 3e4ca92dc..f9c0c0e97 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/complex/FieldComplexTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/complex/FieldComplexTest.java @@ -1529,7 +1529,7 @@ void testSqrtPolar() { for (int j =0; j < 11; j++) { theta = theta.add(FastMath.PI / 12); FieldComplex z = ComplexUtils.polar2Complex(r, theta); - FieldComplex sqrtz = ComplexUtils.polar2Complex(FastMath.sqrt(r), theta.divide(2)); + FieldComplex sqrtz = ComplexUtils.polar2Complex(FastMath.sqrt(r), theta.half()); UnitTestUtils.customAssertEquals(sqrtz, z.sqrt(), 10e-12); } } diff --git a/hipparchus-core/src/test/java/org/hipparchus/dfp/DfpMathTest.java b/hipparchus-core/src/test/java/org/hipparchus/dfp/DfpMathTest.java index a460ea905..8a48fb56f 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/dfp/DfpMathTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/dfp/DfpMathTest.java @@ -500,15 +500,15 @@ void testSin() factory.newDfp("-0"), DfpField.FLAG_INEXACT, "sin #5"); - test(DfpMath.sin(factory.getPi().multiply(2)), + test(DfpMath.sin(factory.getPi().twice()), factory.getZero(), DfpField.FLAG_INEXACT, "sin #6"); - test(DfpMath.sin(factory.getPi().divide(2)), + test(DfpMath.sin(factory.getPi().half()), factory.getOne(), DfpField.FLAG_INEXACT, "sin #7"); - test(DfpMath.sin(factory.getPi().divide(2).negate()), + test(DfpMath.sin(factory.getPi().half().negate()), factory.getOne().negate(), DfpField.FLAG_INEXACT, "sin #8"); diff --git a/hipparchus-core/src/test/java/org/hipparchus/dfp/DfpTest.java b/hipparchus-core/src/test/java/org/hipparchus/dfp/DfpTest.java index 65c2bbc37..4b5eae42b 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/dfp/DfpTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/dfp/DfpTest.java @@ -855,7 +855,7 @@ void testMultiply() pinf, 0, "Multiply #18.1"); - test(field.newDfp("5e131071").multiply(2), + test(field.newDfp("5e131071").twice(), pinf, DfpField.FLAG_OVERFLOW, "Multiply #19"); @@ -863,7 +863,7 @@ void testMultiply() field.newDfp("9.9999999999999950000e131071"), 0, "Multiply #20"); - test(field.newDfp("-5e131071").multiply(2), + test(field.newDfp("-5e131071").twice(), ninf, DfpField.FLAG_OVERFLOW, "Multiply #22"); @@ -1881,7 +1881,7 @@ void testUlpdDfpB() { Dfp one = field.getOne(); Dfp ulp = one.ulp(); assertTrue(one.add(ulp).greaterThan(one)); - assertFalse(one.add(ulp.divide(2)).greaterThan(one)); + assertFalse(one.add(ulp.half()).greaterThan(one)); } @Test diff --git a/hipparchus-core/src/test/java/org/hipparchus/linear/EigenDecompositionNonSymmetricTest.java b/hipparchus-core/src/test/java/org/hipparchus/linear/EigenDecompositionNonSymmetricTest.java index 9e4ffa162..c3e4c71c8 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/linear/EigenDecompositionNonSymmetricTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/linear/EigenDecompositionNonSymmetricTest.java @@ -272,7 +272,7 @@ void testZeroDivide() { Complex isqrt2 = new Complex(1 / FastMath.sqrt(2.0)); checkEigenVector((new Complex[] { new Complex(0.0), isqrt2.negate(), isqrt2.negate() }), ed, 1E-12); Complex isqrt6 = new Complex(1 / FastMath.sqrt(6.0)); - checkEigenVector((new Complex[] { isqrt6.multiply(2), isqrt6.negate(), isqrt6 }), ed, 1E-12); + checkEigenVector((new Complex[] { isqrt6.twice(), isqrt6.negate(), isqrt6 }), ed, 1E-12); } /** test eigenvalues for a big matrix. */ diff --git a/hipparchus-core/src/test/java/org/hipparchus/special/ErfTest.java b/hipparchus-core/src/test/java/org/hipparchus/special/ErfTest.java index 6112290de..3f8838e10 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/special/ErfTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/special/ErfTest.java @@ -210,7 +210,7 @@ void testLargeValuesField() { } assertEquals(one.negate().getReal(), Erf.erf(new Binary64(Double.NEGATIVE_INFINITY)).getReal(), 0); assertEquals(one.getReal(), Erf.erf(new Binary64(Double.POSITIVE_INFINITY)).getReal(), 0); - assertEquals(one.multiply(2).getReal(), new Binary64(Erf.erfc(Double.NEGATIVE_INFINITY)).getReal(), 0); + assertEquals(one.twice().getReal(), new Binary64(Erf.erfc(Double.NEGATIVE_INFINITY)).getReal(), 0); assertEquals(zero.getReal(), Erf.erfc(new Binary64(Double.POSITIVE_INFINITY)).getReal(), 0); } diff --git a/hipparchus-core/src/test/java/org/hipparchus/special/elliptic/jacobi/FieldJacobiThetaTest.java b/hipparchus-core/src/test/java/org/hipparchus/special/elliptic/jacobi/FieldJacobiThetaTest.java index bf12ab7aa..be8e712e5 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/special/elliptic/jacobi/FieldJacobiThetaTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/special/elliptic/jacobi/FieldJacobiThetaTest.java @@ -50,7 +50,7 @@ private > void doTestRealZero(Field field) final T t3Ref = field.getOne().add(q. add(FastMath.pow(q, 4)). add(FastMath.pow(q, 9)). - add(FastMath.pow(q, 16)).multiply(2)); + add(FastMath.pow(q, 16)).twice()); final T theta3 = new FieldJacobiTheta<>(q).values(field.getZero()).theta3(); assertEquals(t3Ref.getReal(), theta3.getReal(), 1.0e-12); } diff --git a/hipparchus-core/src/test/java/org/hipparchus/special/elliptic/jacobi/JacobiEllipticComplexTest.java b/hipparchus-core/src/test/java/org/hipparchus/special/elliptic/jacobi/JacobiEllipticComplexTest.java index 79f7b44fc..e618459eb 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/special/elliptic/jacobi/JacobiEllipticComplexTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/special/elliptic/jacobi/JacobiEllipticComplexTest.java @@ -127,7 +127,7 @@ void testWolframArcsn() { // so despite we don't provide the same result as Wolfram, we provide a correct result Complex wolframZ = new Complex(0.94236298773531348838, 1.92822841948038407820); Complex k = LegendreEllipticIntegral.bigK(je.getM()); - UnitTestUtils.customAssertEquals(k.multiply(2).subtract(wolframZ), je.arcsn(new Complex(2.5, -0.1)), 1.0e-15); + UnitTestUtils.customAssertEquals(k.twice().subtract(wolframZ), je.arcsn(new Complex(2.5, -0.1)), 1.0e-15); } @Test @@ -154,7 +154,7 @@ void testWolframArccs() { // so despite we don't provide the same result as Wolfram, we provide a correct result final Complex wolframZ = new Complex(-3.0359823836145783448, -0.1010810531387431972); final Complex k = LegendreEllipticIntegral.bigK(je.getM()); - final Complex period = k.multiply(2); + final Complex period = k.twice(); UnitTestUtils.customAssertEquals(wolframZ.add(period), je.arccs(new Complex(2.5, -0.1)), 1.0e-15); } @@ -167,7 +167,7 @@ void testWolframArcds() { final Complex wolframZ = new Complex(-3.29799820949072209724, -4.202477914142034207); final Complex k = LegendreEllipticIntegral.bigK(je.getM()); final Complex kPrime = LegendreEllipticIntegral.bigKPrime(je.getM()); - final Complex period = k.add(kPrime.multiplyPlusI()).multiply(2); + final Complex period = k.add(kPrime.multiplyPlusI()).twice(); UnitTestUtils.customAssertEquals(wolframZ.add(period), je.arcds(new Complex(2.5, -0.1)), 1.0e-15); } diff --git a/hipparchus-core/src/test/java/org/hipparchus/util/FastMathTest.java b/hipparchus-core/src/test/java/org/hipparchus/util/FastMathTest.java index fe16b7912..dc5c50342 100644 --- a/hipparchus-core/src/test/java/org/hipparchus/util/FastMathTest.java +++ b/hipparchus-core/src/test/java/org/hipparchus/util/FastMathTest.java @@ -1088,11 +1088,11 @@ void testAsinSpecialCases() { } private Dfp cosh(Dfp x) { - return DfpMath.exp(x).add(DfpMath.exp(x.negate())).divide(2); + return DfpMath.exp(x).add(DfpMath.exp(x.negate())).half(); } private Dfp sinh(Dfp x) { - return DfpMath.exp(x).subtract(DfpMath.exp(x.negate())).divide(2); + return DfpMath.exp(x).subtract(DfpMath.exp(x.negate())).half(); } private Dfp tanh(Dfp x) { diff --git a/hipparchus-geometry/src/main/java/org/hipparchus/geometry/euclidean/threed/FieldRotation.java b/hipparchus-geometry/src/main/java/org/hipparchus/geometry/euclidean/threed/FieldRotation.java index f56ae5e33..251f49f2b 100644 --- a/hipparchus-geometry/src/main/java/org/hipparchus/geometry/euclidean/threed/FieldRotation.java +++ b/hipparchus-geometry/src/main/java/org/hipparchus/geometry/euclidean/threed/FieldRotation.java @@ -483,11 +483,11 @@ public FieldVector3D getAxis(final RotationConvention convention) { */ public T getAngle() { if ((q0.getReal() < -0.1) || (q0.getReal() > 0.1)) { - return q1.square().add(q2.square()).add(q3.square()).sqrt().asin().multiply(2); + return q1.square().add(q2.square()).add(q3.square()).sqrt().asin().twice(); } else if (q0.getReal() < 0) { - return q0.negate().acos().multiply(2); + return q0.negate().acos().twice(); } - return q0.acos().multiply(2); + return q0.acos().twice(); } /** Get the Cardan or Euler angles corresponding to the instance. @@ -546,17 +546,17 @@ public T[][] getMatrix() { // create the matrix final T[][] m = MathArrays.buildArray(q0.getField(), 3, 3); - m [0][0] = q0q0.add(q1q1).multiply(2).subtract(1); - m [1][0] = q1q2.subtract(q0q3).multiply(2); - m [2][0] = q1q3.add(q0q2).multiply(2); + m [0][0] = q0q0.add(q1q1).twice().subtract(1); + m [1][0] = q1q2.subtract(q0q3).twice(); + m [2][0] = q1q3.add(q0q2).twice(); - m [0][1] = q1q2.add(q0q3).multiply(2); - m [1][1] = q0q0.add(q2q2).multiply(2).subtract(1); - m [2][1] = q2q3.subtract(q0q1).multiply(2); + m [0][1] = q1q2.add(q0q3).twice(); + m [1][1] = q0q0.add(q2q2).twice().subtract(1); + m [2][1] = q2q3.subtract(q0q1).twice(); - m [0][2] = q1q3.subtract(q0q2).multiply(2); - m [1][2] = q2q3.add(q0q1).multiply(2); - m [2][2] = q0q0.add(q3q3).multiply(2).subtract(1); + m [0][2] = q1q3.subtract(q0q2).twice(); + m [1][2] = q2q3.add(q0q1).twice(); + m [2][2] = q0q0.add(q3q3).twice().subtract(1); return m; @@ -581,9 +581,9 @@ public FieldVector3D applyTo(final FieldVector3D u) { final T s = q1.multiply(x).add(q2.multiply(y)).add(q3.multiply(z)); - return new FieldVector3D<>(q0.multiply(x.multiply(q0).subtract(q2.multiply(z).subtract(q3.multiply(y)))).add(s.multiply(q1)).multiply(2).subtract(x), - q0.multiply(y.multiply(q0).subtract(q3.multiply(x).subtract(q1.multiply(z)))).add(s.multiply(q2)).multiply(2).subtract(y), - q0.multiply(z.multiply(q0).subtract(q1.multiply(y).subtract(q2.multiply(x)))).add(s.multiply(q3)).multiply(2).subtract(z)); + return new FieldVector3D<>(q0.multiply(x.multiply(q0).subtract(q2.multiply(z).subtract(q3.multiply(y)))).add(s.multiply(q1)).twice().subtract(x), + q0.multiply(y.multiply(q0).subtract(q3.multiply(x).subtract(q1.multiply(z)))).add(s.multiply(q2)).twice().subtract(y), + q0.multiply(z.multiply(q0).subtract(q1.multiply(y).subtract(q2.multiply(x)))).add(s.multiply(q3)).twice().subtract(z)); } @@ -599,9 +599,9 @@ public FieldVector3D applyTo(final Vector3D u) { final T s = q1.multiply(x).add(q2.multiply(y)).add(q3.multiply(z)); - return new FieldVector3D<>(q0.multiply(q0.multiply(x).subtract(q2.multiply(z).subtract(q3.multiply(y)))).add(s.multiply(q1)).multiply(2).subtract(x), - q0.multiply(q0.multiply(y).subtract(q3.multiply(x).subtract(q1.multiply(z)))).add(s.multiply(q2)).multiply(2).subtract(y), - q0.multiply(q0.multiply(z).subtract(q1.multiply(y).subtract(q2.multiply(x)))).add(s.multiply(q3)).multiply(2).subtract(z)); + return new FieldVector3D<>(q0.multiply(q0.multiply(x).subtract(q2.multiply(z).subtract(q3.multiply(y)))).add(s.multiply(q1)).twice().subtract(x), + q0.multiply(q0.multiply(y).subtract(q3.multiply(x).subtract(q1.multiply(z)))).add(s.multiply(q2)).twice().subtract(y), + q0.multiply(q0.multiply(z).subtract(q1.multiply(y).subtract(q2.multiply(x)))).add(s.multiply(q3)).twice().subtract(z)); } @@ -618,9 +618,9 @@ public void applyTo(final T[] in, final T[] out) { final T s = q1.multiply(x).add(q2.multiply(y)).add(q3.multiply(z)); - out[0] = q0.multiply(x.multiply(q0).subtract(q2.multiply(z).subtract(q3.multiply(y)))).add(s.multiply(q1)).multiply(2).subtract(x); - out[1] = q0.multiply(y.multiply(q0).subtract(q3.multiply(x).subtract(q1.multiply(z)))).add(s.multiply(q2)).multiply(2).subtract(y); - out[2] = q0.multiply(z.multiply(q0).subtract(q1.multiply(y).subtract(q2.multiply(x)))).add(s.multiply(q3)).multiply(2).subtract(z); + out[0] = q0.multiply(x.multiply(q0).subtract(q2.multiply(z).subtract(q3.multiply(y)))).add(s.multiply(q1)).twice().subtract(x); + out[1] = q0.multiply(y.multiply(q0).subtract(q3.multiply(x).subtract(q1.multiply(z)))).add(s.multiply(q2)).twice().subtract(y); + out[2] = q0.multiply(z.multiply(q0).subtract(q1.multiply(y).subtract(q2.multiply(x)))).add(s.multiply(q3)).twice().subtract(z); } @@ -636,9 +636,9 @@ public void applyTo(final double[] in, final T[] out) { final T s = q1.multiply(x).add(q2.multiply(y)).add(q3.multiply(z)); - out[0] = q0.multiply(q0.multiply(x).subtract(q2.multiply(z).subtract(q3.multiply(y)))).add(s.multiply(q1)).multiply(2).subtract(x); - out[1] = q0.multiply(q0.multiply(y).subtract(q3.multiply(x).subtract(q1.multiply(z)))).add(s.multiply(q2)).multiply(2).subtract(y); - out[2] = q0.multiply(q0.multiply(z).subtract(q1.multiply(y).subtract(q2.multiply(x)))).add(s.multiply(q3)).multiply(2).subtract(z); + out[0] = q0.multiply(q0.multiply(x).subtract(q2.multiply(z).subtract(q3.multiply(y)))).add(s.multiply(q1)).twice().subtract(x); + out[1] = q0.multiply(q0.multiply(y).subtract(q3.multiply(x).subtract(q1.multiply(z)))).add(s.multiply(q2)).twice().subtract(y); + out[2] = q0.multiply(q0.multiply(z).subtract(q1.multiply(y).subtract(q2.multiply(x)))).add(s.multiply(q3)).twice().subtract(z); } @@ -656,9 +656,9 @@ public static > FieldVector3D applyTo(final final T s = x.multiply(r.getQ1()).add(y.multiply(r.getQ2())).add(z.multiply(r.getQ3())); - return new FieldVector3D<>(x.multiply(r.getQ0()).subtract(z.multiply(r.getQ2()).subtract(y.multiply(r.getQ3()))).multiply(r.getQ0()).add(s.multiply(r.getQ1())).multiply(2).subtract(x), - y.multiply(r.getQ0()).subtract(x.multiply(r.getQ3()).subtract(z.multiply(r.getQ1()))).multiply(r.getQ0()).add(s.multiply(r.getQ2())).multiply(2).subtract(y), - z.multiply(r.getQ0()).subtract(y.multiply(r.getQ1()).subtract(x.multiply(r.getQ2()))).multiply(r.getQ0()).add(s.multiply(r.getQ3())).multiply(2).subtract(z)); + return new FieldVector3D<>(x.multiply(r.getQ0()).subtract(z.multiply(r.getQ2()).subtract(y.multiply(r.getQ3()))).multiply(r.getQ0()).add(s.multiply(r.getQ1())).twice().subtract(x), + y.multiply(r.getQ0()).subtract(x.multiply(r.getQ3()).subtract(z.multiply(r.getQ1()))).multiply(r.getQ0()).add(s.multiply(r.getQ2())).twice().subtract(y), + z.multiply(r.getQ0()).subtract(y.multiply(r.getQ1()).subtract(x.multiply(r.getQ2()))).multiply(r.getQ0()).add(s.multiply(r.getQ3())).twice().subtract(z)); } @@ -675,9 +675,9 @@ public FieldVector3D applyInverseTo(final FieldVector3D u) { final T s = q1.multiply(x).add(q2.multiply(y)).add(q3.multiply(z)); final T m0 = q0.negate(); - return new FieldVector3D<>(m0.multiply(x.multiply(m0).subtract(q2.multiply(z).subtract(q3.multiply(y)))).add(s.multiply(q1)).multiply(2).subtract(x), - m0.multiply(y.multiply(m0).subtract(q3.multiply(x).subtract(q1.multiply(z)))).add(s.multiply(q2)).multiply(2).subtract(y), - m0.multiply(z.multiply(m0).subtract(q1.multiply(y).subtract(q2.multiply(x)))).add(s.multiply(q3)).multiply(2).subtract(z)); + return new FieldVector3D<>(m0.multiply(x.multiply(m0).subtract(q2.multiply(z).subtract(q3.multiply(y)))).add(s.multiply(q1)).twice().subtract(x), + m0.multiply(y.multiply(m0).subtract(q3.multiply(x).subtract(q1.multiply(z)))).add(s.multiply(q2)).twice().subtract(y), + m0.multiply(z.multiply(m0).subtract(q1.multiply(y).subtract(q2.multiply(x)))).add(s.multiply(q3)).twice().subtract(z)); } @@ -694,9 +694,9 @@ public FieldVector3D applyInverseTo(final Vector3D u) { final T s = q1.multiply(x).add(q2.multiply(y)).add(q3.multiply(z)); final T m0 = q0.negate(); - return new FieldVector3D<>(m0.multiply(m0.multiply(x).subtract(q2.multiply(z).subtract(q3.multiply(y)))).add(s.multiply(q1)).multiply(2).subtract(x), - m0.multiply(m0.multiply(y).subtract(q3.multiply(x).subtract(q1.multiply(z)))).add(s.multiply(q2)).multiply(2).subtract(y), - m0.multiply(m0.multiply(z).subtract(q1.multiply(y).subtract(q2.multiply(x)))).add(s.multiply(q3)).multiply(2).subtract(z)); + return new FieldVector3D<>(m0.multiply(m0.multiply(x).subtract(q2.multiply(z).subtract(q3.multiply(y)))).add(s.multiply(q1)).twice().subtract(x), + m0.multiply(m0.multiply(y).subtract(q3.multiply(x).subtract(q1.multiply(z)))).add(s.multiply(q2)).twice().subtract(y), + m0.multiply(m0.multiply(z).subtract(q1.multiply(y).subtract(q2.multiply(x)))).add(s.multiply(q3)).twice().subtract(z)); } @@ -714,9 +714,9 @@ public void applyInverseTo(final T[] in, final T[] out) { final T s = q1.multiply(x).add(q2.multiply(y)).add(q3.multiply(z)); final T m0 = q0.negate(); - out[0] = m0.multiply(x.multiply(m0).subtract(q2.multiply(z).subtract(q3.multiply(y)))).add(s.multiply(q1)).multiply(2).subtract(x); - out[1] = m0.multiply(y.multiply(m0).subtract(q3.multiply(x).subtract(q1.multiply(z)))).add(s.multiply(q2)).multiply(2).subtract(y); - out[2] = m0.multiply(z.multiply(m0).subtract(q1.multiply(y).subtract(q2.multiply(x)))).add(s.multiply(q3)).multiply(2).subtract(z); + out[0] = m0.multiply(x.multiply(m0).subtract(q2.multiply(z).subtract(q3.multiply(y)))).add(s.multiply(q1)).twice().subtract(x); + out[1] = m0.multiply(y.multiply(m0).subtract(q3.multiply(x).subtract(q1.multiply(z)))).add(s.multiply(q2)).twice().subtract(y); + out[2] = m0.multiply(z.multiply(m0).subtract(q1.multiply(y).subtract(q2.multiply(x)))).add(s.multiply(q3)).twice().subtract(z); } @@ -733,9 +733,9 @@ public void applyInverseTo(final double[] in, final T[] out) { final T s = q1.multiply(x).add(q2.multiply(y)).add(q3.multiply(z)); final T m0 = q0.negate(); - out[0] = m0.multiply(m0.multiply(x).subtract(q2.multiply(z).subtract(q3.multiply(y)))).add(s.multiply(q1)).multiply(2).subtract(x); - out[1] = m0.multiply(m0.multiply(y).subtract(q3.multiply(x).subtract(q1.multiply(z)))).add(s.multiply(q2)).multiply(2).subtract(y); - out[2] = m0.multiply(m0.multiply(z).subtract(q1.multiply(y).subtract(q2.multiply(x)))).add(s.multiply(q3)).multiply(2).subtract(z); + out[0] = m0.multiply(m0.multiply(x).subtract(q2.multiply(z).subtract(q3.multiply(y)))).add(s.multiply(q1)).twice().subtract(x); + out[1] = m0.multiply(m0.multiply(y).subtract(q3.multiply(x).subtract(q1.multiply(z)))).add(s.multiply(q2)).twice().subtract(y); + out[2] = m0.multiply(m0.multiply(z).subtract(q1.multiply(y).subtract(q2.multiply(x)))).add(s.multiply(q3)).twice().subtract(z); } @@ -754,9 +754,9 @@ public static > FieldVector3D applyInverseT final T s = x.multiply(r.getQ1()).add(y.multiply(r.getQ2())).add(z.multiply(r.getQ3())); final double m0 = -r.getQ0(); - return new FieldVector3D<>(x.multiply(m0).subtract(z.multiply(r.getQ2()).subtract(y.multiply(r.getQ3()))).multiply(m0).add(s.multiply(r.getQ1())).multiply(2).subtract(x), - y.multiply(m0).subtract(x.multiply(r.getQ3()).subtract(z.multiply(r.getQ1()))).multiply(m0).add(s.multiply(r.getQ2())).multiply(2).subtract(y), - z.multiply(m0).subtract(y.multiply(r.getQ1()).subtract(x.multiply(r.getQ2()))).multiply(m0).add(s.multiply(r.getQ3())).multiply(2).subtract(z)); + return new FieldVector3D<>(x.multiply(m0).subtract(z.multiply(r.getQ2()).subtract(y.multiply(r.getQ3()))).multiply(m0).add(s.multiply(r.getQ1())).twice().subtract(x), + y.multiply(m0).subtract(x.multiply(r.getQ3()).subtract(z.multiply(r.getQ1()))).multiply(m0).add(s.multiply(r.getQ2())).twice().subtract(y), + z.multiply(m0).subtract(y.multiply(r.getQ1()).subtract(x.multiply(r.getQ2()))).multiply(m0).add(s.multiply(r.getQ3())).twice().subtract(z)); } diff --git a/hipparchus-geometry/src/main/java/org/hipparchus/geometry/spherical/twod/PropertiesComputer.java b/hipparchus-geometry/src/main/java/org/hipparchus/geometry/spherical/twod/PropertiesComputer.java index 8b20c4193..e91ddb8f6 100644 --- a/hipparchus-geometry/src/main/java/org/hipparchus/geometry/spherical/twod/PropertiesComputer.java +++ b/hipparchus-geometry/src/main/java/org/hipparchus/geometry/spherical/twod/PropertiesComputer.java @@ -163,7 +163,7 @@ public double getArea() { * @return barycenter */ public S2Point getBarycenter() { - if (summedBarycenter.getNormSq() == 0) { + if (summedBarycenter.getNorm2Sq() == 0) { return S2Point.NaN; } else { return new S2Point(summedBarycenter); diff --git a/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/ClassicalRungeKuttaFieldStateInterpolator.java b/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/ClassicalRungeKuttaFieldStateInterpolator.java index ffe2958ff..f28c3a4b0 100644 --- a/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/ClassicalRungeKuttaFieldStateInterpolator.java +++ b/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/ClassicalRungeKuttaFieldStateInterpolator.java @@ -106,9 +106,9 @@ protected FieldODEStateAndDerivative computeInterpolatedStateAndDerivatives(f final T one = time.getField().getOne(); final T oneMinusTheta = one.subtract(theta); - final T oneMinus2Theta = one.subtract(theta.multiply(2)); + final T oneMinus2Theta = one.subtract(theta.twice()); final T coeffDot1 = oneMinusTheta.multiply(oneMinus2Theta); - final T coeffDot23 = theta.multiply(oneMinusTheta).multiply(2); + final T coeffDot23 = theta.multiply(oneMinusTheta).twice(); final T coeffDot4 = theta.multiply(oneMinus2Theta).negate(); final T[] interpolatedState; final T[] interpolatedDerivatives; diff --git a/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/DormandPrince54FieldStateInterpolator.java b/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/DormandPrince54FieldStateInterpolator.java index 7dfe8d681..6874dd793 100644 --- a/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/DormandPrince54FieldStateInterpolator.java +++ b/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/DormandPrince54FieldStateInterpolator.java @@ -133,7 +133,7 @@ protected FieldODEStateAndDerivative computeInterpolatedStateAndDerivatives(f // interpolate final T one = time.getField().getOne(); final T eta = one.subtract(theta); - final T twoTheta = theta.multiply(2); + final T twoTheta = theta.twice(); final T dot2 = one.subtract(twoTheta); final T dot3 = theta.multiply(theta.multiply(-3).add(2)); final T dot4 = twoTheta.multiply(theta.multiply(twoTheta.subtract(3)).add(1)); @@ -146,46 +146,46 @@ protected FieldODEStateAndDerivative computeInterpolatedStateAndDerivatives(f final T f4 = f3.multiply(eta); final T coeff0 = f1.multiply(a70). subtract(f2.multiply(a70.subtract(1))). - add(f3.multiply(a70.multiply(2).subtract(1))). + add(f3.multiply(a70.twice().subtract(1))). add(f4.multiply(d0)); final T coeff1 = time.getField().getZero(); final T coeff2 = f1.multiply(a72). subtract(f2.multiply(a72)). - add(f3.multiply(a72.multiply(2))). + add(f3.multiply(a72.twice())). add(f4.multiply(d2)); final T coeff3 = f1.multiply(a73). subtract(f2.multiply(a73)). - add(f3.multiply(a73.multiply(2))). + add(f3.multiply(a73.twice())). add(f4.multiply(d3)); final T coeff4 = f1.multiply(a74). subtract(f2.multiply(a74)). - add(f3.multiply(a74.multiply(2))). + add(f3.multiply(a74.twice())). add(f4.multiply(d4)); final T coeff5 = f1.multiply(a75). subtract(f2.multiply(a75)). - add(f3.multiply(a75.multiply(2))). + add(f3.multiply(a75.twice())). add(f4.multiply(d5)); final T coeff6 = f4.multiply(d6).subtract(f3); final T coeffDot0 = a70. subtract(dot2.multiply(a70.subtract(1))). - add(dot3.multiply(a70.multiply(2).subtract(1))). + add(dot3.multiply(a70.twice().subtract(1))). add(dot4.multiply(d0)); final T coeffDot1 = time.getField().getZero(); final T coeffDot2 = a72. subtract(dot2.multiply(a72)). - add(dot3.multiply(a72.multiply(2))). + add(dot3.multiply(a72.twice())). add(dot4.multiply(d2)); final T coeffDot3 = a73. subtract(dot2.multiply(a73)). - add(dot3.multiply(a73.multiply(2))). + add(dot3.multiply(a73.twice())). add(dot4.multiply(d3)); final T coeffDot4 = a74. subtract(dot2.multiply(a74)). - add(dot3.multiply(a74.multiply(2))). + add(dot3.multiply(a74.twice())). add(dot4.multiply(d4)); final T coeffDot5 = a75. subtract(dot2.multiply(a75)). - add(dot3.multiply(a75.multiply(2))). + add(dot3.multiply(a75.twice())). add(dot4.multiply(d5)); final T coeffDot6 = dot4.multiply(d6).subtract(dot3); interpolatedState = previousStateLinearCombination(coeff0, coeff1, coeff2, coeff3, @@ -199,46 +199,46 @@ protected FieldODEStateAndDerivative computeInterpolatedStateAndDerivatives(f final T f4 = f3.multiply(eta); final T coeff0 = f1.multiply(a70). subtract(f2.multiply(a70.subtract(1))). - add(f3.multiply(a70.multiply(2).subtract(1))). + add(f3.multiply(a70.twice().subtract(1))). add(f4.multiply(d0)); final T coeff1 = time.getField().getZero(); final T coeff2 = f1.multiply(a72). subtract(f2.multiply(a72)). - add(f3.multiply(a72.multiply(2))). + add(f3.multiply(a72.twice())). add(f4.multiply(d2)); final T coeff3 = f1.multiply(a73). subtract(f2.multiply(a73)). - add(f3.multiply(a73.multiply(2))). + add(f3.multiply(a73.twice())). add(f4.multiply(d3)); final T coeff4 = f1.multiply(a74). subtract(f2.multiply(a74)). - add(f3.multiply(a74.multiply(2))). + add(f3.multiply(a74.twice())). add(f4.multiply(d4)); final T coeff5 = f1.multiply(a75). subtract(f2.multiply(a75)). - add(f3.multiply(a75.multiply(2))). + add(f3.multiply(a75.twice())). add(f4.multiply(d5)); final T coeff6 = f4.multiply(d6).subtract(f3); final T coeffDot0 = a70. subtract(dot2.multiply(a70.subtract(1))). - add(dot3.multiply(a70.multiply(2).subtract(1))). + add(dot3.multiply(a70.twice().subtract(1))). add(dot4.multiply(d0)); final T coeffDot1 = time.getField().getZero(); final T coeffDot2 = a72. subtract(dot2.multiply(a72)). - add(dot3.multiply(a72.multiply(2))). + add(dot3.multiply(a72.twice())). add(dot4.multiply(d2)); final T coeffDot3 = a73. subtract(dot2.multiply(a73)). - add(dot3.multiply(a73.multiply(2))). + add(dot3.multiply(a73.twice())). add(dot4.multiply(d3)); final T coeffDot4 = a74. subtract(dot2.multiply(a74)). - add(dot3.multiply(a74.multiply(2))). + add(dot3.multiply(a74.twice())). add(dot4.multiply(d4)); final T coeffDot5 = a75. subtract(dot2.multiply(a75)). - add(dot3.multiply(a75.multiply(2))). + add(dot3.multiply(a75.twice())). add(dot4.multiply(d5)); final T coeffDot6 = dot4.multiply(d6).subtract(dot3); interpolatedState = currentStateLinearCombination(coeff0, coeff1, coeff2, coeff3, diff --git a/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/DormandPrince853FieldStateInterpolator.java b/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/DormandPrince853FieldStateInterpolator.java index ab97be120..328c8435d 100644 --- a/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/DormandPrince853FieldStateInterpolator.java +++ b/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/DormandPrince853FieldStateInterpolator.java @@ -104,22 +104,22 @@ public DormandPrince853FieldStateInterpolator(final Field field, final boolea d[1][14] = d[0][14].negate(); // really 0 d[1][15] = d[0][15].negate(); // really 0 - d[2][ 0] = d[0][ 0].multiply(2).subtract(1); - d[2][ 1] = d[0][ 1].multiply(2); - d[2][ 2] = d[0][ 2].multiply(2); - d[2][ 3] = d[0][ 3].multiply(2); - d[2][ 4] = d[0][ 4].multiply(2); - d[2][ 5] = d[0][ 5].multiply(2); - d[2][ 6] = d[0][ 6].multiply(2); - d[2][ 7] = d[0][ 7].multiply(2); - d[2][ 8] = d[0][ 8].multiply(2); - d[2][ 9] = d[0][ 9].multiply(2); - d[2][10] = d[0][10].multiply(2); - d[2][11] = d[0][11].multiply(2); - d[2][12] = d[0][12].multiply(2).subtract(1); // really -1 - d[2][13] = d[0][13].multiply(2); // really 0 - d[2][14] = d[0][14].multiply(2); // really 0 - d[2][15] = d[0][15].multiply(2); // really 0 + d[2][ 0] = d[0][ 0].twice().subtract(1); + d[2][ 1] = d[0][ 1].twice(); + d[2][ 2] = d[0][ 2].twice(); + d[2][ 3] = d[0][ 3].twice(); + d[2][ 4] = d[0][ 4].twice(); + d[2][ 5] = d[0][ 5].twice(); + d[2][ 6] = d[0][ 6].twice(); + d[2][ 7] = d[0][ 7].twice(); + d[2][ 8] = d[0][ 8].twice(); + d[2][ 9] = d[0][ 9].twice(); + d[2][10] = d[0][10].twice(); + d[2][11] = d[0][11].twice(); + d[2][12] = d[0][12].twice().subtract(1); // really -1 + d[2][13] = d[0][13].twice(); // really 0 + d[2][14] = d[0][14].twice(); // really 0 + d[2][15] = d[0][15].twice(); // really 0 d[3][ 0] = fraction(field, -17751989329.0, 2106076560.0); d[3][ 1] = field.getZero(); @@ -225,7 +225,7 @@ protected FieldODEStateAndDerivative computeInterpolatedStateAndDerivatives(f final T one = time.getField().getOne(); final T eta = one.subtract(theta); - final T twoTheta = theta.multiply(2); + final T twoTheta = theta.twice(); final T theta2 = theta.multiply(theta); final T dot1 = one.subtract(twoTheta); final T dot2 = theta.multiply(theta.multiply(-3).add(2)); diff --git a/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/GillFieldStateInterpolator.java b/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/GillFieldStateInterpolator.java index a0a4938db..4a8c36bb8 100644 --- a/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/GillFieldStateInterpolator.java +++ b/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/GillFieldStateInterpolator.java @@ -114,7 +114,7 @@ protected FieldODEStateAndDerivative computeInterpolatedStateAndDerivatives(f final T thetaH, final T oneMinusThetaH) { final T one = time.getField().getOne(); - final T twoTheta = theta.multiply(2); + final T twoTheta = theta.twice(); final T fourTheta2 = twoTheta.multiply(twoTheta); final T coeffDot1 = theta.multiply(twoTheta.subtract(3)).add(1); final T cDot23 = twoTheta.multiply(one.subtract(theta)); diff --git a/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/HighamHall54FieldStateInterpolator.java b/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/HighamHall54FieldStateInterpolator.java index bb962d152..688e0ba43 100644 --- a/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/HighamHall54FieldStateInterpolator.java +++ b/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/HighamHall54FieldStateInterpolator.java @@ -87,7 +87,7 @@ protected FieldODEStateAndDerivative computeInterpolatedStateAndDerivatives(f final T bDot2 = theta.multiply(theta.multiply(theta.multiply( 135.0 / 2.0).add(-729.0 / 8.0)).add(459.0 / 16.0)); final T bDot3 = theta.multiply(theta.multiply(theta.multiply(-120.0 ).add( 152.0 )).add(-44.0 )); final T bDot4 = theta.multiply(theta.multiply(theta.multiply( 125.0 / 2.0).add(-625.0 / 8.0)).add(375.0 / 16.0)); - final T bDot5 = theta.multiply( 5.0 / 8.0).multiply(theta.multiply(2).subtract(1)); + final T bDot5 = theta.multiply( 5.0 / 8.0).multiply(theta.twice().subtract(1)); final T[] interpolatedState; final T[] interpolatedDerivatives; diff --git a/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/MidpointFieldStateInterpolator.java b/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/MidpointFieldStateInterpolator.java index bbad73aed..87c247404 100644 --- a/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/MidpointFieldStateInterpolator.java +++ b/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/MidpointFieldStateInterpolator.java @@ -97,7 +97,7 @@ protected FieldODEStateAndDerivative computeInterpolatedStateAndDerivatives(f final T time, final T theta, final T thetaH, final T oneMinusThetaH) { - final T coeffDot2 = theta.multiply(2); + final T coeffDot2 = theta.twice(); final T coeffDot1 = time.getField().getOne().subtract(coeffDot2); final T[] interpolatedState; final T[] interpolatedDerivatives; diff --git a/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/ThreeEighthesFieldStateInterpolator.java b/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/ThreeEighthesFieldStateInterpolator.java index 362a84907..5a230f26c 100644 --- a/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/ThreeEighthesFieldStateInterpolator.java +++ b/hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/interpolators/ThreeEighthesFieldStateInterpolator.java @@ -110,14 +110,14 @@ protected FieldODEStateAndDerivative computeInterpolatedStateAndDerivatives(f final T coeffDot3 = theta.multiply(0.75); final T coeffDot1 = coeffDot3.multiply(theta.multiply(4).subtract(5)).add(1); final T coeffDot2 = coeffDot3.multiply(theta.multiply(-6).add(5)); - final T coeffDot4 = coeffDot3.multiply(theta.multiply(2).subtract(1)); + final T coeffDot4 = coeffDot3.multiply(theta.twice().subtract(1)); final T[] interpolatedState; final T[] interpolatedDerivatives; if (getGlobalPreviousState() != null && theta.getReal() <= 0.5) { final T s = thetaH.divide(8); final T fourTheta2 = theta.multiply(theta).multiply(4); - final T coeff1 = s.multiply(fourTheta2.multiply(2).subtract(theta.multiply(15)).add(8)); + final T coeff1 = s.multiply(fourTheta2.twice().subtract(theta.multiply(15)).add(8)); final T coeff2 = s.multiply(theta.multiply(5).subtract(fourTheta2)).multiply(3); final T coeff3 = s.multiply(theta).multiply(3); final T coeff4 = s.multiply(fourTheta2.subtract(theta.multiply(3))); @@ -127,7 +127,7 @@ protected FieldODEStateAndDerivative computeInterpolatedStateAndDerivatives(f final T s = oneMinusThetaH.divide(-8); final T fourTheta2 = theta.multiply(theta).multiply(4); final T thetaPlus1 = theta.add(1); - final T coeff1 = s.multiply(fourTheta2.multiply(2).subtract(theta.multiply(7)).add(1)); + final T coeff1 = s.multiply(fourTheta2.twice().subtract(theta.multiply(7)).add(1)); final T coeff2 = s.multiply(thetaPlus1.subtract(fourTheta2)).multiply(3); final T coeff3 = s.multiply(thetaPlus1).multiply(3); final T coeff4 = s.multiply(thetaPlus1.add(fourTheta2)); diff --git a/hipparchus-ode/src/test/java/org/hipparchus/ode/FieldDenseOutputModelTest.java b/hipparchus-ode/src/test/java/org/hipparchus/ode/FieldDenseOutputModelTest.java index b561fead2..fe6742886 100644 --- a/hipparchus-ode/src/test/java/org/hipparchus/ode/FieldDenseOutputModelTest.java +++ b/hipparchus-ode/src/test/java/org/hipparchus/ode/FieldDenseOutputModelTest.java @@ -56,8 +56,8 @@ private > void doTestBoundaries(final Field integ.addStepHandler(new FieldDenseOutputModel()); integ.integrate(new FieldExpandableODE(pb), pb.getInitialState(), pb.getFinalTime()); FieldDenseOutputModel cm = (FieldDenseOutputModel) integ.getStepHandlers().iterator().next(); - cm.getInterpolatedState(pb.getInitialState().getTime().multiply(2).subtract(pb.getFinalTime())); - cm.getInterpolatedState(pb.getFinalTime().multiply(2).subtract(pb.getInitialState().getTime())); + cm.getInterpolatedState(pb.getInitialState().getTime().twice().subtract(pb.getFinalTime())); + cm.getInterpolatedState(pb.getFinalTime().twice().subtract(pb.getInitialState().getTime())); cm.getInterpolatedState(pb.getInitialState().getTime().add(pb.getFinalTime()).multiply(0.5)); } diff --git a/hipparchus-ode/src/test/java/org/hipparchus/ode/TestFieldProblem2.java b/hipparchus-ode/src/test/java/org/hipparchus/ode/TestFieldProblem2.java index ef1b864dc..39e05ed9c 100644 --- a/hipparchus-ode/src/test/java/org/hipparchus/ode/TestFieldProblem2.java +++ b/hipparchus-ode/src/test/java/org/hipparchus/ode/TestFieldProblem2.java @@ -73,7 +73,7 @@ public T[] doComputeDerivatives(T t, T[] y) { public T[] computeTheoreticalState(T t) { final T[] y = MathArrays.buildArray(getField(), getDimension()); T t2 = t.multiply(t); - T c = t2.add(t2.multiply(-0.5).exp().subtract(1).multiply(2)); + T c = t2.add(t2.multiply(-0.5).exp().subtract(1).twice()); for (int i = 0; i < getDimension(); ++i) { y[i] = c; } diff --git a/hipparchus-ode/src/test/java/org/hipparchus/ode/events/FieldCloseEventsTest.java b/hipparchus-ode/src/test/java/org/hipparchus/ode/events/FieldCloseEventsTest.java index d66ecc6c2..dd6576b53 100644 --- a/hipparchus-ode/src/test/java/org/hipparchus/ode/events/FieldCloseEventsTest.java +++ b/hipparchus-ode/src/test/java/org/hipparchus/ode/events/FieldCloseEventsTest.java @@ -2418,7 +2418,7 @@ public int getDimension() { @Override public Binary64[] computeDerivatives(Binary64 t, Binary64[] y) { - return new Binary64[]{one, one.multiply(2)}; + return new Binary64[]{one, one.twice()}; } } diff --git a/hipparchus-ode/src/test/java/org/hipparchus/ode/nonstiff/EmbeddedRungeKuttaFieldIntegratorAbstractTest.java b/hipparchus-ode/src/test/java/org/hipparchus/ode/nonstiff/EmbeddedRungeKuttaFieldIntegratorAbstractTest.java index 081d5db93..c711b7900 100644 --- a/hipparchus-ode/src/test/java/org/hipparchus/ode/nonstiff/EmbeddedRungeKuttaFieldIntegratorAbstractTest.java +++ b/hipparchus-ode/src/test/java/org/hipparchus/ode/nonstiff/EmbeddedRungeKuttaFieldIntegratorAbstractTest.java @@ -762,8 +762,8 @@ protected > void doTestTorqueFreeMotionIssue23 T o2 = FieldVector3D.dotProduct(o0, a2); T o3 = FieldVector3D.dotProduct(o0, a3); T e = i1.multiply(o1).multiply(o1).add(i2.multiply(o2).multiply(o2)).add(i3.multiply(o3).multiply(o3)).multiply(0.5); - T r1 = FastMath.sqrt(e.multiply(i1).multiply(2)); - T r3 = FastMath.sqrt(e.multiply(i3).multiply(2)); + T r1 = FastMath.sqrt(e.multiply(i1).twice()); + T r3 = FastMath.sqrt(e.multiply(i3).twice()); int n = 50; for (int i = 0; i < n; ++i) { SinCos sc = FastMath.sinCos(-0.5 * FastMath.PI * (i + 50) / 200); diff --git a/hipparchus-ode/src/test/java/org/hipparchus/ode/nonstiff/RungeKuttaFieldIntegratorAbstractTest.java b/hipparchus-ode/src/test/java/org/hipparchus/ode/nonstiff/RungeKuttaFieldIntegratorAbstractTest.java index 5d7d03511..5d249a718 100644 --- a/hipparchus-ode/src/test/java/org/hipparchus/ode/nonstiff/RungeKuttaFieldIntegratorAbstractTest.java +++ b/hipparchus-ode/src/test/java/org/hipparchus/ode/nonstiff/RungeKuttaFieldIntegratorAbstractTest.java @@ -630,7 +630,7 @@ public T[] computeDerivatives(T t, T[] primary, T[] primaryDot, T[] secondary) { // a proper example of this is for example optimal control when // the secondary equations handle co-state, which changes control, // and the control changes the primary state - primaryDot[i] = primaryDot[i].multiply(2); + primaryDot[i] = primaryDot[i].twice(); } T[] secondaryDot = secondary.clone(); secondaryDot[0] = t.getField().getOne().negate();