diff options
| author | Daniel Friesel <daniel.friesel@uos.de> | 2020-09-07 14:57:39 +0200 |
|---|---|---|
| committer | Daniel Friesel <daniel.friesel@uos.de> | 2020-09-07 14:57:39 +0200 |
| commit | 8b969f4945e97d811b7a5b27c99b76cf2dd2840b (patch) | |
| tree | 68b402ae63953d51d5d10308003b7ce0ea04db71 /lib/loader.py | |
| parent | 160546a8b11a26c1c56f26b8eff68e455fa9ca1e (diff) | |
| parent | ab33810fa92f8a262695077ae9504c836cd3c1a2 (diff) | |
Merge branch 'master' into decisiontrees
Diffstat (limited to 'lib/loader.py')
| -rw-r--r-- | lib/loader.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/loader.py b/lib/loader.py index c35eb4c..57b3d30 100644 --- a/lib/loader.py +++ b/lib/loader.py @@ -242,7 +242,7 @@ class RawData: file system, making subsequent loads near-instant. """ - def __init__(self, filenames, with_traces=False): + def __init__(self, filenames, with_traces=False, skip_cache=False): """ Create a new RawData object. @@ -321,7 +321,7 @@ class RawData: self.pta = self.ptalog["pta"] self.set_cache_file() - if not with_traces: + if not with_traces and not skip_cache: self.load_cache() def set_cache_file(self): @@ -481,7 +481,7 @@ class RawData: if sorted(online_trace_part["parameter"].keys()) != self._parameter_names: processed_data[ "error" - ] = "Offline #{off_idx:d} (online {on_name:s} @ {on_idx:d}/{on_sub:d}) has inconsistent parameter set: should be {param_want:s}, is {param_is:s}".format( + ] = "Offline #{off_idx:d} (online {on_name:s} @ {on_idx:d}/{on_sub:d}) has inconsistent parameter set: should be {param_want}, is {param_is}".format( off_idx=offline_idx, on_idx=online_run_idx, on_sub=online_trace_part_idx, |