Commit a39ca0ef authored by Ivo Peterek's avatar Ivo Peterek

FIX: switched xLabel and funcLabel values + apply multiplier to values #13

parent 4f6f683e
......@@ -12,6 +12,8 @@ class DataLoad:
self.config_dic = run_path(config_path)
self.data_path = self.config_dic['root_folder'][0][0]
self.main_reg = self.config_dic['main_reg'][0].values()
self.xLabel_multiplier = self.config_dic['x_val_multiplier']
self.funcLabel_multiplier = self.config_dic['label_val_multiplier']
self.regions = list(self.main_reg) +self.config_dic['all_nested_regs']
# for region in os.listdir(self.data_path):
# if os.path.isdir(self.data_path + "/" + region):
......@@ -114,14 +116,15 @@ class DataLoad:
for key, value in dict_plot_data_ylabel.items():
for data in data_region:
if data[0]['arg'] in key and data[0]['category'] in key:
if str(xlabel_val) not in data[1]['lines']:
data[1]['lines'].append(str(xlabel_val))
if str(funclabel_val) not in data[1]['lines']:
data[1]['lines'].append(str(float(funclabel_val)*self.funcLabel_multiplier))
index_of_line = data[1]['lines'].index(str(xlabel_val))
index_of_line = data[1]['lines'].index(str(funclabel_val))
if len(data[1]['heat_data'])-1 < index_of_line:
data[1]['heat_data'].append([])
data[1]['heat_data'][index_of_line].append((float(funclabel_val), value))
data[1]['heat_data'][index_of_line].append((float(xlabel_val)*self.xLabel_multiplier
, value))
if value < data[1]['optim_y_val']: #optimal value is just minimum
data[1]['optim_y_val'] = value
else:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment