Tweaks.

Author: Dannemann

build.gradle.kts

@@ -30,7 +30,7 @@ tasks.test {
 jmh {
     jmhVersion = "1.37"
     includes = listOf(".Benchmark.")
-    benchmarkMode = listOf("thrpt")
+    benchmarkMode = listOf("avgt")
     fork = 2
     warmup = "10s"
     warmupIterations = 3

src/jmh/java/com/stringcompressor/BaseBenchmark.java

@@ -0,0 +1,12 @@
+package com.stringcompressor;
+
+/**
+ * @author Jean Dannemann Carone
+ */
+public class BaseBenchmark {
+
+	public static byte[] generate10MbString(byte[] charset) {
+		return BaseTest.generateRandomString(10 * 1024 * 1024, charset);
+	}
+
+}

src/jmh/java/com/stringcompressor/FiveBitAsciiCompressorBenchmarAk.java

@@ -0,0 +1,53 @@
+package com.stringcompressor;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import static com.stringcompressor.FiveBitAsciiCompressor.DEFAULT_5BIT_CHARSET;
+
+/**
+ * @author Jean Dannemann Carone
+ */
+@State(Scope.Benchmark)
+public class FiveBitAsciiCompressorBenchmark extends BaseBenchmark {
+
+	AsciiCompressor compressor;
+	byte[] toCompress;
+	byte[] toDecompress;
+
+	@Setup(Level.Trial)
+	public void setUp() {
+		compressor = new FiveBitAsciiCompressor();
+		toCompress = generate10MbString(DEFAULT_5BIT_CHARSET);
+		toDecompress = compressor.compress(toCompress);
+	}
+
+	@Benchmark
+	public byte[] compress10Mb() {
+		return compressor.compress(toCompress);
+	}
+
+	@Benchmark
+	public byte[] decompress10Mb() {
+		return compressor.decompress(toDecompress);
+	}
+
+	/**
+	 * For debugging (see JMH in build.gradle.kts).
+	 */
+	public static void main(String[] args) throws RunnerException {
+		new Runner(
+			new OptionsBuilder()
+				.include(FiveBitAsciiCompressorBenchmark.class.getSimpleName())
+				.forks(0)
+				.build())
+			.run();
+	}
+
+}

src/jmh/java/com/stringcompressor/FiveBitAsciiCompressorBenchmark.java

@@ -1,58 +1,42 @@
 package com.stringcompressor;
 
 import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.runner.Runner;
 import org.openjdk.jmh.runner.RunnerException;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-import java.util.Random;
-
 import static com.stringcompressor.FourBitAsciiCompressor.DEFAULT_4BIT_CHARSET;
 
 /**
  * @author Jean Dannemann Carone
  */
-public class FourBitAsciiCompressorBenchmark {
-
-	private static final AsciiCompressor COMPRESSOR = new FourBitAsciiCompressor();
-	private static final int MAX_STRINGS = 256; // Must be a power of 2 for bitwise module.
-	private static final byte[][] INPUT_STRINGS = new byte[MAX_STRINGS][];
-	private static final byte[][] COMPRESSED_STRINGS = new byte[MAX_STRINGS][];
-	private static final Random RANDOM = new Random();
-
-	private static int index;
-
-	static {
-		COMPRESSOR.setPreserveOriginal(true);
-		COMPRESSOR.setThrowException(false);
-
-		int charSetLen = DEFAULT_4BIT_CHARSET.length;
-
-		for (int i = 0; i < MAX_STRINGS; i++) {
-			byte[] string = new byte[10 * 1024 * 1024]; // 10 MB each string.
-
-			for (int j = 0, len = string.length; j < len; j++)
-				string[j] = DEFAULT_4BIT_CHARSET[RANDOM.nextInt(charSetLen)];
-
-			INPUT_STRINGS[i] = string;
-			COMPRESSED_STRINGS[i] = COMPRESSOR.compress(string);
-		}
-
+@State(Scope.Benchmark)
+public class FourBitAsciiCompressorBenchmark extends BaseBenchmark {
+
+	AsciiCompressor compressor;
+	byte[] toCompress;
+	byte[] toDecompress;
+
+	@Setup(Level.Trial)
+	public void setUp() {
+		compressor = new FourBitAsciiCompressor();
+		toCompress = generate10MbString(DEFAULT_4BIT_CHARSET);
+		toDecompress = compressor.compress(toCompress);
 	}
 
-//	@Benchmark
-//	public void baseline() {
-//	}
-
 	@Benchmark
-	public byte[] compressStrings() {
-		return COMPRESSOR.compress(INPUT_STRINGS[index++ & 0x7FFFFFFF & MAX_STRINGS - 1]);
+	public byte[] compress10Mb() {
+		return compressor.compress(toCompress);
 	}
 
-//	@Benchmark
-//	public byte[] decompressStrings() {
-//		return COMPRESSOR.decompress(COMPRESSED_STRINGS[index++ & 0x7FFFFFFF & MAX_STRINGS - 1]);
-//	}
+	@Benchmark
+	public byte[] decompress10Mb() {
+		return compressor.decompress(toDecompress);
+	}
 
 	/**
 	 * For debugging (see JMH in build.gradle.kts).

src/jmh/java/com/stringcompressor/FourBitAsciiCompressorBenchmark.java

@@ -0,0 +1,53 @@
+package com.stringcompressor;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import static com.stringcompressor.SixBitAsciiCompressor.DEFAULT_6BIT_CHARSET;
+
+/**
+ * @author Jean Dannemann Carone
+ */
+@State(Scope.Benchmark)
+public class SixBitAsciiCompressorBenchmark extends BaseBenchmark {
+
+	AsciiCompressor compressor;
+	byte[] toCompress;
+	byte[] toDecompress;
+
+	@Setup(Level.Trial)
+	public void setUp() {
+		compressor = new SixBitAsciiCompressor();
+		toCompress = generate10MbString(DEFAULT_6BIT_CHARSET);
+		toDecompress = compressor.compress(toCompress);
+	}
+
+	@Benchmark
+	public byte[] compress10Mb() {
+		return compressor.compress(toCompress);
+	}
+
+	@Benchmark
+	public byte[] decompress10Mb() {
+		return compressor.decompress(toDecompress);
+	}
+
+	/**
+	 * For debugging (see JMH in build.gradle.kts).
+	 */
+	public static void main(String[] args) throws RunnerException {
+		new Runner(
+			new OptionsBuilder()
+				.include(SixBitAsciiCompressorBenchmark.class.getSimpleName())
+				.forks(0)
+				.build())
+			.run();
+	}
+
+}

src/jmh/java/com/stringcompressor/SixBitAsciiCompressorBenchmark.java

@@ -21,7 +21,7 @@ public abstract class AsciiCompressor {
 	 * the original input string, encoding it and making it unusable. To avoid
 	 * this behavior and compress a copy of the original, set this to <code>true</code>.
 	 */
-	protected boolean preserveOriginal = true; // TODO: Set this false after updating benchmarks.
+	protected boolean preserveOriginal;
 
 	/**
 	 * Throw validation exceptions while compressing. Useful for debug but not

src/main/java/com/stringcompressor/AsciiCompressor.java

@@ -1,5 +1,8 @@
 package com.stringcompressor.exception;
 
+/**
+ * @author Jean Dannemann Carone
+ */
 public class CharacterNotSupportedException extends RuntimeException {
 
 	public CharacterNotSupportedException(String message) {