Merge pull request #1 from lessthanoptimal/SNAPSHOT

Merge latest changes
lessthanoptimal · Mar 8, 2025 · 32a1e56 · 32a1e56
2 parents 20a1842 + 0083529
commit 32a1e56
Show file tree

Hide file tree

Showing 101 changed files with 599 additions and 372 deletions.
diff --git a/.idea/copyright/boofcv.xml b/.idea/copyright/boofcv.xml
diff --git a/README.md b/README.md
@@ -62,7 +62,7 @@ BoofCV is on [Maven Central](http://search.maven.org/) and can be easily added t
 For Gradle projects:
 ```
 dependencies {
-    api(group: 'org.boofcv', name: 'boofcv-core', version: '1.1.7')
+    api(group: 'org.boofcv', name: 'boofcv-core', version: '1.1.8')
 }
 ```
 

diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ allprojects {
     apply plugin: 'com.peterabeles.gversion'
 
     group = 'org.boofcv'
-    version = '1.1.8-SNAPSHOT'
+    version = '1.1.9-SNAPSHOT'
 
     createVersionFile.enabled = false // run only once. enabled in types
 }
@@ -132,8 +132,8 @@ subprojects {
     }
 
     dependencies {
-        api("org.georegression:georegression:0.27.3") { exclude group: 'org.ddogleg' }
-        api("org.ddogleg:ddogleg:0.23.4")
+        api("org.georegression:georegression:0.27.4") { exclude group: 'org.ddogleg' }
+        api("org.ddogleg:ddogleg:0.23.6-SNAPSHOT")
 
         api("net.sf.trove4j:trove4j:${project.trove4j_version}")
 

diff --git a/change.txt b/change.txt
@@ -6,6 +6,23 @@ Version Meaning: <compatible>.<feature>.<bug fix>
 - Second digit indicates if a new feature was added and/or if only a minor refactoring has been done
 - Last digit always indicates a bug fix and other minor changes
 
+---------------------
+Date    : 2025/XXX/YY
+Version : 1.1.9
+
+- VerboseUtils
+  * Moving verbose related utilities into DDogleg
+  * Deprecated functions in BoofCV
+
+---------------------
+Date    : 2025/Mar/06
+Version : 1.1.8
+
+- PackedArray
+  * Added isEquals()
+  * Fixed bug where set(index, point) overwrite the value of `point`
+  * Added implementation specific variants of set( index , ... )
+
 ---------------------
 Date    : 2024/Oct/05
 Version : 1.1.7

diff --git a/integration/boofcv-android/examples/fragment/app/build.gradle b/integration/boofcv-android/examples/fragment/app/build.gradle
@@ -56,7 +56,7 @@ configurations {
 
 dependencies {
     ['boofcv-android', 'boofcv-core'].each {
-        String a -> implementation group: 'org.boofcv', name: a, version: '1.1.7'
+        String a -> implementation group: 'org.boofcv', name: a, version: '1.1.8'
     }
 
     def fragment_version = "2.5.3"

diff --git a/integration/boofcv-android/examples/video/app/build.gradle b/integration/boofcv-android/examples/video/app/build.gradle
@@ -40,7 +40,7 @@ configurations {
 
 dependencies {
     ['boofcv-android', 'boofcv-core'].each {
-        String a -> api group: 'org.boofcv', name: a, version: '1.1.7' }
+        String a -> api group: 'org.boofcv', name: a, version: '1.1.8' }
 
     annotationProcessor 'org.projectlombok:lombok:1.18.16'
 

diff --git a/integration/boofcv-kotlin/build.gradle b/integration/boofcv-kotlin/build.gradle
@@ -1,12 +1,12 @@
 plugins {
-	id 'org.jetbrains.kotlin.jvm' version '1.6.10'
+	id 'org.jetbrains.kotlin.jvm' version '1.7.22'
 }
 
 configurations.all {
 	resolutionStrategy {
 		force "org.jetbrains:annotations:$project.jetnull_version"
-		force "org.jetbrains.kotlin:kotlin-stdlib:1.6.10"
-		force "org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10"
+		force "org.jetbrains.kotlin:kotlin-stdlib:1.7.22"
+		force "org.jetbrains.kotlin:kotlin-stdlib-common:1.7.22"
 	}
 }
 

diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/mesh/MeshViewerPanel.java b/integration/boofcv-swing/src/main/java/boofcv/gui/mesh/MeshViewerPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Peter Abeles. All Rights Reserved.
+ * Copyright (c) 2025, Peter Abeles. All Rights Reserved.
  *
  * This file is part of BoofCV (http://boofcv.org).
  *
@@ -33,6 +33,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.ddogleg.struct.VerbosePrint;
+import org.ddogleg.util.VerboseUtils;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -475,8 +476,8 @@ public void showHelpWindow() {
 	}
 
 	@Override public void setVerbose( @Nullable PrintStream out, @Nullable Set<String> configuration ) {
-		verbose = BoofMiscOps.addPrefix(this, out);
-		BoofMiscOps.verboseChildren(out, configuration, renderer);
+		verbose = VerboseUtils.addPrefix(this, out);
+		VerboseUtils.verboseChildren(out, configuration, renderer);
 	}
 
 	/**

diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/ellipse/BinaryEllipseDetector.java b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/ellipse/BinaryEllipseDetector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Peter Abeles. All Rights Reserved.
+ * Copyright (c) 2025, Peter Abeles. All Rights Reserved.
  *
  * This file is part of BoofCV (http://boofcv.org).
  *
@@ -19,7 +19,6 @@
 package boofcv.alg.shapes.ellipse;
 
 import boofcv.alg.filter.binary.ContourPacked;
-import boofcv.misc.BoofMiscOps;
 import boofcv.struct.distort.PixelTransform;
 import boofcv.struct.image.GrayU8;
 import boofcv.struct.image.ImageGray;
@@ -28,6 +27,7 @@
 import georegression.struct.point.Point2D_I32;
 import org.ddogleg.struct.DogArray;
 import org.ddogleg.struct.VerbosePrint;
+import org.ddogleg.util.VerboseUtils;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.PrintStream;
@@ -197,8 +197,8 @@ public List<EllipseRotated_F64> getFoundEllipses( @Nullable List<EllipseRotated_
 	}
 
 	@Override public void setVerbose( @Nullable PrintStream out, @Nullable Set<String> config ) {
-		this.verbose = BoofMiscOps.addPrefix(this, out);
-		BoofMiscOps.verboseChildren(out, config, ellipseDetector);
+		this.verbose = VerboseUtils.addPrefix(this, out);
+		VerboseUtils.verboseChildren(out, config, ellipseDetector);
 	}
 
 	@SuppressWarnings({"NullAway.Init"})

diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/ellipse/BinaryEllipseDetectorPixel.java b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/ellipse/BinaryEllipseDetectorPixel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Peter Abeles. All Rights Reserved.
+ * Copyright (c) 2025, Peter Abeles. All Rights Reserved.
  *
  * This file is part of BoofCV (http://boofcv.org).
  *
@@ -24,7 +24,6 @@
 import boofcv.alg.filter.binary.ContourOps;
 import boofcv.alg.filter.binary.ContourPacked;
 import boofcv.factory.filter.binary.FactoryBinaryContourFinder;
-import boofcv.misc.BoofMiscOps;
 import boofcv.struct.ConfigLength;
 import boofcv.struct.ConnectRule;
 import boofcv.struct.distort.PixelTransform;
@@ -42,6 +41,7 @@
 import lombok.Setter;
 import org.ddogleg.struct.DogArray;
 import org.ddogleg.struct.VerbosePrint;
+import org.ddogleg.util.VerboseUtils;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.PrintStream;
@@ -344,7 +344,7 @@ public List<Found> getFound() {
 	}
 
 	@Override public void setVerbose( @Nullable PrintStream out, @Nullable Set<String> configuration ) {
-		this.verbose = BoofMiscOps.addPrefix(this, out);
+		this.verbose = VerboseUtils.addPrefix(this, out);
 	}
 
 	@SuppressWarnings({"NullAway.Init"})

diff --git a/main/boofcv-feature/src/main/java/boofcv/struct/feature/PackedTupleArray_B.java b/main/boofcv-feature/src/main/java/boofcv/struct/feature/PackedTupleArray_B.java
@@ -19,6 +19,7 @@
 package boofcv.struct.feature;
 
 import boofcv.misc.BoofLambdas;
+import boofcv.struct.PackedArray;
 import org.ddogleg.struct.DogArray_I32;
 
 /**
@@ -99,6 +100,10 @@ public PackedTupleArray_B( int dof ) {
 		}
 	}
 
+	@Override public boolean isEquals( PackedArray<TupleDesc_B> other ) {
+		return array.isEquals(((PackedTupleArray_B)other).array);
+	}
+
 	@Override public int getDOF() {
 		return dof;
 	}

diff --git a/main/boofcv-feature/src/main/java/boofcv/struct/feature/PackedTupleArray_F64.java b/main/boofcv-feature/src/main/java/boofcv/struct/feature/PackedTupleArray_F64.java
@@ -19,6 +19,7 @@
 package boofcv.struct.feature;
 
 import boofcv.misc.BoofLambdas;
+import boofcv.struct.PackedArray;
 import org.ddogleg.struct.DogArray_F64;
 
 /**
@@ -95,6 +96,10 @@ public PackedTupleArray_F64( int dof ) {
 		}
 	}
 
+	@Override public boolean isEquals( PackedArray<TupleDesc_F64> other ) {
+		return array.isEquals(((PackedTupleArray_F64)other).array);
+	}
+
 	@Override public int getDOF() {
 		return dof;
 	}

diff --git a/main/boofcv-feature/src/main/java/boofcv/struct/feature/PackedTupleArray_S8.java b/main/boofcv-feature/src/main/java/boofcv/struct/feature/PackedTupleArray_S8.java
@@ -19,6 +19,7 @@
 package boofcv.struct.feature;
 
 import boofcv.misc.BoofLambdas;
+import boofcv.struct.PackedArray;
 import org.ddogleg.struct.DogArray_I8;
 
 /**
@@ -95,6 +96,10 @@ public PackedTupleArray_S8( int dof ) {
 		}
 	}
 
+	@Override public boolean isEquals( PackedArray<TupleDesc_S8> other ) {
+		return array.isEquals(((PackedTupleArray_S8)other).array);
+	}
+
 	@Override public int getDOF() {
 		return dof;
 	}

diff --git a/main/boofcv-feature/src/main/java/boofcv/struct/feature/PackedTupleArray_U8.java b/main/boofcv-feature/src/main/java/boofcv/struct/feature/PackedTupleArray_U8.java
@@ -19,6 +19,7 @@
 package boofcv.struct.feature;
 
 import boofcv.misc.BoofLambdas;
+import boofcv.struct.PackedArray;
 import org.ddogleg.struct.DogArray_I8;
 
 /**
@@ -95,6 +96,10 @@ public PackedTupleArray_U8( int dof ) {
 		}
 	}
 
+	@Override public boolean isEquals( PackedArray<TupleDesc_U8> other ) {
+		return array.isEquals(((PackedTupleArray_U8)other).array);
+	}
+
 	@Override public int getDOF() {
 		return dof;
 	}

diff --git a/main/boofcv-feature/src/main/java/boofcv/struct/feature/PackedTupleBigArray_B.java b/main/boofcv-feature/src/main/java/boofcv/struct/feature/PackedTupleBigArray_B.java
@@ -19,6 +19,7 @@
 package boofcv.struct.feature;
 
 import boofcv.misc.BoofLambdas;
+import boofcv.struct.PackedArray;
 import org.ddogleg.struct.BigDogArray_I32;
 import org.ddogleg.struct.BigDogGrowth;
 
@@ -100,6 +101,10 @@ public PackedTupleBigArray_B( int dof ) {
 		});
 	}
 
+	@Override public boolean isEquals( PackedArray<TupleDesc_B> other ) {
+		return array.isEquivalent(((PackedTupleBigArray_B)other).array);
+	}
+
 	@Override public int getDOF() {
 		return dof;
 	}

diff --git a/main/boofcv-feature/src/main/java/boofcv/struct/feature/PackedTupleBigArray_F64.java b/main/boofcv-feature/src/main/java/boofcv/struct/feature/PackedTupleBigArray_F64.java
@@ -19,6 +19,7 @@
 package boofcv.struct.feature;
 
 import boofcv.misc.BoofLambdas;
+import boofcv.struct.PackedArray;
 import org.ddogleg.struct.BigDogArray_F64;
 import org.ddogleg.struct.BigDogGrowth;
 
@@ -96,6 +97,10 @@ public PackedTupleBigArray_F64( int dof ) {
 		});
 	}
 
+	@Override public boolean isEquals( PackedArray<TupleDesc_F64> other ) {
+		return array.isEquivalent(((PackedTupleBigArray_F64)other).array, 0.0);
+	}
+
 	@Override public int getDOF() {
 		return dof;
 	}

diff --git a/main/boofcv-feature/src/main/java/boofcv/struct/feature/PackedTupleBigArray_S8.java b/main/boofcv-feature/src/main/java/boofcv/struct/feature/PackedTupleBigArray_S8.java
@@ -19,6 +19,7 @@
 package boofcv.struct.feature;
 
 import boofcv.misc.BoofLambdas;
+import boofcv.struct.PackedArray;
 import org.ddogleg.struct.BigDogArray_I8;
 import org.ddogleg.struct.BigDogGrowth;
 
@@ -96,6 +97,10 @@ public PackedTupleBigArray_S8( int dof ) {
 		});
 	}
 
+	@Override public boolean isEquals( PackedArray<TupleDesc_S8> other ) {
+		return array.isEquivalent(((PackedTupleBigArray_S8)other).array);
+	}
+
 	@Override public int getDOF() {
 		return dof;
 	}

diff --git a/main/boofcv-feature/src/main/java/boofcv/struct/feature/PackedTupleBigArray_U8.java b/main/boofcv-feature/src/main/java/boofcv/struct/feature/PackedTupleBigArray_U8.java
@@ -19,6 +19,7 @@
 package boofcv.struct.feature;
 
 import boofcv.misc.BoofLambdas;
+import boofcv.struct.PackedArray;
 import org.ddogleg.struct.BigDogArray_I8;
 import org.ddogleg.struct.BigDogGrowth;
 
@@ -96,6 +97,10 @@ public PackedTupleBigArray_U8( int dof ) {
 		});
 	}
 
+	@Override public boolean isEquals( PackedArray<TupleDesc_U8> other ) {
+		return array.isEquivalent(((PackedTupleBigArray_U8)other).array);
+	}
+
 	@Override public int getDOF() {
 		return dof;
 	}

diff --git a/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/MetricBundleAdjustmentUtils.java b/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/MetricBundleAdjustmentUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Peter Abeles. All Rights Reserved.
+ * Copyright (c) 2025, Peter Abeles. All Rights Reserved.
  *
  * This file is part of BoofCV (http://boofcv.org).
  *
@@ -22,12 +22,12 @@
 import boofcv.factory.geo.ConfigBundleAdjustment;
 import boofcv.factory.geo.ConfigTriangulation;
 import boofcv.factory.geo.FactoryMultiView;
-import boofcv.misc.BoofMiscOps;
 import boofcv.misc.ConfigConverge;
 import lombok.Getter;
 import lombok.Setter;
 import org.ddogleg.optimization.ConfigNonLinearLeastSquares;
 import org.ddogleg.struct.VerbosePrint;
+import org.ddogleg.util.VerboseUtils;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.PrintStream;
@@ -141,6 +141,6 @@ public void printCounts( PrintStream out ) {
 	}
 
 	@Override public void setVerbose( @Nullable PrintStream out, @Nullable Set<String> configuration ) {
-		this.verbose = BoofMiscOps.addPrefix(this, out);
+		this.verbose = VerboseUtils.addPrefix(this, out);
 	}
 }
diff --git a/...cv-geo/src/main/java/boofcv/abst/geo/selfcalib/ProjectiveToMetricCameraDualQuadratic.java b/...cv-geo/src/main/java/boofcv/abst/geo/selfcalib/ProjectiveToMetricCameraDualQuadratic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Peter Abeles. All Rights Reserved.
+ * Copyright (c) 2025, Peter Abeles. All Rights Reserved.
  *
  * This file is part of BoofCV (http://boofcv.org).
  *
@@ -38,6 +38,7 @@
 import org.ddogleg.struct.DogArray_I32;
 import org.ddogleg.struct.FastAccess;
 import org.ddogleg.struct.VerbosePrint;
+import org.ddogleg.util.VerboseUtils;
 import org.ejml.data.DMatrix3;
 import org.ejml.data.DMatrixRMaj;
 import org.ejml.dense.row.CommonOps_DDRM;
@@ -361,7 +362,7 @@ private void printFoundMetric( List<ElevateViewInfo> views, MetricCameras metric
 	@Override public int getMinimumViews() {return selfCalib.getMinimumProjectives();}
 
 	@Override public void setVerbose( @Nullable PrintStream out, @Nullable Set<String> configuration ) {
-		this.verbose = BoofMiscOps.addPrefix(this, out);
-		BoofMiscOps.verboseChildren(verbose, configuration, resolveSign, refiner);
+		this.verbose = VerboseUtils.addPrefix(this, out);
+		VerboseUtils.verboseChildren(verbose, configuration, resolveSign, refiner);
 	}
 }