Merge pull request #730 from bowring/issue728

Fixed #728

Author: bowring

squidCore/src/main/java/org/cirdles/squid/algorithms/weightedMeans/WeightedMeanCalculators.java

@@ -195,7 +195,8 @@ public static WtdLinCorrResults wtdLinCorr(double[] y, double[][] sigRho, double
         double mswd = mswdW[minIndex];
         double probfit = probW[minIndex];
 
-        if (linReg && (minIndex > 0)) {
+        // fixed per issue #728
+        if (linReg) {
             wtdLinCorrResults.setSlope(slopeW[minIndex]);
             wtdLinCorrResults.setSigmaSlope(sigmaSlopeW[minIndex]);
             wtdLinCorrResults.setCovSlopeInter(covSlopeInterW[minIndex]);
@@ -332,7 +333,7 @@ public static DeletePointResults deletePoint(int rejPoint, double[] y1, double[]
                 } else if ((j == (rejPoint - 1)) && (m < (n - 1))) {
                     sigRho2[j][m] = 0.0;
                     sigRho2[m][j] = 0.0;
-                } else if ((j < (n - 2)) && (p < n)){
+                } else if ((j < (n - 2)) && (p < n)) {
                     sigRho2[j][m] = sigRho1[m][p];
                     sigRho2[m][j] = sigRho1[p][m];
                 }

squidCore/src/test/java/org/cirdles/squid/algorithms/weightedMeans/WeightedMeanCalculatorsTest.java

@@ -32,11 +32,11 @@ public void wtdLinCorr() throws Exception {
                 {0.0, 0.0, 0.25, 0.003803284943932538, 0.25},
                 {0.0, 0.0, 0.0, 0.25, 0.003803284943932538}};
         expectedBad = false;
-        expectedSlope = 0.0;
+        expectedSlope = -4.5494878620412566E-5;
         expectedIntercept = 1.8464967500150462;
-        expectedSigmaSlope = 0.0;
+        expectedSigmaSlope = 6.924027363443903E-6;
         expectedSigmaIntercept = 0.004522048443740375;
-        expectedCovSlopeInter = 0.0;
+        expectedCovSlopeInter = -2.8336583202677104E-8;
         expectedMswd = 1.2623509241318576;
         expectedProbFit = 0.2853957071615587;
         WtdLinCorrResults results = WeightedMeanCalculators.wtdLinCorr(y, sigRho, x);