Even more

optimatika · Feb 14, 2024 · 5fd6e90 · 5fd6e90
1 parent 6c6afb5
commit 5fd6e90
Show file tree

Hide file tree

Showing 23 changed files with 35 additions and 550 deletions.
diff --git a/src/main/java/org/ojalgo/array/Array1D.java b/src/main/java/org/ojalgo/array/Array1D.java
@@ -404,21 +404,6 @@ public void fillAll(final NullaryFunction<?> supplier) {
         myDelegate.fill(myFirst, myLimit, myStep, supplier);
     }
 
-    @Override
-    public void fillOne(final long index, final Access1D<?> values, final long valueIndex) {
-        myDelegate.fillOne(this.convert(index), values, valueIndex);
-    }
-
-    @Override
-    public void fillOne(final long index, final N value) {
-        myDelegate.fillOne(this.convert(index), value);
-    }
-
-    @Override
-    public void fillOne(final long index, final NullaryFunction<?> supplier) {
-        myDelegate.fillOne(this.convert(index), supplier);
-    }
-
     @Override
     public void fillRange(final long first, final long limit, final N value) {
         myDelegate.fill(this.convert(first), this.convert(limit), myStep, value);

diff --git a/src/main/java/org/ojalgo/array/Array2D.java b/src/main/java/org/ojalgo/array/Array2D.java
@@ -360,7 +360,7 @@ public void fillColumn(final long row, final long col, final Access1D<N> values)
             }
         } else {
             for (long i = 0L; i < limit; i++) {
-                this.fillOne(offset + i, values.get(i));
+                this.set(offset + i, values.get(i));
             }
         }
     }
@@ -387,36 +387,6 @@ public void fillDiagonal(final long row, final long col, final NullaryFunction<?
         myDelegate.fill(Structure2D.index(myRowsCount, row, col), Structure2D.index(myRowsCount, row + tmpCount, col + tmpCount), 1L + myRowsCount, supplier);
     }
 
-    @Override
-    public void fillOne(final long index, final Access1D<?> values, final long valueIndex) {
-        myDelegate.fillOne(index, values, valueIndex);
-    }
-
-    @Override
-    public void fillOne(final long row, final long col, final Access1D<?> values, final long valueIndex) {
-        myDelegate.fillOne(Structure2D.index(myRowsCount, row, col), values, valueIndex);
-    }
-
-    @Override
-    public void fillOne(final long row, final long col, final N value) {
-        myDelegate.fillOne(Structure2D.index(myRowsCount, row, col), value);
-    }
-
-    @Override
-    public void fillOne(final long row, final long col, final NullaryFunction<?> supplier) {
-        myDelegate.fillOne(Structure2D.index(myRowsCount, row, col), supplier);
-    }
-
-    @Override
-    public void fillOne(final long index, final N value) {
-        myDelegate.fillOne(index, value);
-    }
-
-    @Override
-    public void fillOne(final long index, final NullaryFunction<?> supplier) {
-        myDelegate.fillOne(index, supplier);
-    }
-
     @Override
     public void fillRange(final long first, final long limit, final N value) {
         myDelegate.fill(first, limit, 1L, value);
@@ -439,7 +409,7 @@ public void fillRow(final long row, final long col, final Access1D<N> values) {
             }
         } else {
             for (long i = 0L; i < limit; i++) {
-                this.fillOne(offset + i * myRowsCount, values.get(i));
+                this.set(offset + i * myRowsCount, values.get(i));
             }
         }
     }

diff --git a/src/main/java/org/ojalgo/array/ArrayAnyD.java b/src/main/java/org/ojalgo/array/ArrayAnyD.java
@@ -335,31 +335,6 @@ public void fillAll(final NullaryFunction<?> supplier) {
         myDelegate.fill(0L, this.count(), 1L, supplier);
     }
 
