diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/NormalizeVector.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/NormalizeVector.java index 479386478..48ff7f651 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/NormalizeVector.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/NormalizeVector.java @@ -37,9 +37,9 @@ public class NormalizeVector implements Function,List> { for (Double scalar : doubles) { accumulator+=scalar*scalar; } - double vectorLen = Math.sqrt(accumulator); + double scalarLen = Math.sqrt(accumulator); for (double scalarComponent : doubles) { - unit.add(scalarComponent/vectorLen); + unit.add(scalarComponent/scalarLen); } return unit; } diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/UniformVectorSizedStepped.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/UniformVectorSizedStepped.java index b9e9de8c8..4fea50fae 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/UniformVectorSizedStepped.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/UniformVectorSizedStepped.java @@ -58,7 +58,7 @@ public class UniformVectorSizedStepped implements LongFunction> { this.funcs = new LongToDoubleFunction[dim]; for (int i = 0; i < dim; i++) { if (i v4 = f3.apply(i); - assertThat(v4.get(0)).isBetween(3.0d,5.0d); - assertThat(v4.get(1)).isBetween(7.0d,9.0d); - assertThat(v4.get(2)).isBetween(0.0d,1.0d); - assertThat(v4.get(3)).isBetween(0.0d,1.0d); + for (int j = 0; j <= 3; j++) { + dssa[j].accept(v4.get(j)); + } } + assertThat(dssa[0].getMin()).isCloseTo(3.0d, Offset.offset(0.1d)); + assertThat(dssa[0].getMax()).isCloseTo(5.0d, Offset.offset(0.1d)); + assertThat(dssa[1].getMin()).isCloseTo(7.0d, Offset.offset(0.1d)); + assertThat(dssa[1].getMax()).isCloseTo(9.0d, Offset.offset(0.1d)); + assertThat(dssa[2].getMin()).isCloseTo(0.0d, Offset.offset(0.1d)); + assertThat(dssa[2].getMax()).isCloseTo(1.0d, Offset.offset(0.1d)); + assertThat(dssa[3].getMin()).isCloseTo(0.0d, Offset.offset(0.1d)); + assertThat(dssa[3].getMax()).isCloseTo(1.0d, Offset.offset(0.1d)); } }