Merge pull request #303 from imglib/nativetypes

Use Index object for NativeTypes instead of index fields
imglib · Apr 21, 2021 · 114cfe1 · 114cfe1
2 parents 18f8f39 + f413f0b
commit 114cfe1
Show file tree

Hide file tree

Showing 43 changed files with 705 additions and 917 deletions.
diff --git a/src/main/java/net/imglib2/img/array/AbstractArrayCursor.java b/src/main/java/net/imglib2/img/array/AbstractArrayCursor.java
@@ -36,6 +36,7 @@
 
 import net.imglib2.AbstractCursorInt;
 import net.imglib2.Cursor;
+import net.imglib2.type.Index;
 import net.imglib2.type.NativeType;
 import net.imglib2.util.IntervalIndexer;
 
@@ -68,6 +69,8 @@ public abstract class AbstractArrayCursor< T extends NativeType< T > > extends A
 	 */
 	protected final T type;
 
+	private final Index typeIndex;
+
 	/**
 	 * Source image
 	 */
@@ -89,11 +92,12 @@ protected AbstractArrayCursor( final AbstractArrayCursor< T > cursor )
 
 		this.img = cursor.img;
 		this.type = img.createLinkedType();
+		this.typeIndex = type.index();
 		this.offset = cursor.offset;
 		this.size = cursor.size;
 		this.lastIndex = cursor.lastIndex;
 
-		type.updateIndex( cursor.type.getIndex() );
+		typeIndex.set( cursor.typeIndex.get() );
 		type.updateContainer( this );
 	}
 
@@ -109,6 +113,7 @@ public AbstractArrayCursor( final ArrayImg< T, ? > img, final int offset, final
 		super( img.numDimensions() );
 
 		this.type = img.createLinkedType();
+		this.typeIndex = type.index();
 		this.img = img;
 		this.lastIndex = offset + size - 1;
 		this.offset = offset;
@@ -126,25 +131,25 @@ public T get()
 	@Override
 	public boolean hasNext()
 	{
-		return type.getIndex() < lastIndex;
+		return typeIndex.get() < lastIndex;
 	}
 
 	@Override
 	public void jumpFwd( final long steps )
 	{
-		type.incIndex( ( int ) steps );
+		typeIndex.inc( ( int ) steps );
 	}
 
 	@Override
 	public void fwd()
 	{
-		type.incIndex();
+		typeIndex.inc();
 	}
 
 	@Override
 	public void reset()
 	{
-		type.updateIndex( offset - 1 );
+		typeIndex.set( offset - 1 );
 		type.updateContainer( this );
 	}
 
@@ -157,12 +162,12 @@ public String toString()
 	@Override
 	public int getIntPosition( final int dim )
 	{
-		return IntervalIndexer.indexToPosition( type.getIndex(), img.dim, dim );
+		return IntervalIndexer.indexToPosition( typeIndex.get(), img.dim, dim );
 	}
 
 	@Override
 	public void localize( final int[] position )
 	{
-		IntervalIndexer.indexToPosition( type.getIndex(), img.dim, position );
+		IntervalIndexer.indexToPosition( typeIndex.get(), img.dim, position );
 	}
 }
diff --git a/src/main/java/net/imglib2/img/array/AbstractArrayLocalizingCursor.java b/src/main/java/net/imglib2/img/array/AbstractArrayLocalizingCursor.java
@@ -36,6 +36,7 @@
 
 import net.imglib2.AbstractLocalizingCursorInt;
 import net.imglib2.Cursor;
+import net.imglib2.type.Index;
 import net.imglib2.type.NativeType;
 import net.imglib2.util.IntervalIndexer;
 
@@ -69,6 +70,8 @@ public abstract class AbstractArrayLocalizingCursor< T extends NativeType< T > >
 	 */
 	protected final T type;
 
+	private final Index typeIndex;
+
 	/**
 	 * The underlying source {@link ArrayImg}.
 	 */
@@ -96,6 +99,7 @@ protected AbstractArrayLocalizingCursor( final AbstractArrayLocalizingCursor< T
 
 		this.img = cursor.img;
 		this.type = img.createLinkedType();
+		this.typeIndex = type.index();
 		this.offset = cursor.offset;
 		this.size = cursor.size;
 
@@ -108,7 +112,7 @@ protected AbstractArrayLocalizingCursor( final AbstractArrayLocalizingCursor< T
 			max[ d ] = cursor.max[ d ];
 		}
 
-		type.updateIndex( cursor.type.getIndex() );
+		typeIndex.set( cursor.typeIndex.get() );
 		type.updateContainer( this );
 	}
 
@@ -128,6 +132,7 @@ public AbstractArrayLocalizingCursor( final ArrayImg< T, ? > img, final int offs
 		this.size = size;
 
 		this.type = img.createLinkedType();
+		this.typeIndex = type.index();
 		this.lastIndex = offset + size - 1;
 
 		max = new int[ n ];
@@ -152,7 +157,7 @@ public T get()
 	@Override
 	public boolean hasNext()
 	{
-		return type.getIndex() < lastIndex;
+		return typeIndex.get() < lastIndex;
 	}
 
 	/**
@@ -161,7 +166,7 @@ public boolean hasNext()
 	@Override
 	public void fwd()
 	{
-		type.incIndex();
+		typeIndex.inc();
 
 //		 for ( int d = 0; d < n; ++d )
 //		 {
@@ -202,8 +207,8 @@ public void fwd()
 	@Override
 	public void jumpFwd( final long steps )
 	{
-		type.incIndex( ( int ) steps );
-		IntervalIndexer.indexToPosition( type.getIndex(), img.dim, position );
+		typeIndex.inc( ( int ) steps );
+		IntervalIndexer.indexToPosition( typeIndex.get(), img.dim, position );
 	}
 
 	/**
@@ -212,11 +217,11 @@ public void jumpFwd( final long steps )
 	@Override
 	public void reset()
 	{
-		type.updateIndex( offset - 1 );
+		typeIndex.set( offset - 1 );
 
 		IntervalIndexer.indexToPosition( offset, img.dim, position );
 		position[ 0 ]--;
 
-		type.updateContainer( this );
+		type.updateContainer( this ); // TODO: This is unnecessary. Remove.
 	}
 }