From 8ec3a55d50b87418b00e40ca949a7f4ade443064 Mon Sep 17 00:00:00 2001 From: Marc Gay-Balmaz <m.gaybalmaz@gmail.com> Date: Wed, 11 Jul 2018 23:04:44 +0200 Subject: [PATCH] Clean and reformat --- param_tester.py | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/param_tester.py b/param_tester.py index ffdea72..3817238 100644 --- a/param_tester.py +++ b/param_tester.py @@ -2,7 +2,6 @@ import itertools import subprocess import sys from threading import Thread -from typing import Optional, Callable, Iterable, Mapping, Any import numpy @@ -30,26 +29,25 @@ for i in range(1, len(sys.argv)): miss = False elif sys.argv[i][2] == 'o': miss = True - output_file_name = sys.argv[i+1] + output_file_name = sys.argv[i + 1] elif sys.argv[i][2] == 'n': miss = True - exec_cmd = sys.argv[i+1]+" " + exec_cmd = sys.argv[i + 1] + " " elif sys.argv[i][2] == 'c': miss = True print("count arg detected!") - count = int(sys.argv[i+1]) + count = int(sys.argv[i + 1]) elif sys.argv[i][2] == 'j': miss = True print("Multithread arg detected!") - threadNB = int(sys.argv[i+1]) + threadNB = int(sys.argv[i + 1]) elif sys.argv[i][2] == 'l': print("log arg detected!") logarithmical = True print("Arguments parsed") -print("Count = "+str(count)) -print("Log : "+str(logarithmical)) - +print("Count = " + str(count)) +print("Log : " + str(logarithmical)) # create each combination param_combinations = [] @@ -59,11 +57,6 @@ for i in range(len(param_min)): else: act_values = numpy.arange(float(param_min[i]), float(param_max[i]), float(param_increment[i])) param_combinations.append(act_values) - # for k in range(len(act_values)): - # if len(param_combinations) < k+1: - # param_combinations.append([]) - # param_combinations[k].append(act_values[k]) - # k += 1 combination = itertools.product(*param_combinations) @@ -77,8 +70,9 @@ class SimulationRunner(Thread): def run(self) -> None: for i in self.array: for j in range(count): - subprocess.call(exec_cmd + " ".join(str(x) for x in i) + " > " + output_file_name + str(j) + "_" + "_".join( - str(x) for x in i) + ".dat", shell=True) + subprocess.call( + exec_cmd + " ".join(str(x) for x in i) + " > " + output_file_name + str(j) + "_" + "_".join( + str(x) for x in i) + ".dat", shell=True) print("Creating tests") @@ -90,7 +84,7 @@ for p in combination: combinationNB = len(params) for c in range(threadNB): - threads.append(SimulationRunner(params[int(c*combinationNB/threadNB):int((c+1)*combinationNB/threadNB)])) + threads.append(SimulationRunner(params[int(c * combinationNB / threadNB):int((c + 1) * combinationNB / threadNB)])) print("Threads created") for c in range(threadNB): -- GitLab