From 4b7986b96905999d49ba023a5415165fc2a12133 Mon Sep 17 00:00:00 2001
From: Angelos Chatzimparmpas <angelos.chatzimparmpas@gmail.com>
Date: Thu, 7 Mar 2019 17:59:43 +0100
Subject: [PATCH] correlastion squared

Former-commit-id: 486a84934fce1d030038e3db821b1afedd338598
---
 index.html     |  4 ++--
 js/tsne_vis.js | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/index.html b/index.html
index 620ec1b..13981d7 100755
--- a/index.html
+++ b/index.html
@@ -126,7 +126,7 @@
           <div class="col-md-3 col-md-offset-6">
             <div class="panel panel-default right-side-cor">
                 <div class="panel-heading">
-                    <h2 class="panel-title" style="display:inline-block">Correl. Schema Investigation</h2><div class="param" style="display:inline-block; float:right"><label for="param-corlim" style="display:inline-block; float: right">Mininum Correlation: #<output for="param-corlim" id="param-corlim-value" style="display:inline-block; float:right">0.5</output></label>
+                    <h2 class="panel-title" style="display:inline-block">Schema Investigation (Coefficient of Determination)</h2><div class="param" style="display:inline-block; float:right"><label for="param-corlim" style="display:inline-block; float: right">Mininum Correlation: #<output for="param-corlim" id="param-corlim-value" style="display:inline-block; float:right">0.5</output></label>
                     <input id="param-corlim" type="range" min="0" max="1" value="0.5", step="0.1" style="display:inline-block; float:right" onchange="CalculateCorrel(true);">
                     </div>
                 </div>
@@ -197,7 +197,7 @@
       <div class="col-md-3 col-md-offset-6">
         <div class="panel panel-default right-side-star">
           <div class="panel-heading">
-              <h2 class="panel-title">Parallel Coordinates Plot with Local PCA Calculation</h2>
+              <h2 class="panel-title">Parallel Coordinates Plot (with Local PCA Calculation)</h2>
           </div>
           <div class="panel-body">
             <div id="PCP" class="parcoords"></div>
diff --git a/js/tsne_vis.js b/js/tsne_vis.js
index ad304c3..4d1ae0b 100755
--- a/js/tsne_vis.js
+++ b/js/tsne_vis.js
@@ -1699,7 +1699,7 @@ function CalculateCorrel(flagForSchema){ // Calculate the correlation is a funct
           if (isNaN(pearsonCorrelation(tempData, 0, 1))) {
           } else{
             SignStore.push([temp, pearsonCorrelation(tempData, 0, 1)]); // Keep the sign
-              correlationResults.push([Object.keys(dataFeatures[0])[temp] + " (" + temp + ")", Math.abs(pearsonCorrelation(tempData, 0, 1)),temp]); // Find the pearson correlations
+              correlationResults.push([Object.keys(dataFeatures[0])[temp] + " (" + temp + ")", Math.abs(pearsonCorrelation(tempData, 0, 1))*Math.abs(pearsonCorrelation(tempData, 0, 1)),temp]); // Find the pearson correlations
           }
         }
       }
@@ -1725,7 +1725,7 @@ function CalculateCorrel(flagForSchema){ // Calculate the correlation is a funct
     correlationResultsFinal = [];
     for (var i=0; i<correlationResults.length; i++){
       if (parseFloat(document.getElementById("param-corlim-value").value) < Math.abs((maxminArea[correlationResults[i][2]].max - maxminArea[correlationResults[i][2]].min) / (maxminTotal[correlationResults[i][2]].max - maxminTotal[correlationResults[i][2]].min) * correlationResults[i][1])){
-        correlationResultsFinal.push([correlationResults[i][0],Math.abs((maxminArea[correlationResults[i][2]].max - maxminArea[correlationResults[i][2]].min) / (maxminTotal[correlationResults[i][2]].max - maxminTotal[correlationResults[i][2]].min) * correlationResults[i][1]),correlationResults[i][2]]);
+        correlationResultsFinal.push([correlationResults[i][0],Math.abs((maxminArea[correlationResults[i][2]].max - maxminArea[correlationResults[i][2]].min) / (maxminTotal[correlationResults[i][2]].max - maxminTotal[correlationResults[i][2]].min) * correlationResults[i][1])*Math.abs((maxminArea[correlationResults[i][2]].max - maxminArea[correlationResults[i][2]].min) / (maxminTotal[correlationResults[i][2]].max - maxminTotal[correlationResults[i][2]].min) * correlationResults[i][1]),correlationResults[i][2]]);
       }
     }
 
@@ -1747,10 +1747,10 @@ function CalculateCorrel(flagForSchema){ // Calculate the correlation is a funct
 
   for (var j = 0; j < correlationResultsFinal.length; j++) {
     for (var i = 0; i < SignStore.length; i++) {
-      if (SignStore[i][1]*(-1) == correlationResults[j][1]) {
+     /* if (SignStore[i][1]*(-1) == correlationResults[j][1]) {
         correlationResultsFinal[j][1] = parseFloat((correlationResultsFinal[j][1])).toFixed(2) * (-1); // Give the negative sign if needed and multiply by 100
-      }
-      if (SignStore[i][1] == correlationResults[j][1]) {
+      }*/
+      if (SignStore[i][1] == correlationResults[j][1] || SignStore[i][1]*(-1) == correlationResults[j][1]) {
         correlationResultsFinal[j][1] = parseFloat((correlationResultsFinal[j][1])).toFixed(2); // Give a positive sign and multiply by 100
       }
     }
@@ -1830,8 +1830,8 @@ function drawBarChart(){ // Draw the horizontal barchart with the correlations.
   /////////////////////// Update scales ///////////////////////
   /////////////////////////////////////////////////////////////
   //Update the scales
-  main_xScale.domain([-1, 1]);
-  mini_xScale.domain([-1, 1]);     
+  main_xScale.domain([0, 1]);
+  mini_xScale.domain([0, 1]);     
   main_yScale.domain(correlationResultsFinal.map(function(d) { return d[0]; }));
   mini_yScale.domain(correlationResultsFinal.map(function(d) { return d[0]; }));