Added all r2 values to export

ORNL-AMO · Jul 20, 2018 · f23b791 · f23b791
1 parent 4b8066c
commit f23b791
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/enpi_tool.js b/app/enpi_tool.js
@@ -1970,7 +1970,7 @@ function exportData(){
                     //export_formatJson[i]["pValue"] = tables[z]["results"][k]["pValue"][i];
 
                     for (var j = 1; j < outputKeys.length; j++) {
-                        if(outputKeys[j] != "comboNumber"){
+                        if(outputKeys[j] != "comboNumber" && outputKeys[j] != "rSquare"){
                             export_formatJson[i]["(" + dependentNames[z] + ")" + outputKeys[j]] = tables[z]["results"][k][outputKeys[j]][i];
                         }
                     }

diff --git a/app/maths.ts b/app/maths.ts
@@ -53,10 +53,11 @@ function findResults(json, dependentNumber){
             Date: [],
         };
         results["rSquare"] = [];
+        results[i + "rSquare"] = [];
         results["comboNumber"] = [];
         results[i + "Intercept"] = [];
         results[i + "fittedModel"] = [];
-        results["pValue"] = [];
+        results[i + "pValue"] = [];
 
         for(var k = 0; k < independentCombinations[i].length; k++){
             results[i + independentCombinations[i][k] + "Coeff"] = [];
@@ -77,9 +78,10 @@ function findResults(json, dependentNumber){
             results.Date[j] = json.date[dateKeys[0]][j];
 
             results["rSquare"][j] = model.rSquare;
+            results[i + "rSquare"][j] = model.rSquare;
             results["comboNumber"][j] = i;
             results[i + "Intercept"][j] = model.intercept;
-            results["pValue"][j] = model.pValue;
+            results[i + "pValue"][j] = model.pValue;
 
             for(var n = 0; n < independentCombinations[i].length; n++){
                 results[i + independentCombinations[i][n] + "Coeff"][j] = model.params[n];