Bug fixes, minmax off for single outputs.

Author: izzat5233

nn/nn.h

@@ -179,7 +179,7 @@ namespace nn {
          * @param originalMax The original maximum value of the data before normalization
          * @return Denormalized data vector
          */
-        vd_t inverse_minmax(const vd_t &data, double originalMin, double originalMax);
+        vd_t inverseMinmax(const vd_t &data, double originalMin, double originalMax);
     }
 
     /**

nn/src/module.cpp

@@ -30,7 +30,7 @@ void Module::NormalizedData::set(const vvd_t &data) {
     minMax.reserve(data.size());
     for (const vd_t &line: data) {
         double minVal = *std::min_element(line.begin(), line.end());
-        double maxVal = *std::min_element(line.begin(), line.end());
+        double maxVal = *std::max_element(line.begin(), line.end());
         normalized.push_back(process::minmax(line));
         minMax.emplace_back(minVal, maxVal);
     }
@@ -44,7 +44,7 @@ vvd_t Module::NormalizedData::get(const vvd_t &processed) const {
     vvd_t original;
     original.reserve(processed.size());
     for (std::size_t i = 0; i < processed.size(); ++i) {
-        original.push_back(process::inverse_minmax(processed[i], minMax[i].first, minMax[i].second));
+        original.push_back(process::inverseMinmax(processed[i], minMax[i].first, minMax[i].second));
     }
     return original;
 }

nn/src/process.cpp

@@ -8,9 +8,10 @@
 using namespace nn;
 
 vd_t process::minmax(const vd_t &data) {
+    if (data.size() == 1) { return {data[0]}; } // turn off for single outputs
     double minVal = *std::min_element(data.begin(), data.end());
     double maxVal = *std::max_element(data.begin(), data.end());
-    if (minVal == maxVal) { return {(data.size(), 0.5)}; }
+    if (minVal == maxVal) { return vd_t(data.size(), 0.5); }
 
     vd_t normalized(data.size());
     std::transform(data.begin(), data.end(), normalized.begin(), [minVal, maxVal](double x) {
@@ -19,8 +20,8 @@ vd_t process::minmax(const vd_t &data) {
     return normalized;
 }
 
-vd_t process::inverse_minmax(const vd_t &data, double originalMin, double originalMax) {
-    if (originalMin == originalMax) { return {(data.size(), originalMin)}; }
+vd_t process::inverseMinmax(const vd_t &data, double originalMin, double originalMax) {
+    if (data.size() == 1) { return {data[0]}; } // turn off for single outputs
     vd_t denormalized(data.size());
     std::transform(data.begin(), data.end(), denormalized.begin(), [originalMin, originalMax](double x) {
         return x * (originalMax - originalMin) + originalMin;