diff --git a/MDAF/MDAF.py b/MDAF/MDAF.py index 02ed8eb..125ef0f 100644 --- a/MDAF/MDAF.py +++ b/MDAF/MDAF.py @@ -279,7 +279,7 @@ def doe(heuristicpath, testfunctionpaths, heuristic_args, measurementSampleSize failedfunctions[run] = process.exitcode connections[run][0].close() connections[run][1].close() - print('Test Function Completed: '+str(i)+'/'+str(len(proc))) + print('Test Function Completed: '+str(i+1)+'/'+str(len(proc))) # display output diff --git a/MDAF/SampleAlgorithms/SimmulatedAnnealing.py b/MDAF/SampleAlgorithms/SimmulatedAnnealing.py index 0329d52..a898992 100644 --- a/MDAF/SampleAlgorithms/SimmulatedAnnealing.py +++ b/MDAF/SampleAlgorithms/SimmulatedAnnealing.py @@ -39,14 +39,14 @@ def main(func, S, args): t = args["t"] p = args["p"] high = args["upper"] if isinstance(args["upper"], int) else max(args["upper"]) - low = args["lower"] if isinstance(args["lower"], int) else max(args["lower"]) + low = args["lower"] if isinstance(args["lower"], int) else min(args["lower"]) Best = list() Best[:] = cp.deepcopy(S) sigma = 0.1 route.append(Best[:]) for iterationstep in range(100000): - print('\n\n\n') + #print('\n\n\n') R = tweak(cp.deepcopy(S),p,sigma,high, low) #print(R) #print(S) diff --git a/MDAF/SampleAlgorithms/__pycache__/SimmulatedAnnealing.cpython-39.pyc b/MDAF/SampleAlgorithms/__pycache__/SimmulatedAnnealing.cpython-39.pyc index f7f1d6d..25f42a9 100644 Binary files a/MDAF/SampleAlgorithms/__pycache__/SimmulatedAnnealing.cpython-39.pyc and b/MDAF/SampleAlgorithms/__pycache__/SimmulatedAnnealing.cpython-39.pyc differ diff --git a/tests/SimmulatedAnnealing.py b/tests/SimmulatedAnnealing.py index 9756f56..e9c1c00 100644 --- a/tests/SimmulatedAnnealing.py +++ b/tests/SimmulatedAnnealing.py @@ -46,7 +46,7 @@ def main(func, S, args): sigma = 0.1 route.append(Best[:]) while True: - print('\n\n\n') + #print('\n\n\n') R = tweak(cp.deepcopy(S),p,sigma,high, low) print(R) print(S)