Added requirements, Support for extended CAN IDs and fixes a bug for static singnals

This commit is contained in:
Loris1123 2020-06-25 20:58:55 +02:00
parent 37ea909f7d
commit 873c7d8355
3 changed files with 9 additions and 4 deletions

View File

@ -1,12 +1,10 @@
import re import re
def canUtilsToTSV(filename): def canUtilsToTSV(filename):
outFileName = filename + ".tsv" outFileName = filename + ".tsv"
with open(outFileName, "w") as outFile: with open(outFileName, "w") as outFile:
with open(filename, "r") as file: with open(filename, "r") as file:
linePattern = re.compile( linePattern = re.compile(r"\((\d+.\d+)\)\s+[^\s]+\s+(.{3}|.{8})#([0-9A-F]+)")
r"\((\d+.\d+)\)\s+[^\s]+\s+(.{3})#([0-9A-F]+)")
while True: while True:
line = file.readline() line = file.readline()

View File

@ -1,6 +1,6 @@
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
from matplotlib.pyplot import savefig from matplotlib.pyplot import savefig
from numpy import where, isin from numpy import where, isin, ndarray
from os import chdir, mkdir, path from os import chdir, mkdir, path
from shutil import rmtree from shutil import rmtree
from PipelineTimer import PipelineTimer from PipelineTimer import PipelineTimer
@ -39,6 +39,10 @@ def plot_signals_by_arb_id(a_timer: PipelineTimer, arb_id_dict: dict, signal_dic
signals_to_plot.append(signal) signals_to_plot.append(signal)
# One row per signal plus one for the TANG # One row per signal plus one for the TANG
fig, axes = plt.subplots(nrows=1 + len(signals_to_plot), ncols=1) fig, axes = plt.subplots(nrows=1 + len(signals_to_plot), ncols=1)
if not isinstance(axes, ndarray):
print("Static signal. No figures to plot")
continue
plt.suptitle("Time Series and TANG for Arbitration ID " + hex(k_id), plt.suptitle("Time Series and TANG for Arbitration ID " + hex(k_id),
weight='bold', weight='bold',
position=(0.5, 1)) position=(0.5, 1))

3
requirements.txt Normal file
View File

@ -0,0 +1,3 @@
scikit-learn
pandas
matplotlib