Displaying differences for changeset |
@@ -201,11 +201,11 @@ |
double sdosservati = Math.sqrt(coef1_den / (count - 1)); |
double sdsimulati = Math.sqrt(numvaprev / (count - 1)); |
double R = numR / (Math.sqrt(den1R) * Math.sqrt(den2R)); |
- double alpha = sdsimulati / sdosservati; // 2009 |
+ //double alpha = sdsimulati / sdosservati; // 2009 |
double beta = mediasim / mediaoss; |
- //double gamma = (mediaoss * sdsimulati) / (sdosservati * mediasim); // 2012 |
- return 1 - Math.sqrt((R - 1) * (R - 1) + (alpha - 1) * (alpha - 1) + (beta - 1) * (beta - 1)); // 2009 |
- //return 1 - Math.sqrt((R - 1) * (R - 1) + (gamma - 1) * (gamma - 1) + (beta - 1) * (beta - 1)); // 2012 |
+ double gamma = (mediaoss * sdsimulati) / (sdosservati * mediasim); // 2012 |
+ //return 1 - Math.sqrt((R - 1) * (R - 1) + (alpha - 1) * (alpha - 1) + (beta - 1) * (beta - 1)); // 2009 |
+ return 1 - Math.sqrt((R - 1) * (R - 1) + (gamma - 1) * (gamma - 1) + (beta - 1) * (beta - 1)); // 2012 |
} |
@Override |