From 82c15f818bd78cf7c8a71f06817dbaef1e282349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=BChle=2C=20Laura=20Christine=20=28lakue103=29?=
<laura.kuehle@uni-duesseldorf.de>
Date: Wed, 24 Nov 2021 14:48:36 +0100
Subject: [PATCH] Extracted normalization step.
---
ANN_Data_Generator.py | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/ANN_Data_Generator.py b/ANN_Data_Generator.py
index d394521..6d16dbd 100644
--- a/ANN_Data_Generator.py
+++ b/ANN_Data_Generator.py
@@ -3,7 +3,7 @@
@author: Soraya Terrab (sorayaterrab), Laura C. Kühle
TODO: Improve '_generate_cell_data'
-TODO: Extract normalization (Combine smooth and troubled before normalizing)
+TODO: Extract normalization (Combine smooth and troubled before normalizing) -> Done
TODO: Improve verbose output
"""
@@ -67,11 +67,6 @@ class TrainingDataGenerator(object):
troubled_input, troubled_output = self._generate_cell_data(num_troubled_samples,
self._troubled_functions, False)
- # Normalize data
- if normalize:
- smooth_input = self._normalize_data(smooth_input)
- troubled_input = self._normalize_data(troubled_input)
-
# Merge Data
input_matrix = np.concatenate((smooth_input, troubled_input), axis=0)
output_matrix = np.concatenate((smooth_output, troubled_output), axis=0)
@@ -81,7 +76,11 @@ class TrainingDataGenerator(object):
input_matrix = input_matrix[order]
output_matrix = output_matrix[order]
- return input_matrix, output_matrix
+ # Create normalized input data
+ if normalize:
+ input_matrix = self._normalize_data(input_matrix)
+
+ return [input_matrix, output_matrix]
def _generate_cell_data(self, num_samples, initial_conditions, is_smooth):
num_function_samples = num_samples//len(initial_conditions)
--
GitLab