Updates for v2 arch

Author: karlnicholas

src/main/java/org/hdf5javalib/utils/HdfDisplayCountUtils.java

@@ -15,11 +15,14 @@
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.nio.channels.SeekableByteChannel;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 import java.util.Arrays;
+import java.util.BitSet;
 import java.util.Comparator;
 import java.util.Optional;
 
@@ -122,16 +125,16 @@ public static void displayData(SeekableByteChannel channel, HdfDataset ds, HdfFi
         if (ds.hasData()) {
             switch (ds.getDimensionality()) {
                 case 0:
-                    displayScalarData(channel, ds, HdfData.class, reader);
+                    displayScalarData(channel, ds, reader);
                     break;
                 case 1:
-                    displayVectorData(channel, ds, HdfData.class, reader);
+                    displayVectorData(channel, ds, reader);
                     break;
                 case 2:
-                    displayMatrixData(channel, ds, HdfData.class, reader);
+                    displayMatrixData(channel, ds, reader);
                     break;
                 default:
-                    displayNDimData(channel, ds, HdfData.class, reader);
+                    displayNDimData(channel, ds, reader);
                     break;
 
             }
@@ -149,16 +152,17 @@ public static void displayData(SeekableByteChannel channel, HdfDataset ds, HdfFi
      *
      * @param fileChannel the seekable byte channel for reading the HDF5 file
      * @param dataSet     the dataset to read from
-     * @param clazz       the class type of the data
      * @param hdfDataFile the HDF5 file context
      * @param <T>         the type of the data
      * @throws IOException if an I/O error occurs
      */
-    public static <T> void displayScalarData(SeekableByteChannel fileChannel, HdfDataset dataSet, Class<T> clazz, HdfDataFile hdfDataFile) throws IOException, InvocationTargetException, InstantiationException, IllegalAccessException {
+    public static <T extends Comparable<T>> void displayScalarData(SeekableByteChannel fileChannel, HdfDataset dataSet, HdfDataFile hdfDataFile) throws IOException, InvocationTargetException, InstantiationException, IllegalAccessException {
+        Class<T> clazz = getClassForDatatype(dataSet);
         TypedDataSource<T> dataSource = new TypedDataSource<>(fileChannel, hdfDataFile, dataSet, clazz);
 
-        Optional<String> max = dataSource.streamScalar().map(h->h.toString()).max(Comparator.naturalOrder());
-        System.out.println(dataSet.getObjectPath() + " streamScalar nax = " + max.orElse("NO MAX"));
+//        Optional<String> max = dataSource.streamScalar().map(h->h.toString()).max(Comparator.naturalOrder());
+        Optional<T> max = dataSource.streamScalar().max(Comparator.naturalOrder());
+        System.out.println(dataSet.getObjectPath() + " " + dataSet.getDatatype().getDatatypeClass().name() + "->" + clazz.getSimpleName() + " streamScalar max = " + (max.isPresent() ? max.get().toString() : "NaN"));
 //        long count = dataSource.parallelStreamScalar().count();
 //        System.out.println(dataSet.getObjectPath() + " stream count = " + String.format("%,d", count) + ":" + dataSet.getDatatype().toString());
     }
@@ -173,19 +177,20 @@ public static <T> void displayScalarData(SeekableByteChannel fileChannel, HdfDat
      *
      * @param fileChannel the seekable byte channel for reading the HDF5 file
      * @param dataSet     the dataset to read from
-     * @param clazz       the class type of the data elements
      * @param hdfDataFile the HDF5 file context
      * @param <T>         the type of the data elements
      * @throws IOException if an I/O error occurs
      */
-    public static <T> void displayVectorData(SeekableByteChannel fileChannel, HdfDataset dataSet, Class<T> clazz, HdfDataFile hdfDataFile) throws IOException, InvocationTargetException, InstantiationException, IllegalAccessException {
+    public static <T extends Comparable<T>>  void displayVectorData(SeekableByteChannel fileChannel, HdfDataset dataSet, HdfDataFile hdfDataFile) throws IOException, InvocationTargetException, InstantiationException, IllegalAccessException {
+        Class<T> clazz = getClassForDatatype(dataSet);
         TypedDataSource<T> dataSource = new TypedDataSource<>(fileChannel, hdfDataFile, dataSet, clazz);
 
 //        T[] resultArray = dataSource.readVector();
 //        log.info("{} read = {}", displayType(clazz, resultArray), displayValue(resultArray));
 
-        Optional<String> max = dataSource.streamVector().map(h->h.toString()).max(Comparator.naturalOrder());
-        System.out.println(dataSet.getObjectPath() + " streamVector max = " + max.orElse("NO MAX"));
+//        Optional<String> max = dataSource.streamVector().map(h->h.toString()).max(Comparator.naturalOrder());
+        Optional<T> max = dataSource.streamVector().max(Comparator.naturalOrder());
+        System.out.println(dataSet.getObjectPath() + " " + dataSet.getDatatype().getDatatypeClass().name() + "->" + clazz.getSimpleName() + " streamVector max = " + (max.isPresent() ? max.get().toString() : "NaN"));
 
 //        long count = dataSource.parallelStreamVector().count();
 //        System.out.println(dataSet.getObjectPath() + " stream count = " + String.format("%,d", count) + ":" + dataSet.getDatatype().toString());
@@ -201,16 +206,16 @@ public static <T> void displayVectorData(SeekableByteChannel fileChannel, HdfDat
      *
      * @param fileChannel the seekable byte channel for reading the HDF5 file
      * @param dataSet     the dataset to read from
-     * @param clazz       the class type of the data elements
      * @param hdfDataFile the HDF5 file context
      * @param <T>         the type of the data elements
      * @throws IOException if an I/O error occurs
      */
-    public static <T> void displayMatrixData(SeekableByteChannel fileChannel, HdfDataset dataSet, Class<T> clazz, HdfDataFile hdfDataFile) throws IOException, InvocationTargetException, InstantiationException, IllegalAccessException {
+    public static <T extends Comparable<T>> void displayMatrixData(SeekableByteChannel fileChannel, HdfDataset dataSet, HdfDataFile hdfDataFile) throws IOException, InvocationTargetException, InstantiationException, IllegalAccessException {
+        Class<T> clazz = getClassForDatatype(dataSet);
         TypedDataSource<T> dataSource = new TypedDataSource<>(fileChannel, hdfDataFile, dataSet, clazz);
 
-        Optional<String> max = dataSource.streamMatrix().map(h->h.toString()).max(Comparator.naturalOrder());
-        System.out.println(dataSet.getObjectPath() + " streamMatrix max = " + max.orElse("NO MAX"));
+        Optional<T> max = dataSource.streamMatrix().flatMap(h->Arrays.stream(h)).max(Comparator.naturalOrder());
+        System.out.println(dataSet.getObjectPath() + " " + dataSet.getDatatype().getDatatypeClass().name() + "->" + clazz.getSimpleName() + " streamMatrix max = " + (max.isPresent() ? max.get().toString() : "NaN"));
 
 //        long count = dataSource.parallelStreamMatrix().count();
 //        System.out.println(dataSet.getObjectPath() + " stream count = " + String.format("%,d", count) + ":" + dataSet.getDatatype().toString());
@@ -226,22 +231,38 @@ public static <T> void displayMatrixData(SeekableByteChannel fileChannel, HdfDat
      *
      * @param fileChannel the seekable byte channel for reading the HDF5 file
      * @param dataSet     the dataset to read from
-     * @param clazz       the class type of the data elements
      * @param hdfDataFile the HDF5 file context
      * @param <T>         the type of the data elements
      * @throws IOException if an I/O error occurs
      */
-    private static <T> void displayNDimData(SeekableByteChannel fileChannel, HdfDataset dataSet, Class<T> clazz, HdfDataFile hdfDataFile) throws IOException, InvocationTargetException, InstantiationException, IllegalAccessException {
+    private static <T extends Comparable<T>> void displayNDimData(SeekableByteChannel fileChannel, HdfDataset dataSet, HdfDataFile hdfDataFile) throws IOException, InvocationTargetException, InstantiationException, IllegalAccessException {
+        Class<T> clazz = getClassForDatatype(dataSet);
         TypedDataSource<T> dataSource = new TypedDataSource<>(fileChannel, hdfDataFile, dataSet, clazz);
-
 //        String readResult = flattenedArrayToString(dataSource.readFlattened(), dataSource.getShape());
 //        log.info("read = {}", readResult);
 
-        Optional<String> max = dataSource.streamFlattened().map(h->h.toString()).max(Comparator.naturalOrder());
-        System.out.println(dataSet.getObjectPath() + " streamFlattened max = " + max.orElse("NO MAX"));
+//        Optional<String> max = dataSource.streamFlattened().map(h->h.toString()).max(Comparator.naturalOrder());
+        Optional<T> max = dataSource.streamFlattened().max(Comparator.naturalOrder());
+        System.out.println(dataSet.getObjectPath() + " " + dataSet.getDatatype().getDatatypeClass().name() + "->" + clazz.getSimpleName() + " streamFlattened max = " + (max.isPresent() ? max.get().toString() : "NaN"));
 
         //        long count = dataSource.parallelStreamFlattened().count();
 //        System.out.println(dataSet.getObjectPath() + " stream count = " + String.format("%,d", count) + ":" + dataSet.getDatatype().toString());
     }
 
+    private static <T extends Comparable<T>> Class<T> getClassForDatatype(HdfDataset dataSet) {
+        return (Class<T>) switch (dataSet.getDatatype().getDatatypeClass()) {
+            case FIXED -> Long.class;
+            case FLOAT -> Double.class;
+            case TIME -> Long.class;
+            case STRING -> String.class;
+            case BITFIELD -> String.class;
+            case OPAQUE -> String.class;
+            case COMPOUND -> String.class;
+            case REFERENCE -> String.class;
+            case ENUM -> String.class;
+            case VLEN -> String.class;
+            case ARRAY -> String.class;
+        };
+
+    }
 }