Issue698 (#700)

* Made plain SK the default on common lead assignment

* Fixed #698 both items

* Fixed complication from default common lead choice on existing tests

Author: bowring

squidCore/src/main/java/org/cirdles/squid/shrimp/CommonLeadSpecsForSpot.java

@@ -23,10 +23,9 @@
 import org.cirdles.squid.utilities.stateUtilities.SquidLabData;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 
 import static org.cirdles.squid.tasks.expressions.builtinExpressions.BuiltInExpressionsDataDictionary.*;
+import static org.cirdles.squid.utilities.conversionUtilities.RoundingUtilities.squid3RoundedToSize;
 
 /**
  * @author James F. Bowring, CIRDLES.org, and Earth-Time.org
@@ -38,6 +37,7 @@ public class CommonLeadSpecsForSpot implements Serializable {
     public static final int METHOD_COMMON_LEAD_MODEL = 0;
     public static final int METHOD_STACEY_KRAMER = 1;
     public static final int METHOD_STACEY_KRAMER_BY_GROUP = 2;
+    public static int DEFAULT_METHOD = METHOD_STACEY_KRAMER;
 
     private double com_206Pb204Pb;
     private double com_207Pb206Pb;
@@ -64,13 +64,17 @@ public CommonLeadSpecsForSpot() throws SquidException {
         this.com_207Pb204Pb = 0.0;
         this.com_208Pb204Pb = 0.0;
 
-        this.methodSelected = METHOD_COMMON_LEAD_MODEL;
+        // April 2022 issue #698
+        this.methodSelected = DEFAULT_METHOD;
 
         this.sampleAgeType = SampleAgeTypesEnum.PB4COR206_238AGE;
         this.refMatAgeType = ReferenceMaterialAgeTypesEnum.PB4COR206_238AGE_RM;
         this.sampleAgeSK = 0.0;
 
         this.commonLeadModel = SquidLabData.getExistingSquidLabData().getCommonPbDefault();
+
+        // April 2022 issue #698
+        updateCommonLeadRatiosFromAgeSK();
     }
 
     public String correctionMetaData() {
@@ -84,7 +88,7 @@ public String correctionMetaData() {
                 metaData.append("SK");
                 break;
             case METHOD_STACEY_KRAMER_BY_GROUP:
-                metaData.append("SK @ " + (new BigDecimal(sampleAgeSK)).movePointLeft(6).setScale(0, RoundingMode.HALF_UP) + " Ma");
+                metaData.append("SK @ " + squid3RoundedToSize(sampleAgeSK / 1e6, 15));//(new BigDecimal(sampleAgeSK)).movePointLeft(6).setScale(0, RoundingMode.HALF_UP) + " Ma");
                 break;
         }
         return metaData.toString();
@@ -98,10 +102,10 @@ public String correctionSKTargetAge() {
                 metaData.append("n/a");
                 break;
             case METHOD_STACEY_KRAMER:
-                metaData.append((new BigDecimal(targetAge)).movePointLeft(6).setScale(0, RoundingMode.HALF_UP) + " Ma");
+                metaData.append(squid3RoundedToSize(targetAge / 1e6, 15));
                 break;
             case METHOD_STACEY_KRAMER_BY_GROUP:
-                metaData.append((new BigDecimal(sampleAgeSK)).movePointLeft(6).setScale(0, RoundingMode.HALF_UP) + " Ma");
+                metaData.append(squid3RoundedToSize(sampleAgeSK / 1e6, 15));//(new BigDecimal(sampleAgeSK)).movePointLeft(6).setScale(0, RoundingMode.HALF_UP) + " Ma");
                 break;
         }
         return metaData.toString();

squidCore/src/test/java/org/cirdles/squid/core/PrawnFileHandlerIT.java

@@ -23,6 +23,7 @@
 import org.cirdles.squid.projects.SquidProject;
 import org.cirdles.squid.reports.reportSettings.ReportSettings;
 import org.cirdles.squid.reports.reportSettings.ReportSettingsInterface;
+import org.cirdles.squid.shrimp.CommonLeadSpecsForSpot;
 import org.cirdles.squid.shrimp.ShrimpDataFileInterface;
 import org.cirdles.squid.tasks.Task;
 import org.cirdles.squid.tasks.TaskInterface;
@@ -77,6 +78,9 @@ public class PrawnFileHandlerIT {
      */
     @BeforeClass // provides to run setup once
     public static void setUp() throws Exception {
+        // april 2022 to preserve tests due to change in issue #698
+        CommonLeadSpecsForSpot.DEFAULT_METHOD = CommonLeadSpecsForSpot.METHOD_COMMON_LEAD_MODEL;
+
         prawnFileHandler = (new SquidProject(GEOCHRON)).getPrawnFileHandler();
         reportsFolder = temporaryFolder.getRoot();