arch-jedi/nx01
1
Fork 0
Code Issues Pull requests Releases Packages Activity Actions

FC18: realigned ratio to max lego size and equal naming

Browse source
This commit is contained in:
Willem Cazander 2025-09-05 21:03:50 +02:00
parent 6e403ac1c9
commit 81e1647c27
8 changed files with 69 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

10
nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/FourCornerZionStenoLexerSmokeTest.java
View file

@ -46,15 +46,15 @@ public class FourCornerZionStenoLexerSmokeTest {
lexer.withSmokeSignals(smokeReader);
List<Integer> cdc = new ArrayList<>();
cdc.add(192 + FourCornerDotCake.FC_RATIONAL4608_SEL0.getStart() + 1);
cdc.add(192 + FourCornerDotCake.FC_RATIONAL2304_SEL0.getStart() + 1);
Assertions.assertEquals(0, smokeReader.pipeSmokeClouds);
lexer.read(cdc);
Assertions.assertEquals(1, smokeReader.pipeSmokeClouds);
Assertions.assertEquals("burnNumberMissingSparkler:CHOCO_RATIONAL", smokeReader.pipeError);
cdc.addAll(FCDotDEC2701DashPX0.ESC_STOP.baklavaPointSequence());
cdc.add(FourCornerDotCake.FC_RATIONAL4608_SEL0.getStart() + 123);
cdc.add(FourCornerDotCake.FC_RATIONAL4608_BANK.getStart() + 123);
cdc.add(FourCornerDotCake.FC_RATIONAL2304_SEL0.getStart() + 123);
cdc.add(FourCornerDotCake.FC_RATIONAL2304_BANK.getStart() + 123);
cdc.addAll(FCDotDEC2701DashPX0.ESC_STOP.baklavaPointSequence());
smokeReader.reset();
@ -62,8 +62,8 @@ public class FourCornerZionStenoLexerSmokeTest {
Assertions.assertEquals(2, smokeReader.pipeSmokeClouds);
cdc.addAll(FCDotDEC2701DashPX0.ESC_STOP.cakePointSequence());
cdc.add(192 + FourCornerDotCake.FC_RATIONAL4608_SEL0.getStart() + 11);
cdc.add(FourCornerDotCake.FC_RATIONAL4608_BANK.getStart());
cdc.add(192 + FourCornerDotCake.FC_RATIONAL2304_SEL0.getStart() + 11);
cdc.add(FourCornerDotCake.FC_RATIONAL2304_BANK.getStart());
smokeReader.reset();
lexer.read(cdc);
String res = "[0:1:burnNumberMissingSparkler:CHOCO_RATIONAL][0:8:burnNumberMissingSparkler:CHOCO_RATIONAL][0:16:burnNumberMissingSparkler:CHOCO_RATIONAL]";

54
nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoRationalTest.java
View file

@ -73,7 +73,7 @@ public class StenoNumberChocoRationalTest {
public void testBankRationalValuesMax() throws Exception {
List<Integer> outX18 = new ArrayList<>();
FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18(outX18);
BigInteger maxValue = FourCornerZionStenoPetroglyphs.BIG_BITS_2300;
BigInteger maxValue = FourCornerZionStenoPetroglyphs.BIG_BITS_1148;
writerX18.strobeNumberChocoPigRational(FCFlameNumberTaste.NUMBER_POSITIVE, FCFlameNumberTaste.NUMBER_POSITIVE, maxValue, maxValue);
Assertions.assertThrows(IllegalArgumentException.class, () -> {
writerX18.strobeNumberChocoPigRational(FCFlameNumberTaste.NUMBER_POSITIVE, FCFlameNumberTaste.NUMBER_POSITIVE, maxValue, maxValue.add(BigInteger.ONE));
@ -89,31 +89,31 @@ public class StenoNumberChocoRationalTest {
cdc.add(FCDotCDC1604DashP6.NX24_X.ordinal()); // = X
cdc.add(FCDotCDC1604DashP6.NY09_EQUALS.ordinal());
cdc.add(192 + FourCornerDotCake.FC_RATIONAL4608_SEL0.getStart());
cdc.add(FourCornerDotCake.FC_RATIONAL4608_BANK.getStart() + 1);
cdc.add(FourCornerDotCake.FC_RATIONAL4608_SEL0.getStart());
cdc.add(FourCornerDotCake.FC_RATIONAL4608_BANK.getStart() + 11);
cdc.add(96 + FourCornerDotCake.FC_RATIONAL2304_SEL0.getStart());
cdc.add(FourCornerDotCake.FC_RATIONAL2304_BANK.getStart() + 1);
cdc.add(FourCornerDotCake.FC_RATIONAL2304_SEL0.getStart());
cdc.add(FourCornerDotCake.FC_RATIONAL2304_BANK.getStart() + 11);
cdc.add(192 + FourCornerDotCake.FC_RATIONAL4608_SEL0.getStart());
cdc.add(FourCornerDotCake.FC_RATIONAL4608_BANK.getStart() + 1);
cdc.add(FourCornerDotCake.FC_RATIONAL4608_SEL0.getStart());
cdc.add(FourCornerDotCake.FC_RATIONAL4608_BANK.getStart() + 1);
cdc.add(96 + FourCornerDotCake.FC_RATIONAL2304_SEL0.getStart());
cdc.add(FourCornerDotCake.FC_RATIONAL2304_BANK.getStart() + 1);
cdc.add(FourCornerDotCake.FC_RATIONAL2304_SEL0.getStart());
cdc.add(FourCornerDotCake.FC_RATIONAL2304_BANK.getStart() + 1);
cdc.add(192 + FourCornerDotCake.FC_RATIONAL4608_SEL0.getStart());
cdc.add(FourCornerDotCake.FC_RATIONAL4608_BANK.getStart() + 14);
cdc.add(FourCornerDotCake.FC_RATIONAL4608_SEL0.getStart());
cdc.add(FourCornerDotCake.FC_RATIONAL4608_BANK.getStart() + 15);
cdc.add(96 + FourCornerDotCake.FC_RATIONAL2304_SEL0.getStart());
cdc.add(FourCornerDotCake.FC_RATIONAL2304_BANK.getStart() + 14);
cdc.add(FourCornerDotCake.FC_RATIONAL2304_SEL0.getStart());
cdc.add(FourCornerDotCake.FC_RATIONAL2304_BANK.getStart() + 15);
cdc.add(192 + FourCornerDotCake.FC_RATIONAL4608_SEL0.getStart());
cdc.add(FourCornerDotCake.FC_RATIONAL4608_BANK.getStart() + 123);
cdc.add(FourCornerDotCake.FC_RATIONAL4608_SEL0.getStart() + 1);
cdc.add(FourCornerDotCake.FC_RATIONAL4608_BANK.getStart() + 1); // 4096
cdc.add(FourCornerDotCake.FC_RATIONAL4608_BANK.getStart() + 1); // +1 = 4097
cdc.add(96 + FourCornerDotCake.FC_RATIONAL2304_SEL0.getStart());
cdc.add(FourCornerDotCake.FC_RATIONAL2304_BANK.getStart() + 123);
cdc.add(FourCornerDotCake.FC_RATIONAL2304_SEL0.getStart() + 1);
cdc.add(FourCornerDotCake.FC_RATIONAL2304_BANK.getStart() + 1); // 4096
cdc.add(FourCornerDotCake.FC_RATIONAL2304_BANK.getStart() + 1); // +1 = 4097
cdc.add(192 + FourCornerDotCake.FC_RATIONAL4608_SEL0.getStart());
cdc.add(FourCornerDotCake.FC_RATIONAL4608_BANK.getStart() + 4);
cdc.add(FourCornerDotCake.FC_RATIONAL4608_SEL0.getStart());
cdc.add(FourCornerDotCake.FC_RATIONAL4608_BANK.getStart() + 1);
cdc.add(96 + FourCornerDotCake.FC_RATIONAL2304_SEL0.getStart());
cdc.add(FourCornerDotCake.FC_RATIONAL2304_BANK.getStart() + 4);
cdc.add(FourCornerDotCake.FC_RATIONAL2304_SEL0.getStart());
cdc.add(FourCornerDotCake.FC_RATIONAL2304_BANK.getStart() + 1);
cdc.add(FCDotCDC1604DashP6.NY14_SEMICOLON.ordinal());
Assertions.assertEquals("X=¹/₁₁¹/₁¹⁴/₁₅¹²³/₄₀₉₇⁴/₁;", FourCornerUnicodeDisplay.text().renderFromInt18(cdc));
@ -122,12 +122,12 @@ public class StenoNumberChocoRationalTest {
@Test
public void testNCRLargest() throws Exception {
List<Integer> cdc = new ArrayList<>();
cdc.add(FourCornerDotCake.FC_RATIONAL4608_SEL0.getStop());
for (int i = FourCornerDotCake.FC_RATIONAL4608_SEL0.getStop(); i >= FourCornerDotCake.FC_RATIONAL4608_SEL0.getStart(); i--) {
cdc.add(FourCornerDotCake.FC_RATIONAL4608_BANK.getStop());
cdc.add(FourCornerDotCake.FC_RATIONAL2304_SEL0.getStop());
for (int i = FourCornerDotCake.FC_RATIONAL2304_SEL0.getStop(); i >= FourCornerDotCake.FC_RATIONAL2304_SEL0.getStart(); i--) {
cdc.add(FourCornerDotCake.FC_RATIONAL2304_BANK.getStop());
}
String resSuper = "²³³⁸⁷⁸³⁵³¹⁸⁰⁷⁵⁸³³⁹⁵²²⁹⁹⁹⁹⁸⁵⁸⁴⁶¹⁴⁵¹⁵³⁷⁰¹⁶²⁰⁵⁵¹⁴⁷⁰⁴⁷³⁴⁹¹⁸³⁴²⁰³⁶⁵²⁷³²¹⁷³⁵¹⁵⁹⁰⁴⁹⁴⁶²⁶⁰³⁴¹⁷⁴⁵²⁷⁸¹³³⁹⁹⁵⁵⁶³³⁹⁸⁵⁴³⁸³³⁰⁰²⁷³⁷³⁰⁵⁷⁵⁵²⁶⁵⁶⁶⁷⁵⁴⁰²⁹⁰⁷²⁷⁷⁶⁶⁸⁰⁷⁴⁹³²¹²⁸⁷⁶⁹⁰⁹⁸⁷⁵⁵⁹⁴⁶⁵⁹⁹⁹⁰⁵²⁵¹⁴⁹⁵¹¹⁶⁶⁸⁵⁸⁴³¹⁴⁵⁴¹⁰⁸⁰⁵²⁹²³²⁹²⁰⁵⁰⁷³³⁹²⁸⁰³⁶⁶⁶⁰⁸⁵⁴³²⁸⁴¹⁰⁰⁷²⁹³²³⁷⁰⁷⁷⁴⁴⁸⁴⁷⁵²⁹²⁴⁴⁰²⁸⁷⁰⁴³⁷⁵²²²⁸²⁸⁰⁷⁵⁰⁴⁸⁰⁵³⁴⁴¹⁸⁷³⁰⁶⁶⁸⁴¹⁴³¹⁸⁸⁶⁷⁷⁰⁹⁹⁶⁸⁰⁸⁷⁴⁰⁸²⁷²¹¹⁶⁰³⁴⁷⁵⁰³⁸³⁷⁸¹⁷⁴⁹⁷⁶⁷¹²⁶⁸¹⁵¹⁰⁶²²²²⁶¹⁰⁵⁰⁴²⁹³³⁷⁰¹⁰⁸¹⁶³⁹⁴²⁰⁷⁹⁶⁴⁵⁶⁶²⁵⁸³²⁰⁵³⁴⁸⁰⁷⁹²⁸⁴⁰¹⁷⁰²⁰¹⁹⁷⁸⁷⁴⁶⁸⁶³⁸⁷⁵⁶⁵³⁹³⁰⁵³⁶¹³⁰⁶⁹²¹¹⁴⁵³⁴⁵⁵³⁵⁰⁸²¹³⁷⁷³⁶⁷⁷⁵⁴³⁹⁹⁰⁸⁵⁵⁴⁰²⁸⁴⁵⁹⁵²⁶⁹⁰⁹⁶⁶⁴²²⁹⁷⁹⁹⁹⁶⁶¹¹²⁸⁵²¹⁴⁴⁷²¹²⁴¹⁷⁶²⁵⁸⁴²⁰³⁴¹⁶⁹⁰⁷⁰⁹⁶¹⁵⁰¹⁶⁸⁷⁵⁹⁵⁰⁰⁷⁸⁹³⁴⁷⁴⁰⁴⁸⁹⁵³⁶⁸⁶⁶⁶⁶⁵⁰⁶³⁷³⁰⁰⁹⁸¹⁸⁸⁵²³⁵¹⁷⁴⁸¹⁴⁶⁷¹⁹⁵⁸³¹⁰⁹⁴⁸⁴⁶³⁷⁹⁵⁹⁷³⁶⁹⁸⁵⁹⁶⁶⁹³⁴⁶⁹⁰⁵⁴³³⁵⁹⁰⁹²⁶⁴²⁷⁹⁰³²²⁷⁰¹⁷⁵³⁴⁴⁰¹¹⁸¹⁹³⁴¹⁴¹⁴¹⁰²⁴⁹⁴⁸¹²⁰³⁴⁴⁶¹⁵⁵⁰¹¹⁷⁴¹⁰²³⁸⁹⁷⁹¹⁶³⁵⁰²²⁶³⁷³⁸⁷³⁸⁵²⁷⁰⁰⁷⁵⁸⁰²⁸⁵⁰⁵³¹⁷³⁷⁵";
String resSuber = "₂₃₃₈₇₈₃₅₃₁₈₀₇₅₈₃₃₉₅₂₂₉₉₉₉₈₅₈₄₆₁₄₅₁₅₃₇₀₁₆₂₀₅₅₁₄₇₀₄₇₃₄₉₁₈₃₄₂₀₃₆₅₂₇₃₂₁₇₃₅₁₅₉₀₄₉₄₆₂₆₀₃₄₁₇₄₅₂₇₈₁₃₃₉₉₅₅₆₃₃₉₈₅₄₃₈₃₃₀₀₂₇₃₇₃₀₅₇₅₅₂₆₅₆₆₇₅₄₀₂₉₀₇₂₇₇₆₆₈₀₇₄₉₃₂₁₂₈₇₆₉₀₉₈₇₅₅₉₄₆₅₉₉₉₀₅₂₅₁₄₉₅₁₁₆₆₈₅₈₄₃₁₄₅₄₁₀₈₀₅₂₉₂₃₂₉₂₀₅₀₇₃₃₉₂₈₀₃₆₆₆₀₈₅₄₃₂₈₄₁₀₀₇₂₉₃₂₃₇₀₇₇₄₄₈₄₇₅₂₉₂₄₄₀₂₈₇₀₄₃₇₅₂₂₂₈₂₈₀₇₅₀₄₈₀₅₃₄₄₁₈₇₃₀₆₆₈₄₁₄₃₁₈₈₆₇₇₀₉₉₆₈₀₈₇₄₀₈₂₇₂₁₁₆₀₃₄₇₅₀₃₈₃₇₈₁₇₄₉₇₆₇₁₂₆₈₁₅₁₀₆₂₂₂₂₆₁₀₅₀₄₂₉₃₃₇₀₁₀₈₁₆₃₉₄₂₀₇₉₆₄₅₆₆₂₅₈₃₂₀₅₃₄₈₀₇₉₂₈₄₀₁₇₀₂₀₁₉₇₈₇₄₆₈₆₃₈₇₅₆₅₃₉₃₀₅₃₆₁₃₀₆₉₂₁₁₄₅₃₄₅₅₃₅₀₈₂₁₃₇₇₃₆₇₇₅₄₃₉₉₀₈₅₅₄₀₂₈₄₅₉₅₂₆₉₀₉₆₆₄₂₂₉₇₉₉₉₆₆₁₁₂₈₅₂₁₄₄₇₂₁₂₄₁₇₆₂₅₈₄₂₀₃₄₁₆₉₀₇₀₉₆₁₅₀₁₆₈₇₅₉₅₀₀₇₈₉₃₄₇₄₀₄₈₉₅₃₆₈₆₆₆₆₅₀₆₃₇₃₀₀₉₈₁₈₈₅₂₃₅₁₇₄₈₁₄₆₇₁₉₅₈₃₁₀₉₄₈₄₆₃₇₉₅₉₇₃₆₉₈₅₉₆₆₉₃₄₆₉₀₅₄₃₃₅₉₀₉₂₆₄₂₇₉₀₃₂₂₇₀₁₇₅₃₄₄₀₁₁₈₁₉₃₄₁₄₁₄₁₀₂₄₉₄₈₁₂₀₃₄₄₆₁₅₅₀₁₁₇₄₁₀₂₃₈₉₇₉₁₆₃₅₀₂₂₆₃₇₃₈₇₃₈₅₂₇₀₀₇₅₈₀₂₈₅₀₅₃₁₇₃₇₅";
String resSuper = "³⁸²³²⁷⁰⁴⁶⁸³⁰²⁹⁴¹⁸⁴²⁰⁰²⁰²⁴⁶⁰⁷⁴⁵⁰³⁵⁷⁹²⁵⁵⁷⁰⁹⁸⁸³⁵⁸⁹⁶⁵⁰⁴⁹⁹⁴⁰⁶³⁷²¹²³⁴⁸¹⁸²⁴⁸¹¹¹²²⁵⁵⁷⁴⁷³⁹⁵¹¹¹⁶⁷⁸⁹⁹⁶¹³⁴⁸⁷³²³⁷⁰¹⁹⁷⁴⁰²⁸¹⁶⁷⁹⁵⁹⁴³¹⁵⁴⁰⁹⁰²⁸⁶⁸⁸⁰²²¹⁸⁹⁷⁵⁹⁴¹⁵⁶⁴⁵⁸⁵¹⁰⁵⁵⁶³⁸¹⁶⁴¹⁰⁵³⁷⁹⁰²⁹⁵⁶⁰⁷¹⁷⁵³⁸⁸⁷⁸³¹⁹³⁶¹⁴⁴⁹⁸¹³⁴⁹⁷¹⁴⁹⁹⁷⁵⁷⁵³³⁰⁰⁷⁵⁸⁸⁶⁴²⁴⁵¹³⁰⁵⁰⁷³⁶¹¹²⁹⁶⁷⁷¹⁰⁶¹⁶¹⁸¹⁵⁵⁰⁸²⁵⁹⁷⁶⁸⁷⁵¹⁴²⁷⁸⁰⁶²⁴⁰¹²³¹¹⁷¹⁷²⁷⁴¹⁹⁷⁶⁵⁵⁰¹⁶²⁷¹⁹⁷²⁸²⁴⁹⁸⁸²⁰⁶⁵³⁵⁶⁷⁸⁵⁶²⁰⁴⁵²³⁴¹⁴⁰⁹¹³⁹⁵⁷³⁰⁵²¹⁵⁸⁹⁵⁴⁰⁴²³⁸²⁴⁰⁰⁵⁸⁸⁵⁶⁵⁴⁴⁶⁶⁵⁵";
String resSuber = "₃₈₂₃₂₇₀₄₆₈₃₀₂₉₄₁₈₄₂₀₀₂₀₂₄₆₀₇₄₅₀₃₅₇₉₂₅₅₇₀₉₈₈₃₅₈₉₆₅₀₄₉₉₄₀₆₃₇₂₁₂₃₄₈₁₈₂₄₈₁₁₁₂₂₅₅₇₄₇₃₉₅₁₁₁₆₇₈₉₉₆₁₃₄₈₇₃₂₃₇₀₁₉₇₄₀₂₈₁₆₇₉₅₉₄₃₁₅₄₀₉₀₂₈₆₈₈₀₂₂₁₈₉₇₅₉₄₁₅₆₄₅₈₅₁₀₅₅₆₃₈₁₆₄₁₀₅₃₇₉₀₂₉₅₆₀₇₁₇₅₃₈₈₇₈₃₁₉₃₆₁₄₄₉₈₁₃₄₉₇₁₄₉₉₇₅₇₅₃₃₀₀₇₅₈₈₆₄₂₄₅₁₃₀₅₀₇₃₆₁₁₂₉₆₇₇₁₀₆₁₆₁₈₁₅₅₀₈₂₅₉₇₆₈₇₅₁₄₂₇₈₀₆₂₄₀₁₂₃₁₁₇₁₇₂₇₄₁₉₇₆₅₅₀₁₆₂₇₁₉₇₂₈₂₄₉₈₈₂₀₆₅₃₅₆₇₈₅₆₂₀₄₅₂₃₄₁₄₀₉₁₃₉₅₇₃₀₅₂₁₅₈₉₅₄₀₄₂₃₈₂₄₀₀₅₈₈₅₆₅₄₄₆₆₅₅";
Assertions.assertEquals(resSuper + "/" + resSuber, FourCornerUnicodeDisplay.text().renderFromInt18(cdc));
}
}