From 0527b7bcdc95b4e77783f66806c65439e6126f53 Mon Sep 17 00:00:00 2001
From: Baptiste Bauvin <baptiste.bauvin@lis-lab.fr>
Date: Wed, 20 Feb 2019 09:59:36 -0500
Subject: [PATCH] Debugged noise with multicore
---
.../MonoMultiViewClassifiers/ExecClassif.py | 4 +++-
.../MonoMultiViewClassifiers/utils/GetMultiviewDb.py | 8 ++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/multiview_platform/MonoMultiViewClassifiers/ExecClassif.py b/multiview_platform/MonoMultiViewClassifiers/ExecClassif.py
index ed9d7849..64c9f085 100644
--- a/multiview_platform/MonoMultiViewClassifiers/ExecClassif.py
+++ b/multiview_platform/MonoMultiViewClassifiers/ExecClassif.py
@@ -459,8 +459,10 @@ def execClassif(arguments):
getDatabase = execution.getDatabaseFunction(args.name,args.type)
- DATASET, LABELS_DICTIONARY = getDatabase(args.views, args.pathF, args.name, args.CL_nbClass,
+
+ DATASET, LABELS_DICTIONARY, datasetname = getDatabase(args.views, args.pathF, args.name, args.CL_nbClass,
args.CL_classes, randomState, args.full, args.add_noise, args.noise_std)
+ args.name = datasetname
splits = execution.genSplits(DATASET.get("Labels").value, args.CL_split, statsIterRandomStates)
diff --git a/multiview_platform/MonoMultiViewClassifiers/utils/GetMultiviewDb.py b/multiview_platform/MonoMultiViewClassifiers/utils/GetMultiviewDb.py
index 0086ae5c..1143c2ea 100644
--- a/multiview_platform/MonoMultiViewClassifiers/utils/GetMultiviewDb.py
+++ b/multiview_platform/MonoMultiViewClassifiers/utils/GetMultiviewDb.py
@@ -125,7 +125,7 @@ def getPlausibleDBhdf5(features, pathF, name, NB_CLASS=3, LABELS_NAME="", random
datasetFile.close()
datasetFile = h5py.File(pathF + "Plausible.hdf5", "r")
LABELS_DICTIONARY = {0: "No", 1: "Yes", 2:"Maybe"}
- return datasetFile, LABELS_DICTIONARY
+ return datasetFile, LABELS_DICTIONARY, "Plausible"
# def getFakeDBhdf5(features, pathF, name, NB_CLASS, LABELS_NAME, randomState):
@@ -322,10 +322,10 @@ def getClassicDBhdf5(views, pathF, nameDB, NB_CLASS, askedLabelsNames, randomSta
enumerate(datasetFile.get("Labels").attrs["names"]))
if add_noise:
- datasetFile = add_gaussian_noise(datasetFile, randomState, pathF, dataset_name, noise_std)
+ datasetFile, dataset_name = add_gaussian_noise(datasetFile, randomState, pathF, dataset_name, noise_std)
else:
pass
- return datasetFile, labelsDictionary
+ return datasetFile, labelsDictionary, dataset_name
def add_gaussian_noise(dataset_file, random_state, path_f, dataset_name, noise_std=0.15):
@@ -353,7 +353,7 @@ def add_gaussian_noise(dataset_file, random_state, path_f, dataset_name, noise_s
noised_data = np.where(noised_data>view_limits[:,1], view_limits[:,1], noised_data)
noisy_dataset[view_name][...] = noised_data
final_shape = noised_data.shape
- return noisy_dataset
+ return noisy_dataset, dataset_name+"_noised"
--
GitLab