Swap from big integer to stringbuilder creation

KilianB · Jan 6, 2019 · afc026d · afc026d
1 parent da3db29
commit afc026d
Show file tree

Hide file tree

Showing 18 changed files with 142 additions and 100 deletions.
diff --git a/...hub/kilianB/dataStrorage/tree/Result.java → ...b/kilianB/datastructures/tree/Result.java b/...hub/kilianB/dataStrorage/tree/Result.java → ...b/kilianB/datastructures/tree/Result.java
diff --git a/...kilianB/dataStrorage/tree/BinaryTree.java → ...tructures/tree/binaryTree/BinaryTree.java b/...kilianB/dataStrorage/tree/BinaryTree.java → ...tructures/tree/binaryTree/BinaryTree.java
diff --git a/...ithub/kilianB/dataStrorage/tree/Leaf.java → .../datastructures/tree/binaryTree/Leaf.java b/...ithub/kilianB/dataStrorage/tree/Leaf.java → .../datastructures/tree/binaryTree/Leaf.java
diff --git a/...ithub/kilianB/dataStrorage/tree/Node.java → .../datastructures/tree/binaryTree/Node.java b/...ithub/kilianB/dataStrorage/tree/Node.java → .../datastructures/tree/binaryTree/Node.java
diff --git a/src/main/java/com/github/kilianB/hashAlgorithms/AverageColorHash.java b/src/main/java/com/github/kilianB/hashAlgorithms/AverageColorHash.java
@@ -48,7 +48,7 @@ public AverageColorHash(int bitResolution) {
 	}
 
 	@Override
