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

FC18: Clean unicode renderer methods to just one renderer method

Browse source
This commit is contained in:
Willem Cazander 2025-09-28 17:22:02 +02:00
parent 99bce14fd1
commit 5cfb4893db
21 changed files with 103 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/print/FCDocPageWriterCandy.java
View file

@ -175,7 +175,7 @@ public class FCDocPageWriterCandy implements MaisDocPageWriter, FCDocSegmentWrit
continue; continue;
} }
int char18 = slice.getStart() + i; int char18 = slice.getStart() + i;
String char18Str = FourCornerUnicodeDisplay.text().renderFromInt18(List.of(char18)); String char18Str = FourCornerUnicodeDisplay.text().render(List.of(char18));
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
for (int c : char18Str.codePoints().toArray()) { for (int c : char18Str.codePoints().toArray()) {
if (c == '\u0000') { if (c == '\u0000') {

2
nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/print/FCDocPageWriterNCR.java
View file

@ -84,7 +84,7 @@ public class FCDocPageWriterNCR implements MaisDocPageWriter, FCDocSegmentWriter
//piNum.addAll(FCDotDEC2701DashPX0.ESC68_NCR.baklavaPointSequence()); // TODO: use write for 18 bit NCR //piNum.addAll(FCDotDEC2701DashPX0.ESC68_NCR.baklavaPointSequence()); // TODO: use write for 18 bit NCR
piNum.add(FCDotCDC1604DashP6.NX01_A.ordinal() + t); piNum.add(FCDotCDC1604DashP6.NX01_A.ordinal() + t);
piNum.add(FCDotCDC1604DashP6.NX01_A.ordinal() + i); piNum.add(FCDotCDC1604DashP6.NX01_A.ordinal() + i);
String char18Str = FourCornerUnicodeDisplay.text().renderFromInt18(piNum); String char18Str = FourCornerUnicodeDisplay.text().render(piNum);
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
for (int c : char18Str.codePoints().toArray()) { for (int c : char18Str.codePoints().toArray()) {
if (c == '\u0000') { if (c == '\u0000') {

52
nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeDisplay.java
View file

@ -33,8 +33,6 @@ import java.util.function.Consumer;
import org.x4o.fc18.cake2.FourCornerDotCake; import org.x4o.fc18.cake2.FourCornerDotCake;
import org.x4o.fc18.cake2.FourCornerX00PetitVide; import org.x4o.fc18.cake2.FourCornerX00PetitVide;
import org.x4o.fc18.cake2.FourCornerX06BaklavaPointSequence;
import org.x4o.fc18.cake2.FourCornerX18CakePointSequence;
import org.x4o.fc18.cake2.pie9d.FCDotPIE9DDash09; import org.x4o.fc18.cake2.pie9d.FCDotPIE9DDash09;
import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
import org.x4o.fc18.zion7.FourCornerZion7Candlelier; import org.x4o.fc18.zion7.FourCornerZion7Candlelier;
@ -95,35 +93,11 @@ public class FourCornerUnicodeDisplay {
return buf.toString(); return buf.toString();
} }
@Deprecated public String render(List<Integer> chars) {
public String renderFromX06(List<FourCornerX06BaklavaPointSequence> chars) { return buildString(v -> render(chars, v));
return buildString(v -> renderFromX06(chars, v));
} }
@Deprecated public void render(List<Integer> chars, StringBuilder buf) {
public void renderFromX06(List<FourCornerX06BaklavaPointSequence> chars, StringBuilder buf) {
List<Integer> charPoints = new ArrayList<>(chars.size());
chars.forEach(v -> charPoints.addAll(v.baklavaPointSequence()));
renderFromInt18(charPoints, buf);
}
@Deprecated
public String renderFromX18(List<FourCornerX18CakePointSequence> chars) {
return buildString(v -> renderFromX18(chars, v));
}
@Deprecated
public void renderFromX18(List<FourCornerX18CakePointSequence> chars, StringBuilder buf) {
List<Integer> charPoints = new ArrayList<>(chars.size());
chars.forEach(v -> charPoints.addAll(v.cakePointSequence()));
renderFromInt18(charPoints, buf);
}
public String renderFromInt18(List<Integer> chars) {
return buildString(v -> renderFromInt18(chars, v));
}
public void renderFromInt18(List<Integer> chars, StringBuilder buf) {
StenoUnicodePrinter printer = new StenoUnicodePrinter(buf); StenoUnicodePrinter printer = new StenoUnicodePrinter(buf);
FourCornerZionStenoLexer lexer = new FourCornerZionStenoLexer(printer, handleEscape); FourCornerZionStenoLexer lexer = new FourCornerZionStenoLexer(printer, handleEscape);
lexer.withSmokeSignals(printer).read(chars); lexer.withSmokeSignals(printer).read(chars);
@ -262,7 +236,7 @@ public class FourCornerUnicodeDisplay {
public void strobeNumberBASE2Lego(FCFlameFremanLegoBase2 type, BigInteger value) { public void strobeNumberBASE2Lego(FCFlameFremanLegoBase2 type, BigInteger value) {
List<Integer> numberCandy = new ArrayList<>(); List<Integer> numberCandy = new ArrayList<>();
FourCornerRecipe.toDecimalsX18(numberCandy, value); FourCornerRecipe.toDecimalsX18(numberCandy, value);
renderFromInt18(numberCandy, output); render(numberCandy, output);
} }
@Override @Override
@ -272,14 +246,14 @@ public class FourCornerUnicodeDisplay {
numberCandy.add(FCDotCDC1604DashP6.NY19_MINUS.ordinal()); // TODO: use name word symbols numberCandy.add(FCDotCDC1604DashP6.NY19_MINUS.ordinal()); // TODO: use name word symbols
} }
FourCornerRecipe.toDecimalsX18(numberCandy, value); FourCornerRecipe.toDecimalsX18(numberCandy, value);
renderFromInt18(numberCandy, output); render(numberCandy, output);
} }
@Override @Override
public void strobeNumberBASE8Lego(FCFlameFremanLegoBase8 type, BigInteger value) { public void strobeNumberBASE8Lego(FCFlameFremanLegoBase8 type, BigInteger value) {
List<Integer> numberCandy = new ArrayList<>(); List<Integer> numberCandy = new ArrayList<>();
FourCornerRecipe.toDecimalsX18(numberCandy, value); FourCornerRecipe.toDecimalsX18(numberCandy, value);
renderFromInt18(numberCandy, output); render(numberCandy, output);
} }
@Override @Override
@ -291,7 +265,7 @@ public class FourCornerUnicodeDisplay {
numberCandy.add(FCDotCDC1604DashP6.NX14_N.ordinal()); numberCandy.add(FCDotCDC1604DashP6.NX14_N.ordinal());
numberCandy.add(FCDotCDC1604DashP6.NY15_COLON.ordinal()); numberCandy.add(FCDotCDC1604DashP6.NY15_COLON.ordinal());
FourCornerRecipe.toDecimalsX18(numberCandy, taste.ordinal()); // fixme use HEX FourCornerRecipe.toDecimalsX18(numberCandy, taste.ordinal()); // fixme use HEX
renderFromInt18(numberCandy, output); render(numberCandy, output);
return; return;
} }
if (taste.statusSignNegative()) { if (taste.statusSignNegative()) {
@ -307,7 +281,7 @@ public class FourCornerUnicodeDisplay {
} else { } else {
FourCornerRecipe.toDecimalsX18(numberCandy, value); FourCornerRecipe.toDecimalsX18(numberCandy, value);
} }
renderFromInt18(numberCandy, output); render(numberCandy, output);
} }
@Override @Override
@ -332,7 +306,7 @@ public class FourCornerUnicodeDisplay {
for (Integer num : values) { for (Integer num : values) {
FourCornerRecipe.toDecimalsX18(math, num); FourCornerRecipe.toDecimalsX18(math, num);
} }
renderFromInt18(math, output); render(math, output);
} }
@Override @Override
@ -349,7 +323,7 @@ public class FourCornerUnicodeDisplay {
FourCornerRecipe.toScriptSuperX18(numberCandy, numerator); FourCornerRecipe.toScriptSuperX18(numberCandy, numerator);
numberCandy.add(FCDotCDC1604DashP6.NY02_BAR_V_RIGHT.ordinal()); numberCandy.add(FCDotCDC1604DashP6.NY02_BAR_V_RIGHT.ordinal());
FourCornerRecipe.toScriptSubX18(numberCandy, denominator); FourCornerRecipe.toScriptSubX18(numberCandy, denominator);
renderFromInt18(numberCandy, output); render(numberCandy, output);
} }
@Override @Override
@ -368,7 +342,7 @@ public class FourCornerUnicodeDisplay {
FourCornerRecipe.toScriptSuperX18(numberCandy, power); FourCornerRecipe.toScriptSuperX18(numberCandy, power);
numberCandy.add(FCDotCDC1604DashP6.NY18_ASTERISK.ordinal()); numberCandy.add(FCDotCDC1604DashP6.NY18_ASTERISK.ordinal());
FourCornerRecipe.toDecimalsX18(numberCandy, coefficient); FourCornerRecipe.toDecimalsX18(numberCandy, coefficient);
renderFromInt18(numberCandy, output); render(numberCandy, output);
} }
@Override @Override
@ -393,7 +367,7 @@ public class FourCornerUnicodeDisplay {
} }
numberCandy.add(FCDotCDC1604DashP6.NY16_DOT.ordinal()); numberCandy.add(FCDotCDC1604DashP6.NY16_DOT.ordinal());
FourCornerRecipe.toDecimalsX18(numberCandy, mantissa); FourCornerRecipe.toDecimalsX18(numberCandy, mantissa);
renderFromInt18(numberCandy, output); render(numberCandy, output);
} }
@Override @Override
@ -416,7 +390,7 @@ public class FourCornerUnicodeDisplay {
FourCornerRecipe.toDecimalsX18(numberCandy, quake); FourCornerRecipe.toDecimalsX18(numberCandy, quake);
numberCandy.add(FCDotCDC1604DashP6.NY16_DOT.ordinal()); numberCandy.add(FCDotCDC1604DashP6.NY16_DOT.ordinal());
FourCornerRecipe.toDecimalsX18(numberCandy, fraction); FourCornerRecipe.toDecimalsX18(numberCandy, fraction);
renderFromInt18(numberCandy, output); render(numberCandy, output);
} }
@Override @Override

