Fix pointNum in MultiDeviceBatch (#449)

thulab · Sep 27, 2024 · c689751 · c689751
1 parent 4cf5083
commit c689751
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/core/src/main/java/cn/edu/tsinghua/iot/benchmark/entity/Batch/MultiDeviceBatch.java b/core/src/main/java/cn/edu/tsinghua/iot/benchmark/entity/Batch/MultiDeviceBatch.java
@@ -20,6 +20,8 @@
 package cn.edu.tsinghua.iot.benchmark.entity.Batch;
 
 import cn.edu.tsinghua.iot.benchmark.entity.Record;
+import cn.edu.tsinghua.iot.benchmark.entity.Sensor;
+import cn.edu.tsinghua.iot.benchmark.entity.enums.ColumnCategory;
 import cn.edu.tsinghua.iot.benchmark.schema.schemaImpl.DeviceSchema;
 
 import java.util.ArrayList;
@@ -80,11 +82,14 @@ public int getColIndex() {
   @Override
   public long pointNum() {
     long pointNum = 0;
-    for (List<Record> recordList : recordLists) {
-      for (Record record : recordList) {
-        pointNum += record.size();
+    long measureNum = 0;
+    List<Sensor> sensors = deviceSchemas.get(0).getSensors();
+    for (Sensor sensor : sensors) {
+      if (sensor.getColumnCategory() == ColumnCategory.MEASUREMENT) {
+        measureNum++;
       }
     }
+    pointNum = (measureNum * recordLists.size() * recordLists.get(0).size());
     return pointNum;
   }