Skip to content

Commit

Permalink
[wpimath] Add generic circular buffer class to Java
Browse files Browse the repository at this point in the history
The original is now called DoubleCircularBuffer.
  • Loading branch information
calcmogul committed Nov 25, 2023
1 parent 9280054 commit 3894277
Show file tree
Hide file tree
Showing 7 changed files with 449 additions and 42 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import edu.wpi.first.math.MathSharedStore;
import edu.wpi.first.math.MathUsageId;
import edu.wpi.first.util.CircularBuffer;
import edu.wpi.first.util.DoubleCircularBuffer;
import java.util.Arrays;
import org.ejml.simple.SimpleMatrix;

Expand Down Expand Up @@ -48,8 +48,8 @@
* to make sure calculate() gets called at the desired, constant frequency!
*/
public class LinearFilter {
private final CircularBuffer m_inputs;
private final CircularBuffer m_outputs;
private final DoubleCircularBuffer m_inputs;
private final DoubleCircularBuffer m_outputs;
private final double[] m_inputGains;
private final double[] m_outputGains;

Expand All @@ -62,8 +62,8 @@ public class LinearFilter {
* @param fbGains The "feedback" or IIR gains.
*/
public LinearFilter(double[] ffGains, double[] fbGains) {
m_inputs = new CircularBuffer(ffGains.length);
m_outputs = new CircularBuffer(fbGains.length);
m_inputs = new DoubleCircularBuffer(ffGains.length);
m_outputs = new DoubleCircularBuffer(fbGains.length);
m_inputGains = Arrays.copyOf(ffGains, ffGains.length);
m_outputGains = Arrays.copyOf(fbGains, fbGains.length);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

package edu.wpi.first.math.filter;

import edu.wpi.first.util.CircularBuffer;
import edu.wpi.first.util.DoubleCircularBuffer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
Expand All @@ -15,7 +15,7 @@
* processing, LIDAR, or ultrasonic sensors).
*/
public class MedianFilter {
private final CircularBuffer m_valueBuffer;
private final DoubleCircularBuffer m_valueBuffer;
private final List<Double> m_orderedValues;
private final int m_size;

Expand All @@ -26,7 +26,7 @@ public class MedianFilter {
*/
public MedianFilter(int size) {
// Circular buffer of values currently in the window, ordered by time
m_valueBuffer = new CircularBuffer(size);
m_valueBuffer = new DoubleCircularBuffer(size);
// List of values currently in the window, ordered by value
m_orderedValues = new ArrayList<>(size);
// Size of rolling window
Expand Down
45 changes: 24 additions & 21 deletions wpiutil/src/main/java/edu/wpi/first/util/CircularBuffer.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@

package edu.wpi.first.util;

import java.util.Arrays;

/** This is a simple circular buffer so we don't need to "bucket brigade" copy old values. */
public class CircularBuffer {
private double[] m_data;
public class CircularBuffer<T> {
private T[] m_data;

// Index of element at front of buffer
private int m_front;
Expand All @@ -21,9 +19,9 @@ public class CircularBuffer {
*
* @param size The size of the circular buffer.
*/
@SuppressWarnings("unchecked")
public CircularBuffer(int size) {
m_data = new double[size];
Arrays.fill(m_data, 0.0);
m_data = (T[]) new Object[size];
}

/**
Expand All @@ -40,7 +38,7 @@ public int size() {
*
* @return value at front of buffer
*/
public double getFirst() {
public T getFirst() {
return m_data[m_front];
}

Expand All @@ -49,10 +47,11 @@ public double getFirst() {
*
* @return value at back of buffer
*/
public double getLast() {
@SuppressWarnings("unchecked")
public T getLast() {
// If there are no elements in the buffer, do nothing
if (m_length == 0) {
return 0.0;
return (T) new Object();
}

return m_data[(m_front + m_length - 1) % m_data.length];
Expand All @@ -64,7 +63,7 @@ public double getLast() {
*
* @param value The value to push.
*/
public void addFirst(double value) {
public void addFirst(T value) {
if (m_data.length == 0) {
return;
}
Expand All @@ -84,7 +83,7 @@ public void addFirst(double value) {
*
* @param value The value to push.
*/
public void addLast(double value) {
public void addLast(T value) {
if (m_data.length == 0) {
return;
}
Expand All @@ -104,13 +103,14 @@ public void addLast(double value) {
*
* @return value at front of buffer
*/
public double removeFirst() {
@SuppressWarnings("unchecked")
public T removeFirst() {
// If there are no elements in the buffer, do nothing
if (m_length == 0) {
return 0.0;
return (T) new Object();
}

double temp = m_data[m_front];
T temp = m_data[m_front];
m_front = moduloInc(m_front);
m_length--;
return temp;
Expand All @@ -121,10 +121,11 @@ public double removeFirst() {
*
* @return value at back of buffer
*/
public double removeLast() {
@SuppressWarnings("unchecked")
public T removeLast() {
// If there are no elements in the buffer, do nothing
if (m_length == 0) {
return 0.0;
return (T) new Object();
}

m_length--;
Expand All @@ -138,8 +139,9 @@ public double removeLast() {
*
* @param size New buffer size.
*/
@SuppressWarnings("unchecked")
public void resize(int size) {
double[] newBuffer = new double[size];
var newBuffer = (T[]) new Object[size];
m_length = Math.min(m_length, size);
for (int i = 0; i < m_length; i++) {
newBuffer[i] = m_data[(m_front + i) % m_data.length];
Expand All @@ -150,7 +152,6 @@ public void resize(int size) {

/** Sets internal buffer contents to zero. */
public void clear() {
Arrays.fill(m_data, 0.0);
m_front = 0;
m_length = 0;
}
Expand All @@ -161,23 +162,25 @@ public void clear() {
* @param index Index into the buffer.
* @return Element at index starting from front of buffer.
*/
public double get(int index) {
public T get(int index) {
return m_data[(m_front + index) % m_data.length];
}

/**
* Increment an index modulo the length of the m_data buffer.
* Increment an index modulo the length of the buffer.
*
* @param index Index into the buffer.
* @return The incremented index.
*/
private int moduloInc(int index) {
return (index + 1) % m_data.length;
}

/**
* Decrement an index modulo the length of the m_data buffer.
* Decrement an index modulo the length of the buffer.
*
* @param index Index into the buffer.
* @return The decremented index.
*/
private int moduloDec(int index) {
if (index == 0) {
Expand Down
191 changes: 191 additions & 0 deletions wpiutil/src/main/java/edu/wpi/first/util/DoubleCircularBuffer.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
// Copyright (c) FIRST and other WPILib contributors.
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.

package edu.wpi.first.util;

import java.util.Arrays;

/** This is a simple circular buffer so we don't need to "bucket brigade" copy old values. */
public class DoubleCircularBuffer {
private double[] m_data;

// Index of element at front of buffer
private int m_front;

// Number of elements used in buffer
private int m_length;

/**
* Create a CircularBuffer with the provided size.
*
* @param size The size of the circular buffer.
*/
public DoubleCircularBuffer(int size) {
m_data = new double[size];
Arrays.fill(m_data, 0.0);
}

/**
* Returns number of elements in buffer.
*
* @return number of elements in buffer
*/
public int size() {
return m_length;
}

/**
* Get value at front of buffer.
*
* @return value at front of buffer
*/
public double getFirst() {
return m_data[m_front];
}

/**
* Get value at back of buffer.
*
* @return value at back of buffer
*/
public double getLast() {
// If there are no elements in the buffer, do nothing
if (m_length == 0) {
return 0.0;
}

return m_data[(m_front + m_length - 1) % m_data.length];
}

/**
* Push new value onto front of the buffer. The value at the back is overwritten if the buffer is
* full.
*
* @param value The value to push.
*/
public void addFirst(double value) {
if (m_data.length == 0) {
return;
}

m_front = moduloDec(m_front);

m_data[m_front] = value;

if (m_length < m_data.length) {
m_length++;
}
}

/**
* Push new value onto back of the buffer. The value at the front is overwritten if the buffer is
* full.
*
* @param value The value to push.
*/
public void addLast(double value) {
if (m_data.length == 0) {
return;
}

m_data[(m_front + m_length) % m_data.length] = value;

if (m_length < m_data.length) {
m_length++;
} else {
// Increment front if buffer is full to maintain size
m_front = moduloInc(m_front);
}
}

/**
* Pop value at front of buffer.
*
* @return value at front of buffer
*/
public double removeFirst() {
// If there are no elements in the buffer, do nothing
if (m_length == 0) {
return 0.0;
}

double temp = m_data[m_front];
m_front = moduloInc(m_front);
m_length--;
return temp;
}

/**
* Pop value at back of buffer.
*
* @return value at back of buffer
*/
public double removeLast() {
// If there are no elements in the buffer, do nothing
if (m_length == 0) {
return 0.0;
}

m_length--;
return m_data[(m_front + m_length) % m_data.length];
}

/**
* Resizes internal buffer to given size.
*
* <p>A new buffer is allocated because arrays are not resizable.
*
* @param size New buffer size.
*/
public void resize(int size) {
double[] newBuffer = new double[size];
m_length = Math.min(m_length, size);
for (int i = 0; i < m_length; i++) {
newBuffer[i] = m_data[(m_front + i) % m_data.length];
}
m_data = newBuffer;
m_front = 0;
}

/** Sets internal buffer contents to zero. */
public void clear() {
Arrays.fill(m_data, 0.0);
m_front = 0;
m_length = 0;
}

/**
* Get the element at the provided index relative to the start of the buffer.
*
* @param index Index into the buffer.
* @return Element at index starting from front of buffer.
*/
public double get(int index) {
return m_data[(m_front + index) % m_data.length];
}

/**
* Increment an index modulo the length of the buffer.
*
* @param index Index into the buffer.
* @return The incremented index.
*/
private int moduloInc(int index) {
return (index + 1) % m_data.length;
}

/**
* Decrement an index modulo the length of the buffer.
*
* @param index Index into the buffer.
* @return The decremented index.
*/
private int moduloDec(int index) {
if (index == 0) {
return m_data.length - 1;
} else {
return index - 1;
}
}
}
Loading

0 comments on commit 3894277

Please sign in to comment.