7
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX06BaklavaPointSequence.java
View file

@ -22,6 +22,7 @@
*/ */
package org.x4o.fc18.cake2; package org.x4o.fc18.cake2;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/// Number index retriever for four corner baklava points. /// Number index retriever for four corner baklava points.
@ -32,4 +33,10 @@ public interface FourCornerX06BaklavaPointSequence extends FourCornerX00PetitVid
/// One baklava piece weights 52 gram /// One baklava piece weights 52 gram
List<Integer> baklavaPointSequence(); List<Integer> baklavaPointSequence();
static public List<Integer> toFC6(List<FourCornerX06BaklavaPointSequence> chars) {
List<Integer> cakePoints = new ArrayList<>(chars.size());
chars.forEach(v -> cakePoints.addAll(v.baklavaPointSequence()));
return cakePoints;
}
} }

12
nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java
View file

@ -198,8 +198,8 @@ public class FourCornerZionStenoGrapher {
outFlush(); outFlush();
} }
protected void outAddBankCake12(int cakeSel0, int cakeBank, int bankStart, BigInteger value, Function<Integer, Integer> overrideMsb) { protected void outAddBankCake12(FourCornerDotCake cakeSel0, FourCornerDotCake cakeBank, int bankStart, BigInteger value, Function<Integer, Integer> overrideMsb) {
sliceBankCake(NCR_BANK12_BITS, BIG_BITS_12, cakeSel0, cakeBank, bankStart, value, out, overrideMsb); sliceBankCake(NCR_BANK12_BITS, BIG_BITS_12, cakeSel0.getStart(), cakeBank.getStart(), bankStart, value, out, overrideMsb);
outFlush(); outFlush();
} }
@ -480,7 +480,7 @@ public class FourCornerZionStenoGrapher {
requireBigMax(denominator, BIG_BITS_1148); requireBigMax(denominator, BIG_BITS_1148);
requireBigNoneZero(denominator); requireBigNoneZero(denominator);
BigInteger pig = numerator.shiftLeft(1152).add(denominator).add(BigInteger.valueOf(tasteFemale.ordinal()).shiftLeft(1148)); BigInteger pig = numerator.shiftLeft(1152).add(denominator).add(BigInteger.valueOf(tasteFemale.ordinal()).shiftLeft(1148));
outAddBankCake12(FourCornerDotCake.FC_RATIONAL2304_SEL0.getStart(), FourCornerDotCake.FC_RATIONAL2304_BANK.getStart(), NCR_BANK_IDX_TOPPAGE_2304, pig, v -> { outAddBankCake12(FourCornerDotCake.FC_RATIONAL2304_SEL0, FourCornerDotCake.FC_RATIONAL2304_BANK, NCR_BANK_IDX_TOPPAGE_2304, pig, v -> {
return (v & 0xFF) + (tasteFemale.ordinal() << 8); return (v & 0xFF) + (tasteFemale.ordinal() << 8);
}); });
} }
@ -496,7 +496,7 @@ public class FourCornerZionStenoGrapher {
requireBigPositive(coefficient); requireBigPositive(coefficient);
requireBigMax(coefficient, BIG_BITS_2016); requireBigMax(coefficient, BIG_BITS_2016);
BigInteger pig = power.shiftLeft(2016).add(coefficient); BigInteger pig = power.shiftLeft(2016).add(coefficient);
outAddBankCake12(FourCornerDotCake.FC_DECIMAL2304_SEL0.getStart(), FourCornerDotCake.FC_DECIMAL2304_BANK.getStart(), NCR_BANK_IDX_TOPPAGE_2304, pig, v -> { outAddBankCake12(FourCornerDotCake.FC_DECIMAL2304_SEL0, FourCornerDotCake.FC_DECIMAL2304_BANK, NCR_BANK_IDX_TOPPAGE_2304, pig, v -> {
return (v & 0x7F) + (taste.ordinal() << 8) + (bias ? 1 << 7 : 0); return (v & 0x7F) + (taste.ordinal() << 8) + (bias ? 1 << 7 : 0);
}); });
} }
@ -512,7 +512,7 @@ public class FourCornerZionStenoGrapher {
requireBigPositive(mantissa); requireBigPositive(mantissa);
requireBigMax(mantissa, BIG_BITS_2016); requireBigMax(mantissa, BIG_BITS_2016);
BigInteger pig = exponent.shiftLeft(2016).add(mantissa); BigInteger pig = exponent.shiftLeft(2016).add(mantissa);
outAddBankCake12(FourCornerDotCake.FC_FLOAT2304_SEL0.getStart(), FourCornerDotCake.FC_FLOAT2304_BANK.getStart(), NCR_BANK_IDX_TOPPAGE_2304, pig, v -> { outAddBankCake12(FourCornerDotCake.FC_FLOAT2304_SEL0, FourCornerDotCake.FC_FLOAT2304_BANK, NCR_BANK_IDX_TOPPAGE_2304, pig, v -> {
return (v & 0x7F) + (taste.ordinal() << 8) + (bias ? 1 << 7 : 0); return (v & 0x7F) + (taste.ordinal() << 8) + (bias ? 1 << 7 : 0);
}); });
} }
@ -527,7 +527,7 @@ public class FourCornerZionStenoGrapher {
requireBigPositive(fraction); requireBigPositive(fraction);
requireBigMax(fraction, BIG_BITS_1152); requireBigMax(fraction, BIG_BITS_1152);
BigInteger pig = quake.shiftLeft(1152).add(fraction); BigInteger pig = quake.shiftLeft(1152).add(fraction);
outAddBankCake12(FourCornerDotCake.FC_CHOPED2304_SEL0.getStart(), FourCornerDotCake.FC_CHOPED2304_BANK.getStart(), NCR_BANK_IDX_TOPPAGE_2304, pig, v -> { outAddBankCake12(FourCornerDotCake.FC_CHOPED2304_SEL0, FourCornerDotCake.FC_CHOPED2304_BANK, NCR_BANK_IDX_TOPPAGE_2304, pig, v -> {
return (v & 0xFF) + (taste.ordinal() << 8); return (v & 0xFF) + (taste.ordinal() << 8);
}); });
} }

22
nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeDisplayTest.java
View file

