From c98cdf4d1075deddd66be92ceb869705b5f2c166 Mon Sep 17 00:00:00 2001 From: Willem Cazander Date: Fri, 4 Feb 2022 18:00:03 +0100 Subject: [PATCH] =?UTF-8?q?Impl=20BaseGet=E1=BA=ADl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo4d/screen/HebrewWalletRenderer.java | 2 +- .../numberxd/AbstractBaseGetậlLevel0.java | 20 ++++ .../numberxd/AbstractBaseGetậlLevel1.java | 20 ++++ .../numberxd/AbstractBaseGetậlLevel2.java | 20 ++++ .../numberxd/AbstractGroßGetậlŌṁ1ⁿᴰ.java | 53 ++++++++++ .../numberxd/AbstractGroßGetậlŌṁ6ˢᴰ.java | 63 ++++++++++++ .../numberxd/BaseGetậl.java | 15 ++- .../numberxd/BaseGetậlLevel0.java | 14 +++ .../numberxd/BaseGetậlLevel1.java | 14 +++ .../numberxd/BaseGetậlLevel2.java | 14 +++ .../numberxd/BaseGetậlLevel3.java | 14 +++ .../numberxd/GroßGetậl1ⁿᴰ.java | 98 +++++-------------- .../numberxd/GroßGetậl6ˢᴰ.java | 62 +++++------- .../numberxd/GroßGetậlŌṁ1ⁿᴰ.java | 75 -------------- .../numberxd/GroßGetậlŌṁ6ˢᴰ.java | 75 -------------- .../numberxd/GroßGetậlŌṁDiamond1ⁿᴰ.java | 27 +++-- .../numberxd/GroßGetậlŌṁDiamond6ˢᴰ.java | 30 ++++-- .../numberxd/GroßGetậlŌṁHyperStàr1ⁿᴰ.java | 29 ++++-- .../numberxd/GroßGetậlŌṁHyperStàr6ˢᴰ.java | 30 ++++-- .../numberxd/Gê̄ldGetậl.java | 89 +++++++---------- .../numberxd/Gê̄ldGetậlÅtHebrew.java | 7 +- .../numberxd/KlompGetậl4ˢᴰ.java | 57 ++++------- .../numberxd/KlompÅtŌṁKāassGetậl4ˢᴰ.java | 94 +++++++++--------- .../numberxd/WaveGetậl1ᑫᴰ.java | 47 +++++++++ .../numberxd/WaveGetậl1ⁿᴰ.java | 32 ++++++ .../numberxd/base2t/Base2Terminator.java | 16 +-- .../numberxd/base2t/BaseIteratorOctal.java | 18 +--- .../base2t/BaseIteratorOctalAdapter.java | 29 ++++++ .../base2t/BaseIteratorOctalStack.java | 45 +++++++++ .../numberxd/base2t/BaseNumber.java | 2 +- .../numberxd/base2t/BaseNumberTyteXL.java | 11 +++ .../numberxd/base2t/BaseNumberXL.java | 11 +++ .../type/{V01BTemvig.java => V027Temvig.java} | 14 +-- .../type/{V024Teger.java => V036Teger.java} | 14 +-- .../type/{V02ATraw.java => V042Traw.java} | 10 +- .../type/{V048Tong.java => V072Tong.java} | 28 +++--- .../type/{V090Tocta.java => V144Tocta.java} | 28 +++--- .../V348Traz.java => typexl/V0x000348ˣᴸ.java} | 27 ++--- .../V654Triz.java => typexl/V0x000654ˣᴸ.java} | 27 ++--- .../VCA8Tath.java => typexl/V0x000CA8ˣᴸ.java} | 28 +++--- .../numberxd/base2t/typexl/V0x0013B0ˣᴸ.java | 52 ++++++++++ .../numberxd/base2t/typexl/V0x049D40ˣᴸ.java | 52 ++++++++++ 42 files changed, 861 insertions(+), 552 deletions(-) create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel0.java create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel1.java create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel2.java create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/AbstractGroßGetậlŌṁ1ⁿᴰ.java create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/AbstractGroßGetậlŌṁ6ˢᴰ.java create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel0.java create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel1.java create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel2.java create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel3.java delete mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậlŌṁ1ⁿᴰ.java delete mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậlŌṁ6ˢᴰ.java create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/WaveGetậl1ᑫᴰ.java create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/WaveGetậl1ⁿᴰ.java create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseIteratorOctalAdapter.java create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseIteratorOctalStack.java create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumberTyteXL.java create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumberXL.java rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/{V01BTemvig.java => V027Temvig.java} (84%) rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/{V024Teger.java => V036Teger.java} (86%) rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/{V02ATraw.java => V042Traw.java} (85%) rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/{V048Tong.java => V072Tong.java} (72%) rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/{V090Tocta.java => V144Tocta.java} (78%) rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/{type/V348Traz.java => typexl/V0x000348ˣᴸ.java} (53%) rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/{type/V654Triz.java => typexl/V0x000654ˣᴸ.java} (59%) rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/{type/VCA8Tath.java => typexl/V0x000CA8ˣᴸ.java} (55%) create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x0013B0ˣᴸ.java create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x049D40ˣᴸ.java diff --git a/core/src/love/distributedrebirth/demo4d/screen/HebrewWalletRenderer.java b/core/src/love/distributedrebirth/demo4d/screen/HebrewWalletRenderer.java index 1b607432..fc60fcd3 100644 --- a/core/src/love/distributedrebirth/demo4d/screen/HebrewWalletRenderer.java +++ b/core/src/love/distributedrebirth/demo4d/screen/HebrewWalletRenderer.java @@ -43,7 +43,7 @@ public class HebrewWalletRenderer extends ImGuiRendererMain { }; for (String data:walletData) { Gê̄ldGetậl geld = new Gê̄ldGetậl(data); - Gê̄ldGetậl geld2 = new Gê̄ldGetậl(geld.toTeger().toClone().toClone()); // unit test + Gê̄ldGetậl geld2 = geld.toClone(); // unit test ImGui.tableNextRow(); ImGui.tableNextColumn(); ImGui.text(data.length()==2||data.length()==3?"OUT":"IN"); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel0.java b/numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel0.java new file mode 100644 index 00000000..5567999a --- /dev/null +++ b/numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel0.java @@ -0,0 +1,20 @@ +package love.distributedrebirth.numberxd; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.numberxd.base2t.BaseNumber; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +abstract public class AbstractBaseGetậlLevel0,V extends BaseNumber> implements BaseGetậlLevel0 { + + protected int valueIndex0; + + @Override + public void setValueIndex0(int valueIndex0) { + this.valueIndex0 = valueIndex0; + } + + @Override + public int getValueIndex0() { + return valueIndex0; + } +} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel1.java b/numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel1.java new file mode 100644 index 00000000..65b05751 --- /dev/null +++ b/numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel1.java @@ -0,0 +1,20 @@ +package love.distributedrebirth.numberxd; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.numberxd.base2t.BaseNumber; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +abstract public class AbstractBaseGetậlLevel1,V extends BaseNumber> extends AbstractBaseGetậlLevel0 implements BaseGetậlLevel1 { + + protected int valueIndex1; + + @Override + public void setValueIndex1(int valueIndex1) { + this.valueIndex1 = valueIndex1; + } + + @Override + public int getValueIndex1() { + return valueIndex1; + } +} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel2.java b/numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel2.java new file mode 100644 index 00000000..5312d81d --- /dev/null +++ b/numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel2.java @@ -0,0 +1,20 @@ +package love.distributedrebirth.numberxd; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.numberxd.base2t.BaseNumber; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +abstract public class AbstractBaseGetậlLevel2,V extends BaseNumber> extends AbstractBaseGetậlLevel1 implements BaseGetậlLevel2 { + + protected int valueIndex2; + + @Override + public void setValueIndex2(int valueIndex1) { + this.valueIndex1 = valueIndex1; + } + + @Override + public int getValueIndex2() { + return valueIndex1; + } +} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/AbstractGroßGetậlŌṁ1ⁿᴰ.java b/numberxd/src/main/love/distributedrebirth/numberxd/AbstractGroßGetậlŌṁ1ⁿᴰ.java new file mode 100644 index 00000000..36682787 --- /dev/null +++ b/numberxd/src/main/love/distributedrebirth/numberxd/AbstractGroßGetậlŌṁ1ⁿᴰ.java @@ -0,0 +1,53 @@ +package love.distributedrebirth.numberxd; + +import love.distributedrebirth.numberxd.base2t.BaseIteratorOctal; +import love.distributedrebirth.numberxd.base2t.part.T16PartHex; +import love.distributedrebirth.numberxd.base2t.type.V009Tyte; +import love.distributedrebirth.numberxd.base2t.type.V144Tocta; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +abstract public class AbstractGroßGetậlŌṁ1ⁿᴰ> extends AbstractBaseGetậlLevel1 { + + private V144Tocta[] values; + private int valuesLength; + private byte fractalLevel; + + public AbstractGroßGetậlŌṁ1ⁿᴰ(byte fractalLevel) { + this.fractalLevel = fractalLevel; + this.valuesLength = resolveFractalLevel(fractalLevel); + this.values = new V144Tocta[valuesLength]; + for (int i=0;i> extends AbstractBaseGetậlLevel2 { + + private V144Tocta[][] values; + private int valuesLength; + private byte fractalLevel; + + public AbstractGroßGetậlŌṁ6ˢᴰ(byte fractalLevel) { + this.fractalLevel = fractalLevel; + this.valuesLength = resolveFractalLevel(fractalLevel); + this.values = new V144Tocta[T12PartUncial.LENGTH()][valuesLength]; + for (int x=0;x> extends BaseNumberTyte { +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.numberxd.base2t.BaseNumber; +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public interface BaseGetậl,V extends BaseNumber> { + V getValue(); + + T toClone(); } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel0.java b/numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel0.java new file mode 100644 index 00000000..5f35b12c --- /dev/null +++ b/numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel0.java @@ -0,0 +1,14 @@ +package love.distributedrebirth.numberxd; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.numberxd.base2t.BaseNumber; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public interface BaseGetậlLevel0,V extends BaseNumber> extends BaseGetậl { + + void setValueIndex0(int valueIndex0); + + int getValueIndex0(); + + int getValueIndex0Length(); +} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel1.java b/numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel1.java new file mode 100644 index 00000000..b0c2e460 --- /dev/null +++ b/numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel1.java @@ -0,0 +1,14 @@ +package love.distributedrebirth.numberxd; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.numberxd.base2t.BaseNumber; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public interface BaseGetậlLevel1,V extends BaseNumber> extends BaseGetậlLevel0 { + + void setValueIndex1(int valueIndex1); + + int getValueIndex1(); + + int getValueIndex1Length(); +} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel2.java b/numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel2.java new file mode 100644 index 00000000..a19f05a5 --- /dev/null +++ b/numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel2.java @@ -0,0 +1,14 @@ +package love.distributedrebirth.numberxd; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.numberxd.base2t.BaseNumber; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public interface BaseGetậlLevel2,V extends BaseNumber> extends BaseGetậlLevel1 { + + void setValueIndex2(int valueIndex1); + + int getValueIndex2(); + + int getValueIndex2Length(); +} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel3.java b/numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel3.java new file mode 100644 index 00000000..bf4ff190 --- /dev/null +++ b/numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel3.java @@ -0,0 +1,14 @@ +package love.distributedrebirth.numberxd; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.numberxd.base2t.BaseNumber; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public interface BaseGetậlLevel3,V extends BaseNumber> extends BaseGetậlLevel2 { + + void setValueIndex3(int valueIndex1); + + int getValueIndex3(); + + int getValueIndex3Length(); +} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậl1ⁿᴰ.java b/numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậl1ⁿᴰ.java index 026ffa3f..3e1e7cd0 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậl1ⁿᴰ.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậl1ⁿᴰ.java @@ -1,101 +1,53 @@ package love.distributedrebirth.numberxd; -import java.util.ArrayList; -import java.util.List; - -import love.distributedrebirth.numberxd.base2t.BaseAppenderOctal; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.BaseIteratorOctal; -import love.distributedrebirth.numberxd.base2t.BaseAppenderTyte; import love.distributedrebirth.numberxd.base2t.BaseIteratorTyte; +import love.distributedrebirth.numberxd.base2t.part.T16PartHex; import love.distributedrebirth.numberxd.base2t.type.V009Tyte; -import love.distributedrebirth.numberxd.base2t.type.V090Tocta; +import love.distributedrebirth.numberxd.base2t.type.V144Tocta; /** * Holds an 144 bit fraction. - * - * @author willemtsade ©Δ∞ 仙上主天 */ -public class GroßGetậl1ⁿᴰ implements BaseGetậl { +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public class GroßGetậl1ⁿᴰ extends AbstractBaseGetậlLevel0 { - public static int NUMERATOR_SIZE = 7; - public static int DENOMINATOR_SIZE = 9; - public static int BIT_COUNT = V090Tocta.BIT_COUNT; - private final V009Tyte[] numerator = new V009Tyte[NUMERATOR_SIZE]; - private final V009Tyte[] denominator = new V009Tyte[DENOMINATOR_SIZE]; + //public static int NUMERATOR_SIZE = 7; + //public static int DENOMINATOR_SIZE = 9; + //public static int BIT_COUNT = V144Tocta.BIT_COUNT; + //private final V009Tyte[] numerator = new V009Tyte[NUMERATOR_SIZE]; + //private final V009Tyte[] denominator = new V009Tyte[DENOMINATOR_SIZE]; + private final V144Tocta value; public GroßGetậl1ⁿᴰ() { - for (int i=0;i tytes = new ArrayList<>(); - tocta.fillTytesByReference(new BaseAppenderTyte(tytes)); - for (int i=0;i { +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public class GroßGetậl6ˢᴰ extends AbstractBaseGetậlLevel1 { - public static int BIT_COUNT = GroßGetậl1ⁿᴰ.BIT_COUNT * T12PartUncial.LENGTH(); - private GroßGetậl1ⁿᴰ[] values = new GroßGetậl1ⁿᴰ[T12PartUncial.LENGTH()]; + private final V144Tocta[] values = new V144Tocta[T12PartUncial.LENGTH()]; public GroßGetậl6ˢᴰ() { for (int i=0;i getValue(v).fillOctalsByClone(appender)); - } - - @Override - public void fillTytesByReference(BaseAppenderTyte appender) { - T12PartUncial.PART_1.BãßVoorElk(v -> getValue(v).fillTytesByReference(appender)); + BaseIteratorOctalStack cloneStack = new BaseIteratorOctalStack(); + for (int i=0;i & BaseNumber> implements BaseNumber { - - private GroßGetậl1ⁿᴰ[] values; - private int valuesLength; - private byte fractalLevel; - - public GroßGetậlŌṁ1ⁿᴰ(byte fractalLevel) { - this.fractalLevel = fractalLevel; - this.valuesLength = resolveFractalLevel(fractalLevel); - this.values = new GroßGetậl1ⁿᴰ[valuesLength]; - } - - abstract protected int resolveFractalLevel(byte level); - - public final byte getFractalLevel() { - return fractalLevel; - } - - public final int getValuesLength() { - return valuesLength; - } - - private final int validatePartRequest(int part) { - if (part < 0) { - throw new IllegalArgumentException("Requested part is negative"); - } - if (part > valuesLength) { - throw new IllegalArgumentException("Requested part exceeds fractal storage"); - } - return part; - } - - public final GroßGetậl1ⁿᴰ getValue(int part) { - return values[validatePartRequest(part)]; - } - - public final void setValue(int part, GroßGetậl1ⁿᴰ value) { - values[validatePartRequest(part)] = value; - } - - abstract protected V toCloneFractal(byte level); - - @Override - public final V toClone() { - V result = toCloneFractal(getFractalLevel()); - BaseIteratorOctal clonedOctals = iteratorOctalsByClone(); - for (int i=0;i & BaseNumber> implements BaseNumber { - - private GroßGetậl6ˢᴰ[] values; - private int valuesLength; - private byte fractalLevel; - - public GroßGetậlŌṁ6ˢᴰ(byte fractalLevel) { - this.fractalLevel = fractalLevel; - this.valuesLength = resolveFractalLevel(fractalLevel); - this.values = new GroßGetậl6ˢᴰ[valuesLength]; - } - - abstract protected int resolveFractalLevel(byte level); - - public final byte getFractalLevel() { - return fractalLevel; - } - - public final int getValuesLength() { - return valuesLength; - } - - private final int validatePartRequest(int part) { - if (part < 0) { - throw new IllegalArgumentException("Requested part is negative"); - } - if (part > valuesLength) { - throw new IllegalArgumentException("Requested part exceeds fractal storage"); - } - return part; - } - - public final GroßGetậl6ˢᴰ getValue(int part) { - return values[validatePartRequest(part)]; - } - - public final void setValue(int part, GroßGetậl6ˢᴰ value) { - values[validatePartRequest(part)] = value; - } - - abstract protected V toCloneFractal(byte level); - - @Override - public final V toClone() { - V result = toCloneFractal(getFractalLevel()); - BaseIteratorOctal clonedOctals = iteratorOctalsByClone(); - for (int i=0;i { +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.numberxd.base2t.BaseIteratorOctal; +import love.distributedrebirth.numberxd.base2t.BaseIteratorOctalStack; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public class GroßGetậlŌṁDiamond1ⁿᴰ extends AbstractGroßGetậlŌṁ1ⁿᴰ { // 0th = 1 * V144Tocta (1) // 1th = 1+3 * V144Tocta (4) @@ -16,13 +17,25 @@ public class GroßGetậlŌṁDiamond1ⁿᴰ extends GroßGetậlŌṁ1ⁿᴰ { +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.numberxd.base2t.BaseIteratorOctal; +import love.distributedrebirth.numberxd.base2t.BaseIteratorOctalStack; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public class GroßGetậlŌṁDiamond6ˢᴰ extends AbstractGroßGetậlŌṁ6ˢᴰ { // 0th = 1 * V144Tocta (1) // 1th = 1+3 * V144Tocta (4) @@ -16,13 +17,28 @@ public class GroßGetậlŌṁDiamond6ˢᴰ extends GroßGetậlŌṁ6ˢᴰ { +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.numberxd.base2t.BaseIteratorOctal; +import love.distributedrebirth.numberxd.base2t.BaseIteratorOctalStack; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public class GroßGetậlŌṁHyperStàr1ⁿᴰ extends AbstractGroßGetậlŌṁ1ⁿᴰ { // 0th = V144Tocta // 1th = 5 * V144Tocta @@ -15,13 +16,25 @@ public class GroßGetậlŌṁHyperStàr1ⁿᴰ extends GroßGetậlŌṁ1ⁿᴰ super(level); } + public GroßGetậlŌṁHyperStàr1ⁿᴰ(byte level, BaseIteratorOctal values) { + super(level, values); + } + protected int resolveFractalLevel(byte level) { // TODO return level; } - + @Override - protected GroßGetậlŌṁHyperStàr1ⁿᴰ toCloneFractal(byte level) { - return new GroßGetậlŌṁHyperStàr1ⁿᴰ(level); + public GroßGetậlŌṁHyperStàr1ⁿᴰ toClone() { + BaseIteratorOctalStack cloneStack = new BaseIteratorOctalStack(); + for (int x=0;x { +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.numberxd.base2t.BaseIteratorOctal; +import love.distributedrebirth.numberxd.base2t.BaseIteratorOctalStack; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public class GroßGetậlŌṁHyperStàr6ˢᴰ extends AbstractGroßGetậlŌṁ6ˢᴰ { // 0th = V144Tocta // 1th = 5 * V144Tocta @@ -15,13 +16,28 @@ public class GroßGetậlŌṁHyperStàr6ˢᴰ extends GroßGetậlŌṁ6ˢᴰ { - private final Gê̄ldGetậlÅtHebrew nummerAlphabet; - private final Gê̄ldGetậlÅtHebrew nummerDeelA; - private final Gê̄ldGetậlÅtHebrew nummerDeelB; - private final Gê̄ldGetậlÅtHebrew nummerDeelC; + private final V036Teger value; private final double totalDecimalValue; private static final Character LEFT_TO_RIGHT_MARK = 0x200E; private static final Character RIGHT_TO_LEFT_MARK = 0x200F; - public Gê̄ldGetậl(V024Teger teger) { - this( - new Gê̄ldGetậlÅtHebrew(teger.getTytePart(T04PartQuad.PART_1)), - new Gê̄ldGetậlÅtHebrew(teger.getTytePart(T04PartQuad.PART_2)), - new Gê̄ldGetậlÅtHebrew(teger.getTytePart(T04PartQuad.PART_3)), - new Gê̄ldGetậlÅtHebrew(teger.getTytePart(T04PartQuad.PART_4)) - ); - } - - public Gê̄ldGetậl(Gê̄ldGetậlÅtHebrew nummerAlphabet, Gê̄ldGetậlÅtHebrew nummerDeelA, Gê̄ldGetậlÅtHebrew nummerDeelB, Gê̄ldGetậlÅtHebrew nummerDeelC) { - this.nummerAlphabet = nummerAlphabet; - this.nummerDeelA = nummerDeelA; - this.nummerDeelB = nummerDeelB; - this.nummerDeelC = nummerDeelC; + public Gê̄ldGetậl(V036Teger value) { + this.value = value; this.totalDecimalValue = calculateDecimalValue(); } @@ -101,14 +85,19 @@ public class Gê̄ldGetậl { } else { deelC = new Gê̄ldGetậlÅtHebrew(); } - this.nummerAlphabet = full; - this.nummerDeelA = deelA; - this.nummerDeelB = deelB; - this.nummerDeelC = deelC; + value = new V036Teger(); + value.setTytePart(T04PartQuad.PART_1, full.toTyte()); + value.setTytePart(T04PartQuad.PART_2, deelA.toTyte()); + value.setTytePart(T04PartQuad.PART_3, deelB.toTyte()); + value.setTytePart(T04PartQuad.PART_4, deelC.toTyte()); this.totalDecimalValue = calculateDecimalValue(); } private double calculateDecimalValue() { + Gê̄ldGetậlÅtHebrew nummerAlphabet = new Gê̄ldGetậlÅtHebrew(value.getTytePart(T04PartQuad.PART_1)); + Gê̄ldGetậlÅtHebrew nummerDeelA = new Gê̄ldGetậlÅtHebrew(value.getTytePart(T04PartQuad.PART_2)); + Gê̄ldGetậlÅtHebrew nummerDeelB = new Gê̄ldGetậlÅtHebrew(value.getTytePart(T04PartQuad.PART_3)); + Gê̄ldGetậlÅtHebrew nummerDeelC = new Gê̄ldGetậlÅtHebrew(value.getTytePart(T04PartQuad.PART_4)); boolean hasFourDigits = !Gê̄ldGetậlÅtHebrewLetter.NONE.equals(nummerDeelA.getLetter()) && !Gê̄ldGetậlÅtHebrewLetter.NONE.equals(nummerDeelB.getLetter()) && @@ -126,40 +115,19 @@ public class Gê̄ldGetậl { return totalDecimalValue; } - public Gê̄ldGetậlÅtHebrew getNummerAlphabet() { - return nummerAlphabet; - } - - public Gê̄ldGetậlÅtHebrew getNummerDeelA() { - return nummerDeelA; - } - - public Gê̄ldGetậlÅtHebrew getNummerDeelB() { - return nummerDeelB; - } - - public Gê̄ldGetậlÅtHebrew getNummerDeelC() { - return nummerDeelC; - } - public double getTotalDecimalValue() { return totalDecimalValue; } - public V024Teger toTeger() { - V024Teger result = new V024Teger(); - result.setTytePart(T04PartQuad.PART_1, nummerAlphabet.toTyte()); - result.setTytePart(T04PartQuad.PART_2, nummerDeelA.toTyte()); - result.setTytePart(T04PartQuad.PART_3, nummerDeelB.toTyte()); - result.setTytePart(T04PartQuad.PART_4, nummerDeelC.toTyte()); - return result; - } - public String toHebrewString() { return toHebrewString(false); } public String toHebrewString(boolean reverse) { + Gê̄ldGetậlÅtHebrew nummerAlphabet = new Gê̄ldGetậlÅtHebrew(value.getTytePart(T04PartQuad.PART_1)); + Gê̄ldGetậlÅtHebrew nummerDeelA = new Gê̄ldGetậlÅtHebrew(value.getTytePart(T04PartQuad.PART_2)); + Gê̄ldGetậlÅtHebrew nummerDeelB = new Gê̄ldGetậlÅtHebrew(value.getTytePart(T04PartQuad.PART_3)); + Gê̄ldGetậlÅtHebrew nummerDeelC = new Gê̄ldGetậlÅtHebrew(value.getTytePart(T04PartQuad.PART_4)); StringBuilder buf = new StringBuilder(); buf.append(RIGHT_TO_LEFT_MARK); buf.append(nummerAlphabet.getLetter().getCharacter()); @@ -189,4 +157,19 @@ public class Gê̄ldGetậl { } return buf.toString(); } + + @Override + public int getValueIndex0Length() { + return T04PartQuad.LENGTH(); + } + + @Override + public V009Tyte getValue() { + return value.getTytePart(T04PartQuad.values()[valueIndex0]); + } + + @Override + public Gê̄ldGetậl toClone() { + return new Gê̄ldGetậl(value.toClone()); + } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/Gê̄ldGetậlÅtHebrew.java b/numberxd/src/main/love/distributedrebirth/numberxd/Gê̄ldGetậlÅtHebrew.java index 2a56d068..7438a0ca 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/Gê̄ldGetậlÅtHebrew.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/Gê̄ldGetậlÅtHebrew.java @@ -1,14 +1,11 @@ package love.distributedrebirth.numberxd; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.part.T03PartTrit; import love.distributedrebirth.numberxd.base2t.part.T08PartOctal; import love.distributedrebirth.numberxd.base2t.type.V009Tyte; -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class Gê̄ldGetậlÅtHebrew { private static final double NUMERATOR_ONE = 1d; diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/KlompGetậl4ˢᴰ.java b/numberxd/src/main/love/distributedrebirth/numberxd/KlompGetậl4ˢᴰ.java index b10a14b1..cca06c0e 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/KlompGetậl4ˢᴰ.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/KlompGetậl4ˢᴰ.java @@ -1,63 +1,44 @@ package love.distributedrebirth.numberxd; -import love.distributedrebirth.numberxd.base2t.BaseNumberTyte; -import love.distributedrebirth.numberxd.base2t.part.T08PartOctal; -import love.distributedrebirth.numberxd.base2t.type.V654Triz; -import love.distributedrebirth.numberxd.base2t.type.VCA8Tath; -import love.distributedrebirth.numberxd.base2t.BaseAppenderOctal; +import love.distributedrebirth.numberxd.base2t.typexl.V0x000CA8ˣᴸ; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.BaseIteratorOctal; -import love.distributedrebirth.numberxd.base2t.BaseAppenderTyte; +import love.distributedrebirth.numberxd.base2t.BaseIteratorOctalStack; +import love.distributedrebirth.numberxd.base2t.part.T08PartOctal; -/** - * Holds an 25920 bit value. (3240 bytes) - * - * 4 * VCA8Tath red - * 4 * VCA8Tath blue - * - * @author willemtsade ©Δ∞ 仙上主天 - */ -public class KlompGetậl4ˢᴰ implements BaseNumberTyte { +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public class KlompGetậl4ˢᴰ extends AbstractBaseGetậlLevel0 { - public static int BIT_COUNT = V654Triz.BIT_COUNT * T08PartOctal.LENGTH(); - private final VCA8Tath[] values = new VCA8Tath[T08PartOctal.LENGTH()]; + private final V0x000CA8ˣᴸ[] values = new V0x000CA8ˣᴸ[T08PartOctal.LENGTH()]; public KlompGetậl4ˢᴰ() { for (int i=0;i getValue(v).fillOctalsByClone(appender)); - } - - @Override - public void fillTytesByReference(BaseAppenderTyte appender) { - T08PartOctal.PART_1.BãßVoorElk(v -> getValue(v).fillTytesByReference(appender)); + BaseIteratorOctalStack cloneStack = new BaseIteratorOctalStack(); + for (int i=0;i { +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public class KlompÅtŌṁKāassGetậl4ˢᴰ extends AbstractBaseGetậlLevel1 { - private KlompGetậl4ˢᴰ[] kaas; + private final V0x000CA8ˣᴸ[][] kaas; private final int kaasCuts; public KlompÅtŌṁKāassGetậl4ˢᴰ(int kaasCuts) { + if (kaasCuts < 2) { + throw new IllegalArgumentException("Can't slice cheese into less than one peace."); + } this.kaasCuts = kaasCuts; - this.kaas = new KlompGetậl4ˢᴰ[kaasCuts]; + this.kaas = new V0x000CA8ˣᴸ[T08PartOctal.LENGTH()][kaasCuts]; + for (int x=0;x kaasCuts) { - throw new IllegalArgumentException("Requested part exceeds kaasCuts storage"); - } - return part; - } - - public final KlompGetậl4ˢᴰ getValue(int part) { - return kaas[validatePartRequest(part)]; - } - - public final void setValue(int part, KlompGetậl4ˢᴰ value) { - kaas[validatePartRequest(part)] = value; + @Override + public V0x000CA8ˣᴸ getValue() { + return kaas[valueIndex0][valueIndex1]; } @Override - public final KlompÅtŌṁKāassGetậl4ˢᴰ toClone() { - KlompÅtŌṁKāassGetậl4ˢᴰ result = new KlompÅtŌṁKāassGetậl4ˢᴰ(getKaasCuts()); - BaseIteratorOctal clonedOctals = iteratorOctalsByClone(); - for (int i=0;i { + + private final V0x049D40ˣᴸ[] values = new V0x049D40ˣᴸ[T04PartQuad.LENGTH()]; + + public WaveGetậl1ᑫᴰ() { + for (int i=0;i { + + private final V0x049D40ˣᴸ value; + + public WaveGetậl1ⁿᴰ() { + value = new V0x049D40ˣᴸ(); + } + + public WaveGetậl1ⁿᴰ(BaseIteratorOctal values) { + value = new V0x049D40ˣᴸ(values); + } + + @Override + public V0x049D40ˣᴸ getValue() { + return value; + } + + @Override + public WaveGetậl1ⁿᴰ toClone() { + return new WaveGetậl1ⁿᴰ(getValue().iteratorOctalsByClone()); + } +} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/Base2Terminator.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/Base2Terminator.java index 98d5911f..e990f7a1 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/Base2Terminator.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/Base2Terminator.java @@ -10,8 +10,8 @@ import java.util.List; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.bassboonyd.BãßBȍőnEnumInstanceʸᴰ; import love.distributedrebirth.numberxd.base2t.part.T08PartOctal; -import love.distributedrebirth.numberxd.base2t.type.V048Tong; -import love.distributedrebirth.numberxd.base2t.type.V090Tocta; +import love.distributedrebirth.numberxd.base2t.type.V072Tong; +import love.distributedrebirth.numberxd.base2t.type.V144Tocta; /** * Terminate from and to classical bytes. @@ -27,7 +27,7 @@ public enum Base2Terminator implements BãßBȍőnEnumInstanceʸᴰ output) throws IOException { + public int Bãß2ReadTong(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 @@ -37,13 +37,13 @@ public enum Base2Terminator implements BãßBȍőnEnumInstanceʸᴰ octals = Bãß2ReadOctals(v0, v1, v2); - output.add(new V048Tong(new BaseIteratorOctal(octals.iterator()))); + output.add(new V072Tong(new BaseIteratorOctalAdapter(octals.iterator()))); totalBytes += BLOCK_TONG_SIZE; } return totalBytes; } - public int Bãß2ReadTocta(InputStream input, List output) throws IOException { + public int Bãß2ReadTocta(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 @@ -56,7 +56,7 @@ public enum Base2Terminator implements BãßBȍőnEnumInstanceʸᴰ octals = Bãß2ReadOctals(v0, v1, v2, v3, v4, v5); - output.add(new V090Tocta(new BaseIteratorOctal(octals.iterator()))); + output.add(new V144Tocta(new BaseIteratorOctalAdapter(octals.iterator()))); totalBytes += BLOCK_TOCTA_SIZE; } return totalBytes; @@ -76,11 +76,11 @@ public enum Base2Terminator implements BãßBȍőnEnumInstanceʸᴰ data, OutputStream output) throws IOException { + public int Bãß2WriteTong(List data, OutputStream output) throws IOException { return Bãß2Write(data, output); } - public int Bãß2WriteTocta(List data, OutputStream output) throws IOException { + public int Bãß2WriteTocta(List data, OutputStream output) throws IOException { return Bãß2Write(data, output); } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseIteratorOctal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseIteratorOctal.java index e6744d50..aa6061d6 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseIteratorOctal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseIteratorOctal.java @@ -9,21 +9,7 @@ import love.distributedrebirth.numberxd.base2t.part.T08PartOctal; * Iterator model for Octals. */ @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public final class BaseIteratorOctal implements Iterator { - - private final Iterator iterator; +public interface BaseIteratorOctal extends Iterator { - public BaseIteratorOctal(Iterator iterator) { - this.iterator = iterator; - } - - @Override - public boolean hasNext() { - return iterator.hasNext(); - } - - @Override - public T08PartOctal next() { - return iterator.next(); - } } + diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseIteratorOctalAdapter.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseIteratorOctalAdapter.java new file mode 100644 index 00000000..bd6e4bd7 --- /dev/null +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseIteratorOctalAdapter.java @@ -0,0 +1,29 @@ +package love.distributedrebirth.numberxd.base2t; + +import java.util.Iterator; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.numberxd.base2t.part.T08PartOctal; + +/** + * Iterator model for Octals. + */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public final class BaseIteratorOctalAdapter implements BaseIteratorOctal { + + private final Iterator iterator; + + public BaseIteratorOctalAdapter(Iterator iterator) { + this.iterator = iterator; + } + + @Override + public boolean hasNext() { + return iterator.hasNext(); + } + + @Override + public T08PartOctal next() { + return iterator.next(); + } +} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseIteratorOctalStack.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseIteratorOctalStack.java new file mode 100644 index 00000000..d8205724 --- /dev/null +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseIteratorOctalStack.java @@ -0,0 +1,45 @@ +package love.distributedrebirth.numberxd.base2t; + +import java.util.Stack; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.numberxd.base2t.part.T08PartOctal; + +/** + * Stack model for octal iterators. + */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public final class BaseIteratorOctalStack implements BaseIteratorOctal { + + private final Stack stack = new Stack<>(); + + public BaseIteratorOctalStack() { + } + + public void addIterator(BaseIteratorOctal iterator) { + stack.push(iterator); + } + + @Override + public boolean hasNext() { + if (stack.isEmpty()) { + return false; + } + if (stack.peek().hasNext()) { + return true; + } + stack.pop(); + if (stack.isEmpty()) { + return false; + } + return stack.peek().hasNext(); + } + + @Override + public T08PartOctal next() { + if (stack.isEmpty()) { + throw new IllegalStateException("Stack is empty."); + } + return stack.peek().next(); + } +} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumber.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumber.java index f3647fdf..f15c2b73 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumber.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumber.java @@ -27,6 +27,6 @@ public interface BaseNumber> { default BaseIteratorOctal iteratorOctalsByClone() { List octals = new ArrayList<>(); fillOctalsByClone(new BaseAppenderOctal(octals)); - return new BaseIteratorOctal(octals.iterator()); + return new BaseIteratorOctalAdapter(octals.iterator()); } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumberTyteXL.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumberTyteXL.java new file mode 100644 index 00000000..fddbe44f --- /dev/null +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumberTyteXL.java @@ -0,0 +1,11 @@ +package love.distributedrebirth.numberxd.base2t; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; + +/** + * Propogate baseXL interface upwards. + */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public interface BaseNumberTyteXL> extends BaseNumberXL,BaseNumberTyte { + +} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumberXL.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumberXL.java new file mode 100644 index 00000000..d356b07f --- /dev/null +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumberXL.java @@ -0,0 +1,11 @@ +package love.distributedrebirth.numberxd.base2t; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; + +/** + * Marker for XL numbers which needs seperator renderer. + */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public interface BaseNumberXL> extends BaseNumber { + +} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V01BTemvig.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V027Temvig.java similarity index 84% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V01BTemvig.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V027Temvig.java index 934430ea..7a669677 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V01BTemvig.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V027Temvig.java @@ -12,24 +12,24 @@ import love.distributedrebirth.numberxd.base2t.part.T03PartTrit; * Holds an 27 bit value. */ @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public final class V01BTemvig implements BaseNumberTyte { +public final class V027Temvig implements BaseNumberTyte { public static int BIT_COUNT = V009Tyte.BIT_COUNT * T03PartTrit.LENGTH(); private V009Tyte[] values = new V009Tyte[T03PartTrit.LENGTH()]; - public V01BTemvig() { + public V027Temvig() { this(new V009Tyte(), new V009Tyte(), new V009Tyte()); } - public V01BTemvig(BaseIteratorOctal values) { + public V027Temvig(BaseIteratorOctal values) { this(new V009Tyte(values), new V009Tyte(values), new V009Tyte(values)); } - public V01BTemvig(BaseIteratorTyte values) { + public V027Temvig(BaseIteratorTyte values) { this(values.next(), values.next(), values.next()); } - private V01BTemvig(V009Tyte valueHigh, V009Tyte valueMedium, V009Tyte valueLow) { + private V027Temvig(V009Tyte valueHigh, V009Tyte valueMedium, V009Tyte valueLow) { setValue(T03PartTrit.PART_1, valueHigh); setValue(T03PartTrit.PART_2, valueMedium); setValue(T03PartTrit.PART_3, valueLow); @@ -49,8 +49,8 @@ public final class V01BTemvig implements BaseNumberTyte { } @Override - public V01BTemvig toClone() { - return new V01BTemvig(iteratorOctalsByClone()); + public V027Temvig toClone() { + return new V027Temvig(iteratorOctalsByClone()); } @Override diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V024Teger.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V036Teger.java similarity index 86% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V024Teger.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V036Teger.java index e6e17e23..3b3e0199 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V024Teger.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V036Teger.java @@ -13,24 +13,24 @@ import love.distributedrebirth.numberxd.base2t.part.T04PartQuad; * Holds an 36 bit value. */ @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public final class V024Teger implements BaseNumberTyte { +public final class V036Teger implements BaseNumberTyte { public static int BIT_COUNT = V012Tord.BIT_COUNT * T02PartBinary.LENGTH(); private V012Tord[] values = new V012Tord[T02PartBinary.LENGTH()]; - public V024Teger() { + public V036Teger() { this(new V012Tord(), new V012Tord()); } - public V024Teger(BaseIteratorOctal values) { + public V036Teger(BaseIteratorOctal values) { this(new V012Tord(values), new V012Tord(values)); } - public V024Teger(BaseIteratorTyte values) { + public V036Teger(BaseIteratorTyte values) { this(new V012Tord(values), new V012Tord(values)); } - private V024Teger(V012Tord valueHigh, V012Tord valueLow) { + private V036Teger(V012Tord valueHigh, V012Tord valueLow) { setValue(T02PartBinary.PART_1, valueHigh); setValue(T02PartBinary.PART_2, valueLow); } @@ -59,8 +59,8 @@ public final class V024Teger implements BaseNumberTyte { } @Override - public V024Teger toClone() { - return new V024Teger(iteratorOctalsByClone()); + public V036Teger toClone() { + return new V036Teger(iteratorOctalsByClone()); } @Override diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V02ATraw.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V042Traw.java similarity index 85% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V02ATraw.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V042Traw.java index f84e3df1..bae9eb8d 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V02ATraw.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V042Traw.java @@ -10,18 +10,18 @@ import love.distributedrebirth.numberxd.base2t.part.T07PartPlanIt; * Holds an 42 bit value. */ @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public final class V02ATraw implements BaseNumber { +public final class V042Traw implements BaseNumber { public static int BIT_COUNT = V006Tixte.BIT_COUNT * T07PartPlanIt.LENGTH(); private V006Tixte[] values = new V006Tixte[T07PartPlanIt.LENGTH()]; - public V02ATraw() { + public V042Traw() { for (int i=0;i { } @Override - public V02ATraw toClone() { - return new V02ATraw(iteratorOctalsByClone()); + public V042Traw toClone() { + return new V042Traw(iteratorOctalsByClone()); } @Override diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V048Tong.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V072Tong.java similarity index 72% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V048Tong.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V072Tong.java index 5dfca579..1b6f143e 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V048Tong.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V072Tong.java @@ -14,33 +14,33 @@ import love.distributedrebirth.numberxd.base2t.part.T08PartOctal; * Holds an 72 bit value. */ @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public final class V048Tong implements BaseNumberTyte { +public final class V072Tong implements BaseNumberTyte { - public static int BIT_COUNT = V024Teger.BIT_COUNT * T02PartBinary.LENGTH(); - private V024Teger[] values = new V024Teger[T02PartBinary.LENGTH()]; + public static int BIT_COUNT = V036Teger.BIT_COUNT * T02PartBinary.LENGTH(); + private V036Teger[] values = new V036Teger[T02PartBinary.LENGTH()]; - public V048Tong() { - this(new V024Teger(), new V024Teger()); + public V072Tong() { + this(new V036Teger(), new V036Teger()); } - public V048Tong(BaseIteratorOctal values) { - this(new V024Teger(values), new V024Teger(values)); + public V072Tong(BaseIteratorOctal values) { + this(new V036Teger(values), new V036Teger(values)); } - public V048Tong(BaseIteratorTyte values) { - this(new V024Teger(values), new V024Teger(values)); + public V072Tong(BaseIteratorTyte values) { + this(new V036Teger(values), new V036Teger(values)); } - private V048Tong(V024Teger valueHigh, V024Teger valueLow) { + private V072Tong(V036Teger valueHigh, V036Teger valueLow) { setValue(T02PartBinary.PART_1, valueHigh); setValue(T02PartBinary.PART_2, valueLow); } - public V024Teger getValue(T02PartBinary part) { + public V036Teger getValue(T02PartBinary part) { return values[part.ordinal()]; } - public void setValue(T02PartBinary part, V024Teger value) { + public void setValue(T02PartBinary part, V036Teger value) { values[part.ordinal()] = value; } @@ -62,8 +62,8 @@ public final class V048Tong implements BaseNumberTyte { } @Override - public V048Tong toClone() { - return new V048Tong(iteratorOctalsByClone()); + public V072Tong toClone() { + return new V072Tong(iteratorOctalsByClone()); } @Override diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V090Tocta.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V144Tocta.java similarity index 78% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V090Tocta.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V144Tocta.java index 05cbd1db..5f713090 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V090Tocta.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V144Tocta.java @@ -16,33 +16,33 @@ import love.distributedrebirth.numberxd.base2t.part.T16PartHex; * Holds an 144 bit value. */ @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public final class V090Tocta implements BaseNumberTyte { +public final class V144Tocta implements BaseNumberTyte { - public static int BIT_COUNT = V048Tong.BIT_COUNT * T02PartBinary.LENGTH(); - private V048Tong[] values = new V048Tong[T02PartBinary.LENGTH()]; + public static int BIT_COUNT = V072Tong.BIT_COUNT * T02PartBinary.LENGTH(); + private V072Tong[] values = new V072Tong[T02PartBinary.LENGTH()]; - public V090Tocta() { - this(new V048Tong(), new V048Tong()); + public V144Tocta() { + this(new V072Tong(), new V072Tong()); } - public V090Tocta(BaseIteratorOctal values) { - this(new V048Tong(values), new V048Tong(values)); + public V144Tocta(BaseIteratorOctal values) { + this(new V072Tong(values), new V072Tong(values)); } - public V090Tocta(BaseIteratorTyte values) { - this(new V048Tong(values), new V048Tong(values)); + public V144Tocta(BaseIteratorTyte values) { + this(new V072Tong(values), new V072Tong(values)); } - private V090Tocta(V048Tong valueHigh, V048Tong valueLow) { + private V144Tocta(V072Tong valueHigh, V072Tong valueLow) { setValue(T02PartBinary.PART_1, valueHigh); setValue(T02PartBinary.PART_2, valueLow); } - public V048Tong getValue(T02PartBinary part) { + public V072Tong getValue(T02PartBinary part) { return values[part.ordinal()]; } - public void setValue(T02PartBinary part, V048Tong value) { + public void setValue(T02PartBinary part, V072Tong value) { values[part.ordinal()] = value; } @@ -78,8 +78,8 @@ public final class V090Tocta implements BaseNumberTyte { } @Override - public V090Tocta toClone() { - return new V090Tocta(iteratorOctalsByClone()); + public V144Tocta toClone() { + return new V144Tocta(iteratorOctalsByClone()); } @Override diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V348Traz.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x000348ˣᴸ.java similarity index 53% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V348Traz.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x000348ˣᴸ.java index 99665157..08d680b1 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V348Traz.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x000348ˣᴸ.java @@ -1,37 +1,38 @@ -package love.distributedrebirth.numberxd.base2t.type; +package love.distributedrebirth.numberxd.base2t.typexl; 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.BaseNumberXL; import love.distributedrebirth.numberxd.base2t.part.T20PartScore; +import love.distributedrebirth.numberxd.base2t.type.V042Traw; /** * Holds an 840 bit value. */ @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public class V348Traz implements BaseNumber { +public class V0x000348ˣᴸ implements BaseNumberXL { - public static int BIT_COUNT = V02ATraw.BIT_COUNT * T20PartScore.LENGTH(); - private V02ATraw[] values = new V02ATraw[T20PartScore.LENGTH()]; + public static int BIT_COUNT = V042Traw.BIT_COUNT * T20PartScore.LENGTH(); + private V042Traw[] values = new V042Traw[T20PartScore.LENGTH()]; - public V348Traz() { + public V0x000348ˣᴸ() { for (int i=0;i { } @Override - public V348Traz toClone() { - return new V348Traz(iteratorOctalsByClone()); + public V0x000348ˣᴸ toClone() { + return new V0x000348ˣᴸ(iteratorOctalsByClone()); } @Override diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V654Triz.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x000654ˣᴸ.java similarity index 59% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V654Triz.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x000654ˣᴸ.java index b5feb8b0..629a61be 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V654Triz.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x000654ˣᴸ.java @@ -1,38 +1,39 @@ -package love.distributedrebirth.numberxd.base2t.type; +package love.distributedrebirth.numberxd.base2t.typexl; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.BaseAppenderOctal; import love.distributedrebirth.numberxd.base2t.BaseAppenderTyte; import love.distributedrebirth.numberxd.base2t.BaseIteratorOctal; -import love.distributedrebirth.numberxd.base2t.BaseNumberTyte; +import love.distributedrebirth.numberxd.base2t.BaseNumberTyteXL; import love.distributedrebirth.numberxd.base2t.part.T60PartSexagesimal; +import love.distributedrebirth.numberxd.base2t.type.V027Temvig; /** * Holds an 1620 bit value. */ @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public class V654Triz implements BaseNumberTyte { +public class V0x000654ˣᴸ implements BaseNumberTyteXL { - public static int BIT_COUNT = V01BTemvig.BIT_COUNT * T60PartSexagesimal.LENGTH(); - private V01BTemvig[] values = new V01BTemvig[T60PartSexagesimal.LENGTH()]; + public static int BIT_COUNT = V027Temvig.BIT_COUNT * T60PartSexagesimal.LENGTH(); + private V027Temvig[] values = new V027Temvig[T60PartSexagesimal.LENGTH()]; - public V654Triz() { + public V0x000654ˣᴸ() { for (int i=0;i { } @Override - public V654Triz toClone() { - return new V654Triz(iteratorOctalsByClone()); + public V0x000654ˣᴸ toClone() { + return new V0x000654ˣᴸ(iteratorOctalsByClone()); } @Override diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/VCA8Tath.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x000CA8ˣᴸ.java similarity index 55% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/VCA8Tath.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x000CA8ˣᴸ.java index 0deb85f1..c6a50cec 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/VCA8Tath.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x000CA8ˣᴸ.java @@ -1,39 +1,39 @@ -package love.distributedrebirth.numberxd.base2t.type; +package love.distributedrebirth.numberxd.base2t.typexl; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.BaseAppenderOctal; import love.distributedrebirth.numberxd.base2t.BaseAppenderTyte; import love.distributedrebirth.numberxd.base2t.BaseIteratorOctal; -import love.distributedrebirth.numberxd.base2t.BaseNumberTyte; +import love.distributedrebirth.numberxd.base2t.BaseNumberTyteXL; import love.distributedrebirth.numberxd.base2t.part.T02PartBinary; /** * Holds an 3240 bit value. */ @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public class VCA8Tath implements BaseNumberTyte { +public class V0x000CA8ˣᴸ implements BaseNumberTyteXL { - public static int BIT_COUNT = V654Triz.BIT_COUNT * T02PartBinary.LENGTH(); - private V654Triz[] values = new V654Triz[T02PartBinary.LENGTH()]; + public static int BIT_COUNT = V0x000654ˣᴸ.BIT_COUNT * T02PartBinary.LENGTH(); + private V0x000654ˣᴸ[] values = new V0x000654ˣᴸ[T02PartBinary.LENGTH()]; - public VCA8Tath() { - this(new V654Triz(), new V654Triz()); + public V0x000CA8ˣᴸ() { + this(new V0x000654ˣᴸ(), new V0x000654ˣᴸ()); } - public VCA8Tath(BaseIteratorOctal values) { - this(new V654Triz(values), new V654Triz(values)); + public V0x000CA8ˣᴸ(BaseIteratorOctal values) { + this(new V0x000654ˣᴸ(values), new V0x000654ˣᴸ(values)); } - private VCA8Tath(V654Triz valueHigh, V654Triz valueLow) { + private V0x000CA8ˣᴸ(V0x000654ˣᴸ valueHigh, V0x000654ˣᴸ valueLow) { setValue(T02PartBinary.PART_1, valueHigh); setValue(T02PartBinary.PART_2, valueLow); } - public V654Triz getValue(T02PartBinary part) { + public V0x000654ˣᴸ getValue(T02PartBinary part) { return values[part.ordinal()]; } - public void setValue(T02PartBinary part, V654Triz value) { + public void setValue(T02PartBinary part, V0x000654ˣᴸ value) { values[part.ordinal()] = value; } @@ -43,8 +43,8 @@ public class VCA8Tath implements BaseNumberTyte { } @Override - public VCA8Tath toClone() { - return new VCA8Tath(iteratorOctalsByClone()); + public V0x000CA8ˣᴸ toClone() { + return new V0x000CA8ˣᴸ(iteratorOctalsByClone()); } @Override diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x0013B0ˣᴸ.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x0013B0ˣᴸ.java new file mode 100644 index 00000000..73ea776d --- /dev/null +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x0013B0ˣᴸ.java @@ -0,0 +1,52 @@ +package love.distributedrebirth.numberxd.base2t.typexl; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.numberxd.base2t.BaseAppenderOctal; +import love.distributedrebirth.numberxd.base2t.BaseIteratorOctal; +import love.distributedrebirth.numberxd.base2t.BaseNumberXL; +import love.distributedrebirth.numberxd.base2t.part.T06PartSeximal; + +/** + * Holds an 5040 bit value. + */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public class V0x0013B0ˣᴸ implements BaseNumberXL { + + public static int BIT_COUNT = V0x000348ˣᴸ.BIT_COUNT * T06PartSeximal.LENGTH(); + private V0x000348ˣᴸ[] values = new V0x000348ˣᴸ[T06PartSeximal.LENGTH()]; + + public V0x0013B0ˣᴸ() { + for (int i=0;i getValue(v).fillOctalsByClone(appender)); + } +} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x049D40ˣᴸ.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x049D40ˣᴸ.java new file mode 100644 index 00000000..734cfa52 --- /dev/null +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x049D40ˣᴸ.java @@ -0,0 +1,52 @@ +package love.distributedrebirth.numberxd.base2t.typexl; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.numberxd.base2t.BaseAppenderOctal; +import love.distributedrebirth.numberxd.base2t.BaseIteratorOctal; +import love.distributedrebirth.numberxd.base2t.BaseNumberXL; +import love.distributedrebirth.numberxd.base2t.part.T60PartSexagesimal; + +/** + * Holds an 302400 bit value. (37800 bytes) + */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public class V0x049D40ˣᴸ implements BaseNumberXL { + + public static int BIT_COUNT = V0x0013B0ˣᴸ.BIT_COUNT * T60PartSexagesimal.LENGTH(); + private V0x0013B0ˣᴸ[] values = new V0x0013B0ˣᴸ[T60PartSexagesimal.LENGTH()]; + + public V0x049D40ˣᴸ() { + for (int i=0;i getValue(v).fillOctalsByClone(appender)); + } +}