diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel0.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel0.java index 5567999a..86cb2ccb 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel0.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel0.java @@ -4,17 +4,17 @@ 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 { +abstract public class AbstractBaseGetậlLevel0,V extends BaseNumber> implements BaseGetậlMatrix0 { - protected int valueIndex0; + protected int matrix0; @Override - public void setValueIndex0(int valueIndex0) { - this.valueIndex0 = valueIndex0; + public void setMatrix0(int matrix0) { + this.matrix0 = matrix0; } @Override - public int getValueIndex0() { - return valueIndex0; + 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ậlLevel1.java index 65b05751..e17356ea 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel1.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel1.java @@ -4,17 +4,17 @@ 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 { +abstract public class AbstractBaseGetậlLevel1,V extends BaseNumber> extends AbstractBaseGetậlLevel0 implements BaseGetậlMatrix1 { - protected int valueIndex1; + protected int matrix1; @Override - public void setValueIndex1(int valueIndex1) { - this.valueIndex1 = valueIndex1; + public void setMatrix1(int matrix1) { + this.matrix1 = matrix1; } @Override - public int getValueIndex1() { - return valueIndex1; + public int getMatrix1() { + return matrix1; } } diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel2.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel2.java index 5312d81d..5dbff8fd 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel2.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/AbstractBaseGetậlLevel2.java @@ -4,17 +4,17 @@ 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 { +abstract public class AbstractBaseGetậlLevel2,V extends BaseNumber> extends AbstractBaseGetậlLevel1 implements BaseGetậlMatrix2 { - protected int valueIndex2; + protected int matrix2; @Override - public void setValueIndex2(int valueIndex1) { - this.valueIndex1 = valueIndex1; + public void setMatrix2(int matrix2) { + this.matrix2 = matrix2; } @Override - public int getValueIndex2() { - return valueIndex1; + public int getMatrix2() { + return matrix2; } } 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 36682787..fe5ac765 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 @@ -11,9 +11,9 @@ abstract public class AbstractGroßGetậlŌṁ1ⁿᴰ,V extends BaseNumber> extends BaseGetậl { +public interface BaseGetậlMatrix0,V extends BaseNumber> extends BaseGetậl { - void setValueIndex0(int valueIndex0); + void setMatrix0(int valueIndex0); - int getValueIndex0(); + int getMatrix0(); - int getValueIndex0Length(); + int getMatrix0Length(); } diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel1.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlMatrix1.java similarity index 55% rename from demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel1.java rename to demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlMatrix1.java index b0c2e460..af1391e8 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel1.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlMatrix1.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ậlLevel1,V extends BaseNumber> extends BaseGetậlLevel0 { +public interface BaseGetậlMatrix1,V extends BaseNumber> extends BaseGetậlMatrix0 { - void setValueIndex1(int valueIndex1); + void setMatrix1(int valueIndex1); - int getValueIndex1(); + int getMatrix1(); - int getValueIndex1Length(); + int getMatrix1Length(); } diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel2.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlMatrix2.java similarity index 55% rename from demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel2.java rename to demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlMatrix2.java index a19f05a5..6f833067 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel2.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlMatrix2.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ậlLevel2,V extends BaseNumber> extends BaseGetậlLevel1 { +public interface BaseGetậlMatrix2,V extends BaseNumber> extends BaseGetậlMatrix1 { - void setValueIndex2(int valueIndex1); + void setMatrix2(int valueIndex1); - int getValueIndex2(); + int getMatrix2(); - int getValueIndex2Length(); + int getMatrix2Length(); } diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel3.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlMatrix3.java similarity index 55% rename from demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel3.java rename to demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlMatrix3.java index bf4ff190..6026fd7f 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlLevel3.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/BaseGetậlMatrix3.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ậlLevel3,V extends BaseNumber> extends BaseGetậlLevel2 { +public interface BaseGetậlMatrix3,V extends BaseNumber> extends BaseGetậlMatrix2 { - void setValueIndex3(int valueIndex1); + void setMatrix3(int valueIndex1); - int getValueIndex3(); + int getMatrix3(); - int getValueIndex3Length(); + int getMatrix3Length(); } 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 3e1e7cd0..e2cb1697 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 @@ -38,11 +38,11 @@ public class GroßGetậl1ⁿᴰ extends AbstractBaseGetậlLevel0 { - // 0th = 1 * V144Tocta (1) - // 1th = 1+3 * V144Tocta (4) - // 2th = 1+3+6 * V144Tocta (10) - // 3th = 1+3+6+14 * V144Tocta (24) + // 1th = 1 * V144Tocta (1) + // 2th = 1+3 * V144Tocta (4) + // 3th = 1+3+6 * V144Tocta (10) + // 4th = 1+3+6+14 * V144Tocta (24) // etc - public GroßGetậlŌṁDiamond1ⁿᴰ(byte level) { + public GroßGetậlŌṁDiamond1ⁿᴰ(int level) { super(level); } - public GroßGetậlŌṁDiamond1ⁿᴰ(byte level, BaseIteratorOctal values) { + public GroßGetậlŌṁDiamond1ⁿᴰ(int level, BaseIteratorOctal values) { super(level, values); } - protected int resolveFractalLevel(byte level) { - // TODO - return level; + protected int resolveFractalLevel(int n) { + if (n == 1) { + return 1; + } else { + int result = 1 + n * resolveFractalLevel(n - 1); + return result; + } } @Override public GroßGetậlŌṁDiamond1ⁿᴰ toClone() { BaseIteratorOctalStack cloneStack = new BaseIteratorOctalStack(); - for (int x=0;x