added seq pakage and made 'replace' handle DoubleSequence

nietoperz809 · Mar 26, 2023 · fc53ca9 · fc53ca9
1 parent 072006f
commit fc53ca9
Show file tree

Hide file tree

Showing 16 changed files with 72 additions and 48 deletions.
diff --git a/src/jforth/CayleyTable.java b/src/jforth/CayleyTable.java
@@ -1,5 +1,7 @@
 package jforth;
 
+import jforth.seq.DoubleMatrix;
+
 public class CayleyTable {
     private final DoubleMatrix _m;
 

diff --git a/src/jforth/JForth.java b/src/jforth/JForth.java
@@ -4,6 +4,7 @@
 import com.sun.speech.freetts.en.us.cmu_us_kal.KevinVoiceDirectory;
 import guishell.JfTerminalPanel;
 import jforth.forthwords.PredefinedWords;
+import jforth.seq.*;
 import org.apache.commons.math3.analysis.polynomials.PolynomialFunction;
 import org.apache.commons.math3.complex.Complex;
 import org.apache.commons.math3.fraction.Fraction;

diff --git a/src/jforth/StorageWord.java b/src/jforth/StorageWord.java
@@ -2,6 +2,7 @@
 
 import jforth.forthwords.PredefinedWords;
 import jforth.forthwords.WordHelpers;
+import jforth.seq.DoubleSequence;
 import tools.Utilities;
 
 public final class StorageWord extends BaseWord {

diff --git a/src/jforth/forthwords/Filler1.java b/src/jforth/forthwords/Filler1.java
@@ -5,6 +5,7 @@
 import jforth.*;
 import jforth.audio.SAMSpeech;
 import jforth.audio.WaveTools;
+import jforth.seq.*;
 import org.apache.commons.math3.analysis.function.*;
 import org.apache.commons.math3.analysis.integration.SimpsonIntegrator;
 import org.apache.commons.math3.analysis.polynomials.PolynomialFunction;
@@ -2201,7 +2202,7 @@ else if (o1 instanceof Fraction) {
 
         _fw.add(new PrimitiveWord
                 (
-                        "toMix", "Create Mixed List from Double List",
+                        "toMix", "Create Mixed List from stack content",
                         (dStack, vStack) ->
                         {
                             MixedSequence mix = new MixedSequence();

diff --git a/src/jforth/forthwords/Filler2.java b/src/jforth/forthwords/Filler2.java
@@ -6,6 +6,7 @@
 import jforth.audio.MusicTones;
 import jforth.audio.SynthToneBase;
 import jforth.audio.WaveTools;
+import jforth.seq.*;
 import org.apache.commons.math3.complex.Complex;
 import org.apache.commons.math3.fraction.Fraction;
 import org.mathIT.util.FunctionParser;
@@ -1701,12 +1702,23 @@ public void run() {
                         (dStack, vStack) ->
                         {
                             try {
-                                StringSequence ss = Utilities.readStringSequence(dStack);
-                                ArrayList<String> sl = ss.get_list();
-                                String in = Utilities.readString(dStack);
-                                String out = in.replaceAll(sl.get(0), sl.get(1));
-                                dStack.push(out);
-                                return 1;
+                                Object o = dStack.pop();
+                                StringSequence ss = Utilities.getStringSequence(o);
+                                if (ss != null) {
+                                    ArrayList<String> sl = ss.get_list();
+                                    String in = Utilities.readString(dStack);
+                                    String out = in.replaceAll(sl.get(0), sl.get(1));
+                                    dStack.push(out);
+                                    return 1;
+                                } else {
+                                    DoubleSequence ds = Utilities.getDoubleSequence(o);
+                                    ArrayList<Double> sl = ds.get_list();
+                                    DoubleSequence src = Utilities.readDoubleSequence(dStack);
+                                    DoubleSequence dst = DoubleSequence.replace (src, sl.get(0), sl.get(1));
+                                    dStack.push(dst);
+                                    return 1;
+
+                                }
                             } catch (Exception e) {
                                 return 0;
                             }

diff --git a/src/jforth/forthwords/Filler3.java b/src/jforth/forthwords/Filler3.java
@@ -1,6 +1,6 @@
 package jforth.forthwords;
 
-import jforth.DoubleSequence;
+import jforth.seq.DoubleSequence;
 import jforth.PrimitiveWord;
 import jforth.WordsList;
 import org.apache.commons.math3.analysis.function.HarmonicOscillator;

diff --git a/src/jforth/forthwords/WordHelpers.java b/src/jforth/forthwords/WordHelpers.java
@@ -2,6 +2,10 @@
 
 import jforth.*;
 import jforth.ControlWords.LoopControlWord;
+import jforth.seq.DoubleSequence;
+import jforth.seq.MixedSequence;
+import jforth.seq.SequenceBase;
+import jforth.seq.StringSequence;
 import org.apache.commons.math3.analysis.polynomials.PolynomialFunction;
 import org.apache.commons.math3.complex.Complex;
 import org.apache.commons.math3.fraction.Fraction;

diff --git a/src/jforth/DoubleMatrix.java → src/jforth/seq/DoubleMatrix.java b/src/jforth/DoubleMatrix.java → src/jforth/seq/DoubleMatrix.java
@@ -1,4 +1,4 @@
-package jforth;
+package jforth.seq;
 
 import org.apache.commons.math3.linear.BlockRealMatrix;
 import org.apache.commons.math3.linear.MatrixUtils;
@@ -16,7 +16,7 @@ public DoubleMatrix (RealMatrix src)
         super(src.getData());
     }
 
-    DoubleMatrix (int rows, int cols)
+    public DoubleMatrix(int rows, int cols)
     {
         super(rows, cols);
     }
@@ -91,7 +91,7 @@ public static DoubleMatrix fromSequenceArray (ArrayList<DoubleSequence> arr)
         return res;
     }
 
-    static DoubleMatrix parseMatrix (String in, int base)
+    public static DoubleMatrix parseMatrix(String in, int base)
     {
         if (base != 10)
             return null;

diff --git a/src/jforth/DoubleSequence.java → src/jforth/seq/DoubleSequence.java b/src/jforth/DoubleSequence.java → src/jforth/seq/DoubleSequence.java
@@ -1,5 +1,6 @@
-package jforth;
+package jforth.seq;
 
+import jforth.JForth;
 import org.apache.commons.math3.analysis.polynomials.PolynomialFunction;
 import org.apache.commons.math3.analysis.polynomials.PolynomialFunctionLagrangeForm;
 import org.apache.commons.math3.fitting.PolynomialCurveFitter;
@@ -412,4 +413,17 @@ public double[] transformInnerArray (Func<double[], double[]> action) {
         return action.apply(asPrimitiveArray());
     }
 
+    public static DoubleSequence replace (DoubleSequence in, double old, double nev) {
+        ArrayList<Double> ar = in._list;
+        ArrayList ar2 = new ArrayList<Double>();
+        for (Double aDouble : ar) {
+            if (aDouble == old)
+                ar2.add(nev);
+            else
+                ar2.add(aDouble);
+        }
+        DoubleSequence ret = new DoubleSequence();
+        ret._list.addAll(ar2);
+        return ret;
+    }
 }
diff --git a/src/jforth/FracSequence.java → src/jforth/seq/FracSequence.java b/src/jforth/FracSequence.java → src/jforth/seq/FracSequence.java
@@ -1,4 +1,4 @@
-package jforth;
+package jforth.seq;
 
 import org.apache.commons.math3.fraction.Fraction;
 import tools.Utilities;

diff --git a/src/jforth/MixedSequence.java → src/jforth/seq/MixedSequence.java b/src/jforth/MixedSequence.java → src/jforth/seq/MixedSequence.java
@@ -1,7 +1,8 @@
-package jforth;
+package jforth.seq;
 
 // TODO: experimental class
 
+import jforth.JForth;
 import tools.Utilities;
 
 import java.util.ArrayList;
@@ -20,35 +21,9 @@ public MixedSequence (ArrayList<?> ar) {
         this._list = ar;
     }
 
-    public void addAnything (Object o)
-    {
+    public void addAnything (Object o) {
         _list.add(o);
     }
-//
-//    public MixedSequence (String[] in)
-//    {
-//        for (int s=0; s<in.length; s++) {
-//            boolean ret = JForth.doForKnownWordsUnmixed(in[s], this._list::add, 10);
-//            if (!ret)
-//                _list.add(in[s]);
-//        }
-//    }
-//
-//    public MixedSequence (String csv)
-//    {
-//        this (csv.split (";"));
-//    }
-//
-//    public static MixedSequence parseSequence (String in)
-//    {
-//        String seq = Utilities.extractSequence (in);
-//        if (seq == null)
-//        {
-//            return null;
-//        }
-//        return new MixedSequence (seq);
-//    }
-//
 
     public static MixedSequence parseSequence (String in) {
         if (in.startsWith("{") && in.endsWith("}")) {

diff --git a/src/jforth/SequenceBase.java → src/jforth/seq/SequenceBase.java b/src/jforth/SequenceBase.java → src/jforth/seq/SequenceBase.java
@@ -1,4 +1,4 @@
-package jforth;
+package jforth.seq;
 
 import org.apache.commons.math3.fraction.Fraction;
 
@@ -7,7 +7,7 @@
 import java.util.LinkedHashSet;
 
 public class SequenceBase<E extends Comparable<E>> implements Cloneable, java.io.Serializable {
-    protected ArrayList<E> _list = new ArrayList<>();
+    public ArrayList<E> _list = new ArrayList<>();
 
     public SequenceBase() {
     }
@@ -216,4 +216,14 @@ public boolean equals(Object other) {
         return test.size() == 0;
     }
 
+    @Override
+    public SequenceBase<E> clone() {
+        try {
+            SequenceBase<E> clone = (SequenceBase<E>) super.clone();
+            clone._list = new ArrayList<>(_list);
+            return clone;
+        } catch (CloneNotSupportedException e) {
+            throw new AssertionError();
+        }
+    }
 }
diff --git a/src/jforth/StringSequence.java → src/jforth/seq/StringSequence.java b/src/jforth/StringSequence.java → src/jforth/seq/StringSequence.java
@@ -1,9 +1,10 @@
 
 // not used
 
-package jforth;
+package jforth.seq;
 
 
+import jforth.StringEscape;
 import tools.Utilities;
 
 import java.util.*;

diff --git a/src/tools/BuildInfo.java b/src/tools/BuildInfo.java
@@ -1,8 +1,8 @@
 package tools;
 
 public class BuildInfo {
-    private static final String BUILD_NUMBER = "3481";
-    private static final String BUILD_DATE = "02/28/2023 05:59:30 PM";
+    private static final String BUILD_NUMBER = "3495";
+    private static final String BUILD_DATE = "03/26/2023 08:40:20 PM";
 
     public static final String buildInfo = "JForth, Build: " + BUILD_NUMBER + ", " + BUILD_DATE
             + " -- " + System.getProperty("java.version");

diff --git a/src/tools/Utilities.java b/src/tools/Utilities.java
@@ -1,6 +1,9 @@
 package tools;
 
 import jforth.*;
+import jforth.seq.DoubleMatrix;
+import jforth.seq.DoubleSequence;
+import jforth.seq.StringSequence;
 import org.apache.commons.math3.analysis.UnivariateFunction;
 import org.apache.commons.math3.analysis.polynomials.PolynomialFunction;
 import org.apache.commons.math3.complex.Complex;

diff --git a/src/tools/build.number b/src/tools/build.number
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Tue Feb 28 17:59:30 CET 2023
-build.number=3482
+#Sun Mar 26 20:40:20 CEST 2023
+build.number=3496