Format

optimatika · Mar 16, 2024 · 1e586f1 · 1e586f1
1 parent bfaff49
commit 1e586f1
Show file tree

Hide file tree

Showing 36 changed files with 58 additions and 53 deletions.
diff --git a/src/main/java/org/ojalgo/array/BufferArray.java b/src/main/java/org/ojalgo/array/BufferArray.java
@@ -49,7 +49,6 @@
 import org.ojalgo.scalar.Scalar;
 import org.ojalgo.structure.Access1D;
 import org.ojalgo.structure.Structure1D;
-import org.ojalgo.structure.StructureAnyD;
 import org.ojalgo.type.NumberDefinition;
 import org.ojalgo.type.math.MathType;
 

diff --git a/src/main/java/org/ojalgo/data/DataBatch.java b/src/main/java/org/ojalgo/data/DataBatch.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.data;
 
-import static org.ojalgo.function.constant.PrimitiveMath.*;
+import static org.ojalgo.function.constant.PrimitiveMath.ONE;
+import static org.ojalgo.function.constant.PrimitiveMath.ZERO;
 
 import java.util.Collection;
 

diff --git a/src/main/java/org/ojalgo/data/domain/finance/portfolio/OptimisedPortfolio.java b/src/main/java/org/ojalgo/data/domain/finance/portfolio/OptimisedPortfolio.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.data.domain.finance.portfolio;
 
-import static org.ojalgo.function.constant.BigMath.*;
+import static org.ojalgo.function.constant.BigMath.ONE;
+import static org.ojalgo.function.constant.BigMath.ZERO;
 
 import java.math.BigDecimal;
 import java.util.Arrays;

diff --git a/src/main/java/org/ojalgo/equation/Equation.java b/src/main/java/org/ojalgo/equation/Equation.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.equation;
 
-import static org.ojalgo.function.constant.PrimitiveMath.*;
+import static org.ojalgo.function.constant.PrimitiveMath.ONE;
+import static org.ojalgo.function.constant.PrimitiveMath.ZERO;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/src/main/java/org/ojalgo/function/multiary/AffineFunction.java b/src/main/java/org/ojalgo/function/multiary/AffineFunction.java
@@ -21,12 +21,8 @@
  */
 package org.ojalgo.function.multiary;
 
-import org.ojalgo.matrix.store.GenericStore;
 import org.ojalgo.matrix.store.MatrixStore;
 import org.ojalgo.matrix.store.PhysicalStore;
-import org.ojalgo.matrix.store.Primitive64Store;
-import org.ojalgo.scalar.ComplexNumber;
-import org.ojalgo.scalar.RationalNumber;
 import org.ojalgo.scalar.Scalar;
 import org.ojalgo.structure.Access1D;
 

diff --git a/src/main/java/org/ojalgo/function/multiary/ConstantFunction.java b/src/main/java/org/ojalgo/function/multiary/ConstantFunction.java
@@ -21,12 +21,8 @@
  */
 package org.ojalgo.function.multiary;
 
-import org.ojalgo.matrix.store.GenericStore;
 import org.ojalgo.matrix.store.MatrixStore;
 import org.ojalgo.matrix.store.PhysicalStore;
-import org.ojalgo.matrix.store.Primitive64Store;
-import org.ojalgo.scalar.ComplexNumber;
-import org.ojalgo.scalar.RationalNumber;
 import org.ojalgo.scalar.Scalar;
 import org.ojalgo.structure.Access1D;
 

diff --git a/src/main/java/org/ojalgo/function/multiary/LinearFunction.java b/src/main/java/org/ojalgo/function/multiary/LinearFunction.java
@@ -21,12 +21,8 @@
  */
 package org.ojalgo.function.multiary;
 
-import org.ojalgo.matrix.store.GenericStore;
 import org.ojalgo.matrix.store.MatrixStore;
 import org.ojalgo.matrix.store.PhysicalStore;