@ -62,8 +62,9 @@ public class FourCornerUnicodeDisplayTest {
cdc.add(FCDotDEC2701DashPX0.ESC_STOP); cdc.add(FCDotDEC2701DashPX0.ESC_STOP);
cdc.add(FCDotCDC1604DashP6.NX15_O); cdc.add(FCDotCDC1604DashP6.NX15_O);
Assertions.assertEquals("abBCD.jk𝐋𝐌O", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); List<Integer> fc6 = FourCornerX06BaklavaPointSequence.toFC6(cdc);
Assertions.assertEquals("␇␇␇]A␇␇␇]B‽BCD.␇␇␇]JK>LM␘␘␘O", FourCornerUnicodeDisplay.raw().renderFromX06(cdc)); Assertions.assertEquals("abBCD.jk𝐋𝐌O", FourCornerUnicodeDisplay.text().render(fc6));
Assertions.assertEquals("␇␇␇]A␇␇␇]B‽BCD.␇␇␇]JK>LM␘␘␘O", FourCornerUnicodeDisplay.raw().render(fc6));
} }
@Test @Test
@ -77,7 +78,8 @@ public class FourCornerUnicodeDisplayTest {
cdc.add(FCDotCDC1604DashP6.NY01_AT); cdc.add(FCDotCDC1604DashP6.NY01_AT);
cdc.add(FCDotCDC1604DashP6.NX11_K); // = K cdc.add(FCDotCDC1604DashP6.NX11_K); // = K
Assertions.assertEquals("XK", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); List<Integer> fc6 = FourCornerX06BaklavaPointSequence.toFC6(cdc);
Assertions.assertEquals("XK", FourCornerUnicodeDisplay.text().render(fc6));
} }
@Test @Test
@ -90,7 +92,8 @@ public class FourCornerUnicodeDisplayTest {
cdc.add(FCDotCDC1604DashP6.NX04_D); // 3 cdc.add(FCDotCDC1604DashP6.NX04_D); // 3
cdc.add(FCDotCDC1604DashP6.NX11_K); // K cdc.add(FCDotCDC1604DashP6.NX11_K); // K
Assertions.assertEquals("B3K", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); List<Integer> fc6 = FourCornerX06BaklavaPointSequence.toFC6(cdc);
Assertions.assertEquals("B3K", FourCornerUnicodeDisplay.text().render(fc6));
} }
@Test @Test
@ -131,7 +134,8 @@ public class FourCornerUnicodeDisplayTest {
cdc.add(FCDotCDC1604DashP6.NX09_I); cdc.add(FCDotCDC1604DashP6.NX09_I);
cdc.add(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG); cdc.add(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG);
Assertions.assertEquals("θ̲ο̲ι̲θοιhoih̲o̲i̲𝘩𝘰𝘪𝐇𝐎𝐈ΘΟΙ𝚯𝚶𝚰", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); List<Integer> fc6 = FourCornerX06BaklavaPointSequence.toFC6(cdc);
Assertions.assertEquals("θ̲ο̲ι̲θοιhoih̲o̲i̲𝘩𝘰𝘪𝐇𝐎𝐈ΘΟΙ𝚯𝚶𝚰", FourCornerUnicodeDisplay.text().render(fc6));
} }
@Test @Test
@ -142,7 +146,8 @@ public class FourCornerUnicodeDisplayTest {
cdc.add(FCDotPIE9DDash10.BOLD_DECIMAL_3); cdc.add(FCDotPIE9DDash10.BOLD_DECIMAL_3);
cdc.add(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG); cdc.add(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG);
Assertions.assertEquals("𝟏𝟐𝟑", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); List<Integer> fc6 = FourCornerX06BaklavaPointSequence.toFC6(cdc);
Assertions.assertEquals("𝟏𝟐𝟑", FourCornerUnicodeDisplay.text().render(fc6));
} }
@Test @Test
@ -163,7 +168,8 @@ public class FourCornerUnicodeDisplayTest {
cdc.add(FCDotCDC1604DashP6.NX09_I); cdc.add(FCDotCDC1604DashP6.NX09_I);
cdc.add(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG); cdc.add(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG);
// Assertions.assertEquals("𝘩𝘰𝘪╗╞╘hoi", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); List<Integer> fc6 = FourCornerX06BaklavaPointSequence.toFC6(cdc);
Assertions.assertEquals("╗╞╘hoi", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); // Assertions.assertEquals("𝘩𝘰𝘪╗╞╘hoi", FourCornerUnicodeDisplay.text().renderFromInt18(fc6));
Assertions.assertEquals("╗╞╘hoi", FourCornerUnicodeDisplay.text().render(fc6));
} }
} }

22
nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeImportTest.java
View file

@ -52,7 +52,7 @@ public class FourCornerUnicodeImportTest {
Assertions.assertEquals(FCDotCDC1604DashP6.NX01_A.ordinal(), cdc.get(4)); Assertions.assertEquals(FCDotCDC1604DashP6.NX01_A.ordinal(), cdc.get(4));
Assertions.assertEquals(FCDotCDC1604DashP6.NX18_R.ordinal(), cdc.get(5)); Assertions.assertEquals(FCDotCDC1604DashP6.NX18_R.ordinal(), cdc.get(5));
String out = FourCornerUnicodeDisplay.text().renderFromInt18(cdc); String out = FourCornerUnicodeDisplay.text().render(cdc);
Assertions.assertEquals("FOOBAR", out); Assertions.assertEquals("FOOBAR", out);
} }
@ -74,7 +74,7 @@ public class FourCornerUnicodeImportTest {
Assertions.assertEquals(FCDotCDC1604DashP6.NX01_A.ordinal(), cdi.next()); Assertions.assertEquals(FCDotCDC1604DashP6.NX01_A.ordinal(), cdi.next());
Assertions.assertEquals(FCDotCDC1604DashP6.NX18_R.ordinal(), cdi.next()); Assertions.assertEquals(FCDotCDC1604DashP6.NX18_R.ordinal(), cdi.next());
String out = FourCornerUnicodeDisplay.text().renderFromInt18(cdc); String out = FourCornerUnicodeDisplay.text().render(cdc);
Assertions.assertEquals("foobar", out); Assertions.assertEquals("foobar", out);
} }
@ -99,9 +99,9 @@ public class FourCornerUnicodeImportTest {
Assertions.assertEquals(FCDotCDC1604DashP6.NX01_A.ordinal(), cdi.next()); Assertions.assertEquals(FCDotCDC1604DashP6.NX01_A.ordinal(), cdi.next());
Assertions.assertEquals(FCDotCDC1604DashP6.NX18_R.ordinal(), cdi.next()); Assertions.assertEquals(FCDotCDC1604DashP6.NX18_R.ordinal(), cdi.next());
String out = FourCornerUnicodeDisplay.text().renderFromInt18(cdc); String out = FourCornerUnicodeDisplay.text().render(cdc);
Assertions.assertEquals("fooBAR", out); Assertions.assertEquals("fooBAR", out);
Assertions.assertEquals("␇␇␇]FOO␘␘␘BAR", FourCornerUnicodeDisplay.raw().renderFromInt18(cdc)); Assertions.assertEquals("␇␇␇]FOO␘␘␘BAR", FourCornerUnicodeDisplay.raw().render(cdc));
} }
@Test @Test
@ -117,7 +117,7 @@ public class FourCornerUnicodeImportTest {
Assertions.assertEquals(FCDotCDC1604DashP6.NX01_A.cakePointDotIndex(), cdc.get(4)); Assertions.assertEquals(FCDotCDC1604DashP6.NX01_A.cakePointDotIndex(), cdc.get(4));
Assertions.assertEquals(FCDotCDC1604DashP6.NX18_R.cakePointDotIndex(), cdc.get(5)); Assertions.assertEquals(FCDotCDC1604DashP6.NX18_R.cakePointDotIndex(), cdc.get(5));
String out = FourCornerUnicodeDisplay.text().renderFromInt18(cdc); String out = FourCornerUnicodeDisplay.text().render(cdc);
Assertions.assertEquals("fooBAR", out); Assertions.assertEquals("fooBAR", out);
} }
@ -128,7 +128,7 @@ public class FourCornerUnicodeImportTest {
List<Integer> cdc = FourCornerUnicodeImport.lossy().convertToFC6(foobar); List<Integer> cdc = FourCornerUnicodeImport.lossy().convertToFC6(foobar);
Assertions.assertNotNull(cdc); Assertions.assertNotNull(cdc);
Assertions.assertFalse(cdc.isEmpty()); Assertions.assertFalse(cdc.isEmpty());
Assertions.assertEquals("FOOBAR", FourCornerUnicodeDisplay.text().renderFromInt18(cdc)); Assertions.assertEquals("FOOBAR", FourCornerUnicodeDisplay.text().render(cdc));
Assertions.assertThrows(IllegalArgumentException.class, () -> { Assertions.assertThrows(IllegalArgumentException.class, () -> {
FourCornerUnicodeImport.strict().convertToFC6(foobar); FourCornerUnicodeImport.strict().convertToFC6(foobar);
}); });
@ -140,7 +140,7 @@ public class FourCornerUnicodeImportTest {
List<Integer> cdc = FourCornerUnicodeImport.lossy().convertToFC6(foobar); List<Integer> cdc = FourCornerUnicodeImport.lossy().convertToFC6(foobar);
Assertions.assertNotNull(cdc); Assertions.assertNotNull(cdc);
Assertions.assertFalse(cdc.isEmpty()); Assertions.assertFalse(cdc.isEmpty());
Assertions.assertEquals("FOO¿¿¿", FourCornerUnicodeDisplay.text().renderFromInt18(cdc)); Assertions.assertEquals("FOO¿¿¿", FourCornerUnicodeDisplay.text().render(cdc));
Assertions.assertThrows(IllegalArgumentException.class, () -> { Assertions.assertThrows(IllegalArgumentException.class, () -> {
FourCornerUnicodeImport.strict().convertToFC6(foobar); FourCornerUnicodeImport.strict().convertToFC6(foobar);
}); });
@ -166,7 +166,7 @@ public class FourCornerUnicodeImportTest {
Assertions.assertEquals(FCDotCDC1604DashP6.NX04_D.ordinal(), cdi.next()); // 3 Assertions.assertEquals(FCDotCDC1604DashP6.NX04_D.ordinal(), cdi.next()); // 3
Assertions.assertEquals(FCDotCDC1604DashP6.NX08_H.ordinal(), cdi.next()); // 7 Assertions.assertEquals(FCDotCDC1604DashP6.NX08_H.ordinal(), cdi.next()); // 7
String out = FourCornerUnicodeDisplay.text().renderFromInt18(cdc); String out = FourCornerUnicodeDisplay.text().render(cdc);
Assertions.assertEquals("01201337", out); Assertions.assertEquals("01201337", out);
} }
@ -185,7 +185,7 @@ public class FourCornerUnicodeImportTest {
Assertions.assertEquals(FCDotPIE9CDash10.DECIMAL_3.cakePointDotIndex(), cdc.get(6)); // 3 Assertions.assertEquals(FCDotPIE9CDash10.DECIMAL_3.cakePointDotIndex(), cdc.get(6)); // 3
Assertions.assertEquals(FCDotPIE9CDash10.DECIMAL_7.cakePointDotIndex(), cdc.get(7)); // 7 Assertions.assertEquals(FCDotPIE9CDash10.DECIMAL_7.cakePointDotIndex(), cdc.get(7)); // 7
String out = FourCornerUnicodeDisplay.text().renderFromInt18(cdc); String out = FourCornerUnicodeDisplay.text().render(cdc);
Assertions.assertEquals("01201337", out); Assertions.assertEquals("01201337", out);
} }
@ -213,7 +213,7 @@ public class FourCornerUnicodeImportTest {
Assertions.assertEquals(FCDotCMD5401Dash2D.CMD_F4TTY0001_NL, cdi.next()); Assertions.assertEquals(FCDotCMD5401Dash2D.CMD_F4TTY0001_NL, cdi.next());
Assertions.assertEquals(FCDotCMD5401Dash2D.CMD_F4TTY0001_NL, cdi.next()); Assertions.assertEquals(FCDotCMD5401Dash2D.CMD_F4TTY0001_NL, cdi.next());
*/ */
String out = FourCornerUnicodeDisplay.text().renderFromInt18(cdc); String out = FourCornerUnicodeDisplay.text().render(cdc);
Assertions.assertEquals("A\nB\nC\nD\nE\nF\n\n\n", out); Assertions.assertEquals("A\nB\nC\nD\nE\nF\n\n\n", out);
} }
@ -230,7 +230,7 @@ public class FourCornerUnicodeImportTest {
Assertions.assertNotNull(cdi.next()); // fixme Assertions.assertNotNull(cdi.next()); // fixme
//Assertions.assertEquals(FCDotCMD5401Dash2D.CMD_F4TXT0001_SP, cdi.next()); //Assertions.assertEquals(FCDotCMD5401Dash2D.CMD_F4TXT0001_SP, cdi.next());
} }
String out = FourCornerUnicodeDisplay.text().renderFromInt18(cdc); String out = FourCornerUnicodeDisplay.text().render(cdc);
Assertions.assertEquals("                                        ", out); Assertions.assertEquals("                                        ", out);
// Assertions.assertThrows(IllegalArgumentException.class, () -> { // Assertions.assertThrows(IllegalArgumentException.class, () -> {

