From 223d459695d09dcdc3ae28c441be2632ad369920 Mon Sep 17 00:00:00 2001 From: Willem Date: Sat, 5 Feb 2022 16:25:41 +0100 Subject: [PATCH] Renamed idTone to dialTone --- .../gdxapp/screen/SystemBasePartRenderer.java | 2 +- .../numberxd/base2t/glyph/BaseGlyphSet.java | 4 ++-- .../base2t/part/BãßBȍőnPartKeyʸᴰ.java | 2 +- .../numberxd/base2t/part/BãßBȍőnPartʸᴰ.java | 10 ++++----- .../numberxd/base2t/part/T02PartBinary.java | 4 ++-- .../numberxd/base2t/part/T03PartTrit.java | 4 ++-- .../numberxd/base2t/part/T04PartQuad.java | 4 ++-- .../numberxd/base2t/part/T05PartPental.java | 4 ++-- .../numberxd/base2t/part/T06PartSeximal.java | 4 ++-- .../numberxd/base2t/part/T07PartPlanIt.java | 4 ++-- .../numberxd/base2t/part/T08PartOctal.java | 4 ++-- .../numberxd/base2t/part/T10PartDecimal.java | 4 ++-- .../base2t/part/T11PartUndecimal.java | 4 ++-- .../numberxd/base2t/part/T12PartUncial.java | 4 ++-- .../numberxd/base2t/part/T16PartHex.java | 4 ++-- .../numberxd/base2t/part/T20PartScore.java | 4 ++-- .../base2t/part/T60PartSexagesimal.java | 4 ++-- .../numberxd/base2t/BasePartFactoryTest.java | 4 ++-- .../numberxd/base2t/T02PartBinaryTest.java | 10 ++++----- .../numberxd/base2t/T03PartTritTest.java | 14 ++++++------ .../numberxd/base2t/T04PartQuadTest.java | 18 +++++++-------- .../numberxd/base2t/T05PartPentalTest.java | 22 +++++++++---------- .../numberxd/base2t/T06PartSeximalTest.java | 18 +++++++-------- .../numberxd/base2t/T07PartPlanItTest.java | 18 +++++++-------- .../numberxd/base2t/T08PartOctalTest.java | 18 +++++++-------- .../numberxd/base2t/T10PartDecimalTest.java | 18 +++++++-------- .../numberxd/base2t/T11PartUndecimalTest.java | 18 +++++++-------- .../numberxd/base2t/T12PartUncialTest.java | 18 +++++++-------- .../numberxd/base2t/T16PartHexTest.java | 18 +++++++-------- .../numberxd/base2t/T20PartScoreTest.java | 18 +++++++-------- .../numberxd/base2t/T60SexagesimalTest.java | 18 +++++++-------- 31 files changed, 150 insertions(+), 150 deletions(-) diff --git a/demo4d-gdxapp/src/main/love/distributedrebirth/gdxapp/screen/SystemBasePartRenderer.java b/demo4d-gdxapp/src/main/love/distributedrebirth/gdxapp/screen/SystemBasePartRenderer.java index b64081dd..35498515 100644 --- a/demo4d-gdxapp/src/main/love/distributedrebirth/gdxapp/screen/SystemBasePartRenderer.java +++ b/demo4d-gdxapp/src/main/love/distributedrebirth/gdxapp/screen/SystemBasePartRenderer.java @@ -84,7 +84,7 @@ public class SystemBasePartRenderer extends ImGuiRendererMain { ImGui.tableNextColumn(); ImGui.text(Integer.toString(part.BȍőnRangTelEen())); ImGui.tableNextColumn(); - ImGui.text(part.BȍőnIdentifierTone()); + ImGui.text(part.BȍőnDialTone()); ImGui.tableNextColumn(); ImGui.text(part.BȍőnPrintGlyphSetNumber10(BaseGlyphSet.TONE_LETTER)); ImGui.tableNextColumn(); diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSet.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSet.java index ab62be85..0ae1ffc8 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSet.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSet.java @@ -27,8 +27,8 @@ public enum BaseGlyphSet implements BãßBȍőnGlyphSetʸᴰ { LATIN_SUB16(new BaseGlyphSetNumber("₀","₁","₂","₃","₄","₅","₆","₇","₈","₉"), new BaseGlyphSetNumber("₀","₁","₂","₃","₄","₅","₆","₇","₈","₉","ₐ","₆","꜀","ₔ","ₑ","բ"), new BaseGlyphSetNumber("₁","₂","₃","₄","₅","₆","₇","₈","₉","ₐ","₆","꜀","ₔ","ₑ","բ","G","ₕ","ᵢ","ⱼ","ₖ","ₗ","ₘ","ₙ","ₒ","ₚ","Q","ᵣ")), - TONE_LETTER(new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnIdentifierTone()))), - new BaseGlyphSetNumber(v -> T16PartHex.PART_1.BãßVoorElk(x -> v.add(x.BȍőnIdentifierTone()))), + TONE_LETTER(new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnDialTone()))), + new BaseGlyphSetNumber(v -> T16PartHex.PART_1.BãßVoorElk(x -> v.add(x.BȍőnDialTone()))), new BaseGlyphSetNumber("꜊꜈","꜊꜉","꜊꜋","꜊꜌","꜊꜍","꜊꜎","꜊꜏","꜊꜐","꜊꜑","˧˥","˧˦","˧˨","˧˩","˧꜒","˧꜓","˧꜔","˧꜕","˧꜖","꜏˥","꜏˦","꜏˧","꜏˨","꜏˩","꜏꜍","꜏꜎","꜏꜐","꜏꜑")), DIPAVALI_TONE_LR_TOP16(new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnAlt1Value()))), diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartKeyʸᴰ.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartKeyʸᴰ.java index fd3ebacf..1032f526 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartKeyʸᴰ.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartKeyʸᴰ.java @@ -6,7 +6,7 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinStoreKeyʸᴰ; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public enum BãßBȍőnPartKeyʸᴰ implements BãßBȍőnCoffinStoreKeyʸᴰ { - ID_TONE, + DIAL_TONE, CHINA_KEY, CHINA_VALUE, SHIFT_BITS, diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java index c55896fc..dd52b812 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java @@ -23,8 +23,8 @@ public interface BãßBȍőnPartʸᴰ> extends BBC.PUT_MAP(BãßBȍőnPartKeyʸᴰ.MAP_CHINA); } - default String BȍőnIdentifierTone() { - return GET_BBC().GET_STR(BãßBȍőnPartKeyʸᴰ.ID_TONE); + default String BȍőnDialTone() { + return GET_BBC().GET_STR(BãßBȍőnPartKeyʸᴰ.DIAL_TONE); } default String BȍőnChinaKey() { @@ -36,16 +36,16 @@ public interface BãßBȍőnPartʸᴰ> extends } @SuppressWarnings("unchecked") - default T BãßValueOfTone(String identifierTone) { + default T BãßValueOfDialTone(String identifierTone) { Map mapTone = GET_BBC().GET_MAP_OBJ(BãßBȍőnPartKeyʸᴰ.MAP_TONE); if (mapTone.isEmpty()) { - mapTone.putAll(BãßInstancesStream().collect(Collectors.toMap(v -> v.BȍőnIdentifierTone(), v -> v))); + mapTone.putAll(BãßInstancesStream().collect(Collectors.toMap(v -> v.BȍőnDialTone(), v -> v))); } return (T) mapTone.get(identifierTone); } @SuppressWarnings("unchecked") - default T BãßValueOfChina(String chinaKey) { + default T BãßValueOfChinaKey(String chinaKey) { Map mapChina = GET_BBC().GET_MAP_OBJ(BãßBȍőnPartKeyʸᴰ.MAP_CHINA); if (mapChina.isEmpty()) { mapChina.putAll(BãßInstancesStream().collect(Collectors.toMap(v -> v.BȍőnChinaKey(), v -> v))); diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T02PartBinary.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T02PartBinary.java index 36cc1f43..e7b7ff75 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T02PartBinary.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T02PartBinary.java @@ -17,8 +17,8 @@ public enum T02PartBinary implements BãßBȍőnPartʸᴰ { public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } public static int LENGTH() { return values().length; }; - private T02PartBinary(String idTone, String chinaKey, String chinaValue) { - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); + private T02PartBinary(String dialTone, String chinaKey, String chinaValue) { + BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.DIAL_TONE, dialTone); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.INIT_BOON(this); diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T03PartTrit.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T03PartTrit.java index eb135a69..7012669f 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T03PartTrit.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T03PartTrit.java @@ -18,8 +18,8 @@ public enum T03PartTrit implements BãßBȍőnPartʸᴰ { public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } public static int LENGTH() { return values().length; }; - private T03PartTrit(String idTone, String chinaKey, String chinaValue) { - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); + private T03PartTrit(String dialTone, String chinaKey, String chinaValue) { + BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.DIAL_TONE, dialTone); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.INIT_BOON(this); diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T04PartQuad.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T04PartQuad.java index 62166e94..4c283918 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T04PartQuad.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T04PartQuad.java @@ -20,8 +20,8 @@ public enum T04PartQuad implements BãßBȍőnPartAlt1ʸᴰ { public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } public static int LENGTH() { return values().length; }; - private T04PartQuad(String idTone, String chinaKey, String chinaValue, String alt1Value) { - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); + private T04PartQuad(String dialTone, String chinaKey, String chinaValue, String alt1Value) { + BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.DIAL_TONE, dialTone); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_1_VALUE, alt1Value); diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T05PartPental.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T05PartPental.java index 013241e7..39ee8f17 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T05PartPental.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T05PartPental.java @@ -22,8 +22,8 @@ public enum T05PartPental implements BãßBȍőnPartAlt2ʸᴰ { public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } public static int LENGTH() { return values().length; }; - private T05PartPental(String idTone, String chinaKey, String chinaValue, String alt1Value, String alt2Value) { - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); + private T05PartPental(String dialTone, String chinaKey, String chinaValue, String alt1Value, String alt2Value) { + BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.DIAL_TONE, dialTone); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_1_VALUE, alt1Value); diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T06PartSeximal.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T06PartSeximal.java index 0dd6738a..9fa1320a 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T06PartSeximal.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T06PartSeximal.java @@ -22,8 +22,8 @@ public enum T06PartSeximal implements BãßBȍőnPartAlt1ʸᴰ { public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } public static int LENGTH() { return values().length; }; - private T06PartSeximal(String idTone, String chinaKey, String chinaValue, String alt1Value) { - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); + private T06PartSeximal(String dialTone, String chinaKey, String chinaValue, String alt1Value) { + BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.DIAL_TONE, dialTone); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_1_VALUE, alt1Value); diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T07PartPlanIt.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T07PartPlanIt.java index 382ca6c3..35fa4622 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T07PartPlanIt.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T07PartPlanIt.java @@ -23,8 +23,8 @@ public enum T07PartPlanIt implements BãßBȍőnPartAlt1ʸᴰ { public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } public static int LENGTH() { return values().length; }; - private T07PartPlanIt(String idTone, String chinaKey, String chinaValue, String alt1Value) { - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); + private T07PartPlanIt(String dialTone, String chinaKey, String chinaValue, String alt1Value) { + BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.DIAL_TONE, dialTone); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_1_VALUE, alt1Value); diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T08PartOctal.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T08PartOctal.java index 78c5c841..f89fc1d1 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T08PartOctal.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T08PartOctal.java @@ -25,8 +25,8 @@ public enum T08PartOctal implements BãßBȍőnPartʸᴰ,BãßBȍ public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } public static int LENGTH() { return values().length; }; - private T08PartOctal(String idTone, String chinaKey, String chinaValue, int shiftBits) { - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); + private T08PartOctal(String dialTone, String chinaKey, String chinaValue, int shiftBits) { + BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.DIAL_TONE, dialTone); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.SHIFT_BITS, Integer.valueOf(shiftBits)); diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T10PartDecimal.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T10PartDecimal.java index 9f0b5e8c..318bd384 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T10PartDecimal.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T10PartDecimal.java @@ -27,8 +27,8 @@ public enum T10PartDecimal implements BãßBȍőnPartAlt2ʸᴰ { public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } public static int LENGTH() { return values().length; }; - private T10PartDecimal(String idTone, String chinaKey, String chinaValue, String alt1Value, String alt2Value) { - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); + private T10PartDecimal(String dialTone, String chinaKey, String chinaValue, String alt1Value, String alt2Value) { + BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.DIAL_TONE, dialTone); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_1_VALUE, alt1Value); diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T11PartUndecimal.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T11PartUndecimal.java index 3d9b4171..55c69663 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T11PartUndecimal.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T11PartUndecimal.java @@ -27,8 +27,8 @@ public enum T11PartUndecimal implements BãßBȍőnPartAlt1ʸᴰ GET_BBC() { return BBC; } public static int LENGTH() { return values().length; }; - private T11PartUndecimal(String idTone, String chinaKey, String chinaValue, String alt1Value) { - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); + private T11PartUndecimal(String dialTone, String chinaKey, String chinaValue, String alt1Value) { + BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.DIAL_TONE, dialTone); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_1_VALUE, alt1Value); diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T12PartUncial.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T12PartUncial.java index 9a30b168..90adfd60 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T12PartUncial.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T12PartUncial.java @@ -28,8 +28,8 @@ public enum T12PartUncial implements BãßBȍőnPartAlt1ʸᴰ { public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } public static int LENGTH() { return values().length; }; - private T12PartUncial(String idTone, String chinaKey, String chinaValue, String alt1Value) { - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); + private T12PartUncial(String dialTone, String chinaKey, String chinaValue, String alt1Value) { + BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.DIAL_TONE, dialTone); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_1_VALUE, alt1Value); diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T16PartHex.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T16PartHex.java index fe22ade4..63b1ff57 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T16PartHex.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T16PartHex.java @@ -32,8 +32,8 @@ public enum T16PartHex implements BãßBȍőnPartAlt1ʸᴰ { public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } public static int LENGTH() { return values().length; }; - private T16PartHex(String idTone, String chinaKey, String chinaValue, String alt1Value) { - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); + private T16PartHex(String dialTone, String chinaKey, String chinaValue, String alt1Value) { + BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.DIAL_TONE, dialTone); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_1_VALUE, alt1Value); diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T20PartScore.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T20PartScore.java index 5dc08956..ff8b0a0a 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T20PartScore.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T20PartScore.java @@ -46,9 +46,9 @@ public enum T20PartScore implements BãßBȍőnPartAlt4ʸᴰ { public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } public static int LENGTH() { return values().length; }; - private T20PartScore(String idTone, String chinaKey, String chinaValue, + private T20PartScore(String dialTone, String chinaKey, String chinaValue, String alt1Value, String alt2Value, String alt3Value, String alt4Value) { - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); + BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.DIAL_TONE, dialTone); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_1_VALUE, alt1Value); diff --git a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T60PartSexagesimal.java b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T60PartSexagesimal.java index c9c87806..33877f28 100644 --- a/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T60PartSexagesimal.java +++ b/demo4d-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T60PartSexagesimal.java @@ -75,8 +75,8 @@ public enum T60PartSexagesimal implements BãßBȍőnPartʸᴰ GET_BBC() { return BBC; } public static int LENGTH() { return values().length; }; - private T60PartSexagesimal(String idTone, String chinaKey, String chinaValue) { - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); + private T60PartSexagesimal(String dialTone, String chinaKey, String chinaValue) { + BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.DIAL_TONE, dialTone); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.INIT_BOON(this); diff --git a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/BasePartFactoryTest.java b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/BasePartFactoryTest.java index bdc809a2..7f735162 100644 --- a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/BasePartFactoryTest.java +++ b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/BasePartFactoryTest.java @@ -50,11 +50,11 @@ public class BasePartFactoryTest { Map global = new HashMap<>(); for (int base:BasePartFactory.INSTANCE.BãßBases()) { for (BãßBȍőnPartʸᴰ part:BasePartFactory.INSTANCE.BãßBuildPartsByBase(base)) { - if (global.containsKey(part.BȍőnIdentifierTone())) { + if (global.containsKey(part.BȍőnDialTone())) { duplicate = true; break; } - global.put(part.BȍőnIdentifierTone(), part.BȍőnChinaValue()); + global.put(part.BȍőnDialTone(), part.BȍőnChinaValue()); } } Assertions.assertTrue(global.size() > 1); diff --git a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T02PartBinaryTest.java b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T02PartBinaryTest.java index cdf42704..65f8374e 100644 --- a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T02PartBinaryTest.java +++ b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T02PartBinaryTest.java @@ -12,7 +12,7 @@ public class T02PartBinaryTest { @Test public void testBasePart() { for (T02PartBinary value:T02PartBinary.values()) { - Assertions.assertNotNull(value.BȍőnIdentifierTone()); + Assertions.assertNotNull(value.BȍőnDialTone()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); } @@ -20,13 +20,13 @@ public class T02PartBinaryTest { @Test public void testToneMap() { - Assertions.assertEquals(T02PartBinary.PART_1, T02PartBinary.PART_1.BãßValueOfTone("˧")); - Assertions.assertEquals(T02PartBinary.PART_2, T02PartBinary.PART_1.BãßValueOfTone("꜔")); + Assertions.assertEquals(T02PartBinary.PART_1, T02PartBinary.PART_1.BãßValueOfDialTone("˧")); + Assertions.assertEquals(T02PartBinary.PART_2, T02PartBinary.PART_1.BãßValueOfDialTone("꜔")); } @Test public void testChinaMap() { - Assertions.assertEquals(T02PartBinary.PART_1, T02PartBinary.PART_1.BãßValueOfChina("低")); - Assertions.assertEquals(T02PartBinary.PART_2, T02PartBinary.PART_1.BãßValueOfChina("高")); + Assertions.assertEquals(T02PartBinary.PART_1, T02PartBinary.PART_1.BãßValueOfChinaKey("低")); + Assertions.assertEquals(T02PartBinary.PART_2, T02PartBinary.PART_1.BãßValueOfChinaKey("高")); } } diff --git a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T03PartTritTest.java b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T03PartTritTest.java index 8ae58b9b..f4648c58 100644 --- a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T03PartTritTest.java +++ b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T03PartTritTest.java @@ -12,7 +12,7 @@ public class T03PartTritTest { @Test public void testBasePart() { for (T03PartTrit value:T03PartTrit.values()) { - Assertions.assertNotNull(value.BȍőnIdentifierTone()); + Assertions.assertNotNull(value.BȍőnDialTone()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); } @@ -20,15 +20,15 @@ public class T03PartTritTest { @Test public void testToneMap() { - Assertions.assertEquals(T03PartTrit.PART_1, T03PartTrit.PART_1.BãßValueOfTone("˦")); - Assertions.assertEquals(T03PartTrit.PART_2, T03PartTrit.PART_1.BãßValueOfTone("˧")); - Assertions.assertEquals(T03PartTrit.PART_3, T03PartTrit.PART_1.BãßValueOfTone("˨")); + Assertions.assertEquals(T03PartTrit.PART_1, T03PartTrit.PART_1.BãßValueOfDialTone("˦")); + Assertions.assertEquals(T03PartTrit.PART_2, T03PartTrit.PART_1.BãßValueOfDialTone("˧")); + Assertions.assertEquals(T03PartTrit.PART_3, T03PartTrit.PART_1.BãßValueOfDialTone("˨")); } @Test public void testChinaMap() { - Assertions.assertEquals(T03PartTrit.PART_1, T03PartTrit.PART_1.BãßValueOfChina("一")); - Assertions.assertEquals(T03PartTrit.PART_2, T03PartTrit.PART_1.BãßValueOfChina("二")); - Assertions.assertEquals(T03PartTrit.PART_3, T03PartTrit.PART_1.BãßValueOfChina("三")); + Assertions.assertEquals(T03PartTrit.PART_1, T03PartTrit.PART_1.BãßValueOfChinaKey("一")); + Assertions.assertEquals(T03PartTrit.PART_2, T03PartTrit.PART_1.BãßValueOfChinaKey("二")); + Assertions.assertEquals(T03PartTrit.PART_3, T03PartTrit.PART_1.BãßValueOfChinaKey("三")); } } diff --git a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T04PartQuadTest.java b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T04PartQuadTest.java index 5445ed04..e456d6fa 100644 --- a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T04PartQuadTest.java +++ b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T04PartQuadTest.java @@ -12,7 +12,7 @@ public class T04PartQuadTest { @Test public void testBasePart() { for (T04PartQuad value:T04PartQuad.values()) { - Assertions.assertNotNull(value.BȍőnIdentifierTone()); + Assertions.assertNotNull(value.BȍőnDialTone()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); Assertions.assertNotNull(value.BȍőnAlt1Value()); @@ -39,17 +39,17 @@ public class T04PartQuadTest { @Test public void testToneMap() { - Assertions.assertEquals(T04PartQuad.PART_1, T04PartQuad.PART_1.BãßValueOfTone("˥")); - Assertions.assertEquals(T04PartQuad.PART_2, T04PartQuad.PART_1.BãßValueOfTone("꜒")); - Assertions.assertEquals(T04PartQuad.PART_3, T04PartQuad.PART_1.BãßValueOfTone("꜖")); - Assertions.assertEquals(T04PartQuad.PART_4, T04PartQuad.PART_1.BãßValueOfTone("˩")); + Assertions.assertEquals(T04PartQuad.PART_1, T04PartQuad.PART_1.BãßValueOfDialTone("˥")); + Assertions.assertEquals(T04PartQuad.PART_2, T04PartQuad.PART_1.BãßValueOfDialTone("꜒")); + Assertions.assertEquals(T04PartQuad.PART_3, T04PartQuad.PART_1.BãßValueOfDialTone("꜖")); + Assertions.assertEquals(T04PartQuad.PART_4, T04PartQuad.PART_1.BãßValueOfDialTone("˩")); } @Test public void testChinaMap() { - Assertions.assertEquals(T04PartQuad.PART_1, T04PartQuad.PART_1.BãßValueOfChina("北")); - Assertions.assertEquals(T04PartQuad.PART_2, T04PartQuad.PART_1.BãßValueOfChina("東")); - Assertions.assertEquals(T04PartQuad.PART_3, T04PartQuad.PART_1.BãßValueOfChina("西")); - Assertions.assertEquals(T04PartQuad.PART_4, T04PartQuad.PART_1.BãßValueOfChina("南")); + Assertions.assertEquals(T04PartQuad.PART_1, T04PartQuad.PART_1.BãßValueOfChinaKey("北")); + Assertions.assertEquals(T04PartQuad.PART_2, T04PartQuad.PART_1.BãßValueOfChinaKey("東")); + Assertions.assertEquals(T04PartQuad.PART_3, T04PartQuad.PART_1.BãßValueOfChinaKey("西")); + Assertions.assertEquals(T04PartQuad.PART_4, T04PartQuad.PART_1.BãßValueOfChinaKey("南")); } } diff --git a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T05PartPentalTest.java b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T05PartPentalTest.java index 14d62c57..fd744bbc 100644 --- a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T05PartPentalTest.java +++ b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T05PartPentalTest.java @@ -12,7 +12,7 @@ public class T05PartPentalTest { @Test public void testBasePart() { for (T05PartPental value:T05PartPental.values()) { - Assertions.assertNotNull(value.BȍőnIdentifierTone()); + Assertions.assertNotNull(value.BȍőnDialTone()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); } @@ -20,19 +20,19 @@ public class T05PartPentalTest { @Test public void testToneMap() { - Assertions.assertEquals(T05PartPental.PART_1, T05PartPental.PART_1.BãßValueOfTone("˥")); - Assertions.assertEquals(T05PartPental.PART_2, T05PartPental.PART_1.BãßValueOfTone("˦")); - Assertions.assertEquals(T05PartPental.PART_3, T05PartPental.PART_1.BãßValueOfTone("˧")); - Assertions.assertEquals(T05PartPental.PART_4, T05PartPental.PART_1.BãßValueOfTone("˨")); - Assertions.assertEquals(T05PartPental.PART_5, T05PartPental.PART_1.BãßValueOfTone("˩")); + Assertions.assertEquals(T05PartPental.PART_1, T05PartPental.PART_1.BãßValueOfDialTone("˥")); + Assertions.assertEquals(T05PartPental.PART_2, T05PartPental.PART_1.BãßValueOfDialTone("˦")); + Assertions.assertEquals(T05PartPental.PART_3, T05PartPental.PART_1.BãßValueOfDialTone("˧")); + Assertions.assertEquals(T05PartPental.PART_4, T05PartPental.PART_1.BãßValueOfDialTone("˨")); + Assertions.assertEquals(T05PartPental.PART_5, T05PartPental.PART_1.BãßValueOfDialTone("˩")); } @Test public void testChinaMap() { - Assertions.assertEquals(T05PartPental.PART_1, T05PartPental.PART_1.BãßValueOfChina("火")); - Assertions.assertEquals(T05PartPental.PART_2, T05PartPental.PART_1.BãßValueOfChina("水")); - Assertions.assertEquals(T05PartPental.PART_3, T05PartPental.PART_1.BãßValueOfChina("木")); - Assertions.assertEquals(T05PartPental.PART_4, T05PartPental.PART_1.BãßValueOfChina("金")); - Assertions.assertEquals(T05PartPental.PART_5, T05PartPental.PART_1.BãßValueOfChina("土")); + Assertions.assertEquals(T05PartPental.PART_1, T05PartPental.PART_1.BãßValueOfChinaKey("火")); + Assertions.assertEquals(T05PartPental.PART_2, T05PartPental.PART_1.BãßValueOfChinaKey("水")); + Assertions.assertEquals(T05PartPental.PART_3, T05PartPental.PART_1.BãßValueOfChinaKey("木")); + Assertions.assertEquals(T05PartPental.PART_4, T05PartPental.PART_1.BãßValueOfChinaKey("金")); + Assertions.assertEquals(T05PartPental.PART_5, T05PartPental.PART_1.BãßValueOfChinaKey("土")); } } diff --git a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T06PartSeximalTest.java b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T06PartSeximalTest.java index fde62742..8c82caa3 100644 --- a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T06PartSeximalTest.java +++ b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T06PartSeximalTest.java @@ -12,7 +12,7 @@ public class T06PartSeximalTest { @Test public void testBasePart() { for (T06PartSeximal value:T06PartSeximal.values()) { - Assertions.assertNotNull(value.BȍőnIdentifierTone()); + Assertions.assertNotNull(value.BȍőnDialTone()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); Assertions.assertNotNull(value.BȍőnAlt1Value()); @@ -23,17 +23,17 @@ public class T06PartSeximalTest { @Test public void testToneMap() { - Assertions.assertEquals(T06PartSeximal.PART_1, T06PartSeximal.PART_1.BãßValueOfTone("˦")); - Assertions.assertEquals(T06PartSeximal.PART_2, T06PartSeximal.PART_1.BãßValueOfTone("˨")); - Assertions.assertEquals(T06PartSeximal.PART_5, T06PartSeximal.PART_1.BãßValueOfTone("꜊")); - Assertions.assertEquals(T06PartSeximal.PART_6, T06PartSeximal.PART_1.BãßValueOfTone("꜏")); + Assertions.assertEquals(T06PartSeximal.PART_1, T06PartSeximal.PART_1.BãßValueOfDialTone("˦")); + Assertions.assertEquals(T06PartSeximal.PART_2, T06PartSeximal.PART_1.BãßValueOfDialTone("˨")); + Assertions.assertEquals(T06PartSeximal.PART_5, T06PartSeximal.PART_1.BãßValueOfDialTone("꜊")); + Assertions.assertEquals(T06PartSeximal.PART_6, T06PartSeximal.PART_1.BãßValueOfDialTone("꜏")); } @Test public void testChinaMap() { - Assertions.assertEquals(T06PartSeximal.PART_1, T06PartSeximal.PART_1.BãßValueOfChina("四")); - Assertions.assertEquals(T06PartSeximal.PART_2, T06PartSeximal.PART_1.BãßValueOfChina("五")); - Assertions.assertEquals(T06PartSeximal.PART_5, T06PartSeximal.PART_1.BãßValueOfChina("八")); - Assertions.assertEquals(T06PartSeximal.PART_6, T06PartSeximal.PART_1.BãßValueOfChina("九")); + Assertions.assertEquals(T06PartSeximal.PART_1, T06PartSeximal.PART_1.BãßValueOfChinaKey("四")); + Assertions.assertEquals(T06PartSeximal.PART_2, T06PartSeximal.PART_1.BãßValueOfChinaKey("五")); + Assertions.assertEquals(T06PartSeximal.PART_5, T06PartSeximal.PART_1.BãßValueOfChinaKey("八")); + Assertions.assertEquals(T06PartSeximal.PART_6, T06PartSeximal.PART_1.BãßValueOfChinaKey("九")); } } diff --git a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T07PartPlanItTest.java b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T07PartPlanItTest.java index 623d3ca5..b50403c7 100644 --- a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T07PartPlanItTest.java +++ b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T07PartPlanItTest.java @@ -12,7 +12,7 @@ public class T07PartPlanItTest { @Test public void testBasePart() { for (T07PartPlanIt value:T07PartPlanIt.values()) { - Assertions.assertNotNull(value.BȍőnIdentifierTone()); + Assertions.assertNotNull(value.BȍőnDialTone()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); Assertions.assertNotNull(value.BȍőnAlt1Value()); @@ -23,17 +23,17 @@ public class T07PartPlanItTest { @Test public void testToneMap() { - Assertions.assertEquals(T07PartPlanIt.PART_1, T07PartPlanIt.PART_1.BãßValueOfTone("˥")); - Assertions.assertEquals(T07PartPlanIt.PART_2, T07PartPlanIt.PART_1.BãßValueOfTone("꜉")); - Assertions.assertEquals(T07PartPlanIt.PART_6, T07PartPlanIt.PART_1.BãßValueOfTone("꜐")); - Assertions.assertEquals(T07PartPlanIt.PART_7, T07PartPlanIt.PART_1.BãßValueOfTone("˩")); + Assertions.assertEquals(T07PartPlanIt.PART_1, T07PartPlanIt.PART_1.BãßValueOfDialTone("˥")); + Assertions.assertEquals(T07PartPlanIt.PART_2, T07PartPlanIt.PART_1.BãßValueOfDialTone("꜉")); + Assertions.assertEquals(T07PartPlanIt.PART_6, T07PartPlanIt.PART_1.BãßValueOfDialTone("꜐")); + Assertions.assertEquals(T07PartPlanIt.PART_7, T07PartPlanIt.PART_1.BãßValueOfDialTone("˩")); } @Test public void testChinaMap() { - Assertions.assertEquals(T07PartPlanIt.PART_1, T07PartPlanIt.PART_1.BãßValueOfChina("♎︎")); - Assertions.assertEquals(T07PartPlanIt.PART_2, T07PartPlanIt.PART_1.BãßValueOfChina("♏︎")); - Assertions.assertEquals(T07PartPlanIt.PART_6, T07PartPlanIt.PART_1.BãßValueOfChina("♑︎")); - Assertions.assertEquals(T07PartPlanIt.PART_7, T07PartPlanIt.PART_1.BãßValueOfChina("♈︎")); + Assertions.assertEquals(T07PartPlanIt.PART_1, T07PartPlanIt.PART_1.BãßValueOfChinaKey("♎︎")); + Assertions.assertEquals(T07PartPlanIt.PART_2, T07PartPlanIt.PART_1.BãßValueOfChinaKey("♏︎")); + Assertions.assertEquals(T07PartPlanIt.PART_6, T07PartPlanIt.PART_1.BãßValueOfChinaKey("♑︎")); + Assertions.assertEquals(T07PartPlanIt.PART_7, T07PartPlanIt.PART_1.BãßValueOfChinaKey("♈︎")); } } diff --git a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T08PartOctalTest.java b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T08PartOctalTest.java index 17d3bf43..6f661ec1 100644 --- a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T08PartOctalTest.java +++ b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T08PartOctalTest.java @@ -12,7 +12,7 @@ public class T08PartOctalTest { @Test public void testBasePart() { for (T08PartOctal value:T08PartOctal.values()) { - Assertions.assertNotNull(value.BȍőnIdentifierTone()); + Assertions.assertNotNull(value.BȍőnDialTone()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); } @@ -20,17 +20,17 @@ public class T08PartOctalTest { @Test public void testToneMap() { - Assertions.assertEquals(T08PartOctal.PART_1, T08PartOctal.PART_1.BãßValueOfTone("˥")); - Assertions.assertEquals(T08PartOctal.PART_2, T08PartOctal.PART_1.BãßValueOfTone("˩")); - Assertions.assertEquals(T08PartOctal.PART_7, T08PartOctal.PART_1.BãßValueOfTone("꜍")); - Assertions.assertEquals(T08PartOctal.PART_8, T08PartOctal.PART_1.BãßValueOfTone("꜑")); + Assertions.assertEquals(T08PartOctal.PART_1, T08PartOctal.PART_1.BãßValueOfDialTone("˥")); + Assertions.assertEquals(T08PartOctal.PART_2, T08PartOctal.PART_1.BãßValueOfDialTone("˩")); + Assertions.assertEquals(T08PartOctal.PART_7, T08PartOctal.PART_1.BãßValueOfDialTone("꜍")); + Assertions.assertEquals(T08PartOctal.PART_8, T08PartOctal.PART_1.BãßValueOfDialTone("꜑")); } @Test public void testChinaMap() { - Assertions.assertEquals(T08PartOctal.PART_1, T08PartOctal.PART_1.BãßValueOfChina("心")); - Assertions.assertEquals(T08PartOctal.PART_2, T08PartOctal.PART_1.BãßValueOfChina("頭")); - Assertions.assertEquals(T08PartOctal.PART_7, T08PartOctal.PART_1.BãßValueOfChina("肢")); - Assertions.assertEquals(T08PartOctal.PART_8, T08PartOctal.PART_1.BãßValueOfChina("腳")); + Assertions.assertEquals(T08PartOctal.PART_1, T08PartOctal.PART_1.BãßValueOfChinaKey("心")); + Assertions.assertEquals(T08PartOctal.PART_2, T08PartOctal.PART_1.BãßValueOfChinaKey("頭")); + Assertions.assertEquals(T08PartOctal.PART_7, T08PartOctal.PART_1.BãßValueOfChinaKey("肢")); + Assertions.assertEquals(T08PartOctal.PART_8, T08PartOctal.PART_1.BãßValueOfChinaKey("腳")); } } diff --git a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T10PartDecimalTest.java b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T10PartDecimalTest.java index 59024d72..7a9f8218 100644 --- a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T10PartDecimalTest.java +++ b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T10PartDecimalTest.java @@ -12,7 +12,7 @@ public class T10PartDecimalTest { @Test public void testBasePart() { for (T10PartDecimal value:T10PartDecimal.values()) { - Assertions.assertNotNull(value.BȍőnIdentifierTone()); + Assertions.assertNotNull(value.BȍőnDialTone()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); } @@ -20,17 +20,17 @@ public class T10PartDecimalTest { @Test public void testToneMap() { - Assertions.assertEquals(T10PartDecimal.PART_1, T10PartDecimal.PART_1.BãßValueOfTone("˥")); - Assertions.assertEquals(T10PartDecimal.PART_2, T10PartDecimal.PART_1.BãßValueOfTone("˦")); - Assertions.assertEquals(T10PartDecimal.PART_9, T10PartDecimal.PART_1.BãßValueOfTone("꜕")); - Assertions.assertEquals(T10PartDecimal.PART_10, T10PartDecimal.PART_1.BãßValueOfTone("꜖")); + Assertions.assertEquals(T10PartDecimal.PART_1, T10PartDecimal.PART_1.BãßValueOfDialTone("˥")); + Assertions.assertEquals(T10PartDecimal.PART_2, T10PartDecimal.PART_1.BãßValueOfDialTone("˦")); + Assertions.assertEquals(T10PartDecimal.PART_9, T10PartDecimal.PART_1.BãßValueOfDialTone("꜕")); + Assertions.assertEquals(T10PartDecimal.PART_10, T10PartDecimal.PART_1.BãßValueOfDialTone("꜖")); } @Test public void testChinaMap() { - Assertions.assertEquals(T10PartDecimal.PART_1, T10PartDecimal.PART_1.BãßValueOfChina("零")); - Assertions.assertEquals(T10PartDecimal.PART_2, T10PartDecimal.PART_1.BãßValueOfChina("壹")); - Assertions.assertEquals(T10PartDecimal.PART_9, T10PartDecimal.PART_1.BãßValueOfChina("捌")); - Assertions.assertEquals(T10PartDecimal.PART_10, T10PartDecimal.PART_1.BãßValueOfChina("玖")); + Assertions.assertEquals(T10PartDecimal.PART_1, T10PartDecimal.PART_1.BãßValueOfChinaKey("零")); + Assertions.assertEquals(T10PartDecimal.PART_2, T10PartDecimal.PART_1.BãßValueOfChinaKey("壹")); + Assertions.assertEquals(T10PartDecimal.PART_9, T10PartDecimal.PART_1.BãßValueOfChinaKey("捌")); + Assertions.assertEquals(T10PartDecimal.PART_10, T10PartDecimal.PART_1.BãßValueOfChinaKey("玖")); } } diff --git a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T11PartUndecimalTest.java b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T11PartUndecimalTest.java index cb049755..17df5b7f 100644 --- a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T11PartUndecimalTest.java +++ b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T11PartUndecimalTest.java @@ -12,7 +12,7 @@ public class T11PartUndecimalTest { @Test public void testBasePart() { for (T11PartUndecimal value:T11PartUndecimal.values()) { - Assertions.assertNotNull(value.BȍőnIdentifierTone()); + Assertions.assertNotNull(value.BȍőnDialTone()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); } @@ -20,17 +20,17 @@ public class T11PartUndecimalTest { @Test public void testToneMap() { - Assertions.assertEquals(T11PartUndecimal.PART_1, T11PartUndecimal.PART_1.BãßValueOfTone("˥")); - Assertions.assertEquals(T11PartUndecimal.PART_2, T11PartUndecimal.PART_1.BãßValueOfTone("꜈")); - Assertions.assertEquals(T11PartUndecimal.PART_10, T11PartUndecimal.PART_1.BãßValueOfTone("꜐")); - Assertions.assertEquals(T11PartUndecimal.PART_11, T11PartUndecimal.PART_1.BãßValueOfTone("˩")); + Assertions.assertEquals(T11PartUndecimal.PART_1, T11PartUndecimal.PART_1.BãßValueOfDialTone("˥")); + Assertions.assertEquals(T11PartUndecimal.PART_2, T11PartUndecimal.PART_1.BãßValueOfDialTone("꜈")); + Assertions.assertEquals(T11PartUndecimal.PART_10, T11PartUndecimal.PART_1.BãßValueOfDialTone("꜐")); + Assertions.assertEquals(T11PartUndecimal.PART_11, T11PartUndecimal.PART_1.BãßValueOfDialTone("˩")); } @Test public void testChinaMap() { - Assertions.assertEquals(T11PartUndecimal.PART_1, T11PartUndecimal.PART_1.BãßValueOfChina("走")); - Assertions.assertEquals(T11PartUndecimal.PART_2, T11PartUndecimal.PART_1.BãßValueOfChina("跑")); - Assertions.assertEquals(T11PartUndecimal.PART_10, T11PartUndecimal.PART_1.BãßValueOfChina("春")); - Assertions.assertEquals(T11PartUndecimal.PART_11, T11PartUndecimal.PART_1.BãßValueOfChina("耦")); + Assertions.assertEquals(T11PartUndecimal.PART_1, T11PartUndecimal.PART_1.BãßValueOfChinaKey("走")); + Assertions.assertEquals(T11PartUndecimal.PART_2, T11PartUndecimal.PART_1.BãßValueOfChinaKey("跑")); + Assertions.assertEquals(T11PartUndecimal.PART_10, T11PartUndecimal.PART_1.BãßValueOfChinaKey("春")); + Assertions.assertEquals(T11PartUndecimal.PART_11, T11PartUndecimal.PART_1.BãßValueOfChinaKey("耦")); } } diff --git a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T12PartUncialTest.java b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T12PartUncialTest.java index ca3e829c..293fd963 100644 --- a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T12PartUncialTest.java +++ b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T12PartUncialTest.java @@ -12,7 +12,7 @@ public class T12PartUncialTest { @Test public void testBasePart() { for (T12PartUncial value:T12PartUncial.values()) { - Assertions.assertNotNull(value.BȍőnIdentifierTone()); + Assertions.assertNotNull(value.BȍőnDialTone()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); Assertions.assertNotNull(value.BȍőnAlt1Value()); @@ -23,17 +23,17 @@ public class T12PartUncialTest { @Test public void testToneMap() { - Assertions.assertEquals(T12PartUncial.PART_1, T12PartUncial.PART_1.BãßValueOfTone("˥")); - Assertions.assertEquals(T12PartUncial.PART_2, T12PartUncial.PART_1.BãßValueOfTone("˧")); - Assertions.assertEquals(T12PartUncial.PART_11, T12PartUncial.PART_1.BãßValueOfTone("꜏")); - Assertions.assertEquals(T12PartUncial.PART_12, T12PartUncial.PART_1.BãßValueOfTone("꜑")); + Assertions.assertEquals(T12PartUncial.PART_1, T12PartUncial.PART_1.BãßValueOfDialTone("˥")); + Assertions.assertEquals(T12PartUncial.PART_2, T12PartUncial.PART_1.BãßValueOfDialTone("˧")); + Assertions.assertEquals(T12PartUncial.PART_11, T12PartUncial.PART_1.BãßValueOfDialTone("꜏")); + Assertions.assertEquals(T12PartUncial.PART_12, T12PartUncial.PART_1.BãßValueOfDialTone("꜑")); } @Test public void testChinaMap() { - Assertions.assertEquals(T12PartUncial.PART_1, T12PartUncial.PART_1.BãßValueOfChina("日")); - Assertions.assertEquals(T12PartUncial.PART_2, T12PartUncial.PART_1.BãßValueOfChina("月")); - Assertions.assertEquals(T12PartUncial.PART_11, T12PartUncial.PART_1.BãßValueOfChina("黼")); - Assertions.assertEquals(T12PartUncial.PART_12, T12PartUncial.PART_1.BãßValueOfChina("亞")); + Assertions.assertEquals(T12PartUncial.PART_1, T12PartUncial.PART_1.BãßValueOfChinaKey("日")); + Assertions.assertEquals(T12PartUncial.PART_2, T12PartUncial.PART_1.BãßValueOfChinaKey("月")); + Assertions.assertEquals(T12PartUncial.PART_11, T12PartUncial.PART_1.BãßValueOfChinaKey("黼")); + Assertions.assertEquals(T12PartUncial.PART_12, T12PartUncial.PART_1.BãßValueOfChinaKey("亞")); } } diff --git a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T16PartHexTest.java b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T16PartHexTest.java index c448ce32..35f8415f 100644 --- a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T16PartHexTest.java +++ b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T16PartHexTest.java @@ -12,7 +12,7 @@ public class T16PartHexTest { @Test public void testBasePart() { for (T16PartHex value:T16PartHex.values()) { - Assertions.assertNotNull(value.BȍőnIdentifierTone()); + Assertions.assertNotNull(value.BȍőnDialTone()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); } @@ -20,17 +20,17 @@ public class T16PartHexTest { @Test public void testToneMap() { - Assertions.assertEquals(T16PartHex.PART_1, T16PartHex.PART_1.BãßValueOfTone("˥")); - Assertions.assertEquals(T16PartHex.PART_2, T16PartHex.PART_1.BãßValueOfTone("˦")); - Assertions.assertEquals(T16PartHex.PART_15, T16PartHex.PART_1.BãßValueOfTone("꜐")); - Assertions.assertEquals(T16PartHex.PART_16, T16PartHex.PART_1.BãßValueOfTone("꜑")); + Assertions.assertEquals(T16PartHex.PART_1, T16PartHex.PART_1.BãßValueOfDialTone("˥")); + Assertions.assertEquals(T16PartHex.PART_2, T16PartHex.PART_1.BãßValueOfDialTone("˦")); + Assertions.assertEquals(T16PartHex.PART_15, T16PartHex.PART_1.BãßValueOfDialTone("꜐")); + Assertions.assertEquals(T16PartHex.PART_16, T16PartHex.PART_1.BãßValueOfDialTone("꜑")); } @Test public void testChinaMap() { - Assertions.assertEquals(T16PartHex.PART_1, T16PartHex.PART_1.BãßValueOfChina("氫")); - Assertions.assertEquals(T16PartHex.PART_2, T16PartHex.PART_1.BãßValueOfChina("氦")); - Assertions.assertEquals(T16PartHex.PART_15, T16PartHex.PART_1.BãßValueOfChina("磷")); - Assertions.assertEquals(T16PartHex.PART_16, T16PartHex.PART_1.BãßValueOfChina("硫")); + Assertions.assertEquals(T16PartHex.PART_1, T16PartHex.PART_1.BãßValueOfChinaKey("氫")); + Assertions.assertEquals(T16PartHex.PART_2, T16PartHex.PART_1.BãßValueOfChinaKey("氦")); + Assertions.assertEquals(T16PartHex.PART_15, T16PartHex.PART_1.BãßValueOfChinaKey("磷")); + Assertions.assertEquals(T16PartHex.PART_16, T16PartHex.PART_1.BãßValueOfChinaKey("硫")); } } diff --git a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T20PartScoreTest.java b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T20PartScoreTest.java index 967196a2..debf2276 100644 --- a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T20PartScoreTest.java +++ b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T20PartScoreTest.java @@ -12,7 +12,7 @@ public class T20PartScoreTest { @Test public void testBasePart() { for (T20PartScore value:T20PartScore.values()) { - Assertions.assertNotNull(value.BȍőnIdentifierTone()); + Assertions.assertNotNull(value.BȍőnDialTone()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); Assertions.assertNotNull(value.BȍőnAlt1Value()); @@ -23,18 +23,18 @@ public class T20PartScoreTest { @Test public void testToneMap() { - Assertions.assertEquals(T20PartScore.PART_1, T20PartScore.PART_1.BãßValueOfTone("˥")); - Assertions.assertEquals(T20PartScore.PART_2, T20PartScore.PART_1.BãßValueOfTone("˦")); - Assertions.assertEquals(T20PartScore.PART_19, T20PartScore.PART_1.BãßValueOfTone("꜐")); - Assertions.assertEquals(T20PartScore.PART_20, T20PartScore.PART_1.BãßValueOfTone("꜑")); + Assertions.assertEquals(T20PartScore.PART_1, T20PartScore.PART_1.BãßValueOfDialTone("˥")); + Assertions.assertEquals(T20PartScore.PART_2, T20PartScore.PART_1.BãßValueOfDialTone("˦")); + Assertions.assertEquals(T20PartScore.PART_19, T20PartScore.PART_1.BãßValueOfDialTone("꜐")); + Assertions.assertEquals(T20PartScore.PART_20, T20PartScore.PART_1.BãßValueOfDialTone("꜑")); } @Test public void testChinaMap() { - Assertions.assertEquals(T20PartScore.PART_1, T20PartScore.PART_1.BãßValueOfChina("尧")); - Assertions.assertEquals(T20PartScore.PART_2, T20PartScore.PART_1.BãßValueOfChina("泽")); - Assertions.assertEquals(T20PartScore.PART_19, T20PartScore.PART_1.BãßValueOfChina("仄")); - Assertions.assertEquals(T20PartScore.PART_20, T20PartScore.PART_1.BãßValueOfChina("幺")); + Assertions.assertEquals(T20PartScore.PART_1, T20PartScore.PART_1.BãßValueOfChinaKey("尧")); + Assertions.assertEquals(T20PartScore.PART_2, T20PartScore.PART_1.BãßValueOfChinaKey("泽")); + Assertions.assertEquals(T20PartScore.PART_19, T20PartScore.PART_1.BãßValueOfChinaKey("仄")); + Assertions.assertEquals(T20PartScore.PART_20, T20PartScore.PART_1.BãßValueOfChinaKey("幺")); } @Test diff --git a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T60SexagesimalTest.java b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T60SexagesimalTest.java index 88014994..3b7c9a53 100644 --- a/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T60SexagesimalTest.java +++ b/demo4d-numberxd/src/test/love/distributedrebirth/numberxd/base2t/T60SexagesimalTest.java @@ -12,7 +12,7 @@ public class T60SexagesimalTest { @Test public void testBasePart() { for (T60PartSexagesimal value:T60PartSexagesimal.values()) { - Assertions.assertNotNull(value.BȍőnIdentifierTone()); + Assertions.assertNotNull(value.BȍőnDialTone()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); } @@ -20,17 +20,17 @@ public class T60SexagesimalTest { @Test public void testToneMap() { - Assertions.assertEquals(T60PartSexagesimal.PART_1, T60PartSexagesimal.PART_1.BãßValueOfTone("˥˥")); - Assertions.assertEquals(T60PartSexagesimal.PART_2, T60PartSexagesimal.PART_1.BãßValueOfTone("˥˦")); - Assertions.assertEquals(T60PartSexagesimal.PART_59, T60PartSexagesimal.PART_1.BãßValueOfTone("꜒꜕")); - Assertions.assertEquals(T60PartSexagesimal.PART_60, T60PartSexagesimal.PART_1.BãßValueOfTone("꜒꜖")); + Assertions.assertEquals(T60PartSexagesimal.PART_1, T60PartSexagesimal.PART_1.BãßValueOfDialTone("˥˥")); + Assertions.assertEquals(T60PartSexagesimal.PART_2, T60PartSexagesimal.PART_1.BãßValueOfDialTone("˥˦")); + Assertions.assertEquals(T60PartSexagesimal.PART_59, T60PartSexagesimal.PART_1.BãßValueOfDialTone("꜒꜕")); + Assertions.assertEquals(T60PartSexagesimal.PART_60, T60PartSexagesimal.PART_1.BãßValueOfDialTone("꜒꜖")); } @Test public void testChinaMap() { - Assertions.assertEquals(T60PartSexagesimal.PART_1, T60PartSexagesimal.PART_1.BãßValueOfChina("牛")); - Assertions.assertEquals(T60PartSexagesimal.PART_2, T60PartSexagesimal.PART_1.BãßValueOfChina("鸡")); - Assertions.assertEquals(T60PartSexagesimal.PART_59, T60PartSexagesimal.PART_1.BãßValueOfChina("薯")); - Assertions.assertEquals(T60PartSexagesimal.PART_60, T60PartSexagesimal.PART_1.BãßValueOfChina("蘋")); + Assertions.assertEquals(T60PartSexagesimal.PART_1, T60PartSexagesimal.PART_1.BãßValueOfChinaKey("牛")); + Assertions.assertEquals(T60PartSexagesimal.PART_2, T60PartSexagesimal.PART_1.BãßValueOfChinaKey("鸡")); + Assertions.assertEquals(T60PartSexagesimal.PART_59, T60PartSexagesimal.PART_1.BãßValueOfChinaKey("薯")); + Assertions.assertEquals(T60PartSexagesimal.PART_60, T60PartSexagesimal.PART_1.BãßValueOfChinaKey("蘋")); } }