bytedeco#391 Merge DefaultIndex and CustomStridesIndex in StrideIndex…

…. HyperslabIndex now extends StrideIndex
matteodg · May 3, 2020 · 93db7b9 · 93db7b9
1 parent d979e69
commit 93db7b9
Show file tree

Hide file tree

Showing 61 changed files with 145 additions and 187 deletions.
diff --git a/src/main/java/org/bytedeco/javacpp/indexer/Bfloat16ArrayIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/Bfloat16ArrayIndexer.java
@@ -22,8 +22,8 @@
 
 package org.bytedeco.javacpp.indexer;
 
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
-import static org.bytedeco.javacpp.indexer.DefaultIndex.defaultIndex;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.defaultIndex;
 
 /**
  * An indexer for a {@code short[]} array, treated as bfloat16.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/Bfloat16BufferIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/Bfloat16BufferIndexer.java
@@ -24,8 +24,8 @@
 
 import java.nio.Buffer;
 import java.nio.ShortBuffer;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
-import static org.bytedeco.javacpp.indexer.DefaultIndex.defaultIndex;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.defaultIndex;
 
 /**
  * An indexer for a {@link ShortBuffer}, treated as bfloat16.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/Bfloat16Indexer.java b/src/main/java/org/bytedeco/javacpp/indexer/Bfloat16Indexer.java
@@ -24,7 +24,7 @@
 
 import java.nio.ShortBuffer;
 import org.bytedeco.javacpp.ShortPointer;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
 
 /**
  * Abstract indexer for the {@code short} primitive type, treated as bfloat16.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/Bfloat16RawIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/Bfloat16RawIndexer.java
@@ -24,8 +24,8 @@
 
 import org.bytedeco.javacpp.Pointer;
 import org.bytedeco.javacpp.ShortPointer;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
-import static org.bytedeco.javacpp.indexer.DefaultIndex.defaultIndex;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.defaultIndex;
 
 /**
  * An indexer for a {@link ShortPointer} using the {@link Raw} instance, treated as bfloat16.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/BooleanArrayIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/BooleanArrayIndexer.java
@@ -22,8 +22,8 @@
 
 package org.bytedeco.javacpp.indexer;
 
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
-import static org.bytedeco.javacpp.indexer.DefaultIndex.defaultIndex;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.defaultIndex;
 
 /**
  * An indexer for a {@code boolean[]} array.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/BooleanBufferIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/BooleanBufferIndexer.java
@@ -24,8 +24,8 @@
 
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
-import static org.bytedeco.javacpp.indexer.DefaultIndex.defaultIndex;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.defaultIndex;
 
 /**
  * An indexer for a {@link ByteBuffer} as {@code boolean} values.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/BooleanIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/BooleanIndexer.java
@@ -24,7 +24,7 @@
 
 import java.nio.ByteBuffer;
 import org.bytedeco.javacpp.BooleanPointer;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
 
 /**
  * Abstract indexer for the {@code boolean} primitive type.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/BooleanRawIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/BooleanRawIndexer.java
@@ -24,8 +24,8 @@
 
 import org.bytedeco.javacpp.BooleanPointer;
 import org.bytedeco.javacpp.Pointer;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
-import static org.bytedeco.javacpp.indexer.DefaultIndex.defaultIndex;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.defaultIndex;
 
 /**
  * An indexer for a {@link BooleanPointer} using the {@link Raw} instance.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/ByteArrayIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/ByteArrayIndexer.java
@@ -24,8 +24,8 @@
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
-import static org.bytedeco.javacpp.indexer.DefaultIndex.defaultIndex;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.defaultIndex;
 
 /**
  * An indexer for a {@code byte[]} array.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/ByteBufferIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/ByteBufferIndexer.java
@@ -24,8 +24,8 @@
 
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
-import static org.bytedeco.javacpp.indexer.DefaultIndex.defaultIndex;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.defaultIndex;
 
 /**
  * An indexer for a {@link ByteBuffer}.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/ByteIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/ByteIndexer.java
@@ -25,7 +25,7 @@
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import org.bytedeco.javacpp.BytePointer;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
 
 /**
  * Abstract indexer for the {@code byte} primitive type.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/ByteRawIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/ByteRawIndexer.java
@@ -24,8 +24,8 @@
 
 import org.bytedeco.javacpp.BytePointer;
 import org.bytedeco.javacpp.Pointer;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
-import static org.bytedeco.javacpp.indexer.DefaultIndex.defaultIndex;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.defaultIndex;
 
 /**
  * An indexer for a {@link BytePointer} using the {@link Raw} instance.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/CharArrayIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/CharArrayIndexer.java
@@ -22,8 +22,8 @@
 
 package org.bytedeco.javacpp.indexer;
 
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
-import static org.bytedeco.javacpp.indexer.DefaultIndex.defaultIndex;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.defaultIndex;
 
 /**
  * An indexer for a {@code char[]} array.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/CharBufferIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/CharBufferIndexer.java
@@ -24,8 +24,8 @@
 
 import java.nio.Buffer;
 import java.nio.CharBuffer;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
-import static org.bytedeco.javacpp.indexer.DefaultIndex.defaultIndex;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.defaultIndex;
 
 /**
  * An indexer for a {@link CharBuffer}.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/CharIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/CharIndexer.java
@@ -24,7 +24,7 @@
 
 import java.nio.CharBuffer;
 import org.bytedeco.javacpp.CharPointer;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
 
 /**
  * Abstract indexer for the {@code char} primitive type.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/CharRawIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/CharRawIndexer.java
@@ -23,10 +23,9 @@
 package org.bytedeco.javacpp.indexer;
 
 import org.bytedeco.javacpp.CharPointer;
-import org.bytedeco.javacpp.IntPointer;
 import org.bytedeco.javacpp.Pointer;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
-import static org.bytedeco.javacpp.indexer.DefaultIndex.defaultIndex;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.defaultIndex;
 
 /**
  * An indexer for a {@link CharPointer} using the {@link Raw} instance.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/DefaultIndex.java b/src/main/java/org/bytedeco/javacpp/indexer/DefaultIndex.java
diff --git a/src/main/java/org/bytedeco/javacpp/indexer/DoubleArrayIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/DoubleArrayIndexer.java
@@ -22,8 +22,8 @@
 
 package org.bytedeco.javacpp.indexer;
 
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
-import static org.bytedeco.javacpp.indexer.DefaultIndex.defaultIndex;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.defaultIndex;
 
 /**
  * An indexer for a {@code double[]} array.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/DoubleBufferIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/DoubleBufferIndexer.java
@@ -24,8 +24,8 @@
 
 import java.nio.Buffer;
 import java.nio.DoubleBuffer;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
-import static org.bytedeco.javacpp.indexer.DefaultIndex.defaultIndex;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.defaultIndex;
 
 /**
  * An indexer for a {@link DoubleBuffer}.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/DoubleIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/DoubleIndexer.java
@@ -24,7 +24,7 @@
 
 import java.nio.DoubleBuffer;
 import org.bytedeco.javacpp.DoublePointer;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
 
 /**
  * Abstract indexer for the {@code double} primitive type.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/DoubleRawIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/DoubleRawIndexer.java
@@ -24,8 +24,8 @@
 
 import org.bytedeco.javacpp.DoublePointer;
 import org.bytedeco.javacpp.Pointer;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
-import static org.bytedeco.javacpp.indexer.DefaultIndex.defaultIndex;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.defaultIndex;
 
 /**
  * An indexer for a {@link DoublePointer} using the {@link Raw} instance.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/FloatArrayIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/FloatArrayIndexer.java
@@ -22,8 +22,8 @@
 
 package org.bytedeco.javacpp.indexer;
 
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
-import static org.bytedeco.javacpp.indexer.DefaultIndex.defaultIndex;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.defaultIndex;
 
 /**
  * An indexer for a {@code float[]} array.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/FloatBufferIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/FloatBufferIndexer.java
@@ -24,8 +24,8 @@
 
 import java.nio.Buffer;
 import java.nio.FloatBuffer;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
-import static org.bytedeco.javacpp.indexer.DefaultIndex.defaultIndex;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.defaultIndex;
 
 /**
  * An indexer for a {@link FloatBuffer}.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/FloatIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/FloatIndexer.java
@@ -24,7 +24,7 @@
 
 import java.nio.FloatBuffer;
 import org.bytedeco.javacpp.FloatPointer;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
 
 /**
  * Abstract indexer for the {@code float} primitive type.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/FloatRawIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/FloatRawIndexer.java
@@ -24,8 +24,8 @@
 
 import org.bytedeco.javacpp.FloatPointer;
 import org.bytedeco.javacpp.Pointer;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
-import static org.bytedeco.javacpp.indexer.DefaultIndex.defaultIndex;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.defaultIndex;
 
 /**
  * An indexer for a {@link FloatPointer} using the {@link Raw} instance.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/HalfArrayIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/HalfArrayIndexer.java
@@ -22,8 +22,8 @@
 
 package org.bytedeco.javacpp.indexer;
 
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
-import static org.bytedeco.javacpp.indexer.DefaultIndex.defaultIndex;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.defaultIndex;
 
 /**
  * An indexer for a {@code short[]} array, treated as half-precision float.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/HalfBufferIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/HalfBufferIndexer.java
@@ -24,8 +24,8 @@
 
 import java.nio.Buffer;
 import java.nio.ShortBuffer;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
-import static org.bytedeco.javacpp.indexer.DefaultIndex.defaultIndex;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.defaultIndex;
 
 /**
  * An indexer for a {@link ShortBuffer}, treated as half-precision float.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/HalfIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/HalfIndexer.java
@@ -24,7 +24,7 @@
 
 import java.nio.ShortBuffer;
 import org.bytedeco.javacpp.ShortPointer;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
 
 /**
  * Abstract indexer for the {@code short} primitive type, treated as half-precision float.

diff --git a/src/main/java/org/bytedeco/javacpp/indexer/HalfRawIndexer.java b/src/main/java/org/bytedeco/javacpp/indexer/HalfRawIndexer.java
@@ -24,8 +24,8 @@
 
 import org.bytedeco.javacpp.Pointer;
 import org.bytedeco.javacpp.ShortPointer;
-import static org.bytedeco.javacpp.indexer.CustomStridesIndex.customStrides;
-import static org.bytedeco.javacpp.indexer.DefaultIndex.defaultIndex;
+import static org.bytedeco.javacpp.indexer.StrideIndex.customStrides;
+import static org.bytedeco.javacpp.indexer.StrideIndex.defaultIndex;
 
 /**
  * An indexer for a {@link ShortPointer} using the {@link Raw} instance, treated as half-precision float.