From 63f4691e705450972ba76ed48d00ad95f6214813 Mon Sep 17 00:00:00 2001 From: Willem Date: Mon, 8 Sep 2025 17:25:43 +0200 Subject: [PATCH] FC18: Renamed steno grapher to use steno tongue names --- .../zion7/FourCornerZionStenoGrapher.java | 53 ++++++++----------- .../fc18/zion7/flame4/FCFlameStenoTongue.java | 8 +-- .../fc18/cake2/gram5/FCNumberGramTest.java | 4 +- .../org/x4o/fc18/zion7/StenoGrapherTest.java | 10 ++-- .../x4o/fc18/zion7/StenoNumberBase2Test.java | 10 ++-- .../x4o/fc18/zion7/StenoNumberBase8Test.java | 12 ++--- .../zion7/StenoNumberChocoChopedTest.java | 4 +- .../zion7/StenoNumberChocoDecimalTest.java | 4 +- .../fc18/zion7/StenoNumberChocoFloatTest.java | 4 +- .../zion7/StenoNumberChocoRationalTest.java | 6 +-- 10 files changed, 54 insertions(+), 61 deletions(-) diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java index 63c0101..4b437e2 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java @@ -57,47 +57,35 @@ import org.x4o.fc18.zion7.flame4.FCFlameNumberGram; /// @version 1.0 Jan 11, 2025 public class FourCornerZionStenoGrapher { - static public FourCornerZion7Bereshit writerX06(List out) { - return new FourCornerWriterBereshit(v -> out.add(v), () -> {}, FCFlameStenoTongue.FC6_PLUS); - } - - static public FourCornerZion7Candlelier writerX18(List out) { - return new FourCornerWriterCandlelier(v -> out.add(v), () -> {}, FCFlameStenoTongue.FC18); - } - - static public FourCornerZion7TempleScrolls writerXDBX18(List out) { - return new FourCornerWriterTempleScrolls(v -> out.add(v), () -> {}, FCFlameStenoTongue.FC18); - } - /* static public FourCornerZion7Bereshit writerFC6(List out) { - return new FourCornerWriter(v -> out.add(v), () -> {}, true); + return new FourCornerWriterBereshit(v -> out.add(v), () -> {}, FCFlameStenoTongue.FC6); } static public FourCornerZion7Bereshit writerFC6Plus(List out) { - return new FourCornerWriter(v -> out.add(v), () -> {}, true); + return new FourCornerWriterBereshit(v -> out.add(v), () -> {}, FCFlameStenoTongue.FC6_PLUS); } static public FourCornerZion7Candlelier writerFC18(List out) { - return new FourCornerWriter(v -> out.add(v), () -> {}, false); + return new FourCornerWriterCandlelier(v -> out.add(v), () -> {}, FCFlameStenoTongue.FC18); } static public FourCornerZion7Candlelier writerFC18Adult(List out) { - return new FourCornerWriter(v -> out.add(v), () -> {}, false); + return new FourCornerWriterCandlelier(v -> out.add(v), () -> {}, FCFlameStenoTongue.FC18_ADULT); } static public FourCornerZion7BaseVoid writerFC18Worms(List out) { - return new FourCornerWriter(v -> out.add(v), () -> {}, false); + return new FourCornerWriterBaseVoid(v -> out.add(v), () -> {}, FCFlameStenoTongue.FC18_WORMS); } - static public FourCornerZion7TempleScrolls writerTongue(FCFlameStenoTongue outTongue, List out) { - return new FourCornerWriter(v -> out.add(v), () -> {}, false); - } - - static public FourCornerZion7TempleScrolls writerTongue(FCFlameStenoTongue outTongue,List out) { - return new FourCornerWriter(v -> out.add(v), () -> {}, false); - }s - */ - +// static public FourCornerZion7TempleScrolls writerStenoTongue(List out, FCFlameStenoTongue outTongue) { +// return new FourCornerWriterTempleScrolls(v -> out.add(v), () -> {}, outTongue); +// } +// static public FourCornerZion7TempleScrolls writerXDBX18(List out) { +// return new FourCornerWriterTempleScrolls(v -> out.add(v), () -> {}, FCFlameStenoTongue.FC18); +// } +// static public FourCornerZion7TempleScrolls writerXDBX18Adult(List out) { +// return new FourCornerWriterTempleScrolls(v -> out.add(v), () -> {}, FCFlameStenoTongue.FC18_ADULT); +// } /* static public FourCornerZion7TempleScrolls writerX18PackedX8(OutputStream out) { class FourCornerPackedX8Encoder implements IntConsumer, Runnable { @@ -127,13 +115,13 @@ public class FourCornerZionStenoGrapher { } */ - static abstract private class FourCornerWriterBaseVoid implements FourCornerZionStenoPetroglyphs, FourCornerZion7BaseVoid { + static abstract private class FourCornerWriterBase implements FourCornerZionStenoPetroglyphs, FourCornerZion7AlphaOmega { protected final IntConsumer out; private final Runnable outFlush; protected final FCFlameStenoTongue outTongue; - public FourCornerWriterBaseVoid(IntConsumer out, Runnable outFlush, FCFlameStenoTongue outTongue) { + public FourCornerWriterBase(IntConsumer out, Runnable outFlush, FCFlameStenoTongue outTongue) { this.out = Objects.requireNonNull(out); this.outFlush = Objects.requireNonNull(outFlush); this.outTongue = Objects.requireNonNull(outTongue); @@ -242,8 +230,6 @@ public class FourCornerZionStenoGrapher { } } - // --------------------------------------- BEGIN BASE VOID - @Override public void strobeDocumentAlpha() { } @@ -252,6 +238,13 @@ public class FourCornerZionStenoGrapher { public void strobeDocumentOmega() { outFlush(); } + } + + static private class FourCornerWriterBaseVoid extends FourCornerWriterBase implements FourCornerZion7BaseVoid { + + public FourCornerWriterBaseVoid(IntConsumer out, Runnable outFlush, FCFlameStenoTongue outTongue) { + super(out, outFlush, outTongue); + } @Override public void strobeSandWorm(List sandWalk, List sandSpice) { diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/flame4/FCFlameStenoTongue.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/flame4/FCFlameStenoTongue.java index 6e89210..782ed13 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/flame4/FCFlameStenoTongue.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/flame4/FCFlameStenoTongue.java @@ -36,14 +36,14 @@ public enum FCFlameStenoTongue { FC6_PLUS (FourCornerDotCake.FC_CDC1604_P6.getStart(), FourCornerDotCake.FC_PIE9D_27.getStop()), /// Full range with all features FC18 (FourCornerDotCake.FC_CDC1604_P6.getStart(), FourCornerDotCake.FC_CDC1604_P6.getStop()), - /// No candy for adults. + /// An adult man does not use candy. FC18_ADULT (FourCornerDotCake.FC_CLK1K_Z.getStop() + 1, FourCornerDotCake.FC_CDC1604_P6.getStop()), - /// Only adult worms are allowed in the desert of the real. - FC18_WORMS (FourCornerDotCake.FC_SANDWALK_12.getStart(), FourCornerDotCake.FC_SANDWORM_15.getStop()), + /// An sand man rides adult worms, in the desert of the real. + FC18_WORMS (0, -1), // allow zero letters in strobeTheWord range ; private static final FCFlameStenoTongue[] VALUES = values(); - private final int cakePointMin; + private final int cakePointMin; private final int cakePointMax; private FCFlameStenoTongue(int cakePointMin, int cakePointMax) { diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/gram5/FCNumberGramTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/gram5/FCNumberGramTest.java index 33e35d2..156895b 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/gram5/FCNumberGramTest.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/gram5/FCNumberGramTest.java @@ -43,7 +43,7 @@ public class FCNumberGramTest { @Test public void testCut10Simple() throws Exception { List out = new ArrayList<>(); - FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerX18(out); + FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out); writer.strobeNumberGrams(FCFlameNumberGram.CUT_10, List.of(0,1,2,3,4,5,6,7,8,9)); String res = FourCornerUnicodeDisplay.text().renderFromInt18(out); Assertions.assertEquals("0123456789", res); @@ -52,7 +52,7 @@ public class FCNumberGramTest { @Test public void testCutArguFail() throws Exception { List out = new ArrayList<>(); - FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerX18(out); + FourCornerZion7Candlelier writer = FourCornerZionStenoGrapher.writerFC18(out); Assertions.assertThrows(IllegalArgumentException.class, () -> { writer.strobeNumberGrams(FCFlameNumberGram.CUT_10, List.of(10)); }); diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoGrapherTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoGrapherTest.java index a128c43..de926ed 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoGrapherTest.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoGrapherTest.java @@ -54,17 +54,17 @@ public class StenoGrapherTest { @Test public void testStenoTongueLimits() throws Exception { Assertions.assertThrows(IllegalArgumentException.class, () -> { - FourCornerZionStenoGrapher.writerX06(new ArrayList<>()).strobeTheWord(FCFlameWordDish.APPETIZER, 0x040000); + FourCornerZionStenoGrapher.writerFC6Plus(new ArrayList<>()).strobeTheWord(FCFlameWordDish.APPETIZER, 0x040000); }); Assertions.assertThrows(IllegalArgumentException.class, () -> { - FourCornerZionStenoGrapher.writerX18(new ArrayList<>()).strobeTheWord(FCFlameWordDish.APPETIZER, 0x040000); + FourCornerZionStenoGrapher.writerFC18(new ArrayList<>()).strobeTheWord(FCFlameWordDish.APPETIZER, 0x040000); }); } @Test public void testStenoAutoFC6Plus() throws Exception { List out = new ArrayList<>(); - FourCornerZion7Bereshit writerFC06 = FourCornerZionStenoGrapher.writerX06(out); + FourCornerZion7Bereshit writerFC06 = FourCornerZionStenoGrapher.writerFC6Plus(out); writerFC06.strobeTheWord(FCFlameWordDish.CANDY_PIE, 0x00012D); writerFC06.strobeTheWord(FCFlameWordDish.APPETIZER, FCDotCDC1604DashP6.NX01_A.baklavaPointDotIndex()); Assertions.assertEquals(7, out.size()); @@ -83,7 +83,7 @@ public class StenoGrapherTest { @Test public void testSandWorm() throws Exception { List out = new ArrayList<>(); - FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18(out); + FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerFC18(out); Assertions.assertThrows(IllegalArgumentException.class, () -> { writerX18.strobeSandWorm(List.of(PrimordialOctalSound.PART_1), List.of(PrimordialOctalSound.PART_1)); }); @@ -102,7 +102,7 @@ public class StenoGrapherTest { try (OutputStream out = new FileOutputStream(testFile)) { //FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18PackedX8(out); List outX18 = new ArrayList<>(); - FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18(outX18); + FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerFC18(outX18); writerX18.strobeDocumentAlpha(); for (int x = 1; x <= 1025 /*_999999*/; x++) { BigInteger v = BigInteger.valueOf(x); diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberBase2Test.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberBase2Test.java index 9b344a7..bd764f6 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberBase2Test.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberBase2Test.java @@ -44,7 +44,7 @@ public class StenoNumberBase2Test { @Test public void testBASE2Lego123456789FC6() throws Exception { List out = new ArrayList<>(); - FourCornerZion7Bereshit writer = FourCornerZionStenoGrapher.writerX06(out); + FourCornerZion7Bereshit writer = FourCornerZionStenoGrapher.writerFC6(out); writer.strobeNumberBASE2Lego(FCFlameFremanLegoBase2.LEGO_0032, BigInteger.valueOf(123456789)); String resX18 = FourCornerUnicodeDisplay.text().renderFromInt18(out); Assertions.assertEquals("123456789", resX18); @@ -53,7 +53,7 @@ public class StenoNumberBase2Test { @Test public void testBASE2Lego123() throws Exception { List outX18 = new ArrayList<>(); - FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18(outX18); + FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerFC18(outX18); writerX18.strobeNumberBASE2Lego(FCFlameFremanLegoBase2.LEGO_0032, BigInteger.valueOf(123)); String resX18 = FourCornerUnicodeDisplay.text().renderFromInt18(outX18); Assertions.assertEquals("123", resX18); @@ -62,7 +62,7 @@ public class StenoNumberBase2Test { @Test public void testBASE2Signed123() throws Exception { List outX18 = new ArrayList<>(); - FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18(outX18); + FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerFC18(outX18); writerX18.strobeNumberBASE2Signed(FCFlameFremanSignedBase2.SIGNED_0128, true, BigInteger.valueOf(123)); String resX18 = FourCornerUnicodeDisplay.text().renderFromInt18(outX18); Assertions.assertEquals("-123", resX18); @@ -71,7 +71,7 @@ public class StenoNumberBase2Test { @Test public void testBASE2LegoMax() throws Exception { List outX18 = new ArrayList<>(); - FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18(outX18); + FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerFC18(outX18); writerX18.strobeNumberBASE2Lego(FCFlameFremanLegoBase2.LEGO_0016, BigInteger.valueOf(0xFFFF)); Assertions.assertThrows(IllegalArgumentException.class, () -> { writerX18.strobeNumberBASE2Lego(FCFlameFremanLegoBase2.LEGO_0016, BigInteger.valueOf(0xFFFF + 1)); @@ -81,7 +81,7 @@ public class StenoNumberBase2Test { @Test public void testBASE2SignedMax() throws Exception { List outX18 = new ArrayList<>(); - FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18(outX18); + FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerFC18(outX18); writerX18.strobeNumberBASE2Signed(FCFlameFremanSignedBase2.SIGNED_0016, false, BigInteger.valueOf(0x7FFF)); Assertions.assertThrows(IllegalArgumentException.class, () -> { writerX18.strobeNumberBASE2Signed(FCFlameFremanSignedBase2.SIGNED_0016, false, BigInteger.valueOf(0x7FFF + 1)); diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberBase8Test.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberBase8Test.java index 4cbc51e..3d53022 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberBase8Test.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberBase8Test.java @@ -44,7 +44,7 @@ public class StenoNumberBase8Test { @Test public void testBASE8Lego123() throws Exception { List outX18 = new ArrayList<>(); - FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18(outX18); + FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerFC18(outX18); writerX18.strobeNumberBASE8Lego(FCFlameFremanLegoBase8.LEGO_0144, BigInteger.valueOf(123)); String resX18 = FourCornerUnicodeDisplay.text().renderFromInt18(outX18); Assertions.assertEquals("123", resX18); @@ -53,7 +53,7 @@ public class StenoNumberBase8Test { @Test public void testBASE8Lego123456() throws Exception { List outX18 = new ArrayList<>(); - FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18(outX18); + FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerFC18(outX18); writerX18.strobeNumberBASE8Lego(FCFlameFremanLegoBase8.LEGO_0144, BigInteger.valueOf(123456)); String resX18 = FourCornerUnicodeDisplay.text().renderFromInt18(outX18); Assertions.assertEquals("123456", resX18); @@ -62,7 +62,7 @@ public class StenoNumberBase8Test { @Test public void testBASE8Choco123() throws Exception { List outX18 = new ArrayList<>(); - FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18(outX18); + FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerFC18(outX18); writerX18.strobeNumberBASE8Choco(FCFlameFremanChocoBase8.CHOCO_0144, FCFlameNumberTaste.NUMBER_POSITIVE, new BigInteger("123", 10)); String resX18 = FourCornerUnicodeDisplay.text().renderFromInt18(outX18); Assertions.assertEquals("123", resX18); @@ -71,7 +71,7 @@ public class StenoNumberBase8Test { @Test public void testBASE8Choco123456Neg() throws Exception { List outX18 = new ArrayList<>(); - FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18(outX18); + FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerFC18(outX18); writerX18.strobeNumberBASE8Choco(FCFlameFremanChocoBase8.CHOCO_0144, FCFlameNumberTaste.NUMBER_NEGATIVE, new BigInteger("123456", 10)); String resX18 = FourCornerUnicodeDisplay.text().renderFromInt18(outX18); Assertions.assertEquals("-123456", resX18); @@ -80,7 +80,7 @@ public class StenoNumberBase8Test { @Test public void testBASE8ChocoLarge() throws Exception { List outX18 = new ArrayList<>(); - FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18(outX18); + FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerFC18(outX18); writerX18.strobeNumberBASE8Choco(FCFlameFremanChocoBase8.CHOCO_0144, FCFlameNumberTaste.NUMBER_POSITIVE, new BigInteger("1393796574908163946345982392040522594123775", 10)); String resX18 = FourCornerUnicodeDisplay.text().renderFromInt18(outX18); Assertions.assertEquals("1393796574908163946345982392040522594123775", resX18); @@ -89,7 +89,7 @@ public class StenoNumberBase8Test { @Test public void testBASE8ChocoLargeFC6() throws Exception { List out = new ArrayList<>(); - FourCornerZion7Bereshit writer = FourCornerZionStenoGrapher.writerX06(out); + FourCornerZion7Bereshit writer = FourCornerZionStenoGrapher.writerFC6Plus(out); writer.strobeNumberBASE8Choco(FCFlameFremanChocoBase8.CHOCO_0144, FCFlameNumberTaste.NUMBER_POSITIVE, new BigInteger("1393796574908163946345982392040522594123775", 10)); String resX18 = FourCornerUnicodeDisplay.text().renderFromInt18(out); Assertions.assertEquals("1393796574908163946345982392040522594123775", resX18); diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoChopedTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoChopedTest.java index 958c078..d981004 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoChopedTest.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoChopedTest.java @@ -42,7 +42,7 @@ public class StenoNumberChocoChopedTest { @Test public void testChochChoped123() throws Exception { List outX18 = new ArrayList<>(); - FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18(outX18); + FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerFC18(outX18); writerX18.strobeNumberChocoPigChoped(FCFlameNumberTaste.NUMBER_POSITIVE, BigInteger.valueOf(456), BigInteger.valueOf(123)); String resX18 = FourCornerUnicodeDisplay.text().renderFromInt18(outX18); Assertions.assertEquals("456.123", resX18); @@ -51,7 +51,7 @@ public class StenoNumberChocoChopedTest { @Test public void testChochChopedNeg456() throws Exception { List outX18 = new ArrayList<>(); - FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18(outX18); + FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerFC18(outX18); writerX18.strobeNumberChocoPigChoped(FCFlameNumberTaste.NUMBER_NEGATIVE, BigInteger.valueOf(789), BigInteger.valueOf(123)); String resX18 = FourCornerUnicodeDisplay.text().renderFromInt18(outX18); Assertions.assertEquals("-789.123", resX18); diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoDecimalTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoDecimalTest.java index 6fa33c7..f185891 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoDecimalTest.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoDecimalTest.java @@ -42,7 +42,7 @@ public class StenoNumberChocoDecimalTest { @Test public void testChocoDecimal456() throws Exception { List outX18 = new ArrayList<>(); - FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18(outX18); + FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerFC18(outX18); writerX18.strobeNumberChocoPigDecimal(FCFlameNumberTaste.NUMBER_POSITIVE, false, BigInteger.valueOf(123), BigInteger.valueOf(456)); Assertions.assertEquals(4, outX18.size()); String resX18 = FourCornerUnicodeDisplay.text().renderFromInt18(outX18); @@ -54,7 +54,7 @@ public class StenoNumberChocoDecimalTest { Assertions.assertEquals(283, FourCornerZionStenoPetroglyphs.BIG_BITS_283.toString(2).length()); Assertions.assertEquals(2016, FourCornerZionStenoPetroglyphs.BIG_BITS_2016.toString(2).length()); List outX18 = new ArrayList<>(); - FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18(outX18); + FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerFC18(outX18); writerX18.strobeNumberChocoPigDecimal(FCFlameNumberTaste.NUMBER_POSITIVE, false, FourCornerZionStenoPetroglyphs.BIG_BITS_283, FourCornerZionStenoPetroglyphs.BIG_BITS_2016); Assertions.assertEquals(193, outX18.size()); String resX18 = FourCornerUnicodeDisplay.text().renderFromInt18(outX18); diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoFloatTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoFloatTest.java index cd49527..5aacc13 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoFloatTest.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoFloatTest.java @@ -42,7 +42,7 @@ public class StenoNumberChocoFloatTest { @Test public void testChochFloat123() throws Exception { List outX18 = new ArrayList<>(); - FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18(outX18); + FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerFC18(outX18); writerX18.strobeNumberChocoPigFloat(FCFlameNumberTaste.NUMBER_NEGATIVE, false, BigInteger.valueOf(456), BigInteger.valueOf(123)); String resX18 = FourCornerUnicodeDisplay.text().renderFromInt18(outX18); Assertions.assertEquals("(-1)¹*2⁴⁵⁶*1.123", resX18); @@ -51,7 +51,7 @@ public class StenoNumberChocoFloatTest { @Test public void testChochFloatNeg456() throws Exception { List outX18 = new ArrayList<>(); - FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18(outX18); + FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerFC18(outX18); writerX18.strobeNumberChocoPigFloat(FCFlameNumberTaste.NUMBER_POSITIVE, true, BigInteger.valueOf(456), BigInteger.valueOf(789)); String resX18 = FourCornerUnicodeDisplay.text().renderFromInt18(outX18); Assertions.assertEquals("(-1)⁰*2⁻⁴⁵⁶*1.789", resX18); diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoRationalTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoRationalTest.java index a47afed..f389a4b 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoRationalTest.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoRationalTest.java @@ -44,7 +44,7 @@ public class StenoNumberChocoRationalTest { @Test public void testChocoRationalValues() throws Exception { List outX18 = new ArrayList<>(); - FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18(outX18); + FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerFC18(outX18); BigInteger v1 = BigInteger.valueOf(123); writerX18.strobeNumberChocoPigRational(FCFlameNumberTaste.NUMBER_POSITIVE, FCFlameNumberTaste.NUMBER_POSITIVE, BigInteger.ONE, v1); BigInteger v2 = BigInteger.valueOf(12345); @@ -58,7 +58,7 @@ public class StenoNumberChocoRationalTest { @Test public void testChocoRationalCount1024() throws Exception { List outX18 = new ArrayList<>(); - FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18(outX18); + FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerFC18(outX18); for (int x = 1; x <= 1025; x++) { BigInteger v = BigInteger.valueOf(x); writerX18.strobeNumberChocoPigRational(FCFlameNumberTaste.NUMBER_POSITIVE, FCFlameNumberTaste.NUMBER_POSITIVE, BigInteger.ONE, v); @@ -72,7 +72,7 @@ public class StenoNumberChocoRationalTest { @Test public void testChocoRationalValuesMax() throws Exception { List outX18 = new ArrayList<>(); - FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerX18(outX18); + FourCornerZion7Candlelier writerX18 = FourCornerZionStenoGrapher.writerFC18(outX18); BigInteger maxValue = FourCornerZionStenoPetroglyphs.BIG_BITS_1148; writerX18.strobeNumberChocoPigRational(FCFlameNumberTaste.NUMBER_POSITIVE, FCFlameNumberTaste.NUMBER_POSITIVE, maxValue, maxValue); Assertions.assertThrows(IllegalArgumentException.class, () -> {