-	protected BigInteger hash(BufferedImage image, BigInteger hash) {
+	protected BigInteger hash(BufferedImage image, StringBuilder hash) {
 		FastPixel fp = FastPixel.create(ImageUtil.getScaledInstance(image, width, height));
 
 		int[][] grayscale = fp.getAverageGrayscale();

diff --git a/src/main/java/com/github/kilianB/hashAlgorithms/AverageHash.java b/src/main/java/com/github/kilianB/hashAlgorithms/AverageHash.java
@@ -60,7 +60,7 @@ public AverageHash(int bitResolution) {
 	}
 
 	@Override
-	protected BigInteger hash(BufferedImage image, BigInteger hash) {
+	protected BigInteger hash(BufferedImage image, StringBuilder hash) {
 		FastPixel fp = FastPixel.create(ImageUtil.getScaledInstance(image, width, height));
 
 		int[][] luminocity = fp.getLuma();
@@ -72,30 +72,30 @@ protected BigInteger hash(BufferedImage image, BigInteger hash) {
 		return computeHash(hash, luminocity, avgPixelValue);
 	}
 
-	protected BigInteger computeHash(BigInteger hash, double[][] pixelValue, double compareAgainst) {
+	protected BigInteger computeHash(StringBuilder hash, double[][] pixelValue, double compareAgainst) {
 		for (int x = 0; x < width; x++) {
 			for (int y = 0; y < height; y++) {
 				if (pixelValue[x][y] < compareAgainst) {
-					hash = hash.shiftLeft(1);
+					hash.append("0");
 				} else {
-					hash = hash.shiftLeft(1).add(BigInteger.ONE);
+					hash.append("1");
 				}
 			}
 		}
-		return hash;
+		return new BigInteger(hash.toString(),2);
 	}
 
-	protected BigInteger computeHash(BigInteger hash, int[][] pixelValue, double compareAgainst) {
+	protected BigInteger computeHash(StringBuilder hash, int[][] pixelValue, double compareAgainst) {
 		for (int x = 0; x < width; x++) {
 			for (int y = 0; y < height; y++) {
 				if (pixelValue[x][y] < compareAgainst) {
-					hash = hash.shiftLeft(1);
+					hash.append("0");
 				} else {
-					hash = hash.shiftLeft(1).add(BigInteger.ONE);
+					hash.append("1");
 				}
 			}
 		}
-		return hash;
+		return new BigInteger(hash.toString(),2);
 	}
 
 	/**

diff --git a/src/main/java/com/github/kilianB/hashAlgorithms/AverageKernelHash.java b/src/main/java/com/github/kilianB/hashAlgorithms/AverageKernelHash.java
@@ -96,7 +96,7 @@ public AverageKernelHash(int bitResolution, Kernel... kernels) {
 	}
 
 	@Override
-	protected BigInteger hash(BufferedImage image, BigInteger hash) {
+	protected BigInteger hash(BufferedImage image, StringBuilder hash) {
 
 		FastPixel fp = FastPixel.create(ImageUtil.getScaledInstance(image, width, height));
 
@@ -105,7 +105,6 @@ protected BigInteger hash(BufferedImage image, BigInteger hash) {
 		// Calculate the average color of the entire image
 
 		// Kernel filter
-
 		double[][] filtered = null;
 
 		for (Kernel kernel : filters) {

diff --git a/src/main/java/com/github/kilianB/hashAlgorithms/DifferenceHash.java b/src/main/java/com/github/kilianB/hashAlgorithms/DifferenceHash.java
@@ -93,7 +93,7 @@ public DifferenceHash(int bitResolution, Precision precision) {
 	}
 
 	@Override
-	protected BigInteger hash(BufferedImage image, BigInteger hash) {
+	protected BigInteger hash(BufferedImage image, StringBuilder hash) {
 		FastPixel fp = FastPixel.create(ImageUtil.getScaledInstance(image, width, height));
 		// Use data buffer for faster access
 
@@ -103,9 +103,9 @@ protected BigInteger hash(BufferedImage image, BigInteger hash) {
 		for (int x = 1; x < width; x++) {
 			for (int y = 0; y < height; y++) {
 				if (lum[x][y] >= lum[x - 1][y]) {
-					hash = hash.shiftLeft(1);
+					hash.append("0");
 				} else {
-					hash = hash.shiftLeft(1).add(BigInteger.ONE);
+					hash.append("1");
 				}
 			}
 		}
@@ -118,9 +118,9 @@ protected BigInteger hash(BufferedImage image, BigInteger hash) {
 			for (int x = 0; x < width; x++) {
 				for (int y = 1; y < height; y++) {
 					if (lum[x][y] < lum[x][y - 1]) {
-						hash = hash.shiftLeft(1);
+						hash.append("0");
 					} else {
-						hash = hash.shiftLeft(1).add(BigInteger.ONE);
+						hash.append("1");
 					}
 				}
 			}
@@ -131,14 +131,14 @@ protected BigInteger hash(BufferedImage image, BigInteger hash) {
 			for (int x = 1; x < width; x++) {
 				for (int y = 1; y < height; y++) {
 					if (lum[x][y] < lum[x - 1][y - 1]) {
-						hash = hash.shiftLeft(1);
+						hash.append("0");
 					} else {
-						hash = hash.shiftLeft(1).add(BigInteger.ONE);
+						hash.append("1");
 					}
 				}
 			}
 		}
-		return hash;
+		return new BigInteger(hash.toString(),2);
 	}
 
 	/**
@@ -188,6 +188,11 @@ public Hash createAlgorithmSpecificHash(Hash original) {
 		return new DHash(original, this.precision, width, height);
 	}
 
+	/**
+	 * An extended hash class allowing dhashes to be visually represented.
+	 * @author Kilian
+	 * @since 3.0.0
+	 */
 	public static class DHash extends Hash {
 
 		private Precision precision;
@@ -273,9 +278,6 @@ private int drawDoublePrecision(FastPixel writer, int width, int wOffset, int he
 		}
 	}
 
-	/**
-	 * @return
-	 */
 	public Precision getPrecision() {
 		return precision;
 	}

diff --git a/src/main/java/com/github/kilianB/hashAlgorithms/HashingAlgorithm.java b/src/main/java/com/github/kilianB/hashAlgorithms/HashingAlgorithm.java
@@ -117,7 +117,8 @@ public Hash hash(BufferedImage image) {
 			}
 		}
 		immutableState = true;
-		return new Hash(hash(bi, BigInteger.ZERO), getKeyResolution(), algorithmId());
+
+		return new Hash(hash(bi, new StringBuilder(getKeyResolution())), getKeyResolution(), algorithmId());
 	}
 
 	/**
@@ -151,10 +152,10 @@ public Hash hash(File imageFile) throws IOException {
 	 * distance requires the potential length of the key to be known.
 	 * 
 	 * @param image Image whose hash will be calculated
-	 * @param hash  the big integer used to store the hash value
+	 * @param hashBuilder a stringBuilder used to construct the hash
 	 * @return the hash encoded as a big integer
 	 */
-	protected abstract BigInteger hash(BufferedImage image, BigInteger hash);
+	protected abstract BigInteger hash(BufferedImage image, StringBuilder hashBuilder);
 
 	/**
 	 * A unique id identifying the settings and algorithms used to generate the
@@ -223,8 +224,9 @@ public int getKeyResolution() {
 		// return value
 		if (keyResolution < 0) {
 			BufferedImage bi = new BufferedImage(1, 1, BufferedImage.TYPE_3BYTE_BGR);
-			// By preceding a ONE bit we don't fall victim to the 0 bit truncation.
-			keyResolution = this.hash(bi, BigInteger.ONE).bitLength() - 1;
+			StringBuilder sb = new StringBuilder(this.bitResolution);
+			this.hash(bi, sb);
+			keyResolution = sb.length();
 		}
 		return keyResolution;
 	}
@@ -290,11 +292,12 @@ public boolean removeFilter(Filter filter) {
 	 * certain behavior, in particular the
 	 * {@link com.github.kilianB.matcher.Hash#toImage(int)} is likely to differ.
 	 * 
-	 * <p> If the algorithm does not utilize a special hash sub class this
-	 * method simply returns the supplied argument.
+	 * <p>
+	 * If the algorithm does not utilize a special hash sub class this method
+	 * returns the supplied argument.
 	 * 
-	 * @param original
-	 * @return
+	 * @param original the hash to transform
+	 * @return a hash as it would be created by this algorithm.
 	 * @since 3.0.0
 	 */
 	public Hash createAlgorithmSpecificHash(Hash original) {

diff --git a/src/main/java/com/github/kilianB/hashAlgorithms/MedianHash.java b/src/main/java/com/github/kilianB/hashAlgorithms/MedianHash.java
@@ -49,7 +49,7 @@ public MedianHash(int bitResolution) {
 	}
 
 	@Override
-	protected BigInteger hash(BufferedImage image, BigInteger hash) {
+	protected BigInteger hash(BufferedImage image, StringBuilder hash) {
 		FastPixel fp = FastPixel.create(ImageUtil.getScaledInstance(image, width, height));
 
 		int[] lum = fp.getLuma1D();

diff --git a/src/main/java/com/github/kilianB/hashAlgorithms/PerceptiveHash.java b/src/main/java/com/github/kilianB/hashAlgorithms/PerceptiveHash.java
@@ -40,7 +40,7 @@ public PerceptiveHash(int bitResolution) {
 	}
 
 	@Override
-	protected BigInteger hash(BufferedImage image, BigInteger hash) {
+	protected BigInteger hash(BufferedImage image, StringBuilder hash) {
 		FastPixel fp = FastPixel.create(ImageUtil.getScaledInstance(image, width, height));
 
 		int[][] lum = fp.getLuma();
@@ -82,13 +82,13 @@ protected BigInteger hash(BufferedImage image, BigInteger hash) {
 			for (int j = 1; j < subHeight + 1; j++) {
 
 				if (lumAsDouble[i][j] < avg) {
-					hash = hash.shiftLeft(1);
+					hash.append("0");
 				} else {
-					hash = hash.shiftLeft(1).add(BigInteger.ONE);
+					hash.append("1");
 				}
 			}
 		}
-		return hash;
+		return new BigInteger(hash.toString(),2);
 	}
 
 	/**

diff --git a/src/main/java/com/github/kilianB/hashAlgorithms/RotAverageHash.java b/src/main/java/com/github/kilianB/hashAlgorithms/RotAverageHash.java
@@ -83,7 +83,7 @@ public RotAverageHash(int bitResolution) {
 	}
 
 	@Override
-	protected BigInteger hash(BufferedImage image, BigInteger hash) {
+	protected BigInteger hash(BufferedImage image, StringBuilder hash) {
 
 		FastPixel fp = FastPixel.create(ImageUtil.getScaledInstance(image, width, height));
 
@@ -127,13 +127,13 @@ protected BigInteger hash(BufferedImage image, BigInteger hash) {
 		// 0 bucket does not contain any value.
 		for (int i = 2; i < hashArr.length; i++) {
 			if (hashArr[i] >= hashArr[i - 1]) {
-				hash = hash.shiftLeft(1);
+				hash.append("0");
 			} else {
-				hash = hash.shiftLeft(1).add(BigInteger.ONE);
+				hash.append("1");
 			}
 		}
 
-		return hash;
+		return new BigInteger(hash.toString(),2);
 	}
 
 	/**

diff --git a/src/main/java/com/github/kilianB/hashAlgorithms/RotPHash.java b/src/main/java/com/github/kilianB/hashAlgorithms/RotPHash.java
@@ -96,7 +96,7 @@ public RotPHash(int bitResolution, boolean truncateKey) {
 	}
 
 	@Override
-	protected BigInteger hash(BufferedImage image, BigInteger hash) {
+	protected BigInteger hash(BufferedImage image, StringBuilder hash) {
 
 		// 0. Preprocessing. Extract Luminosity
 		BufferedImage transformed = ImageUtil.getScaledInstance(image, width, height);
@@ -156,18 +156,18 @@ protected BigInteger hash(BufferedImage image, BigInteger hash) {
 
 				// We discard parts of the information of the last layer if we need a specific
 				// length key
-				if (this.truncateKey && length == bitResolution - 1)
+				if (this.truncateKey && length == bitResolution)
 					break;
 
 				if (arr[j] >= avg) {
-					hash = hash.shiftLeft(1);
+					hash.append("0");
 				} else {
-					hash = hash.shiftLeft(1).add(BigInteger.ONE);
+					hash.append("1");
 				}
 				length++;
 			}
 		}
-		return hash;
+		return new BigInteger(hash.toString(),2);
 	}
 
 	/**
@@ -185,21 +185,21 @@ protected int computePartition(double originalX, double originalY) {
 		return (int) (distance / widthPerSection);
 	}
 
-	@Override
-	public int getKeyResolution() {
-		// We can compute this more quickly than the super class. so we might as well do
-		// it
-		if (keyResolution < 0) {
-			if (truncateKey) {
-				keyResolution = this.bitResolution;
-			} else {
-				BufferedImage bi = new BufferedImage(1, 1, BufferedImage.TYPE_3BYTE_BGR);
-				keyResolution = this.hash(bi, BigInteger.ONE).bitLength() - 1;
-			}
-
-		}
-		return keyResolution;
-	}
+//	@Override
+//	public int getKeyResolution() {
+//		// We can compute this more quickly than the super class. so we might as well do
+//		// it
+//		if (keyResolution < 0) {
+//			if (truncateKey) {
+//				keyResolution = this.bitResolution;
+//			} else {
+//				BufferedImage bi = new BufferedImage(1, 1, BufferedImage.TYPE_3BYTE_BGR);
+//				keyResolution = this.hash(bi, BigInteger.ONE).bitLength() - 1;
+//			}
+//
+//		}
+//		return keyResolution;
+//	}
 
 	@Override
 	protected int precomputeAlgoId() {

diff --git a/src/main/java/com/github/kilianB/hashAlgorithms/experimental/HogHash.java b/src/main/java/com/github/kilianB/hashAlgorithms/experimental/HogHash.java
@@ -157,7 +157,7 @@ public HogHash(int bitResolution) {
 	}
 
 	@Override
-	protected BigInteger hash(BufferedImage image, BigInteger hash) {
+	protected BigInteger hash(BufferedImage image, StringBuilder hash) {
 
 		BufferedImage bi = ImageUtil.getScaledInstance(image, width, height);
 		FastPixel fp = FastPixel.create(bi);
@@ -191,14 +191,14 @@ protected BigInteger hash(BufferedImage image, BigInteger hash) {
 				}
 				for (int bin = 0; bin < numBins; bin++) {
 					if (bin == maxIndex) {
-						hash = hash.shiftLeft(1);
+						hash.append("0");
 					} else {
-						hash = hash.shiftLeft(1).add(BigInteger.ONE);
+						hash.append("1");
 					}
 				}
 			}
 		}
-		return hash;
+		return new BigInteger(hash.toString(),2);
 	}
 
 	protected int[][][] computeHogFeatures(int[][] lum) {

diff --git a/src/main/java/com/github/kilianB/hashAlgorithms/experimental/HogHashAngularEncoded.java b/src/main/java/com/github/kilianB/hashAlgorithms/experimental/HogHashAngularEncoded.java
@@ -54,7 +54,7 @@ public HogHashAngularEncoded(int width, int height, int cellWidth, int numBins)
 	}
 
 	@Override
-	protected BigInteger hash(BufferedImage image, BigInteger hash) {
+	protected BigInteger hash(BufferedImage image, StringBuilder hash) {
 
 		BufferedImage bi = ImageUtil.getScaledInstance(image, width, height);
 		FastPixel fp = FastPixel.create(bi);
@@ -84,15 +84,15 @@ protected BigInteger hash(BufferedImage image, BigInteger hash) {
 			for (int yCell = 0; yCell < yCells; yCell++) {
 				for (int bin = 0; bin < numBins; bin++) {
 					if (hog[xCell][yCell][bin] > binAverage[bin]) {
-						hash = hash.shiftLeft(1);
+						hash.append("0");
 					} else {
-						hash = hash.shiftLeft(1).add(BigInteger.ONE);
+						hash.append("1");
 					}
 				}
 			}
 		}
 
-		return hash;
+		return new BigInteger(hash.toString(),2);
 	}
 
 }