float array math

Author: brachy84

src/main/java/com/cleanroommc/modularui/test/TestGuis.java

@@ -32,7 +32,6 @@
 import com.cleanroommc.modularui.utils.GameObjectHelper;
 import com.cleanroommc.modularui.utils.Interpolation;
 import com.cleanroommc.modularui.utils.Interpolations;
-import com.cleanroommc.modularui.utils.MathUtils;
 import com.cleanroommc.modularui.utils.Platform;
 import com.cleanroommc.modularui.utils.SpriteHelper;
 import com.cleanroommc.modularui.utils.fakeworld.ArraySchema;
@@ -535,17 +534,15 @@ public static ModularPanel buildCollapseDisabledChildrenUI() {
     }
 
     public static @NotNull ModularPanel buildGraphUI() {
-        float[] x = FloatArrayMath.linspace(-5, 5, 100);
-        float[] y = FloatArrayMath.sin(x, null);
+        float[] x = FloatArrayMath.linspace(-25, 25, 200);
+        // sin(x) / x
+        float[] y1 = FloatArrayMath.div(FloatArrayMath.sin(x, null), x, null);
         return new ModularPanel("graph")
-                .size(200, 200)
+                .size(200, 160)
                 .padding(5)
                 .overlay(new GraphDrawable()
-                        .yLim(-1.2f, 1.2f)
-                        .xTickFinder(MathUtils.PI_HALF, 1)
-                        .yTickFinder(0.2f, 1)
                         .graphAspectRatio(16 / 9f)
-                        .plot(x, y));
+                        .plot(x, y1));
     }
 
     public static @NotNull ModularPanel buildAspectRatioUI() {

src/main/java/com/cleanroommc/modularui/utils/FloatArrayMath.java

@@ -171,10 +171,7 @@ public static float min(float[] arr) {
      * @return result array
      */
     public static float[] plus(float[] src, float op, float @Nullable [] res) {
-        if (res == null) res = new float[src.length];
-        int n = Math.min(src.length, res.length);
-        for (int i = 0; i < n; i++) res[i] = src[i] + op;
-        return res;
+        return applyEach(src, v -> v + op, res);
     }
 
     /**
@@ -186,11 +183,7 @@ public static float[] plus(float[] src, float op, float @Nullable [] res) {
      * @return result array
      */
     public static float[] plus(float[] src, float[] op, float @Nullable [] res) {
-        if (src.length != op.length) throw new IllegalArgumentException("Can't add arrays of different size.");
-        if (res == null) res = new float[src.length];
-        int n = Math.min(src.length, res.length);
-        for (int i = 0; i < n; i++) res[i] = src[i] + op[i];
-        return res;
+        return applyEach(src, op, Float::sum, res);
     }
 
     /**
@@ -202,16 +195,21 @@ public static float[] plus(float[] src, float[] op, float @Nullable [] res) {
      * @return result array
      */
     public static float[] mult(float[] src, float op, float @Nullable [] res) {
-        if (res == null) res = new float[src.length];
-        int n = Math.min(src.length, res.length);
-        for (int i = 0; i < n; i++) res[i] = src[i] * op;
-        return res;
+        return applyEach(src, v -> v * op, res);
+    }
+
+    public static float[] mult(float[] src, float[] op, float @Nullable [] res) {
+        return applyEach(src, op, (v, op1) -> v * op1, res);
     }
 
     public static float[] div(float[] src, float op, float @Nullable [] res) {
         return mult(src, 1 / op, res);
     }
 
+    public static float[] div(float[] src, float[] op, float @Nullable [] res) {
+        return applyEach(src, op, (v, op1) -> v / op1, res);
+    }
+
     public static float[] diff(float[] src) {
         if (src.length < 2) return EMPTY;
         if (src.length == 2) return new float[]{src[1] - src[0]};
@@ -247,6 +245,16 @@ public static float[] applyEach(float[] src, float[] operands1, float[] operands
         return res;
     }
 
+    public static float[] applyEach(float[] src, float[][] operands, NFloatOperator op, float @Nullable [] res) {
+        if (src.length != operands.length) {
+            throw new IllegalArgumentException("Can't apply operator to operands of different size.");
+        }
+        if (res == null) res = new float[src.length];
+        int n = Math.min(src.length, res.length);
+        for (int i = 0; i < n; i++) res[i] = op.apply(src[i], operands[i]);
+        return res;
+    }
+
     public static float[] abs(float[] src, float @Nullable [] res) {
         return applyEach(src, Math::abs, res);
     }
@@ -259,6 +267,10 @@ public static float[] cos(float[] src, float @Nullable [] res) {
         return applyEach(src, MathUtils::cos, res);
     }
 
+    public static float[] tan(float[] src, float @Nullable [] res) {
+        return applyEach(src, MathUtils::tan, res);
+    }
+
     public static float[] clamp(float[] src, float min, float max, float @Nullable [] res) {
         return applyEach(src, v -> MathUtils.clamp(v, min, max), res);
     }
@@ -291,4 +303,9 @@ public interface TernaryFloatOperator {
 
         float apply(float v, float op1, float op2);
     }
+
+    public interface NFloatOperator {
+
+        float apply(float v, float[] op);
+    }
 }