diff --git a/Assert_Results.py b/Assert_Results.py index 3da257ba3502c70bbcdd85a3120188dcba62e266..5162cbefede4613acd289431befeb0aa89acc3d9 100644 --- a/Assert_Results.py +++ b/Assert_Results.py @@ -2,7 +2,7 @@ import re import os import sys -from dataprocessing.Validationtools import * +from dataprocessing.validationtools import * from dataprocessing.readtools import * print("Test Start") # We need to extract all the result files from git now diff --git a/dataprocessing/readtools.py b/dataprocessing/readtools.py index 7be9d12ef2fd804abdc7147625bfcc457c14cfd0..f7b90760b1415eff3d54861d43877c486a62a6f3 100644 --- a/dataprocessing/readtools.py +++ b/dataprocessing/readtools.py @@ -184,13 +184,13 @@ def read_timeseries_NEPLAN_loadflow(file_name, timeseries_names=None, is_regex=F value = [] # list for data - namelist = ['U', 'ANGLEU', 'P', 'Q','I', 'ANGLEI'] + namelist = ['U', 'ANGLEU', 'P', 'Q', 'I', 'ANGLEI'] # Suffix of the data name timeseries = [] line_del = [] # a list for the value to be deleted isfloat = re.compile(r'^[-+]?[0-9]+\.[0-9]+$') # regular expression to find float values - # the ',' in the floats in result file to '.' - for line in str_tmp.readlines(): + # Transfer ',' in the floats in result file to '.' + for line in str_tmp.readlines(): # Check the data to find out floats with ',' line = line.replace(",", ".") high -= high low -= low @@ -216,7 +216,7 @@ def read_timeseries_NEPLAN_loadflow(file_name, timeseries_names=None, is_regex=F with the assumption that the topology of the gird should be correct with which we can validate the current by comparing the voltage of the nodes connected to the ends of the line """ - if flag is not True: + if flag is not True: # flag is true when it's the first line if value[3] is not '#': for m in range(6): timeseries.append(TimeSeries(value[3] + '.' + namelist[m],