feat: support for multiple-correct-weighted answer key (#166)

* feat: support for multiple-correct-weighted answer key; minor refactor evaluation schema * fix: update validation
Udayraj123 · Feb 24, 2024 · c448e0c · c448e0c
1 parent f9f6dc3
commit c448e0c
Show file tree

Hide file tree

Showing 18 changed files with 295 additions and 142 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -41,7 +41,7 @@ repos:
     hooks:
       - id: pytest-on-commit
         name: Running single sample test
-        entry:  pytest -rfpsxEX --disable-warnings --verbose -k sample1
+        entry:  python3 -m pytest -rfpsxEX --disable-warnings --verbose -k sample1
         language: system
         pass_filenames: false
         always_run: true
@@ -51,7 +51,7 @@ repos:
     hooks:
       - id: pytest-on-push
         name: Running all tests before push...
-        entry: pytest -rfpsxEX --disable-warnings --verbose --durations=3
+        entry: python3 -m pytest -rfpsxEX --disable-warnings --verbose --durations=3
         language: system
         pass_filenames: false
         always_run: true

diff --git a/samples/answer-key/using-csv/adrian_omr.png b/samples/answer-key/using-csv/adrian_omr.png
diff --git a/samples/sample2/answer_key.csv → samples/answer-key/using-csv/answer_key.csv b/samples/sample2/answer_key.csv → samples/answer-key/using-csv/answer_key.csv
@@ -1,5 +1,5 @@
-q1,B
+q1,C
 q2,E
 q3,A
-q4,C
+q4,B
 q5,B
diff --git a/samples/sample2/evaluation.json → samples/answer-key/using-csv/evaluation.json b/samples/sample2/evaluation.json → samples/answer-key/using-csv/evaluation.json
@@ -4,7 +4,7 @@
     "answer_key_csv_path": "answer_key.csv",
     "should_explain_scoring": true
   },
-  "marking_scheme": {
+  "marking_schemes": {
     "DEFAULT": {
       "correct": "1",
       "incorrect": "0",

diff --git a/samples/answer-key/using-csv/template.json b/samples/answer-key/using-csv/template.json
@@ -0,0 +1,35 @@
+{
+  "pageDimensions": [
+    300,
+    400
+  ],
+  "bubbleDimensions": [
+    25,
+    25
+  ],
+  "preProcessors": [
+    {
+      "name": "CropPage",
+      "options": {
+        "morphKernel": [
+          10,
+          10
+        ]
+      }
+    }
+  ],
+  "fieldBlocks": {
+    "MCQ_Block_1": {
+      "fieldType": "QTYPE_MCQ5",
+      "origin": [
+        65,
+        60
+      ],
+      "fieldLabels": [
+        "q1..5"
+      ],
+      "labelsGap": 52,
+      "bubblesGap": 41
+    }
+  }
+}
diff --git a/samples/answer-key/weighted-answers/evaluation.json b/samples/answer-key/weighted-answers/evaluation.json
@@ -0,0 +1,35 @@
+{
+  "source_type": "custom",
+  "options": {
+    "questions_in_order": [
+      "q1..5"
+    ],
+    "answers_in_order": [
+      "C",
+      "E",
+      [
+        "A",
+        "C"
+      ],
+      [
+        [
+          "B",
+          2
+        ],
+        [
+          "C",
+          "3/2"
+        ]
+      ],
+      "C"
+    ],
+    "should_explain_scoring": true
+  },
+  "marking_schemes": {
+    "DEFAULT": {
+      "correct": "3",
+      "incorrect": "-1",
+      "unmarked": "0"
+    }
+  }
+}
diff --git a/samples/answer-key/weighted-answers/images/adrian_omr.png b/samples/answer-key/weighted-answers/images/adrian_omr.png
diff --git a/samples/answer-key/weighted-answers/images/adrian_omr_2.png b/samples/answer-key/weighted-answers/images/adrian_omr_2.png
diff --git a/samples/answer-key/weighted-answers/template.json b/samples/answer-key/weighted-answers/template.json
@@ -0,0 +1,35 @@
+{
+  "pageDimensions": [
+    300,
+    400
+  ],
+  "bubbleDimensions": [
+    25,
+    25
+  ],
+  "preProcessors": [
+    {
+      "name": "CropPage",
+      "options": {
+        "morphKernel": [
+          10,
+          10
+        ]
+      }
+    }
+  ],
+  "fieldBlocks": {
+    "MCQ_Block_1": {
+      "fieldType": "QTYPE_MCQ5",
+      "origin": [
+        65,
+        60
+      ],
+      "fieldLabels": [
+        "q1..5"
+      ],
+      "labelsGap": 52,
+      "bubblesGap": 41
+    }
+  }
+}
diff --git a/samples/community/UPSC-mock/evaluation.json b/samples/community/UPSC-mock/evaluation.json
@@ -8,7 +8,7 @@
     ],
     "should_explain_scoring": true
   },
-  "marking_scheme": {
+  "marking_schemes": {
     "DEFAULT": {
       "correct": "2",
       "incorrect": "-2/3",

diff --git a/samples/community/UmarFarootAPS/answer_key.csv b/samples/community/UmarFarootAPS/answer_key.csv
@@ -2,8 +2,8 @@ q1,C
 q2,C
 q3,"D,E"
 q4,"A,AB"
-q5,"['A', ['1', '-2/3', '0']]"
-q6,"['A', ['2']]"
+q5,"[['A', '1'], ['B', '2']]"
+q6,"['A', 'B']"
 q7,C
 q8,D
 q9,B

diff --git a/samples/community/UmarFarootAPS/evaluation.json b/samples/community/UmarFarootAPS/evaluation.json
@@ -4,7 +4,7 @@
     "answer_key_csv_path": "answer_key.csv",
     "should_explain_scoring": true
   },
-  "marking_scheme": {
+  "marking_schemes": {
     "DEFAULT": {
       "correct": "1",
       "incorrect": "0",

diff --git a/samples/sample4/evaluation.json b/samples/sample4/evaluation.json
@@ -11,15 +11,19 @@
       "B",
       "D",
       "C",
-      "BC",
+      [
+        "B",
+        "C",
+        "BC"
+      ],
       "A",
       "C",
       "D",
       "C"
     ],
     "should_explain_scoring": true
   },
-  "marking_scheme": {
+  "marking_schemes": {
     "DEFAULT": {
       "correct": "3",
       "incorrect": "-1",

diff --git a/samples/sample5/evaluation.json b/samples/sample5/evaluation.json
@@ -33,7 +33,7 @@
     ],
     "should_explain_scoring": true
   },
-  "marking_scheme": {
+  "marking_schemes": {
     "DEFAULT": {
       "correct": "1",
       "incorrect": "0",