-import org.ojalgo.matrix.store.Primitive64Store;
-import org.ojalgo.scalar.ComplexNumber;
-import org.ojalgo.scalar.RationalNumber;
 import org.ojalgo.structure.Access1D;
 
 /**

diff --git a/src/main/java/org/ojalgo/function/multiary/PureQuadraticFunction.java b/src/main/java/org/ojalgo/function/multiary/PureQuadraticFunction.java
@@ -21,12 +21,8 @@
  */
 package org.ojalgo.function.multiary;
 
-import org.ojalgo.matrix.store.GenericStore;
 import org.ojalgo.matrix.store.MatrixStore;
 import org.ojalgo.matrix.store.PhysicalStore;
-import org.ojalgo.matrix.store.Primitive64Store;
-import org.ojalgo.scalar.ComplexNumber;
-import org.ojalgo.scalar.RationalNumber;
 import org.ojalgo.scalar.Scalar;
 import org.ojalgo.structure.Access1D;
 import org.ojalgo.structure.Access2D;

diff --git a/src/main/java/org/ojalgo/function/multiary/QuadraticFunction.java b/src/main/java/org/ojalgo/function/multiary/QuadraticFunction.java
@@ -21,12 +21,8 @@
  */
 package org.ojalgo.function.multiary;
 
-import org.ojalgo.matrix.store.GenericStore;
 import org.ojalgo.matrix.store.MatrixStore;
 import org.ojalgo.matrix.store.PhysicalStore;
-import org.ojalgo.matrix.store.Primitive64Store;
-import org.ojalgo.scalar.ComplexNumber;
-import org.ojalgo.scalar.RationalNumber;
 import org.ojalgo.scalar.Scalar;
 import org.ojalgo.structure.Access1D;
 import org.ojalgo.structure.Access2D;

diff --git a/src/main/java/org/ojalgo/matrix/decomposition/LDLDecomposition.java b/src/main/java/org/ojalgo/matrix/decomposition/LDLDecomposition.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.matrix.decomposition;
 
-import static org.ojalgo.function.constant.PrimitiveMath.*;
+import static org.ojalgo.function.constant.PrimitiveMath.MACHINE_SMALLEST;
+import static org.ojalgo.function.constant.PrimitiveMath.ZERO;
 
 import org.ojalgo.RecoverableCondition;
 import org.ojalgo.array.BasicArray;

diff --git a/src/main/java/org/ojalgo/matrix/decomposition/LUDecomposition.java b/src/main/java/org/ojalgo/matrix/decomposition/LUDecomposition.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.matrix.decomposition;
 
-import static org.ojalgo.function.constant.PrimitiveMath.*;
+import static org.ojalgo.function.constant.PrimitiveMath.MACHINE_SMALLEST;
+import static org.ojalgo.function.constant.PrimitiveMath.ZERO;
 
 import org.ojalgo.RecoverableCondition;
 import org.ojalgo.array.BasicArray;

diff --git a/src/main/java/org/ojalgo/matrix/store/Primitive64Store.java b/src/main/java/org/ojalgo/matrix/store/Primitive64Store.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.matrix.store;
 
-import static org.ojalgo.function.constant.PrimitiveMath.*;
+import static org.ojalgo.function.constant.PrimitiveMath.ONE;
+import static org.ojalgo.function.constant.PrimitiveMath.ZERO;
 
 import java.util.Arrays;
 

diff --git a/src/main/java/org/ojalgo/matrix/store/SparseStore.java b/src/main/java/org/ojalgo/matrix/store/SparseStore.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.matrix.store;
 
-import static org.ojalgo.function.constant.PrimitiveMath.*;
+import static org.ojalgo.function.constant.PrimitiveMath.E;
+import static org.ojalgo.function.constant.PrimitiveMath.ZERO;
 
 import java.util.Arrays;
 import java.util.function.IntBinaryOperator;

