Remove some more

optimatika · Feb 13, 2024 · 6c6afb5 · 6c6afb5
1 parent 2c918b7
commit 6c6afb5
Show file tree

Hide file tree

Showing 36 changed files with 56 additions and 951 deletions.
diff --git a/src/main/java/org/ojalgo/array/ArrayC128.java b/src/main/java/org/ojalgo/array/ArrayC128.java
@@ -34,7 +34,7 @@
  *
  * @author apete
  */
-public final class ArrayC128 extends ScalarArray<ComplexNumber> {
+public class ArrayC128 extends ScalarArray<ComplexNumber> {
 
     public static final DenseArray.Factory<ComplexNumber> FACTORY = new DenseArray.Factory<>() {
 

diff --git a/src/main/java/org/ojalgo/array/ArrayR256.java b/src/main/java/org/ojalgo/array/ArrayR256.java
@@ -42,7 +42,7 @@
  *
  * @author apete
  */
-public final class ArrayR256 extends ReferenceTypeArray<BigDecimal> {
+public class ArrayR256 extends ReferenceTypeArray<BigDecimal> {
 
     public static final DenseArray.Factory<BigDecimal> FACTORY = new DenseArray.Factory<>() {
 

diff --git a/src/main/java/org/ojalgo/array/BufferArray.java b/src/main/java/org/ojalgo/array/BufferArray.java
@@ -233,46 +233,6 @@ interface BufferConstructor {
     public static final Factory Z032 = new Factory(MathType.Z032, BufferZ032::new);
     public static final Factory Z064 = new Factory(MathType.Z064, BufferZ064::new);
 
-    /**
-     * @deprecated v52 Use {@link #R064} and {@link MappedFileFactory#make(long)} instead.
-     */
-    @Deprecated
-    public static Array1D<Double> make(final File file, final long count) {
-        return R064.newMapped(file).make(count).wrapInArray1D();
-    }
-
-    /**
-     * @deprecated v52 Use {@link #R064} and {@link MappedFileFactory#make(long)} instead.
-     */
-    @Deprecated
-    public static ArrayAnyD<Double> make(final File file, final long... structure) {
-        return R064.newMapped(file).make(StructureAnyD.count(structure)).wrapInArrayAnyD(structure);
-    }
-
-    /**
-     * @deprecated v52 Use {@link #R064} and {@link MappedFileFactory#make(long)} instead.
-     */
-    @Deprecated
-    public static Array2D<Double> make(final File file, final long rows, final long columns) {
-        return R064.newMapped(file).make(rows * columns).wrapInArray2D(rows);
-    }
-
-    /**
-     * @deprecated v52 Use {@link #R064} and {@link MappedFileFactory#make(long)} instead.
-     */
-    @Deprecated
-    public static DenseArray<Double> make(final int capacity) {
-        return R064.make(capacity);
-    }
-
-    /**
-     * @deprecated v52 Use {@link #R064} and {@link MappedFileFactory#make(long)} instead.
-     */
-    @Deprecated
-    public static BufferArray wrap(final ByteBuffer data) {
-        return new BufferR064(BufferArray.R064, data, null);
-    }
-
     private final Buffer myBuffer;
     private final AutoCloseable myFile;
 

diff --git a/src/main/java/org/ojalgo/array/OffHeapArray.java b/src/main/java/org/ojalgo/array/OffHeapArray.java
@@ -98,22 +98,6 @@ long getCapacityLimit() {
     public static final DenseArray.Factory<Double> Z032 = new Factory(MathType.Z032, OffHeapZ032::new);
     public static final DenseArray.Factory<Double> Z064 = new Factory(MathType.Z064, OffHeapZ064::new);
 
-    /**
-     * @deprecated Use {@link #R032} instead
-     */
-    @Deprecated
-    public static OffHeapArray makeNative32(final long count) {
-        return new OffHeapR032(count);
-    }
-
-    /**
-     * @deprecated Use {@link #R064} instead
-     */
-    @Deprecated
-    public static OffHeapArray makeNative64(final long count) {
-        return new OffHeapR064(count);
-    }
-
     private final long myCount;
 
     OffHeapArray(final DenseArray.Factory<Double> factory, final long count) {

diff --git a/src/main/java/org/ojalgo/array/Primitive32Array.java b/src/main/java/org/ojalgo/array/Primitive32Array.java
diff --git a/src/main/java/org/ojalgo/array/Primitive64Array.java b/src/main/java/org/ojalgo/array/Primitive64Array.java
diff --git a/src/main/java/org/ojalgo/array/QuaternionArray.java b/src/main/java/org/ojalgo/array/QuaternionArray.java
diff --git a/src/main/java/org/ojalgo/array/RationalArray.java b/src/main/java/org/ojalgo/array/RationalArray.java
diff --git a/src/main/java/org/ojalgo/array/SparseArray.java b/src/main/java/org/ojalgo/array/SparseArray.java
@@ -211,15 +211,6 @@ public static final class SparseFactory<N extends Comparable<N>> extends Strateg
             super(denseFactory);
         }
 
-        /**
-         * @deprecated v53 This will create an array of maximum/infinite length. That's probably not what you
-         *             want. Use {@link #make(long)} instead.
-         */
-        @Deprecated
-        public SparseArray<N> make() {
-            return this.make(Long.MAX_VALUE);
-        }
-
         @Override
         public SparseArray<N> make(final int size) {
             return new SparseArray<>(this.getDenseFactory(), this.getGrowthStrategy(), size);

diff --git a/src/main/java/org/ojalgo/array/StrategyBuildingFactory.java b/src/main/java/org/ojalgo/array/StrategyBuildingFactory.java
@@ -29,14 +29,6 @@ public SB chunk(final long chunk) {
         return (SB) this;
     }
 
-    /**
-     * @deprecated v53 Irrelevant. Maybe call {@link #initial(long)}, otherwise just don't call anything.
-     */
-    @Deprecated
-    public SB fixed(final long fixed) {
-        return this.initial(fixed).limit(fixed);
-    }
-
     public FunctionSet<N> function() {
         return myDenseFactory.function();
     }
@@ -54,14 +46,6 @@ public SB initial(final long initial) {
         return (SB) this;
     }
 
-    /**
-     * @deprecated v53 Doesn't do anything. No need to call. Will be removed.
-     */
-    @Deprecated
-    public SB limit(final long limit) {
-        return (SB) this;
-    }
-
     public Scalar.Factory<N> scalar() {
         return myDenseFactory.scalar();
     }

diff --git a/src/main/java/org/ojalgo/function/multiary/AffineFunction.java b/src/main/java/org/ojalgo/function/multiary/AffineFunction.java
@@ -66,60 +66,6 @@ public static <N extends Comparable<N>> Factory<N> factory(final PhysicalStore.F
         return new Factory<>(factory);
     }
 
-    /**
-     * @deprecated v53 Use {@link #factory(PhysicalStore.Factory)} instead.
-     */
-    @Deprecated
-    public static AffineFunction<ComplexNumber> makeComplex(final Access1D<?> coefficients) {
-        // return new AffineFunction<>(GenericStore.C128.rows(coefficients));
-        return AffineFunction.factory(GenericStore.C128).coefficients(coefficients).make(coefficients.size());
-    }
-
-    /**
-     * @deprecated v53 Use {@link #factory(PhysicalStore.Factory)} instead.
-     */
-    @Deprecated
-    public static AffineFunction<ComplexNumber> makeComplex(final int arity) {
-        // return new AffineFunction<>(GenericStore.C128.make(1, arity));
-        return AffineFunction.factory(GenericStore.C128).make(arity);
-    }
-
-    /**
-     * @deprecated v53 Use {@link #factory(PhysicalStore.Factory)} instead.
-     */
-    @Deprecated
-    public static AffineFunction<Double> makePrimitive(final Access1D<?> coefficients) {
-        // return new AffineFunction<>(Primitive64Store.FACTORY.rows(coefficients));
-        return AffineFunction.factory(Primitive64Store.FACTORY).coefficients(coefficients).make(coefficients.size());
-    }
-
-    /**
-     * @deprecated v53 Use {@link #factory(PhysicalStore.Factory)} instead.
-     */
-    @Deprecated
-    public static AffineFunction<Double> makePrimitive(final int arity) {
-        // return new AffineFunction<>(Primitive64Store.FACTORY.make(1, arity));
-        return AffineFunction.factory(Primitive64Store.FACTORY).make(arity);
-    }
-
-    /**
-     * @deprecated v53 Use {@link #factory(PhysicalStore.Factory)} instead.
-     */
-    @Deprecated
-    public static AffineFunction<RationalNumber> makeRational(final Access1D<?> coefficients) {
-        // return new AffineFunction<>(GenericStore.Q128.rows(coefficients));
-        return AffineFunction.factory(GenericStore.Q128).coefficients(coefficients).make(coefficients.size());
-    }
-
-    /**
-     * @deprecated v53 Use {@link #factory(PhysicalStore.Factory)} instead.
-     */
-    @Deprecated
-    public static AffineFunction<RationalNumber> makeRational(final int arity) {
-        // return new AffineFunction<>(GenericStore.Q128.make(1, arity));
-        return AffineFunction.factory(GenericStore.Q128).make(arity);
-    }
-
     public static <N extends Comparable<N>> AffineFunction<N> wrap(final PhysicalStore<N> coefficients) {
         return new AffineFunction<>(coefficients);
     }