From 4cdb373b9ef694509f9b9479445f2eb32e32b2c2 Mon Sep 17 00:00:00 2001 From: Willem Date: Sat, 5 Feb 2022 18:44:41 +0100 Subject: [PATCH] Removed V003Timble from object tree --- .../numberxd/Gê̄ldGetậlÅtHebrew.java | 6 +-- .../numberxd/base2t/type/V003Timble.java | 48 ------------------- .../numberxd/base2t/type/V006Tixte.java | 22 +++++---- .../numberxd/base2t/type/V009Tyte.java | 28 ++++++----- .../numberxd/base2t/type/V018Tord.java | 3 +- 5 files changed, 32 insertions(+), 75 deletions(-) delete mode 100644 demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V003Timble.java diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/Gê̄ldGetậlÅtHebrew.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/Gê̄ldGetậlÅtHebrew.java index 7438a0ca..a2cc315f 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/Gê̄ldGetậlÅtHebrew.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/Gê̄ldGetậlÅtHebrew.java @@ -24,9 +24,9 @@ public class Gê̄ldGetậlÅtHebrew { } public Gê̄ldGetậlÅtHebrew(V009Tyte tyte) { - int value0 = tyte.getValue(T03PartTrit.PART_1).getValue().ordinalOf(T08PartOctal.PART_1); - int value1 = tyte.getValue(T03PartTrit.PART_2).getValue().ordinalOf(T08PartOctal.PART_2); - int value2 = tyte.getValue(T03PartTrit.PART_3).getValue().ordinalOf(T08PartOctal.PART_3); + int value0 = tyte.getValue(T03PartTrit.PART_1).ordinalOf(T08PartOctal.PART_1); + int value1 = tyte.getValue(T03PartTrit.PART_2).ordinalOf(T08PartOctal.PART_2); + int value2 = tyte.getValue(T03PartTrit.PART_3).ordinalOf(T08PartOctal.PART_3); int combinedValue = value0 + value1 + value2; letter = Gê̄ldGetậlÅtHebrewLetter.indexOf(combinedValue); vowel = Gê̄ldGetậlÅtHebrewVowel.indexOf(combinedValue >> Gê̄ldGetậlÅtHebrewLetter.SHIFT_5); diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V003Timble.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V003Timble.java deleted file mode 100644 index 6f12f901..00000000 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V003Timble.java +++ /dev/null @@ -1,48 +0,0 @@ -package love.distributedrebirth.numberxd.base2t.type; - -import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; -import love.distributedrebirth.numberxd.base2t.BaseAppenderOctal; -import love.distributedrebirth.numberxd.base2t.BaseIteratorOctal; -import love.distributedrebirth.numberxd.base2t.BaseNumber; -import love.distributedrebirth.numberxd.base2t.part.T08PartOctal; - -/** - * Holds an 3 bit value. - */ -@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public final class V003Timble implements BaseNumber { - - public static int BIT_COUNT = T08PartOctal.BIT_COUNT; - private final T08PartOctal value; - - public V003Timble() { - this(T08PartOctal.PART_1); - } - - public V003Timble(BaseIteratorOctal values) { - this(values.next()); - } - - public V003Timble(T08PartOctal value) { - this.value = value; - } - - public T08PartOctal getValue() { - return value; - } - - @Override - public int getBitCount() { - return BIT_COUNT; - } - - @Override - public V003Timble toClone() { - return new V003Timble(getValue()); - } - - @Override - public void fillOctalsByClone(BaseAppenderOctal appender) { - appender.add(getValue()); - } -} diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V006Tixte.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V006Tixte.java index c2b09026..dc60793d 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V006Tixte.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V006Tixte.java @@ -5,6 +5,7 @@ import love.distributedrebirth.numberxd.base2t.BaseAppenderOctal; import love.distributedrebirth.numberxd.base2t.BaseIteratorOctal; import love.distributedrebirth.numberxd.base2t.BaseNumber; import love.distributedrebirth.numberxd.base2t.part.T02PartBinary; +import love.distributedrebirth.numberxd.base2t.part.T08PartOctal; /** * Holds an 6 bit value. @@ -12,27 +13,27 @@ import love.distributedrebirth.numberxd.base2t.part.T02PartBinary; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public final class V006Tixte implements BaseNumber { - public static int BIT_COUNT = V003Timble.BIT_COUNT * T02PartBinary.LENGTH(); - private V003Timble[] values = new V003Timble[T02PartBinary.LENGTH()]; + public static int BIT_COUNT = T08PartOctal.BIT_COUNT * T02PartBinary.LENGTH(); + private final T08PartOctal[] values = new T08PartOctal[T02PartBinary.LENGTH()]; public V006Tixte() { - this(new V003Timble(), new V003Timble()); + this(T08PartOctal.PART_1, T08PartOctal.PART_1); } public V006Tixte(BaseIteratorOctal values) { - this(new V003Timble(values), new V003Timble(values)); + this(values.next(), values.next()); } - private V006Tixte(V003Timble valueHigh, V003Timble valueLow) { - setValue(T02PartBinary.PART_1, valueHigh); - setValue(T02PartBinary.PART_2, valueLow); + private V006Tixte(T08PartOctal valueHigh, T08PartOctal valueLow) { + values[0] = valueHigh; + values[1] = valueLow; } - public V003Timble getValue(T02PartBinary part) { + public T08PartOctal getValue(T02PartBinary part) { return values[part.ordinal()]; } - public void setValue(T02PartBinary part, V003Timble value) { + public void setValue(T02PartBinary part, T08PartOctal value) { values[part.ordinal()] = value; } @@ -48,6 +49,7 @@ public final class V006Tixte implements BaseNumber { @Override public void fillOctalsByClone(BaseAppenderOctal appender) { - T02PartBinary.PART_1.BãßVoorElk(v -> getValue(v).fillOctalsByClone(appender)); + appender.add(values[0]); + appender.add(values[1]); } } diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V009Tyte.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V009Tyte.java index 7dda1560..c354a8d5 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V009Tyte.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V009Tyte.java @@ -14,31 +14,31 @@ import love.distributedrebirth.numberxd.base2t.part.T08PartOctal; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public final class V009Tyte implements BaseNumberTyte { - public static int BIT_COUNT = V003Timble.BIT_COUNT * T03PartTrit.LENGTH(); - private final V003Timble[] values = new V003Timble[T03PartTrit.LENGTH()]; + public static int BIT_COUNT = T08PartOctal.BIT_COUNT * T03PartTrit.LENGTH(); + private final T08PartOctal[] values = new T08PartOctal[T03PartTrit.LENGTH()]; public V009Tyte() { - this(new V003Timble(), new V003Timble(), new V003Timble()); + this(T08PartOctal.PART_1, T08PartOctal.PART_1, T08PartOctal.PART_1); } public V009Tyte(BaseIteratorOctal values) { - this(new V003Timble(values), new V003Timble(values), new V003Timble(values)); + this(values.next(), values.next(), values.next()); } public V009Tyte(T08PartOctal valueHigh, T08PartOctal valueMedium, T08PartOctal valueLow) { - this(new V003Timble(valueHigh), new V003Timble(valueMedium), new V003Timble(valueLow)); + values[0] = valueHigh; + values[1] = valueMedium; + values[2] = valueLow; } - private V009Tyte(V003Timble valueHigh, V003Timble valueMedium, V003Timble valueLow) { - values[T03PartTrit.PART_1.ordinal()] = valueHigh; - values[T03PartTrit.PART_2.ordinal()] = valueMedium; - values[T03PartTrit.PART_3.ordinal()] = valueLow; - } - - public V003Timble getValue(T03PartTrit part) { + public T08PartOctal getValue(T03PartTrit part) { return values[part.ordinal()]; } + public void setValue(T03PartTrit part, T08PartOctal value) { + values[part.ordinal()] = value; + } + @Override public int getBitCount() { return BIT_COUNT; @@ -51,7 +51,9 @@ public final class V009Tyte implements BaseNumberTyte { @Override public void fillOctalsByClone(BaseAppenderOctal appender) { - T03PartTrit.PART_1.BãßVoorElk(v -> getValue(v).fillOctalsByClone(appender)); + appender.add(values[0]); + appender.add(values[1]); + appender.add(values[2]); } @Override diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V018Tord.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V018Tord.java index 98c6ecd2..44b52328 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V018Tord.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V018Tord.java @@ -8,6 +8,7 @@ import love.distributedrebirth.numberxd.base2t.BaseIteratorTyte; import love.distributedrebirth.numberxd.base2t.BaseNumberTyte; import love.distributedrebirth.numberxd.base2t.part.T02PartBinary; import love.distributedrebirth.numberxd.base2t.part.T06PartSeximal; +import love.distributedrebirth.numberxd.base2t.part.T08PartOctal; /** * Holds an 18 bit value. @@ -43,7 +44,7 @@ public final class V018Tord implements BaseNumberTyte { values[part.ordinal()] = value; } - public V003Timble getTimblePart(T06PartSeximal part) { + public T08PartOctal getTimblePart(T06PartSeximal part) { return getValue(part.splitPartBinary()).getValue(part.splitPartTrit()); }