From 08de7c0f4fa1e9830e9aafc5f5821eb96c09ca05 Mon Sep 17 00:00:00 2001 From: Willem Date: Fri, 4 Feb 2022 21:26:43 +0100 Subject: [PATCH] Let matrix count from one and added the 4th. --- .../numberxd/AbstractBaseGetậlLevel0.java | 20 ------------------- ...evel1.java => AbstractBaseGetậlMatrix1.java} | 2 +- ...evel2.java => AbstractBaseGetậlMatrix2.java} | 2 +- .../numberxd/AbstractBaseGetậlMatrix3.java | 20 +++++++++++++++++++ .../numberxd/AbstractBaseGetậlMatrix4.java | 20 +++++++++++++++++++ .../numberxd/AbstractGroßGetậlŌṁ1ⁿᴰ.java | 8 ++++---- .../numberxd/AbstractGroßGetậlŌṁ6ˢᴰ.java | 10 +++++----- .../numberxd/BaseGetậlMatrix1.java | 4 ++-- ...etậlMatrix0.java => BaseGetậlMatrix4.java} | 8 ++++---- .../numberxd/GroßGetậl1ⁿᴰ.java | 6 +++--- .../numberxd/GroßGetậl6ˢᴰ.java | 14 ++++++------- .../numberxd/GroßGetậlŌṁDiamond1ⁿᴰ.java | 8 ++++---- .../numberxd/GroßGetậlŌṁDiamond6ˢᴰ.java | 12 +++++------ .../numberxd/GroßGetậlŌṁHyperStàr1ⁿᴰ.java | 8 ++++---- .../numberxd/GroßGetậlŌṁHyperStàr6ˢᴰ.java | 12 +++++------ .../numberxd/Gê̄ldGetậl.java | 6 +++--- .../numberxd/KlompGetậl4ˢᴰ.java | 6 +++--- .../numberxd/KlompÅtŌṁKāassGetậl4ˢᴰ.java | 16 +++++++-------- .../numberxd/WaveGetậl1ᑫᴰ.java | 6 +++--- .../numberxd/GroßGetậlŌṁDiamond1Testⁿᴰ.java | 8 ++++---- 20 files changed, 108 insertions(+), 88 deletions(-) delete mode 100644 demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel0.java rename demo4d-numberxd/src/main/love/distributedrebirth/numberxd/{AbstractBaseGetậlLevel1.java => AbstractBaseGetậlMatrix1.java} (70%) rename demo4d-numberxd/src/main/love/distributedrebirth/numberxd/{AbstractBaseGetậlLevel2.java => AbstractBaseGetậlMatrix2.java} (70%) create mode 100644 demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlMatrix3.java create mode 100644 demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlMatrix4.java rename demo4d-numberxd/src/main/love/distributedrebirth/numberxd/{BaseGetậlMatrix0.java => BaseGetậlMatrix4.java} (57%) diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel0.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel0.java deleted file mode 100644 index 86cb2ccb..00000000 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel0.java +++ /dev/null @@ -1,20 +0,0 @@ -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ậlMatrix0 { - - protected int matrix0; - - @Override - public void setMatrix0(int matrix0) { - this.matrix0 = matrix0; - } - - @Override - public int getMatrix0() { - return matrix0; - } -} diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel1.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlMatrix1.java similarity index 70% rename from demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel1.java rename to demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlMatrix1.java index e17356ea..640d302b 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel1.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlMatrix1.java @@ -4,7 +4,7 @@ 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ậlMatrix1 { +abstract public class AbstractBaseGetậlMatrix1,V extends BaseNumber> implements BaseGetậlMatrix1 { protected int matrix1; diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel2.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlMatrix2.java similarity index 70% rename from demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel2.java rename to demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlMatrix2.java index 5dbff8fd..7c1a8d10 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel2.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlMatrix2.java @@ -4,7 +4,7 @@ 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ậlMatrix2 { +abstract public class AbstractBaseGetậlMatrix2,V extends BaseNumber> extends AbstractBaseGetậlMatrix1 implements BaseGetậlMatrix2 { protected int matrix2; diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlMatrix3.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlMatrix3.java new file mode 100644 index 00000000..f95be4ef --- /dev/null +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlMatrix3.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ậlMatrix3,V extends BaseNumber> extends AbstractBaseGetậlMatrix2 implements BaseGetậlMatrix3 { + + protected int matrix3; + + @Override + public void setMatrix3(int matrix3) { + this.matrix3 = matrix3; + } + + @Override + public int getMatrix3() { + return matrix3; + } +} diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlMatrix4.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlMatrix4.java new file mode 100644 index 00000000..83a74662 --- /dev/null +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlMatrix4.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ậlMatrix4,V extends BaseNumber> extends AbstractBaseGetậlMatrix3 implements BaseGetậlMatrix4 { + + protected int matrix4; + + @Override + public void setMatrix4(int matrix4) { + this.matrix4 = matrix4; + } + + @Override + public int getMatrix4() { + return matrix4; + } +} diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractGroßGetậlŌṁ1ⁿᴰ.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractGroßGetậlŌṁ1ⁿᴰ.java index fe5ac765..1fff7d5f 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractGroßGetậlŌṁ1ⁿᴰ.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractGroßGetậlŌṁ1ⁿᴰ.java @@ -7,7 +7,7 @@ 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 { +abstract public class AbstractGroßGetậlŌṁ1ⁿᴰ> extends AbstractBaseGetậlMatrix2 { private V144Tocta[] values; private int valuesLength; @@ -34,7 +34,7 @@ abstract public class AbstractGroßGetậlŌṁ1ⁿᴰ> extends AbstractBaseGetậlLevel2 { +abstract public class AbstractGroßGetậlŌṁ6ˢᴰ> extends AbstractBaseGetậlMatrix3 { private V144Tocta[][] values; private int valuesLength; @@ -39,7 +39,7 @@ abstract public class AbstractGroßGetậlŌṁ6ˢᴰ,V extends BaseNumber> extends BaseGetậlMatrix0 { +public interface BaseGetậlMatrix1,V extends BaseNumber> extends BaseGetậl { - void setMatrix1(int valueIndex1); + void setMatrix1(int valueIndex0); int getMatrix1(); diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlMatrix0.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlMatrix4.java similarity index 57% rename from demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlMatrix0.java rename to demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlMatrix4.java index a0ffe883..06ada1e7 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlMatrix0.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlMatrix4.java @@ -4,11 +4,11 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.BaseNumber; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public interface BaseGetậlMatrix0,V extends BaseNumber> extends BaseGetậl { +public interface BaseGetậlMatrix4,V extends BaseNumber> extends BaseGetậlMatrix3 { - void setMatrix0(int valueIndex0); + void setMatrix4(int valueIndex1); - int getMatrix0(); + int getMatrix4(); - int getMatrix0Length(); + int getMatrix4Length(); } diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậl1ⁿᴰ.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậl1ⁿᴰ.java index e2cb1697..b6e046b7 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậl1ⁿᴰ.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậl1ⁿᴰ.java @@ -11,7 +11,7 @@ import love.distributedrebirth.numberxd.base2t.type.V144Tocta; * Holds an 144 bit fraction. */ @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public class GroßGetậl1ⁿᴰ extends AbstractBaseGetậlLevel0 { +public class GroßGetậl1ⁿᴰ extends AbstractBaseGetậlMatrix1 { //public static int NUMERATOR_SIZE = 7; //public static int DENOMINATOR_SIZE = 9; @@ -38,11 +38,11 @@ public class GroßGetậl1ⁿᴰ extends AbstractBaseGetậlLevel0 { +public class GroßGetậl6ˢᴰ extends AbstractBaseGetậlMatrix2 { private final V144Tocta[] values = new V144Tocta[T12PartUncial.LENGTH()]; @@ -29,16 +29,16 @@ public class GroßGetậl6ˢᴰ extends AbstractBaseGetậlLevel1 { +public class Gê̄ldGetậl extends AbstractBaseGetậlMatrix1 { private final V036Teger value; private final double totalDecimalValue; @@ -159,13 +159,13 @@ public class Gê̄ldGetậl extends AbstractBaseGetậlLevel0 { +public class KlompGetậl4ˢᴰ extends AbstractBaseGetậlMatrix1 { private final V0x000CA8ˣᴸ[] values = new V0x000CA8ˣᴸ[T08PartOctal.LENGTH()]; @@ -25,11 +25,11 @@ public class KlompGetậl4ˢᴰ extends AbstractBaseGetậlLevel0 { +public class KlompÅtŌṁKāassGetậl4ˢᴰ extends AbstractBaseGetậlMatrix2 { private final V0x000CA8ˣᴸ[][] kaas; private final int kaasCuts; @@ -47,26 +47,26 @@ public class KlompÅtŌṁKāassGetậl4ˢᴰ extends AbstractBaseGetậlLevel1< @Override public V0x000CA8ˣᴸ getValue() { - return kaas[matrix0][matrix1]; + return kaas[matrix1][matrix2]; } @Override - public int getMatrix0Length() { + public int getMatrix1Length() { return T08PartOctal.LENGTH(); } @Override - public int getMatrix1Length() { + public int getMatrix2Length() { return kaasCuts; } @Override public KlompÅtŌṁKāassGetậl4ˢᴰ toClone() { BaseIteratorOctalStack cloneStack = new BaseIteratorOctalStack(); - for (int x=0;x { +public class WaveGetậl1ᑫᴰ extends AbstractBaseGetậlMatrix1 { private final V0x049D40ˣᴸ[] values = new V0x049D40ˣᴸ[T04PartQuad.LENGTH()]; @@ -28,11 +28,11 @@ public class WaveGetậl1ᑫᴰ extends AbstractBaseGetậlLevel0