Fix range of returned by ChgCombined values (they were chopped by half :) great work, yeah)

Author: GreenWizard2015

YASL-Core/src/YASL/Hashing/ChgCombined.java

@@ -24,30 +24,38 @@ public ChgCombined(IHashingAlgorithm<T>... hashes) {
 
 	@Override
 	public IHasher<T> generate(int range, int levels) {
+		final int bytesPerItem = bytesIn(range);
 		return x -> {
-			final int bytesPerItem = bytesIn(range);
 			final ByteBuffer res = populate(x, levels * bytesPerItem);
 			final int[] resArr = new int[levels];
 			for (int i = 0; i < levels; i++) {
 				switch (bytesPerItem) {
 					case 4:
-						resArr[i] = Math.abs(res.getInt() % range);
+						final long value = res.getInt() & 0xFFFFFFFFl;
+						final long lRange = range & 0xFFFFFFFFl;
+						resArr[i] = (int) (value % lRange);
 						break;
 
 					case 2:
-						resArr[i] = Math.abs(res.getShort() % range);
+						resArr[i] = (res.getShort() & 0xFFFF) % range;
 						break;
 
 					case 1:
-						resArr[i] = Math.abs(res.get() % range);
+						resArr[i] = (res.get() & 0xFF) % range;
 						break;
+
+					default:
+						throw new RuntimeException("Unsupported hash size");
 				}
 			}
 			return resArr;
 		};
 	}
 
 	public int bytesIn(int range) {
+		if (range < 0) // unsigned
+			return 4;
+
 		if (range <= 0xFF)
 			return 1;
 		if (range <= 0xFFFF)

YASL-Tests/src/Tests/Hashing/Test_hgCombined.java

@@ -26,7 +26,7 @@ public void respectRange() {
 		IHasher<Integer> gen = new ChgCombined<Integer>( //
 		    (x, r) -> x, // salt
 		    (x, r) -> r.put((byte) 21), //
-		    (x, r) -> r.put((byte) -24) //
+		    (x, r) -> r.put((byte) 24) //
 		).generate(5, 2);
 
 		Assert.assertArrayEquals( //
@@ -70,6 +70,7 @@ public void sizeOfRange() {
 
 		Assert.assertEquals(4, gen.bytesIn(0xFFFF00));
 		Assert.assertEquals(4, gen.bytesIn(0x7FFFFF00));
+		Assert.assertEquals(4, gen.bytesIn(0xFFFFFF00));
 	}
 
 	@Test
@@ -96,4 +97,37 @@ public void use2bytes() {
 		    new int[] { 1, 2 }, gen.apply(0x00010002) //
 		);
 	}
+
+	@Test
+	public void asUnsignedByte() {
+		IHasher<Integer> gen = new ChgCombined<Integer>( //
+		    new CIntegerHashing<>(x -> 0xF0F0F0F0) //
+		).generate(0xFF, 1);
+
+		Assert.assertArrayEquals( //
+		    new int[] { 0xF0 }, gen.apply(0) //
+		);
+	}
+
+	@Test
+	public void asUnsignedWord() {
+		IHasher<Integer> gen = new ChgCombined<Integer>( //
+		    new CIntegerHashing<>(x -> 0xFF00FF00) //
+		).generate(0xFFFF, 1);
+
+		Assert.assertArrayEquals( //
+		    new int[] { 0xFF00 }, gen.apply(0) //
+		);
+	}
+
+	@Test
+	public void asUnsignedInt() {
+		IHasher<Integer> gen = new ChgCombined<Integer>( //
+		    new CIntegerHashing<>(x -> 0xFF00000F) //
+		).generate(0xFFFFFFFF, 1);
+
+		Assert.assertEquals( //
+		    0xFF00000F, gen.apply(3)[0] //
+		);
+	}
 }