From e7ff7f86f8745b265112212a9cc402162f273648 Mon Sep 17 00:00:00 2001
From: Baptiste Bauvin <baptiste.bauvin@lis-lab.fr>
Date: Thu, 5 Sep 2019 16:09:30 -0400
Subject: [PATCH] Added noise std to directory name
---
.../MonoMultiViewClassifiers/ExecClassif.py | 2 +-
.../MonoMultiViewClassifiers/utils/execution.py | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/multiview_platform/MonoMultiViewClassifiers/ExecClassif.py b/multiview_platform/MonoMultiViewClassifiers/ExecClassif.py
index d77fec48..06e66549 100644
--- a/multiview_platform/MonoMultiViewClassifiers/ExecClassif.py
+++ b/multiview_platform/MonoMultiViewClassifiers/ExecClassif.py
@@ -598,7 +598,7 @@ def execClassif(arguments):
directory = execution.initLogFile(name, args.views, args.CL_type,
args.log, args.debug, args.label,
- args.res_dir)
+ args.res_dir, args.add_noise, args.noise_std)
randomState = execution.initRandomState(args.randomState, directory)
statsIterRandomStates = execution.initStatsIterRandomStates(statsIter,
randomState)
diff --git a/multiview_platform/MonoMultiViewClassifiers/utils/execution.py b/multiview_platform/MonoMultiViewClassifiers/utils/execution.py
index f9e5ba3b..3c0b8fee 100644
--- a/multiview_platform/MonoMultiViewClassifiers/utils/execution.py
+++ b/multiview_platform/MonoMultiViewClassifiers/utils/execution.py
@@ -777,7 +777,7 @@ def getDatabaseFunction(name, type):
return getDatabase
-def initLogFile(name, views, CL_type, log, debug, label, result_directory):
+def initLogFile(name, views, CL_type, log, debug, label, result_directory, add_noise, noise_std):
r"""Used to init the directory where the preds will be stored and the log file.
First this function will check if the result directory already exists (only one per minute is allowed).
@@ -800,11 +800,15 @@ def initLogFile(name, views, CL_type, log, debug, label, result_directory):
resultsDirectory : string
Reference to the main results directory for the benchmark.
"""
+ if add_noise:
+ noise_string = "_n_"+str(int(noise_std*100))
+ else:
+ noise_string = ""
if debug:
- resultDirectory = result_directory + name + "/debug_started_" + time.strftime(
+ resultDirectory = result_directory + name + noise_string +"/debug_started_" + time.strftime(
"%Y_%m_%d-%H_%M_%S") + "_" + label + "/"
else:
- resultDirectory = result_directory + name + "/started_" + time.strftime(
+ resultDirectory = result_directory + name + noise_string+ "/started_" + time.strftime(
"%Y_%m_%d-%H_%M") + "_" + label + "/"
logFileName = time.strftime("%Y_%m_%d-%H_%M") + "-" + ''.join(
CL_type) + "-" + "_".join(
--
GitLab