s426271/DALGLI0
1
0
Fork 0
forked from kalmar/DALGLI0
Code Releases Activity

decode added!

Browse Source
This commit is contained in:
Hubert Tylkowski 2018-06-20 01:06:07 +02:00
parent 84c7c81153
commit 446d5f2306
2 changed files with 53 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Zadanie-03/src/com/tylkowski/crc/CrcTask.java
View File

@ -53,7 +53,7 @@ class CrcTask {
}
short[] remainder = calcXOR(piece, polyGenerator);
remainder = removeUnecessaryZeros(remainder);
createMessageFromRemainderAndPartFromOldMessage(remainder, remainder.length);
messageAsShortArray = createMessageFromRemainderAndPartFromOldMessage(remainder, messageAsShortArray);
}
@ -61,12 +61,13 @@ class CrcTask {
}
private void createMessageFromRemainderAndPartFromOldMessage(short[] remainder, int length) {
short[] tempArr = new short[remainder.length + messageAsShortArray.length - polyGenerator.length];
System.arraycopy(remainder, 0, tempArr, 0, length);
private short[] createMessageFromRemainderAndPartFromOldMessage(short[] remainder, short[] msg) {
short[] tempArr = new short[remainder.length + msg.length - polyGenerator.length];
System.arraycopy(remainder, 0, tempArr, 0, remainder.length);
int diff = polyGenerator.length - remainder.length;
System.arraycopy(messageAsShortArray, length + diff, tempArr, length, messageAsShortArray.length - diff - length);
messageAsShortArray = tempArr;
System.arraycopy(msg, remainder.length + diff, tempArr, remainder.length, msg.length - diff - remainder.length);
msg = tempArr;
return msg;
}
private short[] removeUnecessaryZeros(short[] remainder) {
@ -151,15 +152,57 @@ class CrcTask {
polyGenerator[16] = 1;
}
private void swapPolynomialValues() {
private short[] swapPolynomialValues(short[] poly) {
for (int i = 0; i < polyGenerator.length - 1; i++) {
messageAsShortArray[i] = (short) ((messageAsShortArray[i] + 1) % 2);
poly[i] = (short) ((poly[i] + 1) % 2);
}
return poly;
}
String encode() {
convertMessageToBinaryShortArray();
swapPolynomialValues();
messageAsShortArray = swapPolynomialValues(messageAsShortArray);
return rawMessage + generateFCS();
}
boolean decode(String encodedString) {
encodedString = fillPolyTo8(encodedString);
short[] encodedShortArray = convertBinaryStringToShortArray(encodedString);
encodedShortArray = swapPolynomialValues(encodedShortArray);
while (true) {
if (shortArrayContains(encodedShortArray, 1)) {
return true;
}
if (encodedShortArray[0] == 0) {
encodedShortArray = Arrays.copyOfRange(encodedShortArray, 1, encodedShortArray.length);
} else {
short[] piece = Arrays.copyOfRange(encodedShortArray, 0, Math.min(polyGenerator.length, encodedShortArray.length));
if (piece.length < polyGenerator.length) {
return false;
}
short[] remainder = calcXOR(piece, polyGenerator);
remainder = removeUnecessaryZeros(remainder);
encodedShortArray = createMessageFromRemainderAndPartFromOldMessage(remainder, encodedShortArray);
}
}
}
private boolean shortArrayContains(short[] encodedShortArray, int value) {
for (short item : encodedShortArray) {
if (item == value) {
return true;
}
}
return false;
}
private String fillPolyTo8(String encodedString) {
StringBuilder stringBuilder = new StringBuilder(encodedString);
while (stringBuilder.length() % 8 != 0) {
stringBuilder.insert(0, "0");
}
return stringBuilder.toString();
}
}

1
Zadanie-03/src/com/tylkowski/crc/Main.java
View File

@ -5,6 +5,7 @@ public class Main {
public static void main(String[] args) {
CrcTask crcTask = new CrcTask(toBinary(args[0]), args[0]);
System.out.println(crcTask.encode());
System.out.println(crcTask.decode(toBinary(crcTask.encode())));
}
private static String toBinary(String s) {