Skip to content

Commit cea7490

Browse files
karlnicholaskarlnicholas
committed
Updates for v2 arch
1 parent 6e83236 commit cea7490

File tree

13 files changed

+244
-787
lines changed

13 files changed

+244
-787
lines changed

‎src/main/java/org/hdf5javalib/examples/h5ex_d/h5ex_d_read.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.hdf5javalib.examples.h5ex_d;
22

33
import org.hdf5javalib.datasource.TypedDataSource;
4+
import org.hdf5javalib.utils.HdfDisplayUtils;
45
import org.slf4j.Logger;
56
import org.slf4j.LoggerFactory;
67

@@ -12,8 +13,6 @@
1213
import java.util.Objects;
1314
import java.util.stream.Stream;
1415

15-
import static org.hdf5javalib.utils.HdfDisplayUtils.displayFile;
16-
1716
/**
1817
* Demonstrates reading and processing compound data from an HDF5 file.
1918
* <p>
@@ -45,7 +44,7 @@ private void run() {
4544
streamList.filter(p -> p.toString().endsWith(".h5"))
4645
.forEach(p -> {
4746
log.info("Running {}", p.getFileName());
48-
displayFile(p);
47+
HdfDisplayUtils.displayFileContent(p);
4948
});
5049

5150
}

‎src/main/java/org/hdf5javalib/examples/h5ex_t/h5ex_t_read.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.hdf5javalib.examples.h5ex_t;
22

33
import org.hdf5javalib.datasource.TypedDataSource;
4+
import org.hdf5javalib.utils.HdfDisplayUtils;
45
import org.slf4j.Logger;
56
import org.slf4j.LoggerFactory;
67

@@ -12,8 +13,6 @@
1213
import java.util.Objects;
1314
import java.util.stream.Stream;
1415

15-
import static org.hdf5javalib.utils.HdfDisplayUtils.displayFile;
16-
1716
/**
1817
* Demonstrates reading and processing compound data from an HDF5 file.
1918
* <p>
@@ -45,7 +44,7 @@ private void run() {
4544
streamList.filter(p -> p.toString().endsWith(".h5"))
4645
.forEach(p -> {
4746
log.info("Running {}", p.getFileName());
48-
displayFile(p);
47+
HdfDisplayUtils.displayFileContent(p);
4948
});
5049

5150
}

‎src/main/java/org/hdf5javalib/examples/h5ex_tutr/h5ex_tutr_read.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.hdf5javalib.examples.h5ex_tutr;
22

33
import org.hdf5javalib.datasource.TypedDataSource;
4+
import org.hdf5javalib.utils.HdfDisplayUtils;
45
import org.slf4j.Logger;
56
import org.slf4j.LoggerFactory;
67

@@ -12,8 +13,6 @@
1213
import java.util.Objects;
1314
import java.util.stream.Stream;
1415

15-
import static org.hdf5javalib.utils.HdfDisplayUtils.displayFile;
16-
1716
/**
1817
* Demonstrates reading and processing compound data from an HDF5 file.
1918
* <p>
@@ -45,7 +44,7 @@ private void run() {
4544
streamList.filter(p -> p.toString().endsWith(".h5"))
4645
.forEach(p -> {
4746
log.info("Running {}", p.getFileName());
48-
displayFile(p);
47+
HdfDisplayUtils.displayFileContent(p);
4948
});
5049

5150
}

‎src/main/java/org/hdf5javalib/examples/hdf5examples/HDF5Debug.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.hdf5javalib.hdfjava.HdfDataFile;
66
import org.hdf5javalib.hdfjava.HdfDataset;
77
import org.hdf5javalib.hdfjava.HdfFileReader;
8-
import org.hdf5javalib.utils.HdfDisplaySummaryStatsUtils;
8+
import org.hdf5javalib.utils.HdfDisplayUtils;
99
import org.slf4j.Logger;
1010
import org.slf4j.LoggerFactory;
1111

@@ -61,7 +61,7 @@ private static void processFile(Path filePath) {
6161
for (HdfDataset dataSet : reader.getDatasets()) {
6262
System.out.println("{} " + dataSet);
6363
// log.info("{} ", dataSet);
64-
HdfDisplaySummaryStatsUtils.displayData(channel, dataSet, reader);
64+
HdfDisplayUtils.displayData(channel, dataSet, reader, HdfDisplayUtils.DisplayMode.SUMMARY_STATS);
6565
// displayScalarData(channel, dataSet, HdfFloatPoint.class, reader);
6666
}
6767

‎src/main/java/org/hdf5javalib/examples/hdf5examples/HDF5Examples.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.hdf5javalib.examples.hdf5examples;
22

33
import org.hdf5javalib.datasource.TypedDataSource;
4+
import org.hdf5javalib.utils.HdfDisplayUtils;
45
import org.slf4j.Logger;
56
import org.slf4j.LoggerFactory;
67

@@ -12,8 +13,6 @@
1213
import java.util.Objects;
1314
import java.util.stream.Stream;
1415

15-
import static org.hdf5javalib.utils.HdfDisplayUtils.displayFile;
16-
1716
/**
1817
* Demonstrates reading and processing compound data from an HDF5 file.
1918
* <p>
@@ -45,7 +44,7 @@ private void run() {
4544
streamList.filter(p -> p.toString().endsWith(".h5"))
4645
.forEach(p -> {
4746
log.info("Running {}", p.getFileName());
48-
displayFile(p);
47+
HdfDisplayUtils.displayFileContent(p);
4948
});
5049

5150
}

‎src/main/java/org/hdf5javalib/examples/read/DimensionsRead.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
import org.hdf5javalib.datasource.TypedDataSource;
44
import org.hdf5javalib.hdfjava.HdfDataset;
55
import org.hdf5javalib.hdfjava.HdfFileReader;
6+
import org.hdf5javalib.utils.HdfDisplayUtils;
67

78
import java.nio.channels.SeekableByteChannel;
89
import java.nio.file.Files;
910
import java.nio.file.Path;
1011
import java.nio.file.StandardOpenOption;
1112

12-
import static org.hdf5javalib.utils.HdfDisplayUtils.displayData;
1313
import static org.hdf5javalib.utils.HdfReadUtils.getResourcePath;
1414

1515
/**
@@ -43,7 +43,7 @@ private void run() {
4343
HdfFileReader reader = new HdfFileReader(channel).readFile();
4444
log.debug("File BTree: {} ", reader.getBTree());
4545
for (HdfDataset dataSet : reader.getDatasets()) {
46-
displayData(channel, dataSet, reader);
46+
HdfDisplayUtils.displayData(channel, dataSet, reader, HdfDisplayUtils.DisplayMode.FULL_CONTENT);
4747
}
4848
}
4949
} catch (Exception e) {

‎src/main/java/org/hdf5javalib/examples/read/SeparateTypesRead.java‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -45,38 +45,38 @@ private void run() throws Exception {
4545
FileChannel channel = fis.getChannel();
4646
HdfFileReader reader = new HdfFileReader(channel).readFile();
4747
try (HdfDataset dataSet = reader.getDataset("/fixed_point").orElseThrow()) {
48-
HdfDisplayUtils.displayScalarData(channel, dataSet, HdfFixedPoint.class, reader);
49-
HdfDisplayUtils.displayScalarData(channel, dataSet, Integer.class, reader);
50-
HdfDisplayUtils.displayScalarData(channel, dataSet, Long.class, reader);
51-
HdfDisplayUtils.displayScalarData(channel, dataSet, BigInteger.class, reader);
52-
HdfDisplayUtils.displayScalarData(channel, dataSet, BigDecimal.class, reader);
53-
HdfDisplayUtils.displayScalarData(channel, dataSet, String.class, reader);
48+
HdfDisplayUtils.displayScalarContent(channel, dataSet, HdfFixedPoint.class, reader);
49+
HdfDisplayUtils.displayScalarContent(channel, dataSet, Integer.class, reader);
50+
HdfDisplayUtils.displayScalarContent(channel, dataSet, Long.class, reader);
51+
HdfDisplayUtils.displayScalarContent(channel, dataSet, BigInteger.class, reader);
52+
HdfDisplayUtils.displayScalarContent(channel, dataSet, BigDecimal.class, reader);
53+
HdfDisplayUtils.displayScalarContent(channel, dataSet, String.class, reader);
5454
}
5555
try (HdfDataset dataSet = reader.getDataset("float").orElseThrow()) {
56-
HdfDisplayUtils.displayScalarData(channel, dataSet, HdfFloatPoint.class, reader);
57-
HdfDisplayUtils.displayScalarData(channel, dataSet, Float.class, reader);
58-
HdfDisplayUtils.displayScalarData(channel, dataSet, Double.class, reader);
59-
HdfDisplayUtils.displayScalarData(channel, dataSet, String.class, reader);
56+
HdfDisplayUtils.displayScalarContent(channel, dataSet, HdfFloatPoint.class, reader);
57+
HdfDisplayUtils.displayScalarContent(channel, dataSet, Float.class, reader);
58+
HdfDisplayUtils.displayScalarContent(channel, dataSet, Double.class, reader);
59+
HdfDisplayUtils.displayScalarContent(channel, dataSet, String.class, reader);
6060
}
6161
try (HdfDataset dataSet = reader.getDataset("time").orElseThrow()) {
62-
HdfDisplayUtils.displayScalarData(channel, dataSet, HdfTime.class, reader);
63-
HdfDisplayUtils.displayScalarData(channel, dataSet, Long.class, reader);
64-
HdfDisplayUtils.displayScalarData(channel, dataSet, BigInteger.class, reader);
65-
HdfDisplayUtils.displayScalarData(channel, dataSet, String.class, reader);
62+
HdfDisplayUtils.displayScalarContent(channel, dataSet, HdfTime.class, reader);
63+
HdfDisplayUtils.displayScalarContent(channel, dataSet, Long.class, reader);
64+
HdfDisplayUtils.displayScalarContent(channel, dataSet, BigInteger.class, reader);
65+
HdfDisplayUtils.displayScalarContent(channel, dataSet, String.class, reader);
6666
}
6767
try (HdfDataset dataSet = reader.getDataset("string").orElseThrow()) {
68-
HdfDisplayUtils.displayScalarData(channel, dataSet, HdfString.class, reader);
69-
HdfDisplayUtils.displayScalarData(channel, dataSet, String.class, reader);
68+
HdfDisplayUtils.displayScalarContent(channel, dataSet, HdfString.class, reader);
69+
HdfDisplayUtils.displayScalarContent(channel, dataSet, String.class, reader);
7070
}
7171
try (HdfDataset dataSet = reader.getDataset("bitfield").orElseThrow()) {
72-
HdfDisplayUtils.displayScalarData(channel, dataSet, HdfBitField.class, reader);
73-
HdfDisplayUtils.displayScalarData(channel, dataSet, BitSet.class, reader);
74-
HdfDisplayUtils.displayScalarData(channel, dataSet, String.class, reader);
72+
HdfDisplayUtils.displayScalarContent(channel, dataSet, HdfBitField.class, reader);
73+
HdfDisplayUtils.displayScalarContent(channel, dataSet, BitSet.class, reader);
74+
HdfDisplayUtils.displayScalarContent(channel, dataSet, String.class, reader);
7575
}
7676
try (HdfDataset dataSet = reader.getDataset("compound").orElseThrow()) {
77-
HdfDisplayUtils.displayScalarData(channel, dataSet, HdfCompound.class, reader);
78-
HdfDisplayUtils.displayScalarData(channel, dataSet, String.class, reader);
79-
HdfDisplayUtils.displayScalarData(channel, dataSet, Compound.class, reader);
77+
HdfDisplayUtils.displayScalarContent(channel, dataSet, HdfCompound.class, reader);
78+
HdfDisplayUtils.displayScalarContent(channel, dataSet, String.class, reader);
79+
HdfDisplayUtils.displayScalarContent(channel, dataSet, Compound.class, reader);
8080
CompoundDatatype.addConverter(CustomCompound.class, (bytes, compoundDataType) -> {
8181
Map<String, HdfCompoundMember> nameToMember = compoundDataType.getInstance(HdfCompound.class, bytes)
8282
.getMembers()
@@ -88,31 +88,31 @@ private void run() throws Exception {
8888
.someDouble(nameToMember.get("b").getInstance(Double.class))
8989
.build();
9090
});
91-
HdfDisplayUtils.displayScalarData(channel, dataSet, CustomCompound.class, reader);
91+
HdfDisplayUtils.displayScalarContent(channel, dataSet, CustomCompound.class, reader);
9292
}
9393
try (HdfDataset dataSet = reader.getDataset("opaque").orElseThrow()) {
94-
HdfDisplayUtils.displayScalarData(channel, dataSet, HdfOpaque.class, reader);
95-
HdfDisplayUtils.displayScalarData(channel, dataSet, String.class, reader);
96-
HdfDisplayUtils.displayScalarData(channel, dataSet, byte[].class, reader);
94+
HdfDisplayUtils.displayScalarContent(channel, dataSet, HdfOpaque.class, reader);
95+
HdfDisplayUtils.displayScalarContent(channel, dataSet, String.class, reader);
96+
HdfDisplayUtils.displayScalarContent(channel, dataSet, byte[].class, reader);
9797
}
9898
try (HdfDataset dataSet = reader.getDataset("reference").orElseThrow()) {
99-
HdfDisplayUtils.displayScalarData(channel, dataSet, HdfReference.class, reader);
100-
HdfDisplayUtils.displayScalarData(channel, dataSet, String.class, reader);
101-
HdfDisplayUtils.displayScalarData(channel, dataSet, byte[].class, reader);
99+
HdfDisplayUtils.displayScalarContent(channel, dataSet, HdfReference.class, reader);
100+
HdfDisplayUtils.displayScalarContent(channel, dataSet, String.class, reader);
101+
HdfDisplayUtils.displayScalarContent(channel, dataSet, byte[].class, reader);
102102
}
103103
try (HdfDataset dataSet = reader.getDataset("enum").orElseThrow()) {
104-
HdfDisplayUtils.displayScalarData(channel, dataSet, HdfEnum.class, reader);
105-
HdfDisplayUtils.displayScalarData(channel, dataSet, String.class, reader);
104+
HdfDisplayUtils.displayScalarContent(channel, dataSet, HdfEnum.class, reader);
105+
HdfDisplayUtils.displayScalarContent(channel, dataSet, String.class, reader);
106106
}
107107
try (HdfDataset dataSet = reader.getDataset("vlen").orElseThrow()) {
108-
HdfDisplayUtils.displayScalarData(channel, dataSet, HdfVariableLength.class, reader);
109-
HdfDisplayUtils.displayScalarData(channel, dataSet, String.class, reader);
110-
HdfDisplayUtils.displayScalarData(channel, dataSet, Object.class, reader);
108+
HdfDisplayUtils.displayScalarContent(channel, dataSet, HdfVariableLength.class, reader);
109+
HdfDisplayUtils.displayScalarContent(channel, dataSet, String.class, reader);
110+
HdfDisplayUtils.displayScalarContent(channel, dataSet, Object.class, reader);
111111
}
112112
try (HdfDataset dataSet = reader.getDataset("array").orElseThrow()) {
113-
HdfDisplayUtils.displayScalarData(channel, dataSet, HdfArray.class, reader);
114-
HdfDisplayUtils.displayScalarData(channel, dataSet, String.class, reader);
115-
HdfDisplayUtils.displayScalarData(channel, dataSet, HdfData[].class, reader);
113+
HdfDisplayUtils.displayScalarContent(channel, dataSet, HdfArray.class, reader);
114+
HdfDisplayUtils.displayScalarContent(channel, dataSet, String.class, reader);
115+
HdfDisplayUtils.displayScalarContent(channel, dataSet, HdfData[].class, reader);
116116
}
117117
log.info("Superblock: {}", reader.getSuperblock());
118118
}

‎src/main/java/org/hdf5javalib/examples/read/StringRead.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ private void run() throws Exception {
3535
FileChannel channel = fis.getChannel();
3636
HdfFileReader reader = new HdfFileReader(channel).readFile();
3737
try (HdfDataset dataSet = reader.getDataset("/strings").orElseThrow()) {
38-
HdfDisplayUtils.displayVectorData(channel, dataSet, String.class, reader);
38+
HdfDisplayUtils.displayVectorContent(channel, dataSet, String.class, reader);
3939
}
4040
}
4141
filePath = Objects.requireNonNull(StringRead.class.getResource("/utf8_dataset.h5")).getFile();
4242
try (FileInputStream fis = new FileInputStream(filePath)) {
4343
FileChannel channel = fis.getChannel();
4444
HdfFileReader reader = new HdfFileReader(channel).readFile();
4545
try (HdfDataset dataSet = reader.getDataset("/strings").orElseThrow()) {
46-
HdfDisplayUtils.displayVectorData(channel, dataSet, String.class, reader);
46+
HdfDisplayUtils.displayVectorContent(channel, dataSet, String.class, reader);
4747
}
4848
}
4949
}

‎src/main/java/org/hdf5javalib/examples/read/TwentyScalarRead.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ private void run() throws Exception {
4141
HdfFileReader reader = new HdfFileReader(channel).readFile();
4242
for (HdfDataset dataSet : reader.getDatasets()) {
4343
try (HdfDataset ds = dataSet) {
44-
HdfDisplayUtils.displayScalarData(channel, ds, Long.class, reader);
44+
HdfDisplayUtils.displayScalarContent(channel, ds, Long.class, reader);
4545
}
4646
}
4747
log.debug("Superblock: {} ", reader.getSuperblock());

‎src/main/java/org/hdf5javalib/examples/read/VLenTypesRead.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ private void run() throws Exception {
4242
for (HdfDataset dataSet : reader.getDatasets()) {
4343
try (HdfDataset ds = dataSet) {
4444
log.info("Dataset name: {}", ds.getObjectName());
45-
HdfDisplayUtils.displayScalarData(channel, ds, HdfVariableLength.class, reader);
46-
HdfDisplayUtils.displayScalarData(channel, ds, String.class, reader);
47-
HdfDisplayUtils.displayScalarData(channel, ds, Object.class, reader);
45+
HdfDisplayUtils.displayScalarContent(channel, ds, HdfVariableLength.class, reader);
46+
HdfDisplayUtils.displayScalarContent(channel, ds, String.class, reader);
47+
HdfDisplayUtils.displayScalarContent(channel, ds, Object.class, reader);
4848
}
4949
}
5050
log.info("Superblock: {}", reader.getSuperblock());

0 commit comments

Comments
 (0)