4
nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/pie9/FCDotPIE9Test.java
View file

@ -48,13 +48,13 @@ public class FCDotPIE9Test {
cakePoints.add(i); cakePoints.add(i);
} }
FourCornerUnicodeDisplay disp = FourCornerUnicodeDisplay.text(); FourCornerUnicodeDisplay disp = FourCornerUnicodeDisplay.text();
pieChars = disp.renderFromInt18(cakePoints); pieChars = disp.render(cakePoints);
int cakeStart = FourCornerDotCake.FC_CDC1604_P6.getStart(); int cakeStart = FourCornerDotCake.FC_CDC1604_P6.getStart();
int cakeStop = FourCornerDotCake.FC_BYD0127_P7F.getStop(); int cakeStop = FourCornerDotCake.FC_BYD0127_P7F.getStop();
for (int i = cakeStart; i <= cakeStop; i++) { for (int i = cakeStart; i <= cakeStop; i++) {
cakePoints.add(i); cakePoints.add(i);
} }
cakeChars = disp.renderFromInt18(cakePoints); cakeChars = disp.render(cakePoints);
} }
@Test @Test

3
nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotBYDTest.java
View file

@ -75,6 +75,7 @@ public class FCDotBYDTest {
cdc.add(FCDotBYD0127DashP7F.BOX1_03); cdc.add(FCDotBYD0127DashP7F.BOX1_03);
cdc.add(FCDotBYD0127DashP7F.BOX1_07); cdc.add(FCDotBYD0127DashP7F.BOX1_07);
Assertions.assertEquals("═║║═─┄┄┌", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); List<Integer> fc6 = FourCornerX06BaklavaPointSequence.toFC6(cdc);
Assertions.assertEquals("═║║═─┄┄┌", FourCornerUnicodeDisplay.text().render(fc6));
} }
} }

32
nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6Test.java
View file

@ -58,14 +58,14 @@ public class FCDotCDC1604DashP6Test {
@Test @Test
public void testPepper3Sequence() throws Exception { public void testPepper3Sequence() throws Exception {
Assertions.assertEquals("???", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 0))); Assertions.assertEquals("???", FourCornerUnicodeDisplay.text().render(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 0)));
Assertions.assertEquals("??!", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 1))); Assertions.assertEquals("??!", FourCornerUnicodeDisplay.text().render(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 1)));
Assertions.assertEquals("?!?", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 2))); Assertions.assertEquals("?!?", FourCornerUnicodeDisplay.text().render(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 2)));
Assertions.assertEquals("?!!", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 3))); Assertions.assertEquals("?!!", FourCornerUnicodeDisplay.text().render(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 3)));
Assertions.assertEquals("!??", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 4))); Assertions.assertEquals("!??", FourCornerUnicodeDisplay.text().render(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 4)));
Assertions.assertEquals("!?!", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 5))); Assertions.assertEquals("!?!", FourCornerUnicodeDisplay.text().render(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 5)));
Assertions.assertEquals("!!?", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 6))); Assertions.assertEquals("!!?", FourCornerUnicodeDisplay.text().render(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 6)));
Assertions.assertEquals("!!!", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 7))); Assertions.assertEquals("!!!", FourCornerUnicodeDisplay.text().render(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 7)));
} }
@Test @Test
@ -80,14 +80,14 @@ public class FCDotCDC1604DashP6Test {
@Test @Test
public void testSalt3Sequence() throws Exception { public void testSalt3Sequence() throws Exception {
Assertions.assertEquals("<<<", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 0))); Assertions.assertEquals("<<<", FourCornerUnicodeDisplay.text().render(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 0)));
Assertions.assertEquals("<<>", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 1))); Assertions.assertEquals("<<>", FourCornerUnicodeDisplay.text().render(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 1)));
Assertions.assertEquals("<><", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 2))); Assertions.assertEquals("<><", FourCornerUnicodeDisplay.text().render(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 2)));
Assertions.assertEquals("<>>", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 3))); Assertions.assertEquals("<>>", FourCornerUnicodeDisplay.text().render(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 3)));
Assertions.assertEquals("><<", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 4))); Assertions.assertEquals("><<", FourCornerUnicodeDisplay.text().render(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 4)));
Assertions.assertEquals("><>", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 5))); Assertions.assertEquals("><>", FourCornerUnicodeDisplay.text().render(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 5)));
Assertions.assertEquals(">><", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 6))); Assertions.assertEquals(">><", FourCornerUnicodeDisplay.text().render(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 6)));
Assertions.assertEquals(">>>", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 7))); Assertions.assertEquals(">>>", FourCornerUnicodeDisplay.text().render(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 7)));
} }
@Test @Test

4
nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotVT06Test.java
View file

