From 6e5411ff866e113ed0b78b78be2783c763475eb2 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Wed, 10 Apr 2024 18:36:17 -0400 Subject: [PATCH] PacketRatio --- .../rusefi/can/analysis/ByteRateOfChangeReports.java | 2 +- .../main/java/com/rusefi/can/analysis/PacketRatio.java | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/reader/src/main/java/com/rusefi/can/analysis/ByteRateOfChangeReports.java b/reader/src/main/java/com/rusefi/can/analysis/ByteRateOfChangeReports.java index eb50f3b..3cc15e5 100644 --- a/reader/src/main/java/com/rusefi/can/analysis/ByteRateOfChangeReports.java +++ b/reader/src/main/java/com/rusefi/can/analysis/ByteRateOfChangeReports.java @@ -126,7 +126,7 @@ public class ByteRateOfChangeReports { CanToMegaLogViewer.createMegaLogViewer(reportDestinationFolder, logFileContent, simpleFileName); - PacketRatio.write(reportDestinationFolder, logFileContent, simpleFileName); + PacketRatio.write(dbc, reportDestinationFolder, logFileContent, simpleFileName); ByteRateOfChange.TraceReport report = ByteRateOfChange.process(reportDestinationFolder, simpleFileName, logFileContent); report.save(simpleFileName + "-ByteRateOfChange.txt"); diff --git a/reader/src/main/java/com/rusefi/can/analysis/PacketRatio.java b/reader/src/main/java/com/rusefi/can/analysis/PacketRatio.java index 4e6d752..a9700f4 100644 --- a/reader/src/main/java/com/rusefi/can/analysis/PacketRatio.java +++ b/reader/src/main/java/com/rusefi/can/analysis/PacketRatio.java @@ -1,7 +1,8 @@ package com.rusefi.can.analysis; import com.rusefi.can.CANPacket; -import com.rusefi.can.DualSid; +import com.rusefi.can.reader.dbc.DbcFile; +import com.rusefi.can.reader.dbc.DbcPacket; import java.io.File; import java.io.FileWriter; @@ -14,7 +15,7 @@ import java.util.concurrent.atomic.AtomicInteger; public class PacketRatio { - public static void write(String reportDestinationFolder, List logFileContent, String simpleFileName) throws IOException { + public static void write(DbcFile dbc, String reportDestinationFolder, List logFileContent, String simpleFileName) throws IOException { Map countBySID = new TreeMap<>(); @@ -27,7 +28,10 @@ public class PacketRatio { for (Map.Entry e : countBySID.entrySet()) { double ratio = 100.0 * e.getValue().get() / logFileContent.size(); - w.write(DualSid.dualSid(e.getKey()) + ": " + ratio + "\n"); + Integer sid = e.getKey(); + DbcPacket packet = dbc == null ? null : dbc.packets.get(sid); + String key = packet == null ? Integer.toString(sid) : packet.getName(); + w.write(key + ": " + ratio + "\n"); } w.close(); }