Skip to content

Commit cf99ba3

Browse files
alxkmalxkm
authored
Merge branch 'master' into tower_of_hanoi_improvement
2 parents ba1b548 + 6af7f7b commit cf99ba3

File tree

5 files changed

+250
-0
lines changed

5 files changed

+250
-0
lines changed

‎DIRECTORY.md

+4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
* [WordPatternMatcher](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/backtracking/WordPatternMatcher.java)
2424
* [WordSearch](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/backtracking/WordSearch.java)
2525
* bitmanipulation
26+
* [BcdConversion](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/bitmanipulation/BcdConversion.java)
2627
* [BinaryPalindromeCheck](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/bitmanipulation/BinaryPalindromeCheck.java)
2728
* [BitSwap](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/bitmanipulation/BitSwap.java)
2829
* [BooleanAlgebraGates](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/bitmanipulation/BooleanAlgebraGates.java)
@@ -48,6 +49,7 @@
4849
* [SingleElement](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/bitmanipulation/SingleElement.java)
4950
* [SwapAdjacentBits](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/bitmanipulation/SwapAdjacentBits.java)
5051
* [TwosComplement](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/bitmanipulation/TwosComplement.java)
52+
* [Xs3Conversion](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/bitmanipulation/Xs3Conversion.java)
5153
* ciphers
5254
* a5
5355
* [A5Cipher](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/ciphers/a5/A5Cipher.java)
@@ -659,6 +661,7 @@
659661
* [WordPatternMatcherTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/backtracking/WordPatternMatcherTest.java)
660662
* [WordSearchTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/backtracking/WordSearchTest.java)
661663
* bitmanipulation
664+
* [BcdConversionTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/bitmanipulation/BcdConversionTest.java)
662665
* [BinaryPalindromeCheckTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/bitmanipulation/BinaryPalindromeCheckTest.java)
663666
* [BitSwapTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/bitmanipulation/BitSwapTest.java)
664667
* [BooleanAlgebraGatesTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/bitmanipulation/BooleanAlgebraGatesTest.java)
@@ -684,6 +687,7 @@
684687
* [SingleElementTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/bitmanipulation/SingleElementTest.java)
685688
* [SwapAdjacentBitsTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/bitmanipulation/SwapAdjacentBitsTest.java)
686689
* [TwosComplementTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/bitmanipulation/TwosComplementTest.java)
690+
* [Xs3ConversionTest](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/bitmanipulation/Xs3ConversionTest.java)
687691
* ciphers
688692
* a5
689693
* [A5CipherTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/ciphers/a5/A5CipherTest.java)

‎src/main/java/com/thealgorithms/bitmanipulation/BcdConversion.java

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
package com.thealgorithms.bitmanipulation;
2+
3+
/**
4+
* This class provides methods to convert between BCD (Binary-Coded Decimal) and binary.
5+
*
6+
* Binary-Coded Decimal (BCD) is a class of binary encodings of decimal numbers where each decimal digit is represented by a fixed number of binary digits, usually four or eight.
7+
*
8+
* For more information, refer to the
9+
* <a href="https://en.wikipedia.org/wiki/Binary-coded_decimal">Binary-Coded Decimal</a> Wikipedia page.
10+
*
11+
* <b>Example usage:</b>
12+
* <pre>
13+
* int binary = BcdConversion.bcdToBinary(0x1234);
14+
* System.out.println("BCD 0x1234 to binary: " + binary); // Output: 1234
15+
*
16+
* int bcd = BcdConversion.binaryToBcd(1234);
17+
* System.out.println("Binary 1234 to BCD: " + Integer.toHexString(bcd)); // Output: 0x1234
18+
* </pre>
19+
*/
20+
public final class BcdConversion {
21+
private BcdConversion() {
22+
}
23+
/**
24+
* Converts a BCD (Binary-Coded Decimal) number to binary.
25+
*
26+
* @param bcd The BCD number.
27+
* @return The corresponding binary number.
28+
*/
29+
public static int bcdToBinary(int bcd) {
30+
int binary = 0;
31+
int multiplier = 1;
32+
while (bcd > 0) {
33+
int digit = bcd & 0xF; // Extract the last 4 bits (one BCD digit)
34+
binary += digit * multiplier;
35+
multiplier *= 10;
36+
bcd >>= 4; // Shift right by 4 bits to process the next BCD digit
37+
}
38+
return binary;
39+
}
40+
41+
/**
42+
* Converts a binary number to BCD (Binary-Coded Decimal).
43+
*
44+
* @param binary The binary number.
45+
* @return The corresponding BCD number.
46+
*/
47+
public static int binaryToBcd(int binary) {
48+
int bcd = 0;
49+
int shift = 0;
50+
while (binary > 0) {
51+
int digit = binary % 10; // Extract the last decimal digit
52+
bcd |= (digit << (shift * 4)); // Shift the digit to the correct BCD position
53+
binary /= 10; // Remove the last decimal digit
54+
shift++;
55+
}
56+
return bcd;
57+
}
58+
}

‎src/main/java/com/thealgorithms/bitmanipulation/Xs3Conversion.java

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
package com.thealgorithms.bitmanipulation;
2+
3+
/**
4+
* This class provides methods to convert between XS-3 (Excess-3) and binary.
5+
*
6+
* Excess-3, also called XS-3, is a binary-coded decimal (BCD) code in which each decimal digit is represented by its corresponding 4-bit binary value plus 3.
7+
*
8+
* For more information, refer to the
9+
* <a href="https://en.wikipedia.org/wiki/Excess-3">Excess-3</a> Wikipedia page.
10+
*
11+
* <b>Example usage:</b>
12+
* <pre>
13+
* int binary = Xs3Conversion.xs3ToBinary(0x4567);
14+
* System.out.println("XS-3 0x4567 to binary: " + binary); // Output: 1234
15+
*
16+
* int xs3 = Xs3Conversion.binaryToXs3(1234);
17+
* System.out.println("Binary 1234 to XS-3: " + Integer.toHexString(xs3)); // Output: 0x4567
18+
* </pre>
19+
*/
20+
public final class Xs3Conversion {
21+
private Xs3Conversion() {
22+
}
23+
/**
24+
* Converts an XS-3 (Excess-3) number to binary.
25+
*
26+
* @param xs3 The XS-3 number.
27+
* @return The corresponding binary number.
28+
*/
29+
public static int xs3ToBinary(int xs3) {
30+
int binary = 0;
31+
int multiplier = 1;
32+
while (xs3 > 0) {
33+
int digit = (xs3 & 0xF) - 3; // Extract the last 4 bits (one XS-3 digit) and subtract 3
34+
binary += digit * multiplier;
35+
multiplier *= 10;
36+
xs3 >>= 4; // Shift right by 4 bits to process the next XS-3 digit
37+
}
38+
return binary;
39+
}
40+
41+
/**
42+
* Converts a binary number to XS-3 (Excess-3).
43+
*
44+
* @param binary The binary number.
45+
* @return The corresponding XS-3 number.
46+
*/
47+
public static int binaryToXs3(int binary) {
48+
int xs3 = 0;
49+
int shift = 0;
50+
while (binary > 0) {
51+
int digit = (binary % 10) + 3; // Extract the last decimal digit and add 3
52+
xs3 |= (digit << (shift * 4)); // Shift the digit to the correct XS-3 position
53+
binary /= 10; // Remove the last decimal digit
54+
shift++;
55+
}
56+
return xs3;
57+
}
58+
}

