build

- Tuning build script
lint
- Fixing stuff error prone is complaining about

Author: lessthanoptimal

build.gradle

@@ -169,7 +169,7 @@ subprojects {
     // for vectors or scalars. Perhaps a more verbose name should be used but it's disabled for now to reduce build spam
     tasks.withType(JavaCompile).configureEach {
         options.errorprone.enabled = false
-        if (path.contains("Benchmarks") || path.contains("examples") || path.contains("regression"))
+        if (path.contains("Benchmarks") || path.contains("examples") || path.contains("regression") || name.contains("Test"))
             return
 
         options.errorprone.enabled = true
@@ -191,14 +191,6 @@ subprojects {
             option("NullAway:TreatGeneratedAsUnannotated", true)
             option("NullAway:AnnotatedPackages", "org.ejml")
         }
-
-        // Include to disable on test code
-        if (name.toLowerCase().contains("test")) {
-            options.errorprone {
-                disable("NullAway")
-            }
-            options.errorprone.enabled = false
-        }
     }
 
     // Skip these codeless directories when publishing jars locally or to a remote destination

main/ejml-core/src/org/ejml/UtilEjml.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Peter Abeles. All Rights Reserved.
+ * Copyright (c) 2023, Peter Abeles. All Rights Reserved.
  *
  * This file is part of Efficient Java Matrix Library (EJML).
  *
@@ -270,11 +270,13 @@ public static void checkValidMatrixShapeComplex( int rows, int cols ) {
         checkTooLargeComplex(rows, cols);
     }
 
+    @SuppressWarnings({"NarrowCalculation", "IntegerMultiplicationImplicitCastToLong"})
     public static void checkTooLarge( int rows, int cols ) {
         if ((rows*cols) != ((long)rows*cols))
             throw new IllegalArgumentException("Matrix size exceeds the size of an integer");
     }
 
+    @SuppressWarnings({"NarrowCalculation", "IntegerMultiplicationImplicitCastToLong"})
     public static void checkTooLargeComplex( int rows, int cols ) {
         if ((2*rows*cols) != ((long)rows*cols*2))
             throw new IllegalArgumentException("Matrix size exceeds the size of an integer");
@@ -673,19 +675,19 @@ public static boolean exceedsMaxMatrixSize( int numRows, int numCols ) {
         return numCols > Integer.MAX_VALUE/numRows;
     }
 
-    public static void printTime( String message, Process timer ) {
+    public static void printTime( String message, EjmlProcess timer ) {
         printTime("Processing... ", message, timer);
     }
 
-    public static void printTime( String pre, String message, Process timer ) {
+    public static void printTime( String pre, String message, EjmlProcess timer ) {
         System.out.printf(pre);
         long time0 = System.nanoTime();
         timer.process();
         long time1 = System.nanoTime();
         System.out.println(message + " " + ((time1 - time0)*1e-6) + " (ms)");
     }
 
-    public interface Process {
+    public interface EjmlProcess {
         void process();
     }
 

main/ejml-ddense/src/org/ejml/dense/row/MatrixFeatures_DDRM.java

@@ -18,7 +18,7 @@
 package org.ejml.dense.row;
 
 import org.ejml.UtilEjml;
-import org.ejml.data.*;
+import org.ejml.data.DMatrixD1;
 import org.ejml.dense.row.decomposition.chol.CholeskyDecompositionInner_DDRM;
 import org.ejml.dense.row.factory.DecompositionFactory_DDRM;
 import org.ejml.dense.row.mult.VectorVectorMult_DDRM;
@@ -578,11 +578,6 @@ public static boolean isDiagonalPositive( DMatrixRMaj a ) {
         return true;
     }
 
-    // TODO write this
-    public static boolean isFullRank( DMatrixRMaj a ) {
-        throw new RuntimeException("Implement");
-    }
-
     /**
      * <p>
      * Checks to see if the two matrices are the negative of each other:<br>

main/ejml-ddense/src/org/ejml/dense/row/linsol/qr/LinearSolverQrHouseCol_MT_DDRM.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Peter Abeles. All Rights Reserved.
+ * Copyright (c) 2023, Peter Abeles. All Rights Reserved.
  *
  * This file is part of Efficient Java Matrix Library (EJML).
  *
@@ -95,7 +95,6 @@ public void solve( DMatrixRMaj B, DMatrixRMaj X ) {
 
     private static class Work {
         public final DMatrixRMaj a = new DMatrixRMaj(1, 1);
-        public final DMatrixRMaj u = new DMatrixRMaj(1, 1);
         public final DGrowArray tmp = new DGrowArray();
     }
 }

main/ejml-dsparse/src/org/ejml/sparse/csc/RandomMatrices_DSCC.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Peter Abeles. All Rights Reserved.
+ * Copyright (c) 2023, Peter Abeles. All Rights Reserved.
  *
  * This file is part of Efficient Java Matrix Library (EJML).
  *
@@ -243,7 +243,7 @@ public static int nonzero( int numRows, int numCols, double minFill, double maxF
      * @return Random matrix
      */
     public static DMatrixSparseCSC triangle( boolean upper, int N, double minFill, double maxFill, Random rand ) {
-        int nz = (int)(((N - 1)*(N - 1)/2)*(rand.nextDouble()*(maxFill - minFill) + minFill)) + N;
+        int nz = Math.toIntExact((((N - 1L)*(N - 1L)/2L)*(long)(rand.nextDouble()*(maxFill - minFill) + minFill)) + N);
 
         if (upper) {
             return triangleUpper(N, 0, nz, -1, 1, rand);
@@ -300,6 +300,7 @@ public static DMatrixSparseCSC symmetricPosDef( int width, double probabilityZer
      * @param rand Random number generator
      * @return Randomly generated matrix
      */
+    @SuppressWarnings("NarrowCalculation")
     public static DMatrixSparseCSC generateUniform( int numRows, int numCols, int nzEntriesPerColumn,
                                                     double min, double max, Random rand ) {
         if (nzEntriesPerColumn > numRows) {

main/ejml-simple/src/org/ejml/equation/Macro.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Peter Abeles. All Rights Reserved.
+ * Copyright (c) 2023, Peter Abeles. All Rights Reserved.
  *
  * This file is part of Efficient Java Matrix Library (EJML).
  *
@@ -19,8 +19,8 @@
 package org.ejml.equation;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Definition of a macro. Each input will replace the word of its name
@@ -60,9 +60,9 @@ public TokenList execute( List<TokenList.Token> replacements ) {
 
     public class Assign extends Operation {
 
-        HashMap<String, Macro> macros;
+        Map<String, Macro> macros;
 
-        protected Assign( HashMap<String, Macro> macros ) {
+        protected Assign( Map<String, Macro> macros ) {
             super("Macro:" + Macro.this.name);
             this.macros = macros;
         }
@@ -73,7 +73,7 @@ public void process() {
         }
     }
 
-    public Operation createOperation( HashMap<String, Macro> macros ) {
+    public Operation createOperation( Map<String, Macro> macros ) {
         return new Assign(macros);
     }
 }