From 5df8390b32c0dfc003ddec3129dac84519f84d82 Mon Sep 17 00:00:00 2001
From: Sol Dubock <94075844+sjd210@users.noreply.github.com>
Date: Wed, 16 Oct 2024 15:50:15 +0100
Subject: [PATCH 1/2] Re-word Chemistry warning texts

---
 .../quiz/IsaacSymbolicChemistryValidator.java | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/java/uk/ac/cam/cl/dtg/isaac/quiz/IsaacSymbolicChemistryValidator.java b/src/main/java/uk/ac/cam/cl/dtg/isaac/quiz/IsaacSymbolicChemistryValidator.java
index 87b6eafd7..3200bb485 100644
--- a/src/main/java/uk/ac/cam/cl/dtg/isaac/quiz/IsaacSymbolicChemistryValidator.java
+++ b/src/main/java/uk/ac/cam/cl/dtg/isaac/quiz/IsaacSymbolicChemistryValidator.java
@@ -324,9 +324,7 @@ public QuestionValidationResponse validateQuestionResponse(final Question questi
             if (containsError) {
 
                 // User input contains error terms.
-                // FIXME: This currently clashes with determining whether the submitted answer was the wrong type
-                // Inequality should be changed to not allow Nuclear syntax in Chemistry questions and vice versa
-                feedback = new Content("Your answer contains invalid syntax!");
+                feedback = new Content("Your answer is not chemically valid!");
 
             } else if (closestMatch != null && closestMatchType == MatchType.EXACT) {
 
@@ -337,27 +335,27 @@ public QuestionValidationResponse validateQuestionResponse(final Question questi
             } else if (isNuclear && !chemistryQuestion.isNuclear()) {
 
                 // Nuclear/Chemistry mismatch in all correct answers.
-                feedback = new Content("This question is about Chemistry.");
+                feedback = new Content("This question is about Chemistry!");
 
-            } else if (chemistryQuestion.isNuclear() && !isNuclear) {
+            } else if (!isNuclear && chemistryQuestion.isNuclear() ) {
 
                 // Nuclear/Chemistry mismatch in all correct answers.
-                feedback = new Content("This question is about Nuclear Physics.");
+                feedback = new Content("This question is about Nuclear Physics!");
 
             } else if (!isEquation && allEquation) {
 
                 // Equation/Expression mismatch in all correct answers.
-                feedback = new Content("Your answer is an expression but we expected an equation.");
+                feedback = new Content("Your answer is an expression but we expected an equation!");
 
             } else if (isEquation && allExpression) {
 
                 // Equation/Expression mismatch in all correct answers.
-                feedback = new Content("Your answer is an equation or a term but we expected an expression.");
+                feedback = new Content("Your answer is an equation or a term but we expected an expression!");
 
             } else if (isEquation && balancedKnownFlag && !isBalanced) {
 
                 // Input is an unbalanced equation.
-                feedback = new Content("Your equation is unbalanced.");
+                feedback = new Content("Your equation is unbalanced!");
 
             } else if (isNuclear && validityKnownFlag && !isValid) {
 
@@ -373,7 +371,7 @@ public QuestionValidationResponse validateQuestionResponse(final Question questi
                 if (closestResponse.get("sameElements").equals(false)) {
 
                     // Wrong element/compound
-                    feedback = new Content("Check your elements!");
+                    feedback = new Content("Check that you have all the correct atoms present and in the right place!");
 
                 } else if (closestResponse.get("sameCoefficient").equals(false)) {
 
@@ -388,7 +386,7 @@ public QuestionValidationResponse validateQuestionResponse(final Question questi
                 } else if (!isNuclear && closestResponse.get("sameArrow").equals(false)) {
 
                     // Wrong arrow
-                    feedback = new Content("What type of reaction is this?");
+                    feedback = new Content("Check your reaction arrow!");
 
                 } else if (!isNuclear && closestResponse.get("sameBrackets").equals(false)) {
 

From 2e5dc4ebf8d57ef40f591b322fa64433b3f57649 Mon Sep 17 00:00:00 2001
From: Sol Dubock <94075844+sjd210@users.noreply.github.com>
Date: Thu, 24 Oct 2024 14:09:02 +0100
Subject: [PATCH 2/2] Reword default error feedback

---
 .../cam/cl/dtg/isaac/quiz/IsaacSymbolicChemistryValidator.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/uk/ac/cam/cl/dtg/isaac/quiz/IsaacSymbolicChemistryValidator.java b/src/main/java/uk/ac/cam/cl/dtg/isaac/quiz/IsaacSymbolicChemistryValidator.java
index 3200bb485..02fc5e481 100644
--- a/src/main/java/uk/ac/cam/cl/dtg/isaac/quiz/IsaacSymbolicChemistryValidator.java
+++ b/src/main/java/uk/ac/cam/cl/dtg/isaac/quiz/IsaacSymbolicChemistryValidator.java
@@ -324,7 +324,7 @@ public QuestionValidationResponse validateQuestionResponse(final Question questi
             if (containsError) {
 
                 // User input contains error terms.
-                feedback = new Content("Your answer is not chemically valid!");
+                feedback = new Content("We are unable to interpret your answer; it may not be chemically valid or be in a format we don't recognise.");
 
             } else if (closestMatch != null && closestMatchType == MatchType.EXACT) {