Add allowScalingCoefficents option to Chemistry checker

src/main/java/uk/ac/cam/cl/dtg/isaac/dos/IsaacSymbolicChemistryQuestion.java

@@ -32,6 +32,7 @@ public class IsaacSymbolicChemistryQuestion extends IsaacSymbolicQuestion {
     @JsonProperty("isNuclear")
     private boolean isNuclear;
     private boolean allowPermutations;
+    private boolean allowScalingCoefficients;
 
     /**
      * @return whether the question is a nuclear question or not
@@ -58,4 +59,16 @@ public void setNuclear(boolean nuclear) {
     public void setAllowPermutations(boolean allowPermutations) {
         this.allowPermutations = allowPermutations;
     }
+
+    /**
+     * @return whether the question allows coefficients to be multiplied e.g. 10 H2 + 5 O2 -> 10 H2O
+     */
+    public boolean getAllowScalingCoefficients() { return allowScalingCoefficients; }
+
+    /**
+     * @param allowScalingCoefficients set whether the question allows coefficients to be multiplied e.g. 10 H2 + 5 O2 -> 10 H2O
+     */
+    public void setAllowScalingCoefficients(boolean allowScalingCoefficients) {
+        this.allowScalingCoefficients = allowScalingCoefficients;
+    }
 }

src/main/java/uk/ac/cam/cl/dtg/isaac/dto/IsaacSymbolicChemistryQuestionDTO.java

@@ -26,6 +26,7 @@ public class IsaacSymbolicChemistryQuestionDTO extends IsaacSymbolicQuestionDTO
     @JsonProperty("isNuclear")
     private boolean isNuclear;
     private boolean allowPermutations;
+    private boolean allowScalingCoefficients;
 
     /**
      * @return whether the question is a nuclear question or not
@@ -52,4 +53,16 @@ public void setNuclear(boolean nuclear) {
     public void setAllowPermutations(boolean allowPermutations) {
         this.allowPermutations = allowPermutations;
     }
+
+    /**
+     * @return whether the question allows coefficients to be multiplied e.g. 10 H2 + 5 O2 -> 10 H2O
+     */
+    public boolean getAllowScalingCoefficients() { return allowScalingCoefficients; }
+
+    /**
+     * @param allowScalingCoefficients set whether the question allows coefficients to be multiplied e.g. 10 H2 + 5 O2 -> 10 H2O
+     */
+    public void setAllowScalingCoefficients(boolean allowScalingCoefficients) {
+        this.allowScalingCoefficients = allowScalingCoefficients;
+    }
 }

src/main/java/uk/ac/cam/cl/dtg/isaac/quiz/IsaacSymbolicChemistryValidator.java

@@ -192,6 +192,7 @@ public QuestionValidationResponse validateQuestionResponse(final Question questi
                     req.put("test", submittedFormula.getMhchemExpression());
                     req.put("description", chemistryQuestion.getId());
                     req.put("allowPermutations", String.valueOf(chemistryQuestion.getAllowPermutations()));
+                    req.put("allowScalingCoefficients", String.valueOf(chemistryQuestion.getAllowScalingCoefficients()));
                     req.put("questionID", question.getId());
 
                     if (chemistryQuestion.isNuclear()) {