‎src/test/java/com/thealgorithms/bitmanipulation/BcdConversionTest.java

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
package com.thealgorithms.bitmanipulation;
2+
3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
5+
import org.junit.jupiter.api.Test;
6+
7+
/**
8+
* Unit tests for the BcdConversion class.
9+
*/
10+
public class BcdConversionTest {
11+
12+
/**
13+
* Test the bcdToBinary method with a BCD number.
14+
*/
15+
@Test
16+
public void testBcdToBinary() {
17+
int binary = BcdConversion.bcdToBinary(0x1234);
18+
assertEquals(1234, binary); // BCD 0x1234 should convert to binary 1234
19+
}
20+
21+
/**
22+
* Test the binaryToBcd method with a binary number.
23+
*/
24+
@Test
25+
public void testBinaryToBcd() {
26+
int bcd = BcdConversion.binaryToBcd(1234);
27+
assertEquals(0x1234, bcd); // Binary 1234 should convert to BCD 0x1234
28+
}
29+
30+
/**
31+
* Test the bcdToBinary method with zero.
32+
*/
33+
@Test
34+
public void testBcdToBinaryZero() {
35+
int binary = BcdConversion.bcdToBinary(0x0);
36+
assertEquals(0, binary); // BCD 0x0 should convert to binary 0
37+
}
38+
39+
/**
40+
* Test the binaryToBcd method with zero.
41+
*/
42+
@Test
43+
public void testBinaryToBcdZero() {
44+
int bcd = BcdConversion.binaryToBcd(0);
45+
assertEquals(0x0, bcd); // Binary 0 should convert to BCD 0x0
46+
}
47+
48+
/**
49+
* Test the bcdToBinary method with a single digit BCD number.
50+
*/
51+
@Test
52+
public void testBcdToBinarySingleDigit() {
53+
int binary = BcdConversion.bcdToBinary(0x7);
54+
assertEquals(7, binary); // BCD 0x7 should convert to binary 7
55+
}
56+
57+
/**
58+
* Test the binaryToBcd method with a single digit binary number.
59+
*/
60+
@Test
61+
public void testBinaryToBcdSingleDigit() {
62+
int bcd = BcdConversion.binaryToBcd(7);
63+
assertEquals(0x7, bcd); // Binary 7 should convert to BCD 0x7
64+
}
65+
}

‎src/test/java/com/thealgorithms/bitmanipulation/Xs3ConversionTest.java

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
package com.thealgorithms.bitmanipulation;
2+
3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
5+
import org.junit.jupiter.api.Test;
6+
7+
/**
8+
* Unit tests for the Xs3Conversion class.
9+
*/
10+
public class Xs3ConversionTest {
11+
12+
/**
13+
* Test the xs3ToBinary method with an XS-3 number.
14+
*/
15+
@Test
16+
public void testXs3ToBinary() {
17+
int binary = Xs3Conversion.xs3ToBinary(0x4567);
18+
assertEquals(1234, binary); // XS-3 0x4567 should convert to binary 1234
19+
}
20+
21+
/**
22+
* Test the binaryToXs3 method with a binary number.
23+
*/
24+
@Test
25+
public void testBinaryToXs3() {
26+
int xs3 = Xs3Conversion.binaryToXs3(1234);
27+
assertEquals(0x4567, xs3); // Binary 1234 should convert to XS-3 0x4567
28+
}
29+
30+
/**
31+
* Test the xs3ToBinary method with zero.
32+
*/
33+
@Test
34+
public void testXs3ToBinaryZero() {
35+
int binary = Xs3Conversion.xs3ToBinary(0x0);
36+
assertEquals(0, binary); // XS-3 0x0 should convert to binary 0
37+
}
38+
39+
/**
40+
* Test the binaryToXs3 method with zero.
41+
*/
42+
@Test
43+
public void testBinaryToXs3Zero() {
44+
int xs3 = Xs3Conversion.binaryToXs3(0);
45+
assertEquals(0x0, xs3); // Binary 0 should convert to XS-3 0x0
46+
}
47+
48+
/**
49+
* Test the xs3ToBinary method with a single digit XS-3 number.
50+
*/
51+
@Test
52+
public void testXs3ToBinarySingleDigit() {
53+
int binary = Xs3Conversion.xs3ToBinary(0x5);
54+
assertEquals(2, binary); // XS-3 0x5 should convert to binary 2
55+
}
56+
57+
/**
58+
* Test the binaryToXs3 method with a single digit binary number.
59+
*/
60+
@Test
61+
public void testBinaryToXs3SingleDigit() {
62+
int xs3 = Xs3Conversion.binaryToXs3(2);
63+
assertEquals(0x5, xs3); // Binary 2 should convert to XS-3 0x5
64+
}
65+
}

0 commit comments

Comments
 (0)