Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-21 01:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

CircularBuffer now uses an idiomatic interface in C++ and Java (#421)

Browse Source
This commit is contained in:
Tyler Veness
2017-11-22 17:04:57 -08:00
committed by Peter Johnson
parent 029246ed28
commit 85157a56c3
8 changed files with 235 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
wpilibj/src/test/java/edu/wpi/first/wpilibj/CircularBufferTest.java
View File

@@ -15,9 +15,9 @@ import static org.junit.Assert.assertEquals;
public class CircularBufferTest {
private double[] m_values = {751.848, 766.366, 342.657, 234.252, 716.126,
132.344, 445.697, 22.727, 421.125, 799.913};
private double[] m_pushFrontOut = {799.913, 421.125, 22.727, 445.697, 132.344,
private double[] m_addFirstOut = {799.913, 421.125, 22.727, 445.697, 132.344,
716.126, 234.252, 342.657};
private double[] m_pushBackOut = {342.657, 234.252, 716.126, 132.344, 445.697,
private double[] m_addLastOut = {342.657, 234.252, 716.126, 132.344, 445.697,
22.727, 421.125, 799.913};
@BeforeClass
@@ -26,28 +26,28 @@ public class CircularBufferTest {
}
@Test
public void pushFrontTest() {
public void addFirstTest() {
CircularBuffer queue = new CircularBuffer(8);
for (double value : m_values) {
queue.pushFront(value);
queue.addFirst(value);
}
for (int i = 0; i < m_pushFrontOut.length; i++) {
assertEquals(m_pushFrontOut[i], queue.get(i), 0.00005);
for (int i = 0; i < m_addFirstOut.length; i++) {
assertEquals(m_addFirstOut[i], queue.get(i), 0.00005);
}
}
@Test
public void pushBackTest() {
public void addLastTest() {
CircularBuffer queue = new CircularBuffer(8);
for (double value : m_values) {
queue.pushBack(value);
queue.addLast(value);
}
for (int i = 0; i < m_pushBackOut.length; i++) {
assertEquals(m_pushBackOut[i], queue.get(i), 0.00005);
for (int i = 0; i < m_addLastOut.length; i++) {
assertEquals(m_addLastOut[i], queue.get(i), 0.00005);
}
}
@@ -56,9 +56,9 @@ public class CircularBufferTest {
CircularBuffer queue = new CircularBuffer(3);
// Insert three elements into the buffer
queue.pushBack(1.0);
queue.pushBack(2.0);
queue.pushBack(3.0);
queue.addLast(1.0);
queue.addLast(2.0);
queue.addLast(3.0);
assertEquals(1.0, queue.get(0), 0.00005);
assertEquals(2.0, queue.get(1), 0.00005);
@@ -69,27 +69,27 @@ public class CircularBufferTest {
* front-most elements.
*/
queue.pushBack(4.0); // Overwrite 1 with 4
queue.addLast(4.0); // Overwrite 1 with 4
// The buffer now contains 2, 3, and 4
assertEquals(2.0, queue.get(0), 0.00005);
assertEquals(3.0, queue.get(1), 0.00005);
assertEquals(4.0, queue.get(2), 0.00005);
queue.pushBack(5.0); // Overwrite 2 with 5
queue.addLast(5.0); // Overwrite 2 with 5
// The buffer now contains 3, 4, and 5
assertEquals(3.0, queue.get(0), 0.00005);
assertEquals(4.0, queue.get(1), 0.00005);
assertEquals(5.0, queue.get(2), 0.00005);
assertEquals(5.0, queue.popBack(), 0.00005); // 5 is removed
assertEquals(5.0, queue.removeLast(), 0.00005); // 5 is removed
// The buffer now contains 3 and 4
assertEquals(3.0, queue.get(0), 0.00005);
assertEquals(4.0, queue.get(1), 0.00005);
assertEquals(3.0, queue.popFront(), 0.00005); // 3 is removed
assertEquals(3.0, queue.removeFirst(), 0.00005); // 3 is removed
// Leaving only one element with value == 4
assertEquals(4.0, queue.get(0), 0.00005);
@@ -100,10 +100,10 @@ public class CircularBufferTest {
CircularBuffer queue = new CircularBuffer(5);
for (int i = 0; i < 6; i++) {
queue.pushBack(i);
queue.addLast(i);
}
queue.reset();
queue.clear();
for (int i = 0; i < 5; i++) {
assertEquals(0.0, queue.get(i), 0.00005);
@@ -117,9 +117,9 @@ public class CircularBufferTest {
/* Buffer contains {1, 2, 3, _, _}
* ^ front
*/
queue.pushBack(1.0);
queue.pushBack(2.0);
queue.pushBack(3.0);
queue.addLast(1.0);
queue.addLast(2.0);
queue.addLast(3.0);
queue.resize(2);
assertEquals(1.0, queue.get(0), 0.00005);
@@ -129,16 +129,16 @@ public class CircularBufferTest {
assertEquals(1.0, queue.get(0), 0.00005);
assertEquals(2.0, queue.get(1), 0.00005);
queue.reset();
queue.clear();
/* Buffer contains {_, 1, 2, 3, _}
* ^ front
*/
queue.pushBack(0.0);
queue.pushBack(1.0);
queue.pushBack(2.0);
queue.pushBack(3.0);
queue.popFront();
queue.addLast(0.0);
queue.addLast(1.0);
queue.addLast(2.0);
queue.addLast(3.0);
queue.removeFirst();
queue.resize(2);
assertEquals(1.0, queue.get(0), 0.00005);
@@ -148,18 +148,18 @@ public class CircularBufferTest {
assertEquals(1.0, queue.get(0), 0.00005);
assertEquals(2.0, queue.get(1), 0.00005);
queue.reset();
queue.clear();
/* Buffer contains {_, _, 1, 2, 3}
* ^ front
*/
queue.pushBack(0.0);
queue.pushBack(0.0);
queue.pushBack(1.0);
queue.pushBack(2.0);
queue.pushBack(3.0);
queue.popFront();
queue.popFront();
queue.addLast(0.0);
queue.addLast(0.0);
queue.addLast(1.0);
queue.addLast(2.0);
queue.addLast(3.0);
queue.removeFirst();
queue.removeFirst();
queue.resize(2);
assertEquals(1.0, queue.get(0), 0.00005);
@@ -169,14 +169,14 @@ public class CircularBufferTest {
assertEquals(1.0, queue.get(0), 0.00005);
assertEquals(2.0, queue.get(1), 0.00005);
queue.reset();
queue.clear();
/* Buffer contains {3, _, _, 1, 2}
* ^ front
*/
queue.pushBack(3.0);
queue.pushFront(2.0);
queue.pushFront(1.0);
queue.addLast(3.0);
queue.addFirst(2.0);
queue.addFirst(1.0);
queue.resize(2);
assertEquals(1.0, queue.get(0), 0.00005);
@@ -186,14 +186,14 @@ public class CircularBufferTest {
assertEquals(1.0, queue.get(0), 0.00005);
assertEquals(2.0, queue.get(1), 0.00005);
queue.reset();
queue.clear();
/* Buffer contains {2, 3, _, _, 1}
* ^ front
*/
queue.pushBack(2.0);
queue.pushBack(3.0);
queue.pushFront(1.0);
queue.addLast(2.0);
queue.addLast(3.0);
queue.addFirst(1.0);
queue.resize(2);
assertEquals(1.0, queue.get(0), 0.00005);
@@ -203,14 +203,14 @@ public class CircularBufferTest {
assertEquals(1.0, queue.get(0), 0.00005);
assertEquals(2.0, queue.get(1), 0.00005);
// Test pushBack() after resize
queue.pushBack(3.0);
// Test addLast() after resize
queue.addLast(3.0);
assertEquals(1.0, queue.get(0), 0.00005);
assertEquals(2.0, queue.get(1), 0.00005);
assertEquals(3.0, queue.get(2), 0.00005);
// Test pushFront() after resize
queue.pushFront(4.0);
// Test addFirst() after resize
queue.addFirst(4.0);
assertEquals(4.0, queue.get(0), 0.00005);
assertEquals(1.0, queue.get(1), 0.00005);
assertEquals(2.0, queue.get(2), 0.00005);