This is an automated email from the ASF dual-hosted git repository. leirui pushed a commit to branch research/LTS-visualization in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit f52b821018885d6cdaf1ee8052ce845cec639585 Author: Lei Rui <[email protected]> AuthorDate: Sat Oct 12 02:24:00 2024 +0800 add --- .../{MySample_fsw.java => MySample_fsw2.java} | 16 ++++++++-------- ...ySample_fsw.java => MySample_fsw_deprecated.java} | 2 +- ...ySample_simpiece.java => MySample_simpiece2.java} | 20 ++++++++++---------- ...mpiece.java => MySample_simpiece_deprecated.java} | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_fsw.java b/server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_fsw2.java similarity index 92% copy from server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_fsw.java copy to server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_fsw2.java index b7756c7d744..5719a01d956 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_fsw.java +++ b/server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_fsw2.java @@ -27,17 +27,17 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.List; -public class MySample_fsw { +public class MySample_fsw2 { public static void main(String[] args) { String fileDir = "D:\\desktop\\NISTPV\\"; - String[] datasetNameList = new String[] {"Qloss", "Pyra1", "RTD", "WindSpeed"}; - int[] noutList = new int[] {100}; - double[] r = new double[] {0.1, 0.5, 1.3, 0}; - int[] NList = new int[] {2500000, 2500000, 2500000, 500000}; + String[] datasetNameList = new String[]{"Qloss", "Pyra1", "RTD", "WindSpeed"}; + int[] noutList = new int[]{100}; + double[] r = new double[]{0.1, 0.5, 1.3, -1}; + int[] NList = new int[]{2500000, 2500000, 2500000, 2500000}; double[] epsilonList = - new double[] { - 9.999999992942321E-4, 284.40344031846143, 6.428162015438829, 10.818711800659003 + new double[]{ + 9.999999992942321E-4, 284.40344031846143, 6.428162015438829, 12.032509993152416 }; for (int y = 0; y < datasetNameList.length; y++) { String datasetName = datasetNameList[y]; @@ -52,7 +52,7 @@ public class MySample_fsw { TimeSeries ts = TimeSeriesReader.getMyTimeSeries( inputStream, delimiter, false, N, start, hasHeader, true); - // double epsilon = getFSWParam(nout, ts, 1e-12); +// double epsilon = getFSWParam(nout, ts, 1e-12); double epsilon = epsilonList[y]; List<Point> reducedPoints = FSW.reducePoints(ts.data, epsilon); System.out.println( diff --git a/server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_fsw.java b/server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_fsw_deprecated.java similarity index 99% rename from server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_fsw.java rename to server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_fsw_deprecated.java index b7756c7d744..6794acca0dd 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_fsw.java +++ b/server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_fsw_deprecated.java @@ -27,7 +27,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.List; -public class MySample_fsw { +public class MySample_fsw_deprecated { public static void main(String[] args) { String fileDir = "D:\\desktop\\NISTPV\\"; diff --git a/server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_simpiece.java b/server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_simpiece2.java similarity index 91% copy from server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_simpiece.java copy to server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_simpiece2.java index eb5ebe1d16a..dc2ab45af14 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_simpiece.java +++ b/server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_simpiece2.java @@ -28,18 +28,18 @@ import java.io.PrintWriter; import java.util.Comparator; import java.util.List; -public class MySample_simpiece { +public class MySample_simpiece2 { public static void main(String[] args) { String fileDir = "D:\\desktop\\NISTPV\\"; - String[] datasetNameList = new String[] {"Qloss", "Pyra1", "RTD", "WindSpeed"}; - int[] noutList = new int[] {100}; - double[] r = new double[] {0.1, 0.5, 1.3, 0}; + String[] datasetNameList = new String[]{"Qloss", "Pyra1", "RTD", "WindSpeed"}; + int[] noutList = new int[]{100}; + double[] r = new double[]{0.1, 0.5, 1.3, -1}; double[] epsilonList = - new double[] { - 9.999999992942321E-4, 316.5642651891633, 9.186667042922977, 11.162719900131227 + new double[]{ + 9.999999992942321E-4, 316.5640427571989, 9.186666666667406, 11.485437072548848 }; - int[] NList = new int[] {2500000, 2500000, 2500000, 500000}; + int[] NList = new int[]{2500000, 2500000, 2500000, 2500000}; for (int y = 0; y < datasetNameList.length; y++) { String datasetName = datasetNameList[y]; int start = (int) (10000000 / 2 - NList[y] * r[y]); // 从0开始计数 @@ -54,7 +54,7 @@ public class MySample_simpiece { TimeSeries ts = TimeSeriesReader.getMyTimeSeries( inputStream, delimiter, false, N, start, hasHeader, true); - // double epsilon = getSimPieceParam(nout, ts, 1e-12); +// double epsilon = getSimPieceParam(nout, ts, 1e-12); double epsilon = epsilonList[y]; SimPiece simPiece = new SimPiece(ts.data, epsilon); System.out.println( @@ -79,7 +79,7 @@ public class MySample_simpiece { // end point of this segment double v = (segments.get(i + 1).getInitTimestamp() - segments.get(i).getInitTimestamp()) - * segments.get(i).getA() + * segments.get(i).getA() + segments.get(i).getB(); writer.println(segments.get(i + 1).getInitTimestamp() + "," + v); } @@ -90,7 +90,7 @@ public class MySample_simpiece { + segments.get(segments.size() - 1).getB()); double v = (simPiece.lastTimeStamp - segments.get(segments.size() - 1).getInitTimestamp()) - * segments.get(segments.size() - 1).getA() + * segments.get(segments.size() - 1).getA() + segments.get(segments.size() - 1).getB(); writer.println(simPiece.lastTimeStamp + "," + v); } diff --git a/server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_simpiece.java b/server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_simpiece_deprecated.java similarity index 99% rename from server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_simpiece.java rename to server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_simpiece_deprecated.java index eb5ebe1d16a..e7d9a698262 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_simpiece.java +++ b/server/src/main/java/org/apache/iotdb/db/query/simpiece/MySample_simpiece_deprecated.java @@ -28,7 +28,7 @@ import java.io.PrintWriter; import java.util.Comparator; import java.util.List; -public class MySample_simpiece { +public class MySample_simpiece_deprecated { public static void main(String[] args) { String fileDir = "D:\\desktop\\NISTPV\\";
