rusefi
/
can-log-tools
mirror of https://github.com/rusefi/can-log-tools.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sorted by delta

This commit is contained in:
rusefillc 2022-11-12 02:12:28 -05:00
parent f82bd9de34
commit 95ce658d5f
2 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/rusefi/can/ByteRateOfChange.java
View File

@ -80,7 +80,7 @@ public class ByteRateOfChange {
}
private String getLogKey() {
return sid + "_" + index;
return dualSid(sid) + "_byte_" + index + "_bit_" + (index * 8);
}
@Override
@ -98,10 +98,7 @@ public class ByteRateOfChange {
@Override
public String toString() {
return "ByteId{" +
"sid=" + sid +
", index=" + index +
'}';
return getLogKey();
}
}

42
src/test/java/com/rusefi/can/ByteRateOfChangeSandbox.java
View File

@ -13,7 +13,7 @@ public class ByteRateOfChangeSandbox {
public static void main(String[] args) throws IOException {
ReaderTypeHolder.INSTANCE.type = ReaderType.PCAN;
String folder = "C:\\stuff\\rusefi_documentation\\OEM-Docs\\Nissan\\2011_Xterra\\2011-nissan-CAN-June-2021";
String folder = "C:\\stuff\\rusefi_documentation\\OEM-Docs\\Nissan\\2011_Xterra\\CAN-Nov-2022";
String reportDestinationFolder = folder + File.separator + "processed";
new File(reportDestinationFolder).mkdirs();
@ -21,12 +21,9 @@ public class ByteRateOfChangeSandbox {
List<ByteRateOfChange.TraceReport> reports = new ArrayList<>();
FolderUtil.handleFolder(folder, new FolderUtil.FileAction() {
@Override
public void doJob(String simpleFileName, String fullFileName) throws IOException {
ByteRateOfChange.TraceReport report = ByteRateOfChange.process(fullFileName, reportDestinationFolder, simpleFileName);
reports.add(report);
}
FolderUtil.handleFolder(folder, (simpleFileName, fullFileName) -> {
ByteRateOfChange.TraceReport report = ByteRateOfChange.process(fullFileName, reportDestinationFolder, simpleFileName);
reports.add(report);
}, "pcan.trc");
@ -43,25 +40,44 @@ public class ByteRateOfChangeSandbox {
PrintStream report = System.out;
report.println("Between " + traceReport1.getSimpleFileName() + " and " + traceReport2.getSimpleFileName());
report.println("Comparing " + traceReport1.getSimpleFileName() + " and " + traceReport2.getSimpleFileName());
int totalDifferences = 0;
List<ByteVariationDifference> differences = new ArrayList<>();
for (ByteRateOfChange.ByteId id : allKeys) {
ByteRateOfChange.ByteStatistics s1 = traceReport1.getStatistics().computeIfAbsent(id, byteId -> new ByteRateOfChange.ByteStatistics(byteId));
ByteRateOfChange.ByteStatistics s2 = traceReport2.getStatistics().computeIfAbsent(id, byteId -> new ByteRateOfChange.ByteStatistics(byteId));
if (s1.getUniqueValues() != s2.getUniqueValues()) {
report.println(id + ": " + s1.getUniqueValues() + " vs " + s2.getUniqueValues());
totalDifferences++;
String msg = id + ": " + s1.getUniqueValues() + " vs " + s2.getUniqueValues();
differences.add(new ByteVariationDifference(Math.abs(s1.getUniqueValues() - s2.getUniqueValues()), msg));
}
}
differences.sort(new Comparator<ByteVariationDifference>() {
@Override
public int compare(ByteVariationDifference o1, ByteVariationDifference o2) {
return o2.deltaCount - o1.deltaCount;
}
});
report.println(totalDifferences + " total differences");
for (ByteVariationDifference difference : differences)
report.println(difference.msg);
report.println(differences.size() + " total differences");
report.println();
report.println();
report.println();
report.println();
}
static class ByteVariationDifference {
private int deltaCount;
private String msg;
public ByteVariationDifference(int deltaCount, String msg) {
this.deltaCount = deltaCount;
this.msg = msg;
}
}
}