@ -49,7 +49,7 @@ public class FCDotVT06Test {
cdc.addAll(FourCornerRecipe.toDecimalsX06(456)); cdc.addAll(FourCornerRecipe.toDecimalsX06(456));
cdc.add(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG.baklavaPointDotIndex()); cdc.add(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG.baklavaPointDotIndex());
Assertions.assertEquals("␘␘␇AG␇␇␇^BCD¿␇␇␇^EFG‽", FourCornerUnicodeDisplay.raw().renderFromInt18(cdc)); Assertions.assertEquals("␘␘␇AG␇␇␇^BCD¿␇␇␇^EFG‽", FourCornerUnicodeDisplay.raw().render(cdc));
// TODO: Fix lexer embedded escapes, and display external with single unicode escape sign // TODO: Fix lexer embedded escapes, and display external with single unicode escape sign
//Assertions.assertEquals("?AG?BCD?EFG!", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); //Assertions.assertEquals("?AG?BCD?EFG!", FourCornerUnicodeDisplay.text().renderFromX06(cdc));
} }
@ -61,6 +61,6 @@ public class FCDotVT06Test {
cdc.addAll(FourCornerRecipe.toDecimalsX06(5)); cdc.addAll(FourCornerRecipe.toDecimalsX06(5));
cdc.add(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG.baklavaPointDotIndex()); cdc.add(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG.baklavaPointDotIndex());
Assertions.assertEquals("␘␘␇CA␇␇␇^F‽", FourCornerUnicodeDisplay.raw().renderFromInt18(cdc)); Assertions.assertEquals("␘␘␇CA␇␇␇^F‽", FourCornerUnicodeDisplay.raw().render(cdc));
} }
} }

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

@ -67,6 +67,6 @@ public class FourCornerZionStenoLexerSmokeTest {
smokeReader.reset(); smokeReader.reset();
lexer.read(cdc); lexer.read(cdc);
String res = "[0:1:burnNumberMissingSparkler:CHOCO_PIG_RATIONAL][0:8:burnNumberMissingSparkler:CHOCO_PIG_RATIONAL][0:16:burnNumberMissingSparkler:CHOCO_PIG_RATIONAL]"; String res = "[0:1:burnNumberMissingSparkler:CHOCO_PIG_RATIONAL][0:8:burnNumberMissingSparkler:CHOCO_PIG_RATIONAL][0:16:burnNumberMissingSparkler:CHOCO_PIG_RATIONAL]";
Assertions.assertEquals(res, FourCornerUnicodeDisplay.text().renderFromInt18(cdc)); Assertions.assertEquals(res, FourCornerUnicodeDisplay.text().render(cdc));
} }
} }

6
nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoGrapherTest.java
View file

@ -76,7 +76,7 @@ public class StenoGrapherTest {
Assertions.assertEquals(37, outTest.next()); Assertions.assertEquals(37, outTest.next());
Assertions.assertEquals(4, outTest.next()); Assertions.assertEquals(4, outTest.next());
Assertions.assertEquals(37, outTest.next()); Assertions.assertEquals(37, outTest.next());
String res = FourCornerUnicodeDisplay.text().renderFromInt18(out); String res = FourCornerUnicodeDisplay.text().render(out);
Assertions.assertEquals("0A", res); Assertions.assertEquals("0A", res);
} }
@ -92,7 +92,7 @@ public class StenoGrapherTest {
octalMine.add(PrimordialOctalSound.PART_1); octalMine.add(PrimordialOctalSound.PART_1);
} }
writer.strobeSandWorm(octalMine, List.of(PrimordialOctalSound.PART_8, PrimordialOctalSound.PART_8, PrimordialOctalSound.PART_8, PrimordialOctalSound.PART_8, PrimordialOctalSound.PART_8)); writer.strobeSandWorm(octalMine, List.of(PrimordialOctalSound.PART_8, PrimordialOctalSound.PART_8, PrimordialOctalSound.PART_8, PrimordialOctalSound.PART_8, PrimordialOctalSound.PART_8));
String res = FourCornerUnicodeDisplay.text().renderFromInt18(out); String res = FourCornerUnicodeDisplay.text().render(out);
Assertions.assertTrue(res.endsWith("77"), "missing " + res); Assertions.assertTrue(res.endsWith("77"), "missing " + res);
} }
@ -118,7 +118,7 @@ public class StenoGrapherTest {
PrimordialOctalOrangeString str = PrimordialOctalOrangeString.ioSmurfReadStreamX8(in); PrimordialOctalOrangeString str = PrimordialOctalOrangeString.ioSmurfReadStreamX8(in);
List<Integer> testX18 = new ArrayList<>(); List<Integer> testX18 = new ArrayList<>();
PrimordialOctalOrangeString.ioSmurfWriteListX18(testX18, str); PrimordialOctalOrangeString.ioSmurfWriteListX18(testX18, str);
String fileStr = FourCornerUnicodeDisplay.text().renderFromInt18(testX18); String fileStr = FourCornerUnicodeDisplay.text().render(testX18);
//System.out.println(fileStr); //System.out.println(fileStr);
Assertions.assertFalse(fileStr.contains("burnNCR1632MissingBankSparkler"), "data error"); Assertions.assertFalse(fileStr.contains("burnNCR1632MissingBankSparkler"), "data error");
} }

8
nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoLexerInvalidTest.java
View file

@ -41,13 +41,13 @@ public class StenoLexerInvalidTest {
@Test @Test
public void testInvalid18Plus() throws Exception { public void testInvalid18Plus() throws Exception {
String res = "[0:0:burnLexerReservedCakePoint:0x40000]"; String res = "[0:0:burnLexerReservedCakePoint:0x40000]";
Assertions.assertEquals(res, FourCornerUnicodeDisplay.text().renderFromInt18(List.of(0x040000))); Assertions.assertEquals(res, FourCornerUnicodeDisplay.text().render(List.of(0x040000)));
} }
@Test @Test
public void testInvalid18PlusError() throws Exception { public void testInvalid18PlusError() throws Exception {
Assertions.assertThrows(IllegalStateException.class, () -> { Assertions.assertThrows(IllegalStateException.class, () -> {
new FourCornerUnicodeDisplay(true, true, null).renderFromInt18(List.of(0x040000)); new FourCornerUnicodeDisplay(true, true, null).render(List.of(0x040000));
}); });
} }
@ -61,7 +61,7 @@ public class StenoLexerInvalidTest {
cdc.add(0x0400FD); cdc.add(0x0400FD);
cdc.add(FCDotCDC1604DashP6.NX23_W.ordinal()); cdc.add(FCDotCDC1604DashP6.NX23_W.ordinal());
cdc.add(0x0400FC); cdc.add(0x0400FC);
String res = FourCornerUnicodeDisplay.text().renderFromInt18(cdc); String res = FourCornerUnicodeDisplay.text().render(cdc);
Assertions.assertTrue(res.contains("400ff"), "No 400ff in: " + res); Assertions.assertTrue(res.contains("400ff"), "No 400ff in: " + res);
Assertions.assertTrue(res.contains("400fe"), "No 400fe in: " + res); Assertions.assertTrue(res.contains("400fe"), "No 400fe in: " + res);
Assertions.assertTrue(res.contains("400fd"), "No 400fd in: " + res); Assertions.assertTrue(res.contains("400fd"), "No 400fd in: " + res);
@ -76,7 +76,7 @@ public class StenoLexerInvalidTest {
cdc.add(0xFE); cdc.add(0xFE);
cdc.add(FCDotCDC1604DashP6.NY01_AT.ordinal()); cdc.add(FCDotCDC1604DashP6.NY01_AT.ordinal());
cdc.add(0xFD); cdc.add(0xFD);
String res = FourCornerUnicodeDisplay.text().renderFromInt18(cdc); String res = FourCornerUnicodeDisplay.text().render(cdc);
Assertions.assertTrue(res.contains("0xff"), "No 0xff in: " + res); Assertions.assertTrue(res.contains("0xff"), "No 0xff in: " + res);
Assertions.assertTrue(res.contains("0xfe"), "No 0xfe in: " + res); Assertions.assertTrue(res.contains("0xfe"), "No 0xfe in: " + res);
Assertions.assertTrue(res.contains("0xfd"), "No 0xfd in: " + res); Assertions.assertTrue(res.contains("0xfd"), "No 0xfd in: " + res);

6
nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberBase2Test.java
View file

@ -45,7 +45,7 @@ public class StenoNumberBase2Test {
List<Integer> out = new ArrayList<>(); List<Integer> out = new ArrayList<>();
FourCornerZion7Bereshit writer = FourCornerZionStenoGrapher.writerFC6(out); FourCornerZion7Bereshit writer = FourCornerZionStenoGrapher.writerFC6(out);
writer.strobeNumberBASE2Lego(FCFlameFremanLegoBase2.LEGO_0032, BigInteger.valueOf(123456789)); writer.strobeNumberBASE2Lego(FCFlameFremanLegoBase2.LEGO_0032, BigInteger.valueOf(123456789));
String res = FourCornerUnicodeDisplay.text().renderFromInt18(out); String res = FourCornerUnicodeDisplay.text().render(out);
Assertions.assertEquals("123456789", res); Assertions.assertEquals("123456789", res);
} }
@ -54,7 +54,7 @@ public class StenoNumberBase2Test {
List<Integer> out = new ArrayList<>(); List<Integer> out = new ArrayList<>();
FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out); FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out);
writer.strobeNumberBASE2Lego(FCFlameFremanLegoBase2.LEGO_0032, BigInteger.valueOf(123)); writer.strobeNumberBASE2Lego(FCFlameFremanLegoBase2.LEGO_0032, BigInteger.valueOf(123));
String res = FourCornerUnicodeDisplay.text().renderFromInt18(out); String res = FourCornerUnicodeDisplay.text().render(out);
Assertions.assertEquals("123", res); Assertions.assertEquals("123", res);
} }
@ -63,7 +63,7 @@ public class StenoNumberBase2Test {
List<Integer> out = new ArrayList<>(); List<Integer> out = new ArrayList<>();
FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out); FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out);
writer.strobeNumberBASE2Signed(FCFlameFremanSignedBase2.SIGNED_0128, true, BigInteger.valueOf(123)); writer.strobeNumberBASE2Signed(FCFlameFremanSignedBase2.SIGNED_0128, true, BigInteger.valueOf(123));
String res = FourCornerUnicodeDisplay.text().renderFromInt18(out); String res = FourCornerUnicodeDisplay.text().render(out);
Assertions.assertEquals("-123", res); Assertions.assertEquals("-123", res);
} }

