Layout fixes. And some refactoring.

izzat5233 · Dec 19, 2023 · fc45d06 · fc45d06
1 parent 03c3a7e
commit fc45d06
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 23 deletions.
diff --git a/nn/src/module.cpp b/nn/src/module.cpp
@@ -52,15 +52,16 @@ double Module::getLearningRate() const {
 }
 
 void Module::NormalizedData::set(const vvd_t &data) {
-    minMax.resize(data[0].size());
-    for (std::size_t i = 0; i < minMax.size(); ++i) {
+    minMax.clear();
+    minMax.reserve(data[0].size());
+    for (std::size_t i = 0; i < data[0].size(); ++i) {
         double minParam = data[0][i];
         double maxParam = data[0][i];
         for (std::size_t j = 1; j < data.size(); ++j) {
             minParam = std::min(minParam, data[j][i]);
             maxParam = std::max(maxParam, data[j][i]);
         }
-        minMax[i] = {minParam, maxParam};
+        minMax.emplace_back(minParam, maxParam);
     }
     normalized = normalize(data);
 }
@@ -76,17 +77,17 @@ const vvd_t &Module::NormalizedData::use() const {
 vvd_t Module::NormalizedData::normalize(const nn::vvd_t &original) const {
     vvd_t norm;
     norm.reserve(original.size());
-    for (std::size_t i = 0; i < original.size(); ++i) {
-        norm.push_back(process::minmax(original[i], minMax));
+    for (const vd_t &data: original) {
+        norm.push_back(process::minmax(data, minMax));
     }
     return norm;
 }
 
 vvd_t Module::NormalizedData::denormalize(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::inverseMinmax(processed[i], minMax));
+    for (const vd_t &data: processed) {
+        original.push_back(process::inverseMinmax(data, minMax));
     }
     return original;
 }

diff --git a/nn/src/process.cpp b/nn/src/process.cpp
@@ -9,8 +9,6 @@ using namespace nn;
 
 vd_t process::minmax(const vd_t &data, const vpd_t &minMaxParams) {
     assert(data.size() == minMaxParams.size());
-    if (data.size() == 1) { return {data[0]}; } // turn off for single vectors
-
     vd_t normalized(data.size());
     for (std::size_t i = 0; i < data.size(); ++i) {
         auto [minParam, maxParam] = minMaxParams[i];
@@ -22,8 +20,6 @@ vd_t process::minmax(const vd_t &data, const vpd_t &minMaxParams) {
 
 vd_t process::inverseMinmax(const vd_t &data, const vpd_t &minMaxParams) {
     assert(data.size() == minMaxParams.size());
-    if (data.size() == 1) { return {data[0]}; } // turn off for single vectors
-
     vd_t denormalized(data.size());
     for (std::size_t i = 0; i < data.size(); ++i) {
         auto [minParam, maxParam] = minMaxParams[i];

diff --git a/web/content/control/test.html b/web/content/control/test.html
@@ -3,24 +3,20 @@
         <div class="d-flex justify-content-center">
             <div class="btn-group" role="group" aria-label="Get Outputs">
                 <button type="button" class="btn btn-lg btn-primary fs-5" onclick="getTestOutputs()">
-                    Get Test Outputs
+                    Get Predictions
                 </button>
-                <button type="button" class="btn btn-lg btn-outline-primary bi bi-download fs-5" disabled
-                        id="downloadOutputsButton" onclick="network.downloadPredictedOutputs()"> Download
+                <button type="button" class="btn btn-lg btn-outline-primary bi bi-x-lg fs-5"
+                        id="clearOutputsButton" onclick="clearPredictedTable()"> Clear
+                </button>
+                <button type="button" class="btn btn-lg btn-outline-primary bi bi-download fs-5"
+                        id="downloadWeightsButton" onclick="network.downloadNetwork()"> Download Network Data
                 </button>
-                <button type="button" class="btn btn-lg btn-outline-primary fs-5"
-                        id="clearOutputsButton" onclick="clearPredictedTable()">Clear
+                <button type="button" class="btn btn-lg btn-outline-primary bi bi-download fs-5" disabled
+                        id="downloadOutputsButton" onclick="network.downloadPredictedOutputs()"> Download Predictions
                 </button>
             </div>
         </div>
     </div>
-    <div class="col">
-        <div class="d-flex justify-content-center">
-            <button type="button" class="btn btn-lg btn-primary bi bi-download fs-5" id="downloadWeightsButton"
-                    onclick="network.downloadNetwork()"> Download Network Weights
-            </button>
-        </div>
-    </div>
 </div>
 <hr class="my-4">
 <div class="container">