updates expressions

CIRDLES · Mar 30, 2017 · 767222a · 767222a
1 parent 208c943
commit 767222a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/...va/org/cirdles/calamari/tasks/expressions/customExpressions/CustomExpression_LnPbR_U.java b/...va/org/cirdles/calamari/tasks/expressions/customExpressions/CustomExpression_LnPbR_U.java
@@ -31,7 +31,7 @@ public class CustomExpression_LnPbR_U {
     /**
      * Squid Excel format is ln(["206/238"])
      */
-    public final static ExpressionTreeInterface EXPRESSION = new ExpressionTree("Ln206/238");
+    public final static ExpressionTreeInterface EXPRESSION = new ExpressionTree("LnPbR_U");
 
     static {
         ((ExpressionTreeWithRatiosInterface) EXPRESSION).getRatiosOfInterest().add(RawRatioNamesSHRIMP.r206_238w);

diff --git a/core/src/main/java/org/cirdles/calamari/tasks/storedTasks/SquidBodorkosTask1.java b/core/src/main/java/org/cirdles/calamari/tasks/storedTasks/SquidBodorkosTask1.java
@@ -19,8 +19,11 @@
 import org.cirdles.calamari.tasks.expressions.builtinExpressions.SquidExpressionMinus1;
 import org.cirdles.calamari.tasks.expressions.builtinExpressions.SquidExpressionMinus3;
 import org.cirdles.calamari.tasks.expressions.builtinExpressions.SquidExpressionMinus4;
+import org.cirdles.calamari.tasks.expressions.customExpressions.CustomExpression_Expo;
 import org.cirdles.calamari.tasks.expressions.customExpressions.CustomExpression_LnPbR_U;
 import org.cirdles.calamari.tasks.expressions.customExpressions.CustomExpression_LnUO_U;
+import org.cirdles.calamari.tasks.expressions.customExpressions.CustomExpression_Net204BiWt;
+import org.cirdles.calamari.tasks.expressions.customExpressions.CustomExpression_Net204cts_sec;
 
 /**
  *
@@ -40,11 +43,11 @@ public SquidBodorkosTask1() {
 
         taskExpressionsOrdered.add(SquidExpressionMinus3.EXPRESSION);
 
-//        taskExpressionsOrdered.add(CustomExpression_Net204cts_sec.EXPRESSION);
-//        
-//        taskExpressionsOrdered.add(CustomExpression_Net204BiWt.EXPRESSION);
-//        
-//        taskExpressionsOrdered.add(CustomExpression_Expo.EXPRESSION);
+        taskExpressionsOrdered.add(CustomExpression_Net204cts_sec.EXPRESSION);
+
+        taskExpressionsOrdered.add(CustomExpression_Net204BiWt.EXPRESSION);
+
+        taskExpressionsOrdered.add(CustomExpression_Expo.EXPRESSION);
 
         // experiment
 //        ((XMLSerializerInterface) SquidExpressionMinus3.EXPRESSION).serializeXMLObject(SquidExpressionMinus3.EXPRESSION, "SquidExpressionMinus3.xml");