diff --git a/src/main/java/uk/ac/cam/cl/dtg/isaac/dos/IsaacLLMFreeTextQuestion.java b/src/main/java/uk/ac/cam/cl/dtg/isaac/dos/IsaacLLMFreeTextQuestion.java index 690d27376f..c8ea9478d5 100644 --- a/src/main/java/uk/ac/cam/cl/dtg/isaac/dos/IsaacLLMFreeTextQuestion.java +++ b/src/main/java/uk/ac/cam/cl/dtg/isaac/dos/IsaacLLMFreeTextQuestion.java @@ -22,8 +22,6 @@ public class IsaacLLMFreeTextQuestion extends Question { private List markScheme; private Integer maxMarks; private String additionalMarkingInstructions; - @Deprecated - private String markCalculationInstructions; private List markedExamples; private LLMMarkingExpression markingFormula; @Deprecated @@ -60,15 +58,6 @@ public void setAdditionalMarkingInstructions(String additionalMarkingInstruction this.additionalMarkingInstructions = additionalMarkingInstructions; } - @Deprecated - public String getMarkCalculationInstructions() { - return markCalculationInstructions; - } - @Deprecated - public void setMarkCalculationInstructions(String markCalculationInstructions) { - this.markCalculationInstructions = markCalculationInstructions; - } - public List getMarkedExamples() { return markedExamples; } diff --git a/src/main/java/uk/ac/cam/cl/dtg/isaac/dos/LLMFreeTextQuestionValidationResponse.java b/src/main/java/uk/ac/cam/cl/dtg/isaac/dos/LLMFreeTextQuestionValidationResponse.java index f5e687f0b9..f408ef2a76 100644 --- a/src/main/java/uk/ac/cam/cl/dtg/isaac/dos/LLMFreeTextQuestionValidationResponse.java +++ b/src/main/java/uk/ac/cam/cl/dtg/isaac/dos/LLMFreeTextQuestionValidationResponse.java @@ -11,9 +11,6 @@ @DTOMapping(LLMFreeTextQuestionValidationResponseDTO.class) public class LLMFreeTextQuestionValidationResponse extends QuestionValidationResponse { - private String markCalculationInstructions; - private String additionalMarkingInstructions; - private Integer maxMarks; private Integer marksAwarded; private List markBreakdown; @@ -26,27 +23,6 @@ public LLMFreeTextQuestionValidationResponse(final String questionId, final Choi super(questionId, answer, correct, explanation, dateAttempted); } - public String getMarkCalculationInstructions() { - return markCalculationInstructions; - } - public void setMarkCalculationInstructions(String markCalculationInstructions) { - this.markCalculationInstructions = markCalculationInstructions; - } - - public String getAdditionalMarkingInstructions() { - return additionalMarkingInstructions; - } - public void setAdditionalMarkingInstructions(String additionalMarkingInstructions) { - this.additionalMarkingInstructions = additionalMarkingInstructions; - } - - public Integer getMaxMarks() { - return maxMarks; - } - public void setMaxMarks(Integer maxMarks) { - this.maxMarks = maxMarks; - } - public Integer getMarksAwarded() { return marksAwarded; } diff --git a/src/main/java/uk/ac/cam/cl/dtg/isaac/dto/LLMFreeTextQuestionValidationResponseDTO.java b/src/main/java/uk/ac/cam/cl/dtg/isaac/dto/LLMFreeTextQuestionValidationResponseDTO.java index e1c68fb928..8baa85aaa1 100644 --- a/src/main/java/uk/ac/cam/cl/dtg/isaac/dto/LLMFreeTextQuestionValidationResponseDTO.java +++ b/src/main/java/uk/ac/cam/cl/dtg/isaac/dto/LLMFreeTextQuestionValidationResponseDTO.java @@ -5,43 +5,15 @@ import java.util.List; public class LLMFreeTextQuestionValidationResponseDTO extends QuestionValidationResponseDTO { - private String markCalculationInstructions; - private String additionalMarkingInstructions; - private Integer maxMarks; private Integer marksAwarded; private List markBreakdown; public LLMFreeTextQuestionValidationResponseDTO() { } - public String getMarkCalculationInstructions() { - return markCalculationInstructions; - } - - public void setMarkCalculationInstructions(String markCalculationInstructions) { - this.markCalculationInstructions = markCalculationInstructions; - } - - public String getAdditionalMarkingInstructions() { - return additionalMarkingInstructions; - } - - public void setAdditionalMarkingInstructions(String additionalMarkingInstructions) { - this.additionalMarkingInstructions = additionalMarkingInstructions; - } - - public Integer getMaxMarks() { - return maxMarks; - } - - public void setMaxMarks(Integer maxMarks) { - this.maxMarks = maxMarks; - } - public Integer getMarksAwarded() { return marksAwarded; } - public void setMarksAwarded(Integer marksAwarded) { this.marksAwarded = marksAwarded; } @@ -49,7 +21,6 @@ public void setMarksAwarded(Integer marksAwarded) { public List getMarkBreakdown() { return markBreakdown; } - public void setMarkBreakdown(List markBreakdown) { this.markBreakdown = markBreakdown; } diff --git a/src/main/java/uk/ac/cam/cl/dtg/isaac/quiz/IsaacLLMFreeTextValidator.java b/src/main/java/uk/ac/cam/cl/dtg/isaac/quiz/IsaacLLMFreeTextValidator.java index 80ee99d2d0..a811eec313 100644 --- a/src/main/java/uk/ac/cam/cl/dtg/isaac/quiz/IsaacLLMFreeTextValidator.java +++ b/src/main/java/uk/ac/cam/cl/dtg/isaac/quiz/IsaacLLMFreeTextValidator.java @@ -294,10 +294,8 @@ private LLMFreeTextQuestionValidationResponse generateQuestionValidationResponse LLMFreeTextQuestionValidationResponse validationResponse = new LLMFreeTextQuestionValidationResponse( question.getId(), answer, isConsideredCorrect, null, new Date()); - validationResponse.setMaxMarks(question.getMaxMarks()); validationResponse.setMarksAwarded(markTotal); validationResponse.setMarkBreakdown(markBreakdown); - validationResponse.setAdditionalMarkingInstructions(question.getAdditionalMarkingInstructions()); return validationResponse; }