fixed corner case bug affecting movingAverage function in combination…

… with constantLine
EinsamHauer · Oct 24, 2016 · 9833d0d · 9833d0d
1 parent 9022a74
commit 9833d0d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/main/java/net/iponweb/disthene/reader/graphite/functions/DistheneFunction.java b/src/main/java/net/iponweb/disthene/reader/graphite/functions/DistheneFunction.java
@@ -90,7 +90,7 @@ public Target shiftBy(long shift) {
     @Override
     public Target previous(long period) {
         try {
-            DistheneFunction function = FunctionRegistry.getFunction(getContext(), name, to - period , to - 1);
+            DistheneFunction function = FunctionRegistry.getFunction(getContext(), name, from - period , from - 1);
 
             for (Object argument : arguments) {
                 if (argument instanceof Target) {

diff --git a/src/main/java/net/iponweb/disthene/reader/utils/TimeSeriesUtils.java b/src/main/java/net/iponweb/disthene/reader/utils/TimeSeriesUtils.java
@@ -2,9 +2,7 @@
 
 import net.iponweb.disthene.reader.beans.TimeSeries;
 
-import java.math.BigInteger;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -75,7 +73,7 @@ private static void align(List<TimeSeries> timeSeries) {
     // todo: think about different consolidation functions?
     // todo: assuming timeSeries.from <= from <= to <= timeSeries.to - has to be checked?
     // todo: from % step == 0 && to % step == 0
-    public static void consolidate(TimeSeries timeSeries, int step, long from, long to) {
+    private static void consolidate(TimeSeries timeSeries, int step, long from, long to) {
         List<Double> consolidated = new ArrayList<>();
         List<Double> buffer = new ArrayList<>();