diff --git a/src/main/java/com/rusefi/can/analysis/ByteRateOfChangeReports.java b/src/main/java/com/rusefi/can/analysis/ByteRateOfChangeReports.java index b527425..b8c4a7d 100644 --- a/src/main/java/com/rusefi/can/analysis/ByteRateOfChangeReports.java +++ b/src/main/java/com/rusefi/can/analysis/ByteRateOfChangeReports.java @@ -11,14 +11,14 @@ public class ByteRateOfChangeReports { /** * sweet baby O(n^2) */ - public static void compareEachReportAgainstAllOthers(String reportDestinationFolder, List reports, CanContext context) throws FileNotFoundException { + public static void compareEachReportAgainstAllOthers(String reportDestinationFolder, List reports, CanMetaDataContext context) throws FileNotFoundException { for (int i = 0; i < reports.size(); i++) { for (int j = i + 1; j < reports.size(); j++) compareTwoReports(reportDestinationFolder, reports.get(i), reports.get(j), context); } } - private static void compareTwoReports(String reportDestinationFolder, ByteRateOfChange.TraceReport traceReport1, ByteRateOfChange.TraceReport traceReport2, CanContext context) throws FileNotFoundException { + private static void compareTwoReports(String reportDestinationFolder, ByteRateOfChange.TraceReport traceReport1, ByteRateOfChange.TraceReport traceReport2, CanMetaDataContext context) throws FileNotFoundException { Set allKeys = new TreeSet<>(); allKeys.addAll(traceReport1.getStatistics().keySet()); allKeys.addAll(traceReport2.getStatistics().keySet()); @@ -92,7 +92,7 @@ public class ByteRateOfChangeReports { public static void scanInputFolder(String inputFolderName, String fileNameSuffix) throws IOException { String reportDestinationFolder = createOutputFolder(inputFolderName); - CanContext context = CanContext.read(inputFolderName); + CanMetaDataContext context = CanMetaDataContext.read(inputFolderName); List reports = new ArrayList<>(); diff --git a/src/main/java/com/rusefi/can/analysis/CanContext.java b/src/main/java/com/rusefi/can/analysis/CanMetaDataContext.java similarity index 79% rename from src/main/java/com/rusefi/can/analysis/CanContext.java rename to src/main/java/com/rusefi/can/analysis/CanMetaDataContext.java index 7eed4cf..07dd622 100644 --- a/src/main/java/com/rusefi/can/analysis/CanContext.java +++ b/src/main/java/com/rusefi/can/analysis/CanMetaDataContext.java @@ -7,13 +7,13 @@ import java.io.FileNotFoundException; import java.io.FileReader; import java.util.*; -public class CanContext { +public class CanMetaDataContext { final Set withChecksum = new HashSet<>(); final Map> countersMap; Set counterBytes = new HashSet<>(); - private CanContext(List withChecksum, Map> countersMap) { + private CanMetaDataContext(List withChecksum, Map> countersMap) { this.countersMap = countersMap; this.withChecksum.addAll(withChecksum); @@ -33,17 +33,17 @@ public class CanContext { } } - public static CanContext read(String inputFolderName) throws FileNotFoundException { + public static CanMetaDataContext read(String inputFolderName) throws FileNotFoundException { Yaml checksum = new Yaml(); String checkSumFileName = inputFolderName + File.separator + ChecksumScanner.CHECKSUM_YAML; if (!new File(checkSumFileName).exists()) - return new CanContext(new ArrayList<>(), new HashMap<>()); + return new CanMetaDataContext(new ArrayList<>(), new HashMap<>()); List withChecksum = checksum.load(new FileReader(checkSumFileName)); Yaml countersYaml = new Yaml(); Map> countersMap = countersYaml.load(new FileReader(inputFolderName + File.separator + CounterScanner.COUNTERS_YAML)); - return new CanContext(withChecksum, countersMap); + return new CanMetaDataContext(withChecksum, countersMap); } }