diff --git a/app/src/main/java/xdsopl/robot36/ComplexDelay.java b/app/src/main/java/xdsopl/robot36/ComplexDelay.java deleted file mode 100644 index 8a7e4c6..0000000 --- a/app/src/main/java/xdsopl/robot36/ComplexDelay.java +++ /dev/null @@ -1,27 +0,0 @@ -/* -Complex digital delay line - -Copyright 2024 Ahmet Inan -*/ - -package xdsopl.robot36; - -public class ComplexDelay { - public final int length; - private final Delay real; - private final Delay imag; - private final Complex temp; - - ComplexDelay(int length) { - this.length = length; - this.real = new Delay(length); - this.imag = new Delay(length); - this.temp = new Complex(); - } - - Complex push(Complex input) { - temp.real = real.push(input.real); - temp.imag = imag.push(input.imag); - return temp; - } -} diff --git a/app/src/main/java/xdsopl/robot36/ComplexMovingAverage.java b/app/src/main/java/xdsopl/robot36/ComplexMovingAverage.java deleted file mode 100644 index 02e22f2..0000000 --- a/app/src/main/java/xdsopl/robot36/ComplexMovingAverage.java +++ /dev/null @@ -1,21 +0,0 @@ -/* -Complex Moving Average - -Copyright 2024 Ahmet Inan -*/ - -package xdsopl.robot36; - -public class ComplexMovingAverage extends ComplexMovingSum { - public ComplexMovingAverage(int length) { - super(length); - } - - public Complex avg() { - return sum().div(length); - } - - public Complex avg(Complex input) { - return sum(input).div(length); - } -} diff --git a/app/src/main/java/xdsopl/robot36/ComplexMovingSum.java b/app/src/main/java/xdsopl/robot36/ComplexMovingSum.java deleted file mode 100644 index 49293e9..0000000 --- a/app/src/main/java/xdsopl/robot36/ComplexMovingSum.java +++ /dev/null @@ -1,38 +0,0 @@ -/* -Complex Moving Sum - -Copyright 2024 Ahmet Inan -*/ - -package xdsopl.robot36; - -public class ComplexMovingSum { - public final int length; - private final SimpleMovingSum real; - private final SimpleMovingSum imag; - private final Complex temp; - - ComplexMovingSum(int length) { - this.length = length; - this.real = new SimpleMovingSum(length); - this.imag = new SimpleMovingSum(length); - this.temp = new Complex(); - } - - void add(Complex input) { - real.add(input.real); - imag.add(input.imag); - } - - Complex sum() { - temp.real = real.sum(); - temp.imag = imag.sum(); - return temp; - } - - Complex sum(Complex input) { - temp.real = real.sum(input.real); - temp.imag = imag.sum(input.imag); - return temp; - } -} diff --git a/app/src/main/java/xdsopl/robot36/ExponentialMovingAverage.java b/app/src/main/java/xdsopl/robot36/ExponentialMovingAverage.java index d35bb93..c4ba06c 100644 --- a/app/src/main/java/xdsopl/robot36/ExponentialMovingAverage.java +++ b/app/src/main/java/xdsopl/robot36/ExponentialMovingAverage.java @@ -14,18 +14,10 @@ public class ExponentialMovingAverage { this.alpha = 1; } - ExponentialMovingAverage(float alpha) { - this.alpha = alpha; - } - public float avg(float input) { return prev = prev * (1 - alpha) + alpha * input; } - public void reset() { - prev = 0; - } - public void reset(float alpha) { this.alpha = alpha; prev = 0; diff --git a/app/src/main/java/xdsopl/robot36/SimpleMovingAverage.java b/app/src/main/java/xdsopl/robot36/SimpleMovingAverage.java index 9a24c87..338ba5c 100644 --- a/app/src/main/java/xdsopl/robot36/SimpleMovingAverage.java +++ b/app/src/main/java/xdsopl/robot36/SimpleMovingAverage.java @@ -11,10 +11,6 @@ public class SimpleMovingAverage extends SimpleMovingSum { super(length); } - public float avg() { - return sum() / length; - } - public float avg(float input) { return sum(input) / length; }