Restrict LLM marking formula types

isaacphysics · Sep 10, 2024 · 090489d · 090489d
1 parent e68be89
commit 090489d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/main/java/uk/ac/cam/cl/dtg/isaac/dos/content/LLMMarkingConstant.java b/src/main/java/uk/ac/cam/cl/dtg/isaac/dos/content/LLMMarkingConstant.java
@@ -6,7 +6,7 @@
 @JsonContentType("LLMMarkingConstant")
 public class LLMMarkingConstant extends LLMMarkingExpression {
     private String type;
-    private String value;
+    private Integer value;
 
     public LLMMarkingConstant() {
     }
@@ -20,10 +20,10 @@ public void setType(String type) {
         this.type = type;
     }
 
-    public String getValue() {
+    public Integer getValue() {
         return value;
     }
-    public void setValue(String value) {
+    public void setValue(Integer value) {
         this.value = value;
     }
 }
diff --git a/src/main/java/uk/ac/cam/cl/dtg/isaac/dos/content/LLMMarkingFunction.java b/src/main/java/uk/ac/cam/cl/dtg/isaac/dos/content/LLMMarkingFunction.java
@@ -7,8 +7,12 @@
  */
 @JsonContentType("LLMMarkingFunction")
 public class LLMMarkingFunction extends LLMMarkingExpression {
+    public enum FunctionName {
+        SUM, MIN, MAX
+    }
+
     private String type;
-    private String name;
+    private FunctionName name;
     private List<LLMMarkingExpression> arguments;
 
     public LLMMarkingFunction() {
@@ -23,10 +27,10 @@ public void setType(String type) {
         this.type = type;
     }
 
-    public String getName() {
+    public FunctionName getName() {
         return name;
     }
-    public void setName(String name) {
+    public void setName(FunctionName name) {
         this.name = name;
     }