Skip to content

Bring coord sig fig feedback in line with numeric questions #761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
axlewin wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Bring coord sig fig feedback in line with numeric questions #761

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
884cfa1
Prevent coord sig figs defaulting to 2 when they should be ignored
axlewin Feb 25, 2026
67114d2
Bring coord sig fig feedback in line with numeric questions
axlewin Feb 27, 2026
12a8713
Fix subset sig figs logic
axlewin Feb 27, 2026
276825c
Prevent sig fig feedback on incorrect values
axlewin Feb 27, 2026
62f0e27
Show sig fig feedback for allowSubsetMatch choices
axlewin Feb 27, 2026
33ddd13
Simplify validator logic
axlewin Feb 27, 2026
fe5d039
Remove redundant null check
axlewin Feb 27, 2026
97ec917
Restore default feedback for correct choices
axlewin Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 52 additions & 11 deletions src/main/java/uk/ac/cam/cl/dtg/isaac/quiz/IsaacCoordinateValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ public final QuestionValidationResponse validateQuestionResponse(final Question
IsaacCoordinateQuestion coordinateQuestion = (IsaacCoordinateQuestion) question;
CoordinateChoice submittedChoice = (CoordinateChoice) answer;

Integer sigFigsMin = coordinateQuestion.getSignificantFiguresMin();
Integer sigFigsMax = coordinateQuestion.getSignificantFiguresMax();

// STEP 0: Is it even possible to answer this question?

if (null == coordinateQuestion.getChoices() || coordinateQuestion.getChoices().isEmpty()) {
Expand Down Expand Up @@ -127,10 +130,6 @@ public final QuestionValidationResponse validateQuestionResponse(final Question
}
List<CoordinateItem> choiceItems = coordinateChoice.getItems().stream().map(i -> (CoordinateItem) i).collect(Collectors.toList());

// Get significant figures to validate with
Integer sigFigsMin = coordinateQuestion.getSignificantFiguresMin();
Integer sigFigsMax = coordinateQuestion.getSignificantFiguresMax();

// Check that the items in the submitted answer match the items in the choice numerically

boolean allItemsMatch = false;
Expand All @@ -151,10 +150,10 @@ public final QuestionValidationResponse validateQuestionResponse(final Question
CoordinateItem choiceItem = choiceItems.get(coordIndex);
CoordinateItem submittedItem = submittedItems.get(coordIndex);
// Check that the submitted item matches the choice item
if (!coordinateItemsMatch(submittedItem, choiceItem, sigFigsMin, sigFigsMax)) {
if (!coordinateItemsMatch(submittedItem, choiceItem, sigFigsMin, sigFigsMax, false)) {
allItemsMatch = false;
// Check if this is just a significant figures mismatch
if (!coordinateItemsMatch(submittedItem, choiceItem, null, null)) {
if (!coordinateItemsMatch(submittedItem, choiceItem, sigFigsMin, sigFigsMax, true)) {
allItemsMatchWithoutSigFigs = false;
// Exit early on mismatch:
break;
Expand All @@ -169,7 +168,8 @@ public final QuestionValidationResponse validateQuestionResponse(final Question
break;
} else if (allItemsMatchWithoutSigFigs) {
feedback = new Content(DEFAULT_VALIDATION_RESPONSE);
feedback.setTags(new HashSet<>(ImmutableList.of("sig_figs")));
// Too many sig figs, or too few sig figs but the choice has trailing zeros; otherwise correct
feedback.setTags(new HashSet<>(ImmutableList.of("sig_figs", "sig_figs_too_many")));
break;
}

Expand All @@ -179,23 +179,37 @@ public final QuestionValidationResponse validateQuestionResponse(final Question
// For correct choices, check if the submitted items are a proper subset of the choice
if (coordinateChoice.isCorrect() && (choiceItems.size() > submittedItems.size())) {
boolean allSubmittedItemsInChoiceItems = true;
boolean allItemsInChoiceWithoutSigFigs = true;
for (CoordinateItem submittedItem : submittedItems) {
boolean submittedItemInChoiceItem = false;
boolean itemInChoiceWithoutSigFigs = false;
for (CoordinateItem choiceItem : choiceItems) {
if (coordinateItemsMatch(submittedItem, choiceItem, sigFigsMin, sigFigsMax)) {
if (coordinateItemsMatch(submittedItem, choiceItem, sigFigsMin, sigFigsMax,
false)) {
submittedItemInChoiceItem = true;
break;
} else if (coordinateItemsMatch(submittedItem, choiceItem, sigFigsMin, sigFigsMax,
true)) {
itemInChoiceWithoutSigFigs = true;
}
}
if (!submittedItemInChoiceItem) {
allSubmittedItemsInChoiceItems = false;
break;
// Check if this is just a significant figures mismatch
if (!itemInChoiceWithoutSigFigs) {
allItemsInChoiceWithoutSigFigs = false;
break;
}
}
}
if (allSubmittedItemsInChoiceItems) {
feedback = new Content((submittedItems.size() == 1 ? "This is" : "These are")
+ " correct, but can you find more?");
break;
} else if (allItemsInChoiceWithoutSigFigs) {
feedback = new Content(DEFAULT_VALIDATION_RESPONSE);
feedback.setTags(new HashSet<>(ImmutableList.of("sig_figs", "sig_figs_too_many")));
break;
}
}

Expand All @@ -204,23 +218,35 @@ public final QuestionValidationResponse validateQuestionResponse(final Question
boolean allowSubsetMatch = (null != coordinateChoice.isAllowSubsetMatch() && coordinateChoice.isAllowSubsetMatch());
if (allowSubsetMatch && (submittedItems.size() > choiceItems.size())) {
boolean allChoiceItemsInSubmittedItems = true;
boolean allItemsInSubmittedWithoutSigFigs = true;
for (CoordinateItem choiceItem : choiceItems) {
boolean choiceItemInSubmittedItems = false;
boolean itemInSubmittedWithoutSigFigs = false;
for (CoordinateItem submittedItem : submittedItems) {
if (coordinateItemsMatch(submittedItem, choiceItem, sigFigsMin, sigFigsMax)) {
if (coordinateItemsMatch(submittedItem, choiceItem, sigFigsMin, sigFigsMax, false)) {
choiceItemInSubmittedItems = true;
break;
} else if (coordinateItemsMatch(submittedItem, choiceItem, sigFigsMin, sigFigsMax, true)) {
itemInSubmittedWithoutSigFigs = true;
}
}
if (!choiceItemInSubmittedItems) {
allChoiceItemsInSubmittedItems = false;
// Check if this is just a significant figures mismatch
if (!itemInSubmittedWithoutSigFigs) {
allItemsInSubmittedWithoutSigFigs = false;
}
break;
}
}
if (allChoiceItemsInSubmittedItems) {
responseCorrect = coordinateChoice.isCorrect();
feedback = (Content) coordinateChoice.getExplanation();
break;
} else if (allItemsInSubmittedWithoutSigFigs) {
feedback = new Content(DEFAULT_VALIDATION_RESPONSE);
feedback.setTags(new HashSet<>(ImmutableList.of("sig_figs", "sig_figs_too_many")));
break;
}
}
}
Expand All @@ -236,12 +262,19 @@ public final QuestionValidationResponse validateQuestionResponse(final Question
if (feedbackIsNullOrEmpty(feedback) && null != coordinateQuestion.getDefaultFeedback()) {
feedback = coordinateQuestion.getDefaultFeedback();
}
// If there was no default feedback, check for too few significant figures
if (feedbackIsNullOrEmpty(feedback) && submittedItems.stream().anyMatch(i -> i.getCoordinates().stream()
.anyMatch(c -> ValidationUtils.tooFewSignificantFigures(c, sigFigsMin, log)))) {
feedback = new Content(DEFAULT_VALIDATION_RESPONSE);
feedback.setTags(new HashSet<>(ImmutableList.of("sig_figs", "sig_figs_too_few")));
}

return new QuestionValidationResponse(question.getId(), answer, responseCorrect, feedback, new Date());
}

private boolean coordinateItemsMatch(final CoordinateItem submittedItem, final CoordinateItem choiceItem,
final Integer sigFigsMin, final Integer sigFigsMax) {
final Integer sigFigsMin, final Integer sigFigsMax,
final boolean allowTooManySigFigs) {

if (submittedItem.getCoordinates().size() != choiceItem.getCoordinates().size()) {
return false;
Expand All @@ -251,6 +284,14 @@ private boolean coordinateItemsMatch(final CoordinateItem submittedItem, final C
String submittedValue = submittedItem.getCoordinates().get(dimension);
String choiceValue = choiceItem.getCoordinates().get(dimension);

if (allowTooManySigFigs) {
// Check if the submission has more significant figures than the allowed maximum
if (null != sigFigsMax && ValidationUtils.tooManySignificantFigures(submittedValue, sigFigsMax, log)) {
// Check if the submission would match the choice if we ignore the excess significant figures
return ValidationUtils.numericValuesMatch(choiceValue, submittedValue, sigFigsMax, log);
}
}

int sigFigs = ValidationUtils.numberOfSignificantFiguresToValidateWith(submittedValue, sigFigsMin, sigFigsMax, log);
if (!ValidationUtils.numericValuesMatch(choiceValue, submittedValue, sigFigs, log)
|| null != sigFigsMin && ValidationUtils.tooFewSignificantFigures(submittedValue, sigFigsMin, log)
Expand Down
Loading