12
nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberBase8Test.java
View file

@ -46,7 +46,7 @@ public class StenoNumberBase8Test {
List<Integer> out = new ArrayList<>(); List<Integer> out = new ArrayList<>();
FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out); FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out);
writer.strobeNumberBASE8Lego(FCFlameFremanLegoBase8.LEGO_0144, BigInteger.valueOf(123)); writer.strobeNumberBASE8Lego(FCFlameFremanLegoBase8.LEGO_0144, BigInteger.valueOf(123));
String res = FourCornerUnicodeDisplay.text().renderFromInt18(out); String res = FourCornerUnicodeDisplay.text().render(out);
Assertions.assertEquals("123", res); Assertions.assertEquals("123", res);
} }
@ -55,7 +55,7 @@ public class StenoNumberBase8Test {
List<Integer> out = new ArrayList<>(); List<Integer> out = new ArrayList<>();
FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out); FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out);
writer.strobeNumberBASE8Lego(FCFlameFremanLegoBase8.LEGO_0144, BigInteger.valueOf(123456)); writer.strobeNumberBASE8Lego(FCFlameFremanLegoBase8.LEGO_0144, BigInteger.valueOf(123456));
String res = FourCornerUnicodeDisplay.text().renderFromInt18(out); String res = FourCornerUnicodeDisplay.text().render(out);
Assertions.assertEquals("123456", res); Assertions.assertEquals("123456", res);
} }
@ -64,7 +64,7 @@ public class StenoNumberBase8Test {
List<Integer> out = new ArrayList<>(); List<Integer> out = new ArrayList<>();
FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out); FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out);
writer.strobeNumberBASE8Choco(FCFlameFremanChocoBase8.CHOCO_0144, FCFlameNumberTaste.NUMBER_POSITIVE, new BigInteger("123", 10)); writer.strobeNumberBASE8Choco(FCFlameFremanChocoBase8.CHOCO_0144, FCFlameNumberTaste.NUMBER_POSITIVE, new BigInteger("123", 10));
String res = FourCornerUnicodeDisplay.text().renderFromInt18(out); String res = FourCornerUnicodeDisplay.text().render(out);
Assertions.assertEquals("123", res); Assertions.assertEquals("123", res);
} }
@ -73,7 +73,7 @@ public class StenoNumberBase8Test {
List<Integer> out = new ArrayList<>(); List<Integer> out = new ArrayList<>();
FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out); FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out);
writer.strobeNumberBASE8Choco(FCFlameFremanChocoBase8.CHOCO_0144, FCFlameNumberTaste.NUMBER_NEGATIVE, new BigInteger("123456", 10)); writer.strobeNumberBASE8Choco(FCFlameFremanChocoBase8.CHOCO_0144, FCFlameNumberTaste.NUMBER_NEGATIVE, new BigInteger("123456", 10));
String res = FourCornerUnicodeDisplay.text().renderFromInt18(out); String res = FourCornerUnicodeDisplay.text().render(out);
Assertions.assertEquals("-123456", res); Assertions.assertEquals("-123456", res);
} }
@ -82,7 +82,7 @@ public class StenoNumberBase8Test {
List<Integer> out = new ArrayList<>(); List<Integer> out = new ArrayList<>();
FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out); FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out);
writer.strobeNumberBASE8Choco(FCFlameFremanChocoBase8.CHOCO_0144, FCFlameNumberTaste.NUMBER_POSITIVE, new BigInteger("1393796574908163946345982392040522594123775", 10)); writer.strobeNumberBASE8Choco(FCFlameFremanChocoBase8.CHOCO_0144, FCFlameNumberTaste.NUMBER_POSITIVE, new BigInteger("1393796574908163946345982392040522594123775", 10));
String res = FourCornerUnicodeDisplay.text().renderFromInt18(out); String res = FourCornerUnicodeDisplay.text().render(out);
Assertions.assertEquals("1393796574908163946345982392040522594123775", res); Assertions.assertEquals("1393796574908163946345982392040522594123775", res);
} }
@ -91,7 +91,7 @@ public class StenoNumberBase8Test {
List<Integer> out = new ArrayList<>(); List<Integer> out = new ArrayList<>();
FourCornerZion7Bereshit writer = FourCornerZionStenoGrapher.writerFC6Plus(out); FourCornerZion7Bereshit writer = FourCornerZionStenoGrapher.writerFC6Plus(out);
writer.strobeNumberBASE8Choco(FCFlameFremanChocoBase8.CHOCO_0144, FCFlameNumberTaste.NUMBER_POSITIVE, new BigInteger("1393796574908163946345982392040522594123775", 10)); writer.strobeNumberBASE8Choco(FCFlameFremanChocoBase8.CHOCO_0144, FCFlameNumberTaste.NUMBER_POSITIVE, new BigInteger("1393796574908163946345982392040522594123775", 10));
String res = FourCornerUnicodeDisplay.text().renderFromInt18(out); String res = FourCornerUnicodeDisplay.text().render(out);
Assertions.assertEquals("1393796574908163946345982392040522594123775", res); Assertions.assertEquals("1393796574908163946345982392040522594123775", res);
} }
} }

4
nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoChopedTest.java
View file

@ -44,7 +44,7 @@ public class StenoNumberChocoChopedTest {
List<Integer> out = new ArrayList<>(); List<Integer> out = new ArrayList<>();
FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out); FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out);
writer.strobeNumberChocoPigChoped(FCFlameNumberTaste.NUMBER_POSITIVE, BigInteger.valueOf(456), BigInteger.valueOf(123)); writer.strobeNumberChocoPigChoped(FCFlameNumberTaste.NUMBER_POSITIVE, BigInteger.valueOf(456), BigInteger.valueOf(123));
String res = FourCornerUnicodeDisplay.text().renderFromInt18(out); String res = FourCornerUnicodeDisplay.text().render(out);
Assertions.assertEquals("456.123", res); Assertions.assertEquals("456.123", res);
} }
@ -53,7 +53,7 @@ public class StenoNumberChocoChopedTest {
List<Integer> out = new ArrayList<>(); List<Integer> out = new ArrayList<>();
FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out); FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out);
writer.strobeNumberChocoPigChoped(FCFlameNumberTaste.NUMBER_NEGATIVE, BigInteger.valueOf(789), BigInteger.valueOf(123)); writer.strobeNumberChocoPigChoped(FCFlameNumberTaste.NUMBER_NEGATIVE, BigInteger.valueOf(789), BigInteger.valueOf(123));
String res = FourCornerUnicodeDisplay.text().renderFromInt18(out); String res = FourCornerUnicodeDisplay.text().render(out);
Assertions.assertEquals("-789.123", res); Assertions.assertEquals("-789.123", res);
} }
} }

4
nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoDecimalTest.java
View file