-    @Override
-    public void fillOne(final long index, final Access1D<?> values, final long valueIndex) {
-        myDelegate.fillOne(index, values, valueIndex);
-    }
-
-    @Override
-    public void fillOne(final long index, final N value) {
-        myDelegate.fillOne(index, value);
-    }
-
-    @Override
-    public void fillOne(final long index, final NullaryFunction<?> supplier) {
-        myDelegate.fillOne(index, supplier);
-    }
-
-    @Override
-    public void fillOne(final long[] reference, final N value) {
-        myDelegate.fillOne(StructureAnyD.index(myStructure, reference), value);
-    }
-
-    @Override
-    public void fillOne(final long[] reference, final NullaryFunction<?> supplier) {
-        myDelegate.fillOne(StructureAnyD.index(myStructure, reference), supplier);
-    }
-
     @Override
     public void fillRange(final long first, final long limit, final N value) {
         myDelegate.fill(first, limit, 1L, value);

diff --git a/src/main/java/org/ojalgo/array/OffHeapArray.java b/src/main/java/org/ojalgo/array/OffHeapArray.java
@@ -25,7 +25,6 @@
 
 import org.ojalgo.function.BinaryFunction;
 import org.ojalgo.function.FunctionSet;
-import org.ojalgo.function.NullaryFunction;
 import org.ojalgo.function.PrimitiveFunction;
 import org.ojalgo.function.UnaryFunction;
 import org.ojalgo.function.VoidFunction;
@@ -147,21 +146,6 @@ public void fillAll(final Double value) {
         this.fill(0L, this.count(), 1L, value);
     }
 
-    @Override
-    public void fillOne(final long index, final Access1D<?> values, final long valueIndex) {
-        this.set(index, values.doubleValue(valueIndex));
-    }
-
-    @Override
-    public void fillOne(final long index, final Double value) {
-        this.set(index, value.doubleValue());
-    }
-
-    @Override
-    public void fillOne(final long index, final NullaryFunction<?> supplier) {
-        this.set(index, supplier.doubleValue());
-    }
-
     @Override
     public Double get(final long index) {
         return Double.valueOf(this.doubleValue(index));

diff --git a/src/main/java/org/ojalgo/array/PlainArray.java b/src/main/java/org/ojalgo/array/PlainArray.java
@@ -133,21 +133,6 @@ public final void fillAll(final NullaryFunction<?> supplier) {
         this.fill(0, this.size(), 1, supplier);
     }
 
-    @Override
-    public final void fillOne(final long index, final Access1D<?> values, final long valueIndex) {
-        this.fillOne(Math.toIntExact(index), values, valueIndex);
-    }
-
-    @Override
-    public final void fillOne(final long index, final N value) {
-        this.fillOne(Math.toIntExact(index), value);
-    }
-
-    @Override
-    public final void fillOne(final long index, final NullaryFunction<?> supplier) {
-        this.fillOne(Math.toIntExact(index), supplier);
-    }
-
     @Override
     public final void fillRange(final long first, final long limit, final N number) {
         this.fill(first, limit, 1L, number);

diff --git a/src/main/java/org/ojalgo/array/SegmentedArray.java b/src/main/java/org/ojalgo/array/SegmentedArray.java
@@ -150,21 +150,6 @@ public void fillAll(final NullaryFunction<?> supplier) {
         }
     }
 
-    @Override
-    public void fillOne(final long index, final Access1D<?> values, final long valueIndex) {
-        mySegments[(int) (index >> myIndexBits)].fillOne(index & myIndexMask, values, valueIndex);
-    }
-
-    @Override
-    public void fillOne(final long index, final N value) {
-        mySegments[(int) (index >> myIndexBits)].fillOne(index & myIndexMask, value);
-    }
-
-    @Override
-    public void fillOne(final long index, final NullaryFunction<?> supplier) {
-        mySegments[(int) (index >> myIndexBits)].fillOne(index & myIndexMask, supplier);
-    }
-
     @Override
     public void fillRange(final long first, final long limit, final N value) {
 

diff --git a/src/main/java/org/ojalgo/array/SparseArray.java b/src/main/java/org/ojalgo/array/SparseArray.java
@@ -380,25 +380,6 @@ public void fillAll(final NullaryFunction<?> supplier) {
         myValues.fillAll(supplier);
     }
 
-    @Override
-    public void fillOne(final long index, final Access1D<?> values, final long valueIndex) {
-        if (this.isPrimitive()) {
-            this.set(index, values.doubleValue(valueIndex));
-        } else {
-            this.set(index, values.get(valueIndex));
-        }
-    }
-
-    @Override
-    public void fillOne(final long index, final N value) {
-        this.set(index, value);
-    }
-
-    @Override
-    public void fillOne(final long index, final NullaryFunction<?> supplier) {
-        this.set(index, supplier.get());
-    }
-
     @Override
     public void fillRange(final long first, final long limit, final N value) {
         this.fill(first, limit, 1L, value);
@@ -731,14 +712,14 @@ protected void exchange(final long firstA, final long firstB, final long step, f
     @Override
     protected void fill(final long first, final long limit, final long step, final N value) {
         for (long i = first; i < limit; i += step) {
-            this.fillOne(i, value);
+            this.set(i, value);
         }
     }
 
     @Override
     protected void fill(final long first, final long limit, final long step, final NullaryFunction<?> supplier) {
         for (long i = first; i < limit; i += step) {
-            this.fillOne(i, supplier);
+            this.set(i, supplier.get());
         }
     }
 

diff --git a/src/main/java/org/ojalgo/function/multiary/MultiaryFunction.java b/src/main/java/org/ojalgo/function/multiary/MultiaryFunction.java
@@ -101,15 +101,6 @@ public interface TwiceDifferentiable<N extends Comparable<N>> extends MultiaryFu
          */
         MatrixStore<N> getHessian(Access1D<N> point);
 
-        /**
-         * @return The gradient at origin (0-vector), negated or not
-         * @deprecated v53 Use {@link #getLinearFactors(boolean)} instead.
-         */
-        @Deprecated
-        default MatrixStore<N> getLinearFactors() {
-            return this.getLinearFactors(false);
-        }
-
         /**
          * @return The gradient at origin (0-vector), negated or not
          */

diff --git a/src/main/java/org/ojalgo/matrix/Mutator2D.java b/src/main/java/org/ojalgo/matrix/Mutator2D.java
@@ -268,54 +268,6 @@ public void fillMatching(final UnaryFunction<N> function, final Access1D<N> argu
         myDelegate.fillMatching(function, arguments);
     }
 
-    @Override
-    public void fillOne(final long index, final Access1D<?> values, final long valueIndex) {
-        if (!mySafe) {
-            throw new IllegalStateException();
-        }
-        myDelegate.fillOne(index, values, valueIndex);
-    }
-
-    @Override
-    public void fillOne(final long row, final long col, final Access1D<?> values, final long valueIndex) {
-        if (!mySafe) {
-            throw new IllegalStateException();
-        }
-        myDelegate.fillOne(row, col, values, valueIndex);
-    }
-
-    @Override
-    public void fillOne(final long row, final long col, final N value) {
-        if (!mySafe) {
-            throw new IllegalStateException();
-        }
-        myDelegate.fillOne(row, col, value);
-    }
-
-    @Override
-    public void fillOne(final long row, final long col, final NullaryFunction<?> supplier) {
-        if (!mySafe) {
-            throw new IllegalStateException();
-        }
-        myDelegate.fillOne(row, col, supplier);
-    }
-
-    @Override
-    public void fillOne(final long index, final N value) {
-        if (!mySafe) {
-            throw new IllegalStateException();
-        }
-        myDelegate.fillOne(index, value);
-    }
-
-    @Override
-    public void fillOne(final long index, final NullaryFunction<?> supplier) {
-        if (!mySafe) {
-            throw new IllegalStateException();
-        }
-        myDelegate.fillOne(index, supplier);
-    }
-
     @Override
     public void fillRange(final long first, final long limit, final N value) {
         if (!mySafe) {

diff --git a/src/main/java/org/ojalgo/matrix/store/GenericStore.java b/src/main/java/org/ojalgo/matrix/store/GenericStore.java
@@ -633,21 +633,6 @@ protected void conquer(final int first, final int limit) {
         }
     }
 
-    @Override
-    public void fillOne(final long row, final long col, final Access1D<?> values, final long valueIndex) {
-        this.set(row, col, values.get(valueIndex));
-    }
-
-    @Override
-    public void fillOne(final long row, final long col, final N value) {
-        myUtility.fillOne(row, col, value);
-    }
-
-    @Override
-    public void fillOne(final long row, final long col, final NullaryFunction<?> supplier) {
-        myUtility.fillOne(row, col, supplier);
-    }
-
     @Override
     public void fillRow(final long row, final long col, final Access1D<N> values) {
         myUtility.fillRow(row, col, values);

diff --git a/src/main/java/org/ojalgo/matrix/store/PhysicalStore.java b/src/main/java/org/ojalgo/matrix/store/PhysicalStore.java
@@ -60,14 +60,6 @@ public interface Factory<N extends Comparable<N>, I extends PhysicalStore<N> & F
 
         DenseArray.Factory<N> array();
 
-        /**
-         * @deprecated v50 No need to call this.
-         */
-        @Deprecated
-        default PhysicalStore.Factory<N, I> builder() {
-            return this;
-        }
-
         I conjugate(Access2D<?> source);
 
         @Override

diff --git a/src/main/java/org/ojalgo/matrix/store/Primitive32Store.java b/src/main/java/org/ojalgo/matrix/store/Primitive32Store.java
@@ -441,21 +441,6 @@ public void fillMatching(final UnaryFunction<Double> function, final Access1D<Do
         myUtility.fillMatching(function, arguments);
     }
 
-    @Override
-    public void fillOne(final long row, final long col, final Access1D<?> values, final long valueIndex) {
-        myUtility.fillOne(row, col, values, valueIndex);
-    }
-
-    @Override
-    public void fillOne(final long row, final long col, final Double value) {
-        myUtility.fillOne(row, col, value);
-    }
-
-    @Override
-    public void fillOne(final long row, final long col, final NullaryFunction<?> supplier) {
-        myUtility.fillOne(row, col, supplier);
-    }
-
     @Override
     public void fillRow(final long row, final Access1D<Double> values) {
         myUtility.fillRow(row, values);

diff --git a/src/main/java/org/ojalgo/matrix/store/Primitive64Store.java b/src/main/java/org/ojalgo/matrix/store/Primitive64Store.java
@@ -650,21 +650,6 @@ protected void conquer(final int first, final int limit) {
         }
     }
 
-    @Override
-    public void fillOne(final long row, final long col, final Access1D<?> values, final long valueIndex) {
-        this.set(row, col, values.doubleValue(valueIndex));
-    }
-
-    @Override
-    public void fillOne(final long row, final long col, final Double value) {
-        myUtility.fillOne(row, col, value);
-    }
-
-    @Override
-    public void fillOne(final long row, final long col, final NullaryFunction<?> supplier) {
-        myUtility.fillOne(row, col, supplier);
-    }
-
     @Override
     public void fillRow(final long row, final long col, final Access1D<Double> values) {
         myUtility.fillRow(row, col, values);

diff --git a/src/main/java/org/ojalgo/matrix/store/RawStore.java b/src/main/java/org/ojalgo/matrix/store/RawStore.java
@@ -477,21 +477,6 @@ public void fillMatching(final Access1D<Double> left, final BinaryFunction<Doubl
         }
     }
 
-    @Override
-    public void fillOne(final long row, final long col, final Access1D<?> values, final long valueIndex) {
-        this.set(row, col, values.doubleValue(valueIndex));
-    }
-
-    @Override
-    public void fillOne(final long row, final long col, final Double value) {
-        data[Math.toIntExact(row)][Math.toIntExact(col)] = value.doubleValue();
-    }
-
-    @Override
-    public void fillOne(final long row, final long col, final NullaryFunction<?> supplier) {
-        data[Math.toIntExact(row)][Math.toIntExact(col)] = supplier.doubleValue();
-    }
-
     @Override
     public void fillRange(final long first, final long limit, final Double value) {
         FillMatchingDual.fillRange(data, (int) first, (int) limit, value.doubleValue());