From 9f38515b661f4965bbea5ea5e40b25bab92058d5 Mon Sep 17 00:00:00 2001 From: Craig Warren Date: Fri, 18 Dec 2015 10:41:54 +0000 Subject: [PATCH] Updated fitness_diff_dB function to return inverse of difference which is required as optimisation method looks for when fitness is greater than stopping value; converted responses to NumPy arrays. --- user_libs/optimisations/taguchi_fitness.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_libs/optimisations/taguchi_fitness.py b/user_libs/optimisations/taguchi_fitness.py index 7eb552e7..e7715c08 100644 --- a/user_libs/optimisations/taguchi_fitness.py +++ b/user_libs/optimisations/taguchi_fitness.py @@ -128,7 +128,7 @@ def fitness_diff_dB(filename, args): f = h5py.File(args['refresp'], 'r') tmp = f['/rxs/rx1/'] fieldname = list(tmp.keys())[0] - refresp = tmp[fieldname] + refresp = np.array(tmp[fieldname]) # Load (from gprMax output file) the response f = h5py.File(filename, 'r') @@ -138,13 +138,13 @@ def fitness_diff_dB(filename, args): tmp = f['/rxs/rx' + str(rx) + '/'] if tmp.attrs['Name'] in args['outputs']: fieldname = list(tmp.keys())[0] - modelresp = tmp[fieldname] + modelresp = np.array(tmp[fieldname]) # Calculate sum of differences diffdB = np.abs(modelresp - refresp) / np.amax(np.abs(refresp)) diffdB = 20 * np.log10(np.sum(diffdB)) - return diffdB + return 1 / diffdB