@ -45,7 +45,7 @@ public class StenoNumberChocoDecimalTest {
FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out); FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out);
writer.strobeNumberChocoPigDecimal(FCFlameNumberTaste.NUMBER_POSITIVE, false, BigInteger.valueOf(123), BigInteger.valueOf(456)); writer.strobeNumberChocoPigDecimal(FCFlameNumberTaste.NUMBER_POSITIVE, false, BigInteger.valueOf(123), BigInteger.valueOf(456));
Assertions.assertEquals(4, out.size()); Assertions.assertEquals(4, out.size());
String res = FourCornerUnicodeDisplay.text().renderFromInt18(out); String res = FourCornerUnicodeDisplay.text().render(out);
Assertions.assertEquals("(-1)⁰*10¹²³*456", res); Assertions.assertEquals("(-1)⁰*10¹²³*456", res);
} }
@ -57,7 +57,7 @@ public class StenoNumberChocoDecimalTest {
FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out); FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out);
writer.strobeNumberChocoPigDecimal(FCFlameNumberTaste.NUMBER_POSITIVE, false, FourCornerZionStenoPetroglyphs.BIG_BITS_283, FourCornerZionStenoPetroglyphs.BIG_BITS_2016); writer.strobeNumberChocoPigDecimal(FCFlameNumberTaste.NUMBER_POSITIVE, false, FourCornerZionStenoPetroglyphs.BIG_BITS_283, FourCornerZionStenoPetroglyphs.BIG_BITS_2016);
Assertions.assertEquals(193, out.size()); Assertions.assertEquals(193, out.size());
String res = FourCornerUnicodeDisplay.text().renderFromInt18(out); String res = FourCornerUnicodeDisplay.text().render(out);
Assertions.assertEquals("(-1)⁰*10¹⁵⁵⁴¹³⁵¹¹³⁷⁸⁰⁵⁸³²⁵⁶⁷³⁵⁵⁶⁹⁵²⁵⁴⁵⁸⁸¹⁵¹²⁵³¹³⁹²⁵⁴⁷¹²⁴¹⁷¹¹⁶¹⁷⁰⁰¹⁴⁴⁹⁹²⁷⁷⁹¹¹²³⁴²⁸¹⁶⁴¹⁶⁶⁷⁹⁸⁵⁴⁰⁷*7524389324549354450012295667238056650488661292408472865850279440061341770661038088891003609523855490537527473858068236032063038821912119420032983735773778315780422968627185582125139830259059580693966159220800634538007951025529707819651368618588002973837229854435730968342995245834129352264002058451047722604571453619205472623157541916371455764131661512732115122042085430429090324954236930736866452001076451671762299658372499364800367306988138217572983729940207496105489713305332746758395131148149101871456611571055068153665866066783899124296271513772531723497342815490725823828326183977758546404902789185535", res); Assertions.assertEquals("(-1)⁰*10¹⁵⁵⁴¹³⁵¹¹³⁷⁸⁰⁵⁸³²⁵⁶⁷³⁵⁵⁶⁹⁵²⁵⁴⁵⁸⁸¹⁵¹²⁵³¹³⁹²⁵⁴⁷¹²⁴¹⁷¹¹⁶¹⁷⁰⁰¹⁴⁴⁹⁹²⁷⁷⁹¹¹²³⁴²⁸¹⁶⁴¹⁶⁶⁷⁹⁸⁵⁴⁰⁷*7524389324549354450012295667238056650488661292408472865850279440061341770661038088891003609523855490537527473858068236032063038821912119420032983735773778315780422968627185582125139830259059580693966159220800634538007951025529707819651368618588002973837229854435730968342995245834129352264002058451047722604571453619205472623157541916371455764131661512732115122042085430429090324954236930736866452001076451671762299658372499364800367306988138217572983729940207496105489713305332746758395131148149101871456611571055068153665866066783899124296271513772531723497342815490725823828326183977758546404902789185535", res);
} }
} }

4
nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoFloatTest.java
View file

@ -44,7 +44,7 @@ public class StenoNumberChocoFloatTest {
List<Integer> out = new ArrayList<>(); List<Integer> out = new ArrayList<>();
FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out); FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out);
writer.strobeNumberChocoPigFloat(FCFlameNumberTaste.NUMBER_NEGATIVE, false, BigInteger.valueOf(456), BigInteger.valueOf(123)); writer.strobeNumberChocoPigFloat(FCFlameNumberTaste.NUMBER_NEGATIVE, false, BigInteger.valueOf(456), BigInteger.valueOf(123));
String res = FourCornerUnicodeDisplay.text().renderFromInt18(out); String res = FourCornerUnicodeDisplay.text().render(out);
Assertions.assertEquals("(-1)¹*2⁴⁵⁶*1.123", res); Assertions.assertEquals("(-1)¹*2⁴⁵⁶*1.123", res);
} }
@ -53,7 +53,7 @@ public class StenoNumberChocoFloatTest {
List<Integer> out = new ArrayList<>(); List<Integer> out = new ArrayList<>();
FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out); FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out);
writer.strobeNumberChocoPigFloat(FCFlameNumberTaste.NUMBER_POSITIVE, true, BigInteger.valueOf(456), BigInteger.valueOf(789)); writer.strobeNumberChocoPigFloat(FCFlameNumberTaste.NUMBER_POSITIVE, true, BigInteger.valueOf(456), BigInteger.valueOf(789));
String res = FourCornerUnicodeDisplay.text().renderFromInt18(out); String res = FourCornerUnicodeDisplay.text().render(out);
Assertions.assertEquals("(-1)⁰*2⁻⁴⁵⁶*1.789", res); Assertions.assertEquals("(-1)⁰*2⁻⁴⁵⁶*1.789", res);
} }
} }

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

