Final Marcus pull

src/main/java/edu/rpi/legup/puzzle/thermometer/ThermometerVial.java

@@ -75,9 +75,13 @@ public boolean containsCell(ThermometerCell cell){
         return false;
     }
 
-    //basic accessors
+    //Returns cell containing head of thermometer
     public ThermometerCell getHead(){return cells.getFirst();}
+
+    //Returns cell containing tail of thermometer
     public ThermometerCell getTail(){return cells.getLast();}
+
+    //Retruns all cells in vial, from head to tip
     public ArrayList<ThermometerCell> getCells(){return cells;}
 
     //checking for discontinuous flow inside of vial

src/main/java/edu/rpi/legup/puzzle/thermometer/rules/DiscontinuousMercuryContradictionRule.java

@@ -9,6 +9,7 @@
 
 import java.util.ArrayList;
 
+//TODO: Rule is untested
 public class DiscontinuousMercuryContradictionRule extends ContradictionRule{
 
     private final String NO_CONTRADICTION_MESSAGE = "Does not contain a contradiction at this index";

src/main/java/edu/rpi/legup/puzzle/thermometer/rules/MercuryOrBlockedCaseRule.java

@@ -10,6 +10,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+//TODO: Rule is untested
 public class MercuryOrBlockedCaseRule extends CaseRule {
     public MercuryOrBlockedCaseRule() {
         super("THERM-CASE-0001",

src/main/java/edu/rpi/legup/puzzle/thermometer/rules/PriorFilledDirectRule.java

@@ -12,6 +12,7 @@
 
 import java.util.ArrayList;
 
+//TODO: Rule is untested
 public class PriorFilledDirectRule extends DirectRule {
 
     public PriorFilledDirectRule() {

src/main/java/edu/rpi/legup/puzzle/thermometer/rules/RestEmptyDirectRule.java

@@ -13,6 +13,7 @@
 import java.util.ArrayList;
 import java.util.Set;
 
+//TODO: Rule is untested
 public class RestEmptyDirectRule extends DirectRule {
 
     public RestEmptyDirectRule() {

src/main/java/edu/rpi/legup/puzzle/thermometer/rules/TooFewMercuryContradiction.java

@@ -7,6 +7,7 @@
 import edu.rpi.legup.puzzle.thermometer.ThermometerCell;
 import edu.rpi.legup.puzzle.thermometer.ThermometerFill;
 
+//TODO: Rule is untested
 public class TooFewMercuryContradiction extends ContradictionRule{
 
     private final String Invalid_Use_Message = "Mercury can still reach limit";

src/main/java/edu/rpi/legup/puzzle/thermometer/rules/TooManyMercuryContradiction.java

@@ -7,6 +7,7 @@
 import edu.rpi.legup.puzzle.thermometer.ThermometerCell;
 import edu.rpi.legup.puzzle.thermometer.ThermometerFill;
 
+//TODO: Rule is untested
 public class TooManyMercuryContradiction extends ContradictionRule{
 
     private final String Invalid_Use_Message = "Mercury does not exceed limit";

src/main/java/edu/rpi/legup/puzzle/thermometer/rules/thermometer_reference_sheet.txt

@@ -1,8 +1,16 @@
 THERM-BASC-0001 : RestEmptyDirectRule
 THERM-BASC-0002 : PriorFilledDirectRule
+THERM-BASC-0003 : FinishWithMercuryDirectRule
+THERM-BASC-0004 : FinishWithBlockedDirectRule
+THERM-BASC-0005 : MinimumFillDirectRule
+THERM-BASC-0006 : ThermometerTooLargeDirectRule
 
 THERM-CONT-0001 : DiscontinuousMercuryContradictionRule
 THERM-CONT-0002 : TooFewMercuryContradiction
 THERM-CONT-0003 : TooManyMercuryContradiction
 
-THERM-CASE-0001 : MercuryOrBlockedCaseRule
+THERM-CASE-0001 : MercuryOrBlockedCaseRule
+THERM-CASE-0002 : SatisfyMercuryCaseRule
+
+Images can be found/edited here:
+https://docs.google.com/presentation/d/1YHNog2fGvLJEx4kbJZiwwAlP-m2-E1O7hGh0HJ7S0gE/edit?usp=sharing