From 45e587bc53b59e3463a58365e7f82fc60f8de709 Mon Sep 17 00:00:00 2001 From: Willem Cazander Date: Sun, 30 Jan 2022 15:27:30 +0100 Subject: [PATCH] Converted to hex for V654Tath --- .../demo4d/base2t/Base2Terminator.java | 12 +++---- .../demo4d/base2t/V003Timble.java | 1 + .../demo4d/base2t/V009Tyte.java | 1 + .../base2t/{V018Tord.java => V012Tord.java} | 15 +++++---- .../{V027Temvig.java => V01BTemvig.java} | 15 +++++---- .../base2t/{V036Teger.java => V024Teger.java} | 29 ++++++++-------- .../base2t/{V072Tong.java => V048Tong.java} | 29 ++++++++-------- .../base2t/{V144Tocta.java => V090Tocta.java} | 33 ++++++++++--------- .../demo4d/base2t/V654Tath.java | 12 +++++++ 9 files changed, 83 insertions(+), 64 deletions(-) rename core/src/love/distributedrebirth/demo4d/base2t/{V018Tord.java => V012Tord.java} (79%) rename core/src/love/distributedrebirth/demo4d/base2t/{V027Temvig.java => V01BTemvig.java} (76%) rename core/src/love/distributedrebirth/demo4d/base2t/{V036Teger.java => V024Teger.java} (59%) rename core/src/love/distributedrebirth/demo4d/base2t/{V072Tong.java => V048Tong.java} (61%) rename core/src/love/distributedrebirth/demo4d/base2t/{V144Tocta.java => V090Tocta.java} (65%) create mode 100644 core/src/love/distributedrebirth/demo4d/base2t/V654Tath.java diff --git a/core/src/love/distributedrebirth/demo4d/base2t/Base2Terminator.java b/core/src/love/distributedrebirth/demo4d/base2t/Base2Terminator.java index 81935ad2..5f892adf 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/Base2Terminator.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/Base2Terminator.java @@ -19,7 +19,7 @@ public class Base2Terminator { private static final int SHIFT_8 = 8; private static final int SHIFT_16 = 16; - public int base2ReadTong(InputStream input, List output) throws IOException { + public int base2ReadTong(InputStream input, List output) throws IOException { int totalBytes = 0; byte[] data = new byte[BLOCK_TONG_SIZE]; int readDataSize = 0; // per 9 bytes we have 24 octals for one V072Tong number @@ -29,13 +29,13 @@ public class Base2Terminator { int v1 = data[3] + (data[4] << SHIFT_8) + (data[5] << SHIFT_16); int v2 = data[6] + (data[7] << SHIFT_8) + (data[8] << SHIFT_16); List octals = base2ReadOctals(v0, v1, v2); - output.add(new V072Tong(new T08PartOctalBaseIterator(octals.iterator()))); + output.add(new V048Tong(new T08PartOctalBaseIterator(octals.iterator()))); totalBytes += BLOCK_TONG_SIZE; } return totalBytes; } - public int base2ReadTocta(InputStream input, List output) throws IOException { + public int base2ReadTocta(InputStream input, List output) throws IOException { int totalBytes = 0; byte[] data = new byte[BLOCK_TOCTA_SIZE]; int readDataSize = 0; // per 18 bytes we have 48 octals for one V144Tocta number @@ -48,7 +48,7 @@ public class Base2Terminator { int v4 = data[12] + (data[13] << SHIFT_8) + (data[14] << SHIFT_16); int v5 = data[15] + (data[16] << SHIFT_8) + (data[17] << SHIFT_16); List octals = base2ReadOctals(v0, v1, v2, v3, v4, v5); - output.add(new V144Tocta(new T08PartOctalBaseIterator(octals.iterator()))); + output.add(new V090Tocta(new T08PartOctalBaseIterator(octals.iterator()))); totalBytes += BLOCK_TOCTA_SIZE; } return totalBytes; @@ -68,11 +68,11 @@ public class Base2Terminator { return octals; } - public int base2WriteTong(List data, OutputStream output) throws IOException { + public int base2WriteTong(List data, OutputStream output) throws IOException { return base2Write(data, output); } - public int base2WriteTocta(List data, OutputStream output) throws IOException { + public int base2WriteTocta(List data, OutputStream output) throws IOException { return base2Write(data, output); } diff --git a/core/src/love/distributedrebirth/demo4d/base2t/V003Timble.java b/core/src/love/distributedrebirth/demo4d/base2t/V003Timble.java index 448dcb9a..e36a6c79 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/V003Timble.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/V003Timble.java @@ -1,6 +1,7 @@ package love.distributedrebirth.demo4d.base2t; /** + * Holds an 3 bit value. * * @author willemtsade ©Δ∞ 仙上主天 * diff --git a/core/src/love/distributedrebirth/demo4d/base2t/V009Tyte.java b/core/src/love/distributedrebirth/demo4d/base2t/V009Tyte.java index 542afced..2849df54 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/V009Tyte.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/V009Tyte.java @@ -1,6 +1,7 @@ package love.distributedrebirth.demo4d.base2t; /** + * Holds an 9 bit value. * * @author willemtsade ©Δ∞ 仙上主天 * diff --git a/core/src/love/distributedrebirth/demo4d/base2t/V018Tord.java b/core/src/love/distributedrebirth/demo4d/base2t/V012Tord.java similarity index 79% rename from core/src/love/distributedrebirth/demo4d/base2t/V018Tord.java rename to core/src/love/distributedrebirth/demo4d/base2t/V012Tord.java index 295b11d6..1f8c7f2c 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/V018Tord.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/V012Tord.java @@ -1,28 +1,29 @@ package love.distributedrebirth.demo4d.base2t; /** + * Holds an 18 bit value. * * @author willemtsade ©Δ∞ 仙上主天 * */ -public final class V018Tord implements BaseNumberTyte { +public final class V012Tord implements BaseNumberTyte { public static int BIT_COUNT = V009Tyte.BIT_COUNT * T02PartBinary.LENGTH; private V009Tyte[] values = new V009Tyte[T02PartBinary.LENGTH]; - public V018Tord() { + public V012Tord() { this(new V009Tyte(), new V009Tyte()); } - public V018Tord(T08PartOctalBaseIterator values) { + public V012Tord(T08PartOctalBaseIterator values) { this(new V009Tyte(values), new V009Tyte(values)); } - public V018Tord(V009TyteBaseIterator values) { + public V012Tord(V009TyteBaseIterator values) { this(values.next(), values.next()); } - private V018Tord(V009Tyte valueHigh, V009Tyte valueLow) { + private V012Tord(V009Tyte valueHigh, V009Tyte valueLow) { setValue(T02PartBinary.PART_1, valueHigh); setValue(T02PartBinary.PART_2, valueLow); } @@ -49,8 +50,8 @@ public final class V018Tord implements BaseNumberTyte { } @Override - public V018Tord toClone() { - return new V018Tord(cloneIterator()); + public V012Tord toClone() { + return new V012Tord(cloneIterator()); } @Override diff --git a/core/src/love/distributedrebirth/demo4d/base2t/V027Temvig.java b/core/src/love/distributedrebirth/demo4d/base2t/V01BTemvig.java similarity index 76% rename from core/src/love/distributedrebirth/demo4d/base2t/V027Temvig.java rename to core/src/love/distributedrebirth/demo4d/base2t/V01BTemvig.java index 6537812a..0781ba7d 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/V027Temvig.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/V01BTemvig.java @@ -1,28 +1,29 @@ package love.distributedrebirth.demo4d.base2t; /** + * Holds an 27 bit value. * * @author willemtsade ©Δ∞ 仙上主天 * */ -public final class V027Temvig implements BaseNumberTyte { +public final class V01BTemvig implements BaseNumberTyte { public static int BIT_COUNT = V009Tyte.BIT_COUNT * T03PartTrit.LENGTH; private V009Tyte[] values = new V009Tyte[T03PartTrit.LENGTH]; - public V027Temvig() { + public V01BTemvig() { this(new V009Tyte(), new V009Tyte(), new V009Tyte()); } - public V027Temvig(T08PartOctalBaseIterator values) { + public V01BTemvig(T08PartOctalBaseIterator values) { this(new V009Tyte(values), new V009Tyte(values), new V009Tyte(values)); } - public V027Temvig(V009TyteBaseIterator values) { + public V01BTemvig(V009TyteBaseIterator values) { this(values.next(), values.next(), values.next()); } - private V027Temvig(V009Tyte valueHigh, V009Tyte valueMedium, V009Tyte valueLow) { + private V01BTemvig(V009Tyte valueHigh, V009Tyte valueMedium, V009Tyte valueLow) { setValue(T03PartTrit.PART_1, valueHigh); setValue(T03PartTrit.PART_2, valueMedium); setValue(T03PartTrit.PART_3, valueLow); @@ -42,8 +43,8 @@ public final class V027Temvig implements BaseNumberTyte { } @Override - public V027Temvig toClone() { - return new V027Temvig(cloneIterator()); + public V01BTemvig toClone() { + return new V01BTemvig(cloneIterator()); } @Override diff --git a/core/src/love/distributedrebirth/demo4d/base2t/V036Teger.java b/core/src/love/distributedrebirth/demo4d/base2t/V024Teger.java similarity index 59% rename from core/src/love/distributedrebirth/demo4d/base2t/V036Teger.java rename to core/src/love/distributedrebirth/demo4d/base2t/V024Teger.java index 39c47ee2..e4de6510 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/V036Teger.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/V024Teger.java @@ -1,37 +1,38 @@ package love.distributedrebirth.demo4d.base2t; /** + * Holds an 36 bit value. * * @author willemtsade ©Δ∞ 仙上主天 * */ -public final class V036Teger implements BaseNumberTyte { +public final class V024Teger implements BaseNumberTyte { - public static int BIT_COUNT = V018Tord.BIT_COUNT * T02PartBinary.LENGTH; - private V018Tord[] values = new V018Tord[T02PartBinary.LENGTH]; + public static int BIT_COUNT = V012Tord.BIT_COUNT * T02PartBinary.LENGTH; + private V012Tord[] values = new V012Tord[T02PartBinary.LENGTH]; - public V036Teger() { - this(new V018Tord(), new V018Tord()); + public V024Teger() { + this(new V012Tord(), new V012Tord()); } - public V036Teger(T08PartOctalBaseIterator values) { - this(new V018Tord(values), new V018Tord(values)); + public V024Teger(T08PartOctalBaseIterator values) { + this(new V012Tord(values), new V012Tord(values)); } - public V036Teger(V009TyteBaseIterator values) { - this(new V018Tord(values), new V018Tord(values)); + public V024Teger(V009TyteBaseIterator values) { + this(new V012Tord(values), new V012Tord(values)); } - private V036Teger(V018Tord valueHigh, V018Tord valueLow) { + private V024Teger(V012Tord valueHigh, V012Tord valueLow) { setValue(T02PartBinary.PART_1, valueHigh); setValue(T02PartBinary.PART_2, valueLow); } - public V018Tord getValue(T02PartBinary part) { + public V012Tord getValue(T02PartBinary part) { return values[part.ordinal()]; } - public void setValue(T02PartBinary part, V018Tord value) { + public void setValue(T02PartBinary part, V012Tord value) { values[part.ordinal()] = value; } @@ -51,8 +52,8 @@ public final class V036Teger implements BaseNumberTyte { } @Override - public V036Teger toClone() { - return new V036Teger(cloneIterator()); + public V024Teger toClone() { + return new V024Teger(cloneIterator()); } @Override diff --git a/core/src/love/distributedrebirth/demo4d/base2t/V072Tong.java b/core/src/love/distributedrebirth/demo4d/base2t/V048Tong.java similarity index 61% rename from core/src/love/distributedrebirth/demo4d/base2t/V072Tong.java rename to core/src/love/distributedrebirth/demo4d/base2t/V048Tong.java index 1822a94f..4b1c525f 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/V072Tong.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/V048Tong.java @@ -1,37 +1,38 @@ package love.distributedrebirth.demo4d.base2t; /** + * Holds an 72 bit value. * * @author willemtsade ©Δ∞ 仙上主天 * */ -public final class V072Tong implements BaseNumberTyte { +public final class V048Tong implements BaseNumberTyte { - public static int BIT_COUNT = V036Teger.BIT_COUNT * T02PartBinary.LENGTH; - private V036Teger[] values = new V036Teger[T02PartBinary.LENGTH]; + public static int BIT_COUNT = V024Teger.BIT_COUNT * T02PartBinary.LENGTH; + private V024Teger[] values = new V024Teger[T02PartBinary.LENGTH]; - public V072Tong() { - this(new V036Teger(), new V036Teger()); + public V048Tong() { + this(new V024Teger(), new V024Teger()); } - public V072Tong(T08PartOctalBaseIterator values) { - this(new V036Teger(values), new V036Teger(values)); + public V048Tong(T08PartOctalBaseIterator values) { + this(new V024Teger(values), new V024Teger(values)); } - public V072Tong(V009TyteBaseIterator values) { - this(new V036Teger(values), new V036Teger(values)); + public V048Tong(V009TyteBaseIterator values) { + this(new V024Teger(values), new V024Teger(values)); } - private V072Tong(V036Teger valueHigh, V036Teger valueLow) { + private V048Tong(V024Teger valueHigh, V024Teger valueLow) { setValue(T02PartBinary.PART_1, valueHigh); setValue(T02PartBinary.PART_2, valueLow); } - public V036Teger getValue(T02PartBinary part) { + public V024Teger getValue(T02PartBinary part) { return values[part.ordinal()]; } - public void setValue(T02PartBinary part, V036Teger value) { + public void setValue(T02PartBinary part, V024Teger value) { values[part.ordinal()] = value; } @@ -53,8 +54,8 @@ public final class V072Tong implements BaseNumberTyte { } @Override - public V072Tong toClone() { - return new V072Tong(cloneIterator()); + public V048Tong toClone() { + return new V048Tong(cloneIterator()); } @Override diff --git a/core/src/love/distributedrebirth/demo4d/base2t/V144Tocta.java b/core/src/love/distributedrebirth/demo4d/base2t/V090Tocta.java similarity index 65% rename from core/src/love/distributedrebirth/demo4d/base2t/V144Tocta.java rename to core/src/love/distributedrebirth/demo4d/base2t/V090Tocta.java index 780320df..d0e712ba 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/V144Tocta.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/V090Tocta.java @@ -1,37 +1,38 @@ package love.distributedrebirth.demo4d.base2t; /** + * Holds an 144 bit value. * * @author willemtsade ©Δ∞ 仙上主天 * */ -public final class V144Tocta implements BaseNumberTyte { +public final class V090Tocta implements BaseNumberTyte { - public static int BIT_COUNT = V072Tong.BIT_COUNT * T02PartBinary.LENGTH; - private V072Tong[] values = new V072Tong[T02PartBinary.LENGTH]; + public static int BIT_COUNT = V048Tong.BIT_COUNT * T02PartBinary.LENGTH; + private V048Tong[] values = new V048Tong[T02PartBinary.LENGTH]; - public V144Tocta() { - this(new V072Tong(), new V072Tong()); + public V090Tocta() { + this(new V048Tong(), new V048Tong()); } - public V144Tocta(T08PartOctalBaseIterator values) { - this(new V072Tong(values), new V072Tong(values)); + public V090Tocta(T08PartOctalBaseIterator values) { + this(new V048Tong(values), new V048Tong(values)); } - public V144Tocta(V009TyteBaseIterator values) { - this(new V072Tong(values), new V072Tong(values)); + public V090Tocta(V009TyteBaseIterator values) { + this(new V048Tong(values), new V048Tong(values)); } - private V144Tocta(V072Tong valueHigh, V072Tong valueLow) { + private V090Tocta(V048Tong valueHigh, V048Tong valueLow) { setValue(T02PartBinary.PART_1, valueHigh); setValue(T02PartBinary.PART_2, valueLow); } - public V072Tong getValue(T02PartBinary part) { + public V048Tong getValue(T02PartBinary part) { return values[part.ordinal()]; } - public void setValue(T02PartBinary part, V072Tong value) { + public void setValue(T02PartBinary part, V048Tong value) { values[part.ordinal()] = value; } @@ -49,13 +50,13 @@ public final class V144Tocta implements BaseNumberTyte { .setValue(part.splitPartBinary(T04PartQuad.PART_4), value); } - public V018Tord getTordPart(T08PartOctal part) { + public V012Tord getTordPart(T08PartOctal part) { return getValue(part.splitPartBinary(T03PartTrit.PART_1)) .getValue(part.splitPartBinary(T03PartTrit.PART_2)) .getValue(part.splitPartBinary(T03PartTrit.PART_3)); } - public void setTordPart(T08PartOctal part, V018Tord value) { + public void setTordPart(T08PartOctal part, V012Tord value) { getValue(part.splitPartBinary(T03PartTrit.PART_1)) .getValue(part.splitPartBinary(T03PartTrit.PART_2)) .setValue(part.splitPartBinary(T03PartTrit.PART_3), value); @@ -67,8 +68,8 @@ public final class V144Tocta implements BaseNumberTyte { } @Override - public V144Tocta toClone() { - return new V144Tocta(cloneIterator()); + public V090Tocta toClone() { + return new V090Tocta(cloneIterator()); } @Override diff --git a/core/src/love/distributedrebirth/demo4d/base2t/V654Tath.java b/core/src/love/distributedrebirth/demo4d/base2t/V654Tath.java new file mode 100644 index 00000000..6877c06d --- /dev/null +++ b/core/src/love/distributedrebirth/demo4d/base2t/V654Tath.java @@ -0,0 +1,12 @@ +package love.distributedrebirth.demo4d.base2t; + +/** + * Holds an 1620 bit value. + * + * @author willemtsade ©Δ∞ 仙上主天 + * + */ +public class V654Tath { + + // TODO: 27(V01BTemvig) * T60Sexagesimal +}