@ -51,7 +51,7 @@ public class StenoNumberChocoRationalTest {
writer.strobeNumberChocoPigRational(FCFlameNumberTaste.NUMBER_POSITIVE, FCFlameNumberTaste.NUMBER_POSITIVE, BigInteger.ONE, v2); writer.strobeNumberChocoPigRational(FCFlameNumberTaste.NUMBER_POSITIVE, FCFlameNumberTaste.NUMBER_POSITIVE, BigInteger.ONE, v2);
BigInteger v3 = BigInteger.valueOf(5432); BigInteger v3 = BigInteger.valueOf(5432);
writer.strobeNumberChocoPigRational(FCFlameNumberTaste.NUMBER_NEGATIVE, FCFlameNumberTaste.NUMBER_NEGATIVE, v3, v3); writer.strobeNumberChocoPigRational(FCFlameNumberTaste.NUMBER_NEGATIVE, FCFlameNumberTaste.NUMBER_NEGATIVE, v3, v3);
String res = FourCornerUnicodeDisplay.text().renderFromInt18(out); String res = FourCornerUnicodeDisplay.text().render(out);
Assertions.assertEquals("¹/₁₂₃¹/₁₂₃₄₅⁻⁵⁴³²/₋₅₄₃₂", res); Assertions.assertEquals("¹/₁₂₃¹/₁₂₃₄₅⁻⁵⁴³²/₋₅₄₃₂", res);
} }
@ -63,7 +63,7 @@ public class StenoNumberChocoRationalTest {
BigInteger v = BigInteger.valueOf(x); BigInteger v = BigInteger.valueOf(x);
writer.strobeNumberChocoPigRational(FCFlameNumberTaste.NUMBER_POSITIVE, FCFlameNumberTaste.NUMBER_POSITIVE, BigInteger.ONE, v); writer.strobeNumberChocoPigRational(FCFlameNumberTaste.NUMBER_POSITIVE, FCFlameNumberTaste.NUMBER_POSITIVE, BigInteger.ONE, v);
} }
String res = FourCornerUnicodeDisplay.text().renderFromInt18(out); String res = FourCornerUnicodeDisplay.text().render(out);
Assertions.assertTrue(res.startsWith("¹/₁¹/₂¹/₃"), "missing " + res); Assertions.assertTrue(res.startsWith("¹/₁¹/₂¹/₃"), "missing " + res);
Assertions.assertTrue(res.contains("¹/₅₁₂¹/₅₁₃¹/₅₁₄"), "missing " + res); Assertions.assertTrue(res.contains("¹/₅₁₂¹/₅₁₃¹/₅₁₄"), "missing " + res);
Assertions.assertTrue(res.endsWith("¹/₁₀₂₃¹/₁₀₂₄¹/₁₀₂₅"), "missing " + res); Assertions.assertTrue(res.endsWith("¹/₁₀₂₃¹/₁₀₂₄¹/₁₀₂₅"), "missing " + res);
@ -116,7 +116,7 @@ public class StenoNumberChocoRationalTest {
cdc.add(FourCornerDotCake.FC_RATIONAL2304_BANK.getStart() + 1); cdc.add(FourCornerDotCake.FC_RATIONAL2304_BANK.getStart() + 1);
cdc.add(FCDotCDC1604DashP6.NY14_SEMICOLON.ordinal()); cdc.add(FCDotCDC1604DashP6.NY14_SEMICOLON.ordinal());
Assertions.assertEquals("X=¹/₁₁¹/₁¹⁴/₁₅¹²³/₄₀₉₇⁴/₁;", FourCornerUnicodeDisplay.text().renderFromInt18(cdc)); Assertions.assertEquals("X=¹/₁₁¹/₁¹⁴/₁₅¹²³/₄₀₉₇⁴/₁;", FourCornerUnicodeDisplay.text().render(cdc));
} }
@Test @Test
@ -128,6 +128,6 @@ public class StenoNumberChocoRationalTest {
} }
String resSuper = "³⁸²³²⁷⁰⁴⁶⁸³⁰²⁹⁴¹⁸⁴²⁰⁰²⁰²⁴⁶⁰⁷⁴⁵⁰³⁵⁷⁹²⁵⁵⁷⁰⁹⁸⁸³⁵⁸⁹⁶⁵⁰⁴⁹⁹⁴⁰⁶³⁷²¹²³⁴⁸¹⁸²⁴⁸¹¹¹²²⁵⁵⁷⁴⁷³⁹⁵¹¹¹⁶⁷⁸⁹⁹⁶¹³⁴⁸⁷³²³⁷⁰¹⁹⁷⁴⁰²⁸¹⁶⁷⁹⁵⁹⁴³¹⁵⁴⁰⁹⁰²⁸⁶⁸⁸⁰²²¹⁸⁹⁷⁵⁹⁴¹⁵⁶⁴⁵⁸⁵¹⁰⁵⁵⁶³⁸¹⁶⁴¹⁰⁵³⁷⁹⁰²⁹⁵⁶⁰⁷¹⁷⁵³⁸⁸⁷⁸³¹⁹³⁶¹⁴⁴⁹⁸¹³⁴⁹⁷¹⁴⁹⁹⁷⁵⁷⁵³³⁰⁰⁷⁵⁸⁸⁶⁴²⁴⁵¹³⁰⁵⁰⁷³⁶¹¹²⁹⁶⁷⁷¹⁰⁶¹⁶¹⁸¹⁵⁵⁰⁸²⁵⁹⁷⁶⁸⁷⁵¹⁴²⁷⁸⁰⁶²⁴⁰¹²³¹¹⁷¹⁷²⁷⁴¹⁹⁷⁶⁵⁵⁰¹⁶²⁷¹⁹⁷²⁸²⁴⁹⁸⁸²⁰⁶⁵³⁵⁶⁷⁸⁵⁶²⁰⁴⁵²³⁴¹⁴⁰⁹¹³⁹⁵⁷³⁰⁵²¹⁵⁸⁹⁵⁴⁰⁴²³⁸²⁴⁰⁰⁵⁸⁸⁵⁶⁵⁴⁴⁶⁶⁵⁵"; String resSuper = "³⁸²³²⁷⁰⁴⁶⁸³⁰²⁹⁴¹⁸⁴²⁰⁰²⁰²⁴⁶⁰⁷⁴⁵⁰³⁵⁷⁹²⁵⁵⁷⁰⁹⁸⁸³⁵⁸⁹⁶⁵⁰⁴⁹⁹⁴⁰⁶³⁷²¹²³⁴⁸¹⁸²⁴⁸¹¹¹²²⁵⁵⁷⁴⁷³⁹⁵¹¹¹⁶⁷⁸⁹⁹⁶¹³⁴⁸⁷³²³⁷⁰¹⁹⁷⁴⁰²⁸¹⁶⁷⁹⁵⁹⁴³¹⁵⁴⁰⁹⁰²⁸⁶⁸⁸⁰²²¹⁸⁹⁷⁵⁹⁴¹⁵⁶⁴⁵⁸⁵¹⁰⁵⁵⁶³⁸¹⁶⁴¹⁰⁵³⁷⁹⁰²⁹⁵⁶⁰⁷¹⁷⁵³⁸⁸⁷⁸³¹⁹³⁶¹⁴⁴⁹⁸¹³⁴⁹⁷¹⁴⁹⁹⁷⁵⁷⁵³³⁰⁰⁷⁵⁸⁸⁶⁴²⁴⁵¹³⁰⁵⁰⁷³⁶¹¹²⁹⁶⁷⁷¹⁰⁶¹⁶¹⁸¹⁵⁵⁰⁸²⁵⁹⁷⁶⁸⁷⁵¹⁴²⁷⁸⁰⁶²⁴⁰¹²³¹¹⁷¹⁷²⁷⁴¹⁹⁷⁶⁵⁵⁰¹⁶²⁷¹⁹⁷²⁸²⁴⁹⁸⁸²⁰⁶⁵³⁵⁶⁷⁸⁵⁶²⁰⁴⁵²³⁴¹⁴⁰⁹¹³⁹⁵⁷³⁰⁵²¹⁵⁸⁹⁵⁴⁰⁴²³⁸²⁴⁰⁰⁵⁸⁸⁵⁶⁵⁴⁴⁶⁶⁵⁵";
String resSuber = "₃₈₂₃₂₇₀₄₆₈₃₀₂₉₄₁₈₄₂₀₀₂₀₂₄₆₀₇₄₅₀₃₅₇₉₂₅₅₇₀₉₈₈₃₅₈₉₆₅₀₄₉₉₄₀₆₃₇₂₁₂₃₄₈₁₈₂₄₈₁₁₁₂₂₅₅₇₄₇₃₉₅₁₁₁₆₇₈₉₉₆₁₃₄₈₇₃₂₃₇₀₁₉₇₄₀₂₈₁₆₇₉₅₉₄₃₁₅₄₀₉₀₂₈₆₈₈₀₂₂₁₈₉₇₅₉₄₁₅₆₄₅₈₅₁₀₅₅₆₃₈₁₆₄₁₀₅₃₇₉₀₂₉₅₆₀₇₁₇₅₃₈₈₇₈₃₁₉₃₆₁₄₄₉₈₁₃₄₉₇₁₄₉₉₇₅₇₅₃₃₀₀₇₅₈₈₆₄₂₄₅₁₃₀₅₀₇₃₆₁₁₂₉₆₇₇₁₀₆₁₆₁₈₁₅₅₀₈₂₅₉₇₆₈₇₅₁₄₂₇₈₀₆₂₄₀₁₂₃₁₁₇₁₇₂₇₄₁₉₇₆₅₅₀₁₆₂₇₁₉₇₂₈₂₄₉₈₈₂₀₆₅₃₅₆₇₈₅₆₂₀₄₅₂₃₄₁₄₀₉₁₃₉₅₇₃₀₅₂₁₅₈₉₅₄₀₄₂₃₈₂₄₀₀₅₈₈₅₆₅₄₄₆₆₅₅"; String resSuber = "₃₈₂₃₂₇₀₄₆₈₃₀₂₉₄₁₈₄₂₀₀₂₀₂₄₆₀₇₄₅₀₃₅₇₉₂₅₅₇₀₉₈₈₃₅₈₉₆₅₀₄₉₉₄₀₆₃₇₂₁₂₃₄₈₁₈₂₄₈₁₁₁₂₂₅₅₇₄₇₃₉₅₁₁₁₆₇₈₉₉₆₁₃₄₈₇₃₂₃₇₀₁₉₇₄₀₂₈₁₆₇₉₅₉₄₃₁₅₄₀₉₀₂₈₆₈₈₀₂₂₁₈₉₇₅₉₄₁₅₆₄₅₈₅₁₀₅₅₆₃₈₁₆₄₁₀₅₃₇₉₀₂₉₅₆₀₇₁₇₅₃₈₈₇₈₃₁₉₃₆₁₄₄₉₈₁₃₄₉₇₁₄₉₉₇₅₇₅₃₃₀₀₇₅₈₈₆₄₂₄₅₁₃₀₅₀₇₃₆₁₁₂₉₆₇₇₁₀₆₁₆₁₈₁₅₅₀₈₂₅₉₇₆₈₇₅₁₄₂₇₈₀₆₂₄₀₁₂₃₁₁₇₁₇₂₇₄₁₉₇₆₅₅₀₁₆₂₇₁₉₇₂₈₂₄₉₈₈₂₀₆₅₃₅₆₇₈₅₆₂₀₄₅₂₃₄₁₄₀₉₁₃₉₅₇₃₀₅₂₁₅₈₉₅₄₀₄₂₃₈₂₄₀₀₅₈₈₅₆₅₄₄₆₆₅₅";
Assertions.assertEquals(resSuper + "/" + resSuber, FourCornerUnicodeDisplay.text().renderFromInt18(cdc)); Assertions.assertEquals(resSuper + "/" + resSuber, FourCornerUnicodeDisplay.text().render(cdc));
} }
} }

2
nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberGramTest.java
View file

@ -62,7 +62,7 @@ public class StenoNumberGramTest {
List<Integer> out = new ArrayList<>(); List<Integer> out = new ArrayList<>();
FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out); FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out);
writer.strobeNumberGrams(FCFlameNumberGram.CUT_10, List.of(0,1,2,3,4,5,6,7,8,9)); // TODO: realign PIE candy numbers to be ONE based to align with terminators writer.strobeNumberGrams(FCFlameNumberGram.CUT_10, List.of(0,1,2,3,4,5,6,7,8,9)); // TODO: realign PIE candy numbers to be ONE based to align with terminators
String res = FourCornerUnicodeDisplay.text().renderFromInt18(out); String res = FourCornerUnicodeDisplay.text().render(out);
Assertions.assertEquals("0123456789", res); Assertions.assertEquals("0123456789", res);
} }