This is an automated email from the ASF dual-hosted git repository. leirui pushed a commit to branch research/area-visualization in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit dad9adc040abc97fd5016da155ba7d794e3b1b79 Author: Lei Rui <[email protected]> AuthorDate: Mon Feb 3 21:33:07 2025 +0800 add --- server/pom.xml | 74 +++++++++++----------- .../apache/iotdb/db/query/eBUG/sample_eBUG.java | 17 +++-- 2 files changed, 47 insertions(+), 44 deletions(-) diff --git a/server/pom.xml b/server/pom.xml index 1688dc9e4c9..73af108a647 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -284,43 +284,43 @@ </execution> </executions> </plugin> - <!-- <plugin>--> - <!-- <artifactId>maven-assembly-plugin</artifactId>--> - <!-- <configuration>--> - <!-- <finalName>sample_ltd</finalName>--> - <!-- <!– <finalName>sample_swab_ad</finalName>–>--> - <!-- <!– <finalName>sample_swab</finalName>–>--> - <!-- <!– <finalName>sample_rdp</finalName>–>--> - <!-- <!– <finalName>sample_minmax</finalName>–>--> - <!-- <!– <finalName>sample_fsw</finalName>–>--> - <!-- <!– <finalName>sample_eBUG</finalName>–>--> - <!-- <!– <finalName>sample_BUYdiff</finalName>–>--> - <!-- <archive>--> - <!-- <manifest>--> - <!-- <mainClass>org.apache.iotdb.db.query.eBUG.sample_LTD</mainClass>--> - <!-- <!– <mainClass>org.apache.iotdb.db.query.eBUG.sample_SWABAD</mainClass>–>--> - <!-- <!– <mainClass>org.apache.iotdb.db.query.eBUG.sample_SWAB</mainClass>–>--> - <!-- <!– <mainClass>org.apache.iotdb.db.query.eBUG.sample_Rdp</mainClass>–>--> - <!-- <!– <mainClass>org.apache.iotdb.db.query.eBUG.sample_MinMax</mainClass>–>--> - <!-- <!– <mainClass>org.apache.iotdb.db.query.eBUG.sample_FSW</mainClass>–>--> - <!-- <!– <mainClass>org.apache.iotdb.db.query.eBUG.sample_eBUG</mainClass>–>--> - <!-- <!– <mainClass>org.apache.iotdb.db.query.eBUG.sample_bottomUpYdiff</mainClass>–>--> - <!-- </manifest>--> - <!-- </archive>--> - <!-- <descriptorRefs>--> - <!-- <descriptorRef>jar-with-dependencies</descriptorRef>--> - <!-- </descriptorRefs>--> - <!-- </configuration>--> - <!-- <executions>--> - <!-- <execution>--> - <!-- <id>make-assembly</id>--> - <!-- <phase>package</phase>--> - <!-- <goals>--> - <!-- <goal>single</goal>--> - <!-- </goals>--> - <!-- </execution>--> - <!-- </executions>--> - <!-- </plugin>--> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <!-- <finalName>sample_ltd</finalName>--> + <!-- <finalName>sample_swab_ad</finalName>--> + <!-- <finalName>sample_swab</finalName>--> + <!-- <finalName>sample_rdp</finalName>--> + <!-- <finalName>sample_minmax</finalName>--> + <!-- <finalName>sample_fsw</finalName>--> + <finalName>sample_eBUG</finalName> + <!-- <finalName>sample_BUYdiff</finalName>--> + <archive> + <manifest> + <!-- <mainClass>org.apache.iotdb.db.query.eBUG.sample_LTD</mainClass>--> + <!-- <mainClass>org.apache.iotdb.db.query.eBUG.sample_SWABAD</mainClass>--> + <!-- <mainClass>org.apache.iotdb.db.query.eBUG.sample_SWAB</mainClass>--> + <!-- <mainClass>org.apache.iotdb.db.query.eBUG.sample_Rdp</mainClass>--> + <!-- <mainClass>org.apache.iotdb.db.query.eBUG.sample_MinMax</mainClass>--> + <!-- <mainClass>org.apache.iotdb.db.query.eBUG.sample_FSW</mainClass>--> + <mainClass>org.apache.iotdb.db.query.eBUG.sample_eBUG</mainClass> + <!-- <mainClass>org.apache.iotdb.db.query.eBUG.sample_bottomUpYdiff</mainClass>--> + </manifest> + </archive> + <descriptorRefs> + <descriptorRef>jar-with-dependencies</descriptorRef> + </descriptorRefs> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <profiles> diff --git a/server/src/main/java/org/apache/iotdb/db/query/eBUG/sample_eBUG.java b/server/src/main/java/org/apache/iotdb/db/query/eBUG/sample_eBUG.java index d8a4b5ea198..9e8033bded3 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/eBUG/sample_eBUG.java +++ b/server/src/main/java/org/apache/iotdb/db/query/eBUG/sample_eBUG.java @@ -10,8 +10,8 @@ import static org.apache.iotdb.db.query.eBUG.eBUG.buildEffectiveArea; public class sample_eBUG { // 输入一条时间序列 t,v - // 输出按照bottom-up淘汰顺序排列的dominated significance,t,v。 - // 用于后期在线采样时选取倒数m个点（也就是DS最大的m个点，或者最晚淘汰的m个点）作为采样结果（选出之后要自行把这m个点重新按照时间戳x递增排列） + // 输出按照bottom-up淘汰顺序倒序排列的dominated significance,t,v。 + // 用于后期在线采样时选取前m个点（也就是DS最大的m个点，或者最晚淘汰的m个点）作为采样结果（选出之后要自行把这m个点重新按照时间戳x递增排列） public static void main(String[] args) { if (args.length < 7) { System.out.println( @@ -70,15 +70,18 @@ public class sample_eBUG { // 写入表头 if (m <= 2) { System.out.println( - "precomputation mode, outputting (z,x,y) ordered by z in ascending order"); - writer.write("z,x,y"); + "precomputation mode, outputting (id,x,y,z) ordered by z in descending order"); + writer.write("id,x,y,z"); writer.newLine(); - // 写入数据行，按顺序 z, x, y - // 按照z,x,y三列，因为results结果已经按照z（即DS）递增排序，对应bottom-up的淘汰顺序，越小代表越早被淘汰 + // 写入数据行， + // 按照idx,x,y,z四列，results结果已经按照z（即DS）递减排序，对应bottom-up的淘汰顺序的倒序，越大代表越晚被淘汰 + // idx是从1开始的顺序编号 + int idx = 1; for (Point point : results) { - writer.write(point.z + "," + point.x + "," + point.y); + writer.write(idx + "," + point.x + "," + point.y + "," + point.z); writer.newLine(); + idx++; } } else { System.out.println(