diff --git a/src/main/java/org/ojalgo/optimisation/Variable.java b/src/main/java/org/ojalgo/optimisation/Variable.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.optimisation;
 
-import static org.ojalgo.function.constant.BigMath.*;
+import static org.ojalgo.function.constant.BigMath.ONE;
+import static org.ojalgo.function.constant.BigMath.ZERO;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;

diff --git a/src/main/java/org/ojalgo/optimisation/convex/QPESolver.java b/src/main/java/org/ojalgo/optimisation/convex/QPESolver.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.optimisation.convex;
 
-import static org.ojalgo.function.constant.PrimitiveMath.*;
+import static org.ojalgo.function.constant.PrimitiveMath.ADD;
+import static org.ojalgo.function.constant.PrimitiveMath.ZERO;
 
 import org.ojalgo.matrix.store.MatrixStore;
 import org.ojalgo.matrix.store.PhysicalStore;

diff --git a/src/main/java/org/ojalgo/optimisation/linear/LinearSolver.java b/src/main/java/org/ojalgo/optimisation/linear/LinearSolver.java
@@ -235,8 +235,6 @@ public static final class StandardBuilder extends LinearSolver.Builder<StandardB
             super();
         }
 
-
-
     }
 
     static abstract class Builder<B extends LinearSolver.Builder<B>> extends GenericSolver.Builder<B, LinearSolver> {

diff --git a/src/main/java/org/ojalgo/optimisation/linear/TableauCutGenerator.java b/src/main/java/org/ojalgo/optimisation/linear/TableauCutGenerator.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.optimisation.linear;
 
-import static org.ojalgo.function.constant.PrimitiveMath.*;
+import static org.ojalgo.function.constant.PrimitiveMath.ONE;
+import static org.ojalgo.function.constant.PrimitiveMath.ZERO;
 
 import java.util.Arrays;
 

diff --git a/src/main/java/org/ojalgo/optimisation/linear/TableauStore.java b/src/main/java/org/ojalgo/optimisation/linear/TableauStore.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.optimisation.linear;
 
-import static org.ojalgo.function.constant.PrimitiveMath.*;
+import static org.ojalgo.function.constant.PrimitiveMath.ONE;
+import static org.ojalgo.function.constant.PrimitiveMath.ZERO;
 
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/src/main/java/org/ojalgo/random/Binomial.java b/src/main/java/org/ojalgo/random/Binomial.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.random;
 
-import static org.ojalgo.function.constant.PrimitiveMath.*;
+import static org.ojalgo.function.constant.PrimitiveMath.HALF;
+import static org.ojalgo.function.constant.PrimitiveMath.ONE;
 
 import org.ojalgo.function.constant.PrimitiveMath;
 import org.ojalgo.function.special.CombinatorialFunctions;

diff --git a/src/main/java/org/ojalgo/random/ContinuousDistribution.java b/src/main/java/org/ojalgo/random/ContinuousDistribution.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.random;
 
-import static org.ojalgo.function.constant.PrimitiveMath.*;
+import static org.ojalgo.function.constant.PrimitiveMath.ONE;
+import static org.ojalgo.function.constant.PrimitiveMath.TWO;
 
 public interface ContinuousDistribution extends Distribution {
 

diff --git a/src/main/java/org/ojalgo/random/Erlang.java b/src/main/java/org/ojalgo/random/Erlang.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.random;
 
-import static org.ojalgo.function.constant.PrimitiveMath.*;
+import static org.ojalgo.function.constant.PrimitiveMath.ONE;
+import static org.ojalgo.function.constant.PrimitiveMath.ZERO;
 
 import org.ojalgo.function.constant.PrimitiveMath;
 

diff --git a/src/main/java/org/ojalgo/random/Exponential.java b/src/main/java/org/ojalgo/random/Exponential.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.random;
 
-import static org.ojalgo.function.constant.PrimitiveMath.*;
+import static org.ojalgo.function.constant.PrimitiveMath.ONE;
+import static org.ojalgo.function.constant.PrimitiveMath.ZERO;
 
 import org.ojalgo.function.constant.PrimitiveMath;
 

diff --git a/src/main/java/org/ojalgo/random/Geometric.java b/src/main/java/org/ojalgo/random/Geometric.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.random;
 
-import static org.ojalgo.function.constant.PrimitiveMath.*;
+import static org.ojalgo.function.constant.PrimitiveMath.HALF;
+import static org.ojalgo.function.constant.PrimitiveMath.ONE;
 
 import org.ojalgo.function.constant.PrimitiveMath;
 

diff --git a/src/main/java/org/ojalgo/random/Poisson.java b/src/main/java/org/ojalgo/random/Poisson.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.random;
 
-import static org.ojalgo.function.constant.PrimitiveMath.*;
+import static org.ojalgo.function.constant.PrimitiveMath.ONE;
+import static org.ojalgo.function.constant.PrimitiveMath.ZERO;
 
 import org.ojalgo.function.constant.PrimitiveMath;
 import org.ojalgo.function.special.MissingMath;

diff --git a/src/main/java/org/ojalgo/random/RandomNumber.java b/src/main/java/org/ojalgo/random/RandomNumber.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.random;
 
-import static org.ojalgo.function.constant.PrimitiveMath.*;
+import static org.ojalgo.function.constant.PrimitiveMath.ONE;
+import static org.ojalgo.function.constant.PrimitiveMath.ZERO;
 
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;

diff --git a/src/main/java/org/ojalgo/random/Weibull.java b/src/main/java/org/ojalgo/random/Weibull.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.random;
 
-import static org.ojalgo.function.constant.PrimitiveMath.*;
+import static org.ojalgo.function.constant.PrimitiveMath.ONE;
+import static org.ojalgo.function.constant.PrimitiveMath.TWO;
 
 import org.ojalgo.function.constant.PrimitiveMath;
 import org.ojalgo.function.special.GammaFunction;

diff --git a/src/main/java/org/ojalgo/random/process/PoissonProcess.java b/src/main/java/org/ojalgo/random/process/PoissonProcess.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.random.process;
 
-import static org.ojalgo.function.constant.PrimitiveMath.*;
+import static org.ojalgo.function.constant.PrimitiveMath.SQRT;
+import static org.ojalgo.function.constant.PrimitiveMath.ZERO;
 
 import org.ojalgo.ProgrammingError;
 import org.ojalgo.random.Exponential;

diff --git a/src/main/java/org/ojalgo/random/scedasticity/ARCH.java b/src/main/java/org/ojalgo/random/scedasticity/ARCH.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.random.scedasticity;
 
-import static org.ojalgo.function.constant.PrimitiveMath.*;
+import static org.ojalgo.function.constant.PrimitiveMath.TWELVE;
+import static org.ojalgo.function.constant.PrimitiveMath.ZERO;
 
 import java.util.Arrays;
 

diff --git a/src/main/java/org/ojalgo/type/CalendarDate.java b/src/main/java/org/ojalgo/type/CalendarDate.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.type;
 
-import static java.time.temporal.ChronoField.*;
+import static java.time.temporal.ChronoField.INSTANT_SECONDS;
+import static java.time.temporal.ChronoField.NANO_OF_SECOND;
 
 import java.time.*;
 import java.time.temporal.*;

diff --git a/src/test/java/org/ojalgo/ann/NeuralNetworkWorkedExample.java b/src/test/java/org/ojalgo/ann/NeuralNetworkWorkedExample.java
@@ -21,8 +21,10 @@
  */
 package org.ojalgo.ann;
 
-import static org.ojalgo.ann.ArtificialNeuralNetwork.Activator.*;
-import static org.ojalgo.function.constant.PrimitiveMath.*;
+import static org.ojalgo.ann.ArtificialNeuralNetwork.Activator.SIGMOID;
+import static org.ojalgo.ann.ArtificialNeuralNetwork.Activator.SOFTMAX;
+import static org.ojalgo.function.constant.PrimitiveMath.FIVE;
+import static org.ojalgo.function.constant.PrimitiveMath.ONE;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/src/test/java/org/ojalgo/function/multiary/LinearCase.java b/src/test/java/org/ojalgo/function/multiary/LinearCase.java
@@ -55,7 +55,8 @@ public void setup() {
 
         myLinearFunction2 = LinearFunction.factory(Primitive64Store.FACTORY).coefficients(linear.transpose()).make(linear.transpose().size());
         myAffineFunction2 = AffineFunction.factory(Primitive64Store.FACTORY).coefficients(linear.transpose()).make(linear.transpose().size());
-        myQuadraticFunction2 = QuadraticFunction.factory(Primitive64Store.FACTORY).quadratic(quadratic).linear(linear.transpose()).make(linear.transpose().size());
+        myQuadraticFunction2 = QuadraticFunction.factory(Primitive64Store.FACTORY).quadratic(quadratic).linear(linear.transpose())
+                .make(linear.transpose().size());
 
         myArg = Primitive64Store.FACTORY.makeFilled(arity, 1, new Uniform(-1, 2));
     }

diff --git a/src/test/java/org/ojalgo/function/special/BetaFunctionTest.java b/src/test/java/org/ojalgo/function/special/BetaFunctionTest.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.function.special;
 
-import static org.ojalgo.function.constant.PrimitiveMath.*;
+import static org.ojalgo.function.constant.PrimitiveMath.ONE;
+import static org.ojalgo.function.constant.PrimitiveMath.ZERO;
 
 import org.junit.jupiter.api.Test;
 import org.ojalgo.TestUtils;

diff --git a/src/test/java/org/ojalgo/optimisation/convex/ComPictetPamBamTest.java b/src/test/java/org/ojalgo/optimisation/convex/ComPictetPamBamTest.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.optimisation.convex;
 
-import static org.ojalgo.function.constant.BigMath.*;
+import static org.ojalgo.function.constant.BigMath.ONE;
+import static org.ojalgo.function.constant.BigMath.TWO;
 
 import java.math.BigDecimal;
 import java.util.Arrays;

diff --git a/src/test/java/org/ojalgo/optimisation/integer/KnapsackTest.java b/src/test/java/org/ojalgo/optimisation/integer/KnapsackTest.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.optimisation.integer;
 
-import static org.ojalgo.function.constant.BigMath.*;
+import static org.ojalgo.function.constant.BigMath.ONE;
+import static org.ojalgo.function.constant.BigMath.ZERO;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;

diff --git a/src/test/java/org/ojalgo/optimisation/integer/TestOjAlgo.java b/src/test/java/org/ojalgo/optimisation/integer/TestOjAlgo.java
@@ -21,7 +21,8 @@
  */
 package org.ojalgo.optimisation.integer;
 
-import static org.ojalgo.function.constant.BigMath.*;
+import static org.ojalgo.function.constant.BigMath.ONE;
+import static org.ojalgo.function.constant.BigMath.ZERO;
 
 import java.math.BigDecimal;
 

diff --git a/src/test/java/org/ojalgo/optimisation/service/OptimisationServiceTest.java b/src/test/java/org/ojalgo/optimisation/service/OptimisationServiceTest.java
@@ -13,7 +13,6 @@
 @Tag("network")
 public class OptimisationServiceTest {
 
-
     private static final String PATH_ENVIRONMENT = "/optimisation/v01/environment";
     private static final String PATH_TEST = "/optimisation/v01/test";
     private static final String HOST = "http://51.20.44.70:8080";
-Original file line number
+Diff line change
@@ Expand Up @@
                 super();
             }
         }
         static abstract class Builder<B extends LinearSolver.Builder<B>> extends GenericSolver.Builder<B, LinearSolver> {
@@ Expand Down @@