Skip to content
Snippets Groups Projects
Commit db8da548 authored by Powers, Peter M.'s avatar Powers, Peter M.
Browse files

sequences cleaning

parent 1fff601b
No related branches found
No related tags found
1 merge request!197Data tests
......@@ -44,9 +44,9 @@ class SequencesTests {
double[] xs1 = new double[1];
double[] ys1 = new double[1];
double[] xs3 = new double[] { 1, 2, 3 };
double[] xs3 = { 1, 2, 3 };
double[] ys3zero = new double[3];
double[] ys3ones = new double[] { 1, 1, 1 };
double[] ys3ones = { 1, 1, 1 };
// size and clear check
ArrayXySequence xy1 = (ArrayXySequence) XySequence.create(xs1, ys1);
......@@ -58,20 +58,20 @@ class SequencesTests {
ArrayXySequence xy3b = (ArrayXySequence) XySequence.create(xs3, ys3ones);
assertSame(xy3b, Sequences.trim(xy3b));
double[] xs4toTrim = new double[] { 1, 2, 3, 4 };
double[] ys4toTrim = new double[] { 1, 1, 1, 0 };
double[] xs4expect = new double[] { 1, 2, 3 };
double[] ys4expect = new double[] { 1, 1, 1 };
double[] xs4toTrim = { 1, 2, 3, 4 };
double[] ys4toTrim = { 1, 1, 1, 0 };
double[] xs4expect = { 1, 2, 3 };
double[] ys4expect = { 1, 1, 1 };
// extra test that gets upper end y = 0
ArrayXySequence xy4toTrim = (ArrayXySequence) XySequence.create(xs4toTrim, ys4toTrim);
ArrayXySequence xy4expect = (ArrayXySequence) XySequence.create(xs4expect, ys4expect);
assertEquals(xy4expect, Sequences.trim(xy4toTrim));
double[] xs5toTrim = new double[] { 1, 2, 3, 4, 5 };
double[] ys5toTrim = new double[] { 0, 1, 1, 1, 0 };
double[] xs5expect = new double[] { 2, 3, 4 };
double[] ys5expect = new double[] { 1, 1, 1 };
double[] xs5toTrim = { 1, 2, 3, 4, 5 };
double[] ys5toTrim = { 0, 1, 1, 1, 0 };
double[] xs5expect = { 2, 3, 4 };
double[] ys5expect = { 1, 1, 1 };
// immutable trimmed
ArrayXySequence xy5toTrim = (ArrayXySequence) XySequence.create(xs5toTrim, ys5toTrim);
......@@ -87,8 +87,8 @@ class SequencesTests {
@Test
final void nonZeroIndexTests() {
double[] values = new double[] { 0.0, 0.0, 1.0, 1.0, 0.0, 0.0 };
double[] zeros = new double[] { 0.0 };
double[] values = { 0.0, 0.0, 1.0, 1.0, 0.0, 0.0 };
double[] zeros = { 0.0 };
int first = 2;
int last = 3;
......@@ -100,9 +100,9 @@ class SequencesTests {
@Test
final void toCumulativeTests() {
double[] xs = new double[] { 1, 2, 3, 4, 5 };
double[] ys = new double[] { 1, 1, 1, 1, 1 };
double[] ysExpect = new double[] { 5, 4, 3, 2, 1 };
double[] xs = { 1, 2, 3, 4, 5 };
double[] ys = { 1, 1, 1, 1, 1 };
double[] ysExpect = { 5, 4, 3, 2, 1 };
XySequence xyActual = Sequences.toCumulative(XySequence.create(xs, ys));
XySequence xyExpect = XySequence.create(xs, ysExpect);
......@@ -113,7 +113,7 @@ class SequencesTests {
final void arrayBuilderTests() {
double[] expected =
new double[] { 5.05, 5.1499999999999995, 5.25, 5.35, 5.45, 5.55, 5.65, 5.75 };
{ 5.05, 5.1499999999999995, 5.25, 5.35, 5.45, 5.55, 5.65, 5.75 };
double[] actual = Sequences.arrayBuilder(5.05, 5.83, 0.1).centered().build();
assertArrayEquals(expected, actual);
......@@ -142,7 +142,7 @@ class SequencesTests {
assertArrayEquals(expected, actual);
double maxNoRound = 6.7999999; // 2 value array expected
double[] expectNoRound = new double[] { 6.5, 6.65 };
double[] expectNoRound = { 6.5, 6.65 };
double[] actualNoRound = Sequences.arrayBuilder(6.5, maxNoRound, 0.15)
.scale(5)
.centered()
......@@ -150,7 +150,7 @@ class SequencesTests {
assertArrayEquals(expectNoRound, actualNoRound);
double maxRound = 6.79999999; // 3 value array expected
double[] expectRound = new double[] { 6.5, 6.65, 6.8 };
double[] expectRound = { 6.5, 6.65, 6.8 };
double[] actualRound = Sequences.arrayBuilder(6.5, maxRound, 0.15)
.scale(5)
.centered()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment