8.2.6 RC

Changed

- better coverage of BinaryCalc

Security

- fj-bom updated to to 1.3.5

Author: fugerit79

CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- better coverage of BinaryCalc
+
+### Security
+
+- fj-bom updated to to 1.3.5
+
 ## [8.2.5] - 2023-09-04
 
 ### Added

docgen/require/katexInjector.js

@@ -15,7 +15,7 @@ $(document).ready( function () {
         katex.render(addDisp+texTxt, el);
     }
     catch(err) {
-        $(this).html("<span class='err'>"+err);
+        $(this).html("<span class='err'>error");
     }
   });
 

fj-core/src/main/java/org/fugerit/java/core/util/BinaryCalc.java

@@ -1,7 +1,9 @@
 package org.fugerit.java.core.util;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.Function;
 
 /*
  * 
@@ -13,13 +15,39 @@ public class BinaryCalc {
 
 	private BinaryCalc() {}
 
-	public static long hexToLong( String hexString ) {
-		long result = 0;
-		hexString = hexString.toUpperCase();
-		for ( int k=hexString.length()-1, esp=0; k>=0; k--, esp++ ) {
-			result+= BinaryNumber.hexToInt( hexString.charAt( k ) )*Math.pow( 16 , esp );
+	private static final BigDecimal ZERO = new BigDecimal( "0" ).setScale( 0 ); 
+	
+	private static long convertToLong( String stringVal, Function<Character, Integer> fun, int pow ) {
+		BigDecimal result = ZERO;
+		stringVal = stringVal.toUpperCase();
+		for ( int k=stringVal.length()-1, esp=0; k>=0; k--, esp++ ) {
+			result = result.add( new BigDecimal( fun.apply( stringVal.charAt( k ) )*Math.pow( pow , esp ) ) );
 		}
-		return result;
+		return result.longValue();
+	}
+	
+	public static long hexToLong( String stringVal ) {
+		return convertToLong( stringVal , c -> BinaryNumber.hexToInt( c ) , 16 );
+	}
+	
+	public static long octToLong( String stringVal ) {
+		return convertToLong( stringVal , c -> BinaryNumber.octToInt( c ) , 8 );
+	}
+	
+	public static long binToLong( String stringVal ) {
+		return convertToLong( stringVal , c -> BinaryNumber.binToInt( c ) , 2 );
+	}
+
+	public static String longToHex( long value ) {
+		return new BinaryNumber( value ).getHexString();
+	}
+	
+	public static String longToOct( long value ) {
+		return new BinaryNumber( value ).getOctString();
+	}
+	
+	public static String longToBin( long value ) {
+		return new BinaryNumber( value ).getBinString();
 	}
 
 }
@@ -66,6 +94,11 @@ public BinaryNumber() {
 		this.size = 0;
 	}
 
+	public BinaryNumber( long value ) {
+		this();
+		this.setValue(value);
+	}
+	
 	private byte[] data;
 
 	private int size;
@@ -94,45 +127,10 @@ public int get( int index, int radix ) {
 		return result;
 	}
 
-	public int binSize() {
-		return this.size;
-	}
-	
-	public int octSize() {
-		return this.size( OCT_RADIX );
-	}
-	
-	public int hextSize() {
-		return this.size( HEX_RADIX );
-	}	
-	
-	public int getBin( int index ) {
-		return this.data[index];
-	}	
-	
-	public int getOct( int index ) {
-		return this.get( index, OCT_RADIX );
-	}
-	
-	public int getHex( int index ) {
-		return this.get( index, HEX_RADIX );
-	}	
-	
-	public char getBinValue( int index ) {
-		return VALUES_BIN[ this.getBin( index ) ];
-	}
-	
-	public char getOctValue( int index ) {
-		return VALUES_OCT[ this.getOct( index ) ];
-	}	
-	
-	public char getHexValue( int index ) {
-		return VALUES_HEX[ this.getHex( index ) ];
-	}
-
 	private String getString( char[] values, int radix ) { 
 		StringBuilder buffer = new StringBuilder();
-		for ( int k=0; k<this.size( radix ); k++ ) {
+		int currSize = this.size( radix );
+		for ( int k=currSize-1; k>=0; k-- ) {
 			buffer.append( values[ this.get( k , radix ) ] );
 		}
 		return buffer.toString();
@@ -150,9 +148,4 @@ public String getHexString() {
 		return this.getString( VALUES_HEX, HEX_RADIX );
 	}	
 
-	@Override
-	public String toString() {
-		return this.getBinString();
-	}
-	
 }

fj-core/src/test/java/test/org/fugerit/java/core/util/TestBinaryCalc.java

@@ -10,10 +10,67 @@
 public class TestBinaryCalc extends BasicTest {
 
 	@Test
-	public void hexToLong() {
+	public void hexToLongFF() {
 		long res = BinaryCalc.hexToLong( "FF" );
-		logger.info( "TEST : {}", res );
+		logger.info( "TEST hex 1 : {}", res );
 		assertEquals( 255L , res );
 	}
+	
+	@Test
+	public void hexToLongF() {
+		long res = BinaryCalc.hexToLong( "F" );
+		logger.info( "TEST hex 2 : {}", res );
+		assertEquals( 15L , res );
+	}
+	
+	@Test
+	public void hexToLong7BB() {
+		long res = BinaryCalc.hexToLong( "7BB" );
+		logger.info( "TEST hex 3 : {}", res );
+		assertEquals( 1979L , res );
+	}
+	
+	@Test
+	public void octToLong255() {
+		long res = BinaryCalc.octToLong( "377" );
+		logger.info( "TEST oct 1 : {}", res );
+		assertEquals( 255L , res );
+	}
+	
+	
+	@Test
+	public void binToLong55() {
+		long res = BinaryCalc.binToLong( "11111111" );
+		logger.info( "TEST bin 1 : {}", res );
+		assertEquals( 255L , res );
+	}
+	
+	@Test
+	public void longToHex255() {
+		String res = BinaryCalc.longToHex( 255 );
+		logger.info( "TEST long 1 : {}", res );
+		assertEquals( "FF" , res );
+	}
+	
+	@Test
+	public void longToOct255() {
+		String res = BinaryCalc.longToOct( 255 );
+		logger.info( "TEST long 2 : {}", res );
+		assertEquals( "377" , res );
+	}
+	
+	@Test
+	public void longToBin255() {
+		String res = BinaryCalc.longToBin( 255 );
+		logger.info( "TEST long 3 : {}", res );
+		assertEquals( "11111111" , res );
+	}
+	
+	@Test
+	public void longToHex43133() {
+		String res = BinaryCalc.longToHex( 43133 );
+		logger.info( "TEST long 4 : {}", res );
+		assertEquals( "A87D" , res );
+	}
 
 }

pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-bom</artifactId>
-		<version>1.3.4</version>
+		<version>1.3.5</version>
 		<relativePath></relativePath>
 	</parent>