Skip to content

Commit

Permalink
perf: bump jitk/ejml version and update JacobianDeterminantRandomAccess
Browse files Browse the repository at this point in the history
* also bump imglib2 and bdv dependency versions
  • Loading branch information
bogovicj committed Mar 11, 2024
1 parent 0a148e1 commit 11174a4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
7 changes: 5 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,12 @@
<license.projectName>BigWarp plugin for Fiji.</license.projectName>
<license.excludes>**/resources/*.xml</license.excludes>

<imglib2.version>6.2.0</imglib2.version>
<imglib2.version>6.3.0</imglib2.version>
<imglib2-realtransform.version>4.0.1</imglib2-realtransform.version>

<jcommander.version>1.48</jcommander.version>
<alphanumeric-comparator.version>1.4.1</alphanumeric-comparator.version>
<jitk-tps.version>3.0.3</jitk-tps.version>
<jitk-tps.version>3.0.4</jitk-tps.version>

<!-- NB: Deploy releases to the SciJava Maven repository. -->
<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
Expand All @@ -138,6 +138,9 @@
<n5-ij.version>4.1.0</n5-ij.version>
<n5-viewer_fiji.version>6.1.0</n5-viewer_fiji.version>

<bigdataviewer-core.version>10.4.14</bigdataviewer-core.version>
<bigdataviewer-vistools.version>1.0.0-beta-34</bigdataviewer-vistools.version>

</properties>

<repositories>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
*/
package bigwarp.source;

import org.ejml.data.DenseMatrix64F;
import org.ejml.ops.CommonOps;
import org.ejml.data.DMatrixRMaj;
import org.ejml.dense.row.CommonOps_DDRM;

import net.imglib2.AbstractRealInterval;
import net.imglib2.AbstractRealLocalizable;
Expand All @@ -33,7 +33,6 @@
import net.imglib2.RealRandomAccess;
import net.imglib2.RealRandomAccessibleRealInterval;
import net.imglib2.realtransform.AffineTransform;
import net.imglib2.realtransform.RealTransform;
import net.imglib2.realtransform.inverse.DifferentiableRealTransform;
import net.imglib2.type.numeric.RealType;

Expand Down Expand Up @@ -80,9 +79,9 @@ public T get()
double[] x = new double[ numDimensions() ];
localize( x );
AffineTransform jacobian = transform.jacobian( x );
DenseMatrix64F jacMtx = new DenseMatrix64F();
DMatrixRMaj jacMtx = new DMatrixRMaj();
jacMtx.data = jacobian.getRowPackedCopy();
out.setReal( CommonOps.det( jacMtx ) );
out.setReal( CommonOps_DDRM.det( jacMtx ) );

return out;
}
Expand Down

0 comments on commit 11174a4

Please sign in to comment.