fix: working evaluation code

fix: evaluation schema fixes
Udayraj123 · Jan 7, 2023 · 453680b · 453680b
1 parent 3e7450f
commit 453680b
Show file tree

Hide file tree

Showing 28 changed files with 1,010 additions and 805 deletions.
diff --git a/...unity/external/UPSC mock/IMG_8441-min.jpg → ...y/external/UPSC mock/csv/IMG_8441-min.jpg b/...unity/external/UPSC mock/IMG_8441-min.jpg → ...y/external/UPSC mock/csv/IMG_8441-min.jpg
diff --git a/...unity/external/UPSC mock/IMG_8446-min.jpg → ...y/external/UPSC mock/csv/IMG_8446-min.jpg b/...unity/external/UPSC mock/IMG_8446-min.jpg → ...y/external/UPSC mock/csv/IMG_8446-min.jpg
diff --git a/...mmunity/external/UPSC mock/answer_key.csv → ...ity/external/UPSC mock/csv/answer_key.csv b/...mmunity/external/UPSC mock/answer_key.csv → ...ity/external/UPSC mock/csv/answer_key.csv
diff --git a/samples/community/external/UPSC mock/csv/evaluation.json b/samples/community/external/UPSC mock/csv/evaluation.json
@@ -0,0 +1,22 @@
+{
+  "source_type": "custom",
+  "options": {
+    "questions_in_order": ["q1", "q2", "q3", "q4", "q5"],
+    "answers_in_order": ["C", "B", "A", "D", "E"]
+  },
+  "marking_scheme": {
+    "DEFAULT": {"correct": "2", "incorrect": "-1/3", "unmarked": "0" },
+    "NO_NEGATIVES": {
+      "questions": ["q1", "q2", "q3"],
+      "marking": { "correct": "2", "incorrect": "0", "unmarked": "0" }
+    },
+    "BONUS_ATTEMPTED": {
+      "questions": ["q4"],
+      "marking": { "unmarked": "0", "correct": "2", "incorrect": "2" }
+    },
+    "BONUS_ALL": {
+      "questions": ["q5"],
+      "marking": { "unmarked": "2", "correct": "2", "incorrect": "2" }
+    }
+  }
+}
diff --git a/...ommunity/external/UPSC mock/template.json → ...nity/external/UPSC mock/csv/template.json b/...ommunity/external/UPSC mock/template.json → ...nity/external/UPSC mock/csv/template.json
@@ -117,67 +117,7 @@
     "q97",
     "q98",
     "q99",
-    "q100",
-    "q101",
-    "q102",
-    "q103",
-    "q104",
-    "q105",
-    "q106",
-    "q107",
-    "q108",
-    "q109",
-    "q110",
-    "q111",
-    "q112",
-    "q113",
-    "q114",
-    "q115",
-    "q116",
-    "q117",
-    "q118",
-    "q119",
-    "q120",
-    "q121",
-    "q122",
-    "q123",
-    "q124",
-    "q125",
-    "q126",
-    "q127",
-    "q128",
-    "q129",
-    "q130",
-    "q131",
-    "q132",
-    "q133",
-    "q134",
-    "q135",
-    "q136",
-    "q137",
-    "q138",
-    "q139",
-    "q140",
-    "q141",
-    "q142",
-    "q143",
-    "q144",
-    "q145",
-    "q146",
-    "q147",
-    "q148",
-    "q149",
-    "q150",
-    "q151",
-    "q152",
-    "q153",
-    "q154",
-    "q155",
-    "q156",
-    "q157",
-    "q158",
-    "q159",
-    "q160"
+    "q100"
   ],
   "qBlocks": {
     "bookletNo": {
@@ -319,138 +259,6 @@
         ]
       ],
       "qType": "QTYPE_MCQ4"
-    },
-    "q101block": {
-      "orig": [1125, 1569],
-      "bigGaps": [11, 11],
-      "gaps": [63.75, 32.73],
-      "qNos": [
-        [
-          [
-            "q101",
-            "q102",
-            "q103",
-            "q104",
-            "q105",
-            "q106",
-            "q107",
-            "q108",
-            "q109",
-            "q110"
-          ]
-        ]
-      ],
-      "qType": "QTYPE_MCQ4"
-    },
-    "q111block": {
-      "orig": [1125, 1901],
-      "bigGaps": [11, 11],
-      "gaps": [63.75, 32.73],
-      "qNos": [
-        [
-          [
-            "q111",
-            "q112",
-            "q113",
-            "q114",
-            "q115",
-            "q116",
-            "q117",
-            "q118",
-            "q119",
-            "q120"
-          ]
-        ]
-      ],
-      "qType": "QTYPE_MCQ4"
-    },
-    "q121block": {
-      "orig": [1452, 918],
-      "bigGaps": [11, 11],
-      "gaps": [63.75, 32.73],
-      "qNos": [
-        [
-          [
-            "q121",
-            "q122",
-            "q123",
-            "q124",
-            "q125",
-            "q126",
-            "q127",
-            "q128",
-            "q129",
-            "q130"
-          ]
-        ]
-      ],
-      "qType": "QTYPE_MCQ4"
-    },
-    "q131block": {
-      "orig": [1452, 1245],
-      "bigGaps": [11, 11],
-      "gaps": [63.75, 32.73],
-      "qNos": [
-        [
-          [
-            "q131",
-            "q132",
-            "q133",
-            "q134",
-            "q135",
-            "q136",
-            "q137",
-            "q138",
-            "q139",
-            "q140"
-          ]
-        ]
-      ],
-      "qType": "QTYPE_MCQ4"
-    },
-    "q141block": {
-      "orig": [1452, 1569],
-      "bigGaps": [11, 11],
-      "gaps": [63.75, 32.73],
-      "qNos": [
-        [
-          [
-            "q141",
-            "q142",
-            "q143",
-            "q144",
-            "q145",
-            "q146",
-            "q147",
-            "q148",
-            "q149",
-            "q150"
-          ]
-        ]
-      ],
-      "qType": "QTYPE_MCQ4"
-    },
-    "q151block": {
-      "orig": [1452, 1901],
-      "bigGaps": [11, 11],
-      "gaps": [63.75, 32.73],
-      "qNos": [
-        [
-          [
-            "q151",
-            "q152",
-            "q153",
-            "q154",
-            "q155",
-            "q156",
-            "q157",
-            "q158",
-            "q159",
-            "q160"
-          ]
-        ]
-      ],
-      "qType": "QTYPE_MCQ4"
     }
   },
   "mapper": {},

diff --git a/samples/community/external/UPSC mock/custom/IMG_8441-min.jpg b/samples/community/external/UPSC mock/custom/IMG_8441-min.jpg
diff --git a/...unity/external/UPSC mock/IMG_8443-min.jpg → ...xternal/UPSC mock/custom/IMG_8443-min.jpg b/...unity/external/UPSC mock/IMG_8443-min.jpg → ...xternal/UPSC mock/custom/IMG_8443-min.jpg
diff --git a/...unity/external/UPSC mock/IMG_8445-min.jpg → ...xternal/UPSC mock/custom/IMG_8445-min.jpg b/...unity/external/UPSC mock/IMG_8445-min.jpg → ...xternal/UPSC mock/custom/IMG_8445-min.jpg
diff --git a/samples/community/external/UPSC mock/custom/IMG_8446-min.jpg b/samples/community/external/UPSC mock/custom/IMG_8446-min.jpg
diff --git a/...external/UPSC mock/evaluation-custom.json → ...external/UPSC mock/custom/evaluation.json b/...external/UPSC mock/evaluation-custom.json → ...external/UPSC mock/custom/evaluation.json
@@ -1,10 +1,12 @@
 {
   "source_type": "custom",
   "options": {
-    "answers": ["C", "B", "A", "D"]
+    "questions_in_order": ["q1","q2","q3","q4"],
+    "answers_in_order": ["C", "B", "A", "D"],
+    "should_explain_scoring": true
   },
   "marking_scheme": {
-    "default": { "correct": "2", "incorrect": "-1/3", "unmarked": "0" },
+    "DEFAULT": {"correct": "2", "incorrect": "-1/3", "unmarked": "0" },
     "NO_NEGATIVES": {
       "questions": ["q1..3", "q6..100"],
       "marking": { "correct": "2", "incorrect": "0", "unmarked": "0" }