Sketch out DAG grader

Author: SethPoulsen

runestone/parsons/js/dagGrader.js

@@ -0,0 +1,24 @@
+import LineBasedGrader from "./lineGrader";
+
+export default class DAGGrader extends LineBasedGrader {
+
+    inverseLISIndices(arr) {
+        throw new Error("LIS algorithm for DAG grader not yet implemented.")
+    }
+
+    checkCorrectOrdering(solutionLines, answerLines) {
+        let isCorrectOrder = true;
+        this.correctLines = 0;
+        this.solutionLength = solutionLines.length;
+        let loopLimit = Math.min(solutionLines.length, answerLines.length);
+        for (i = 0; i < loopLimit; i++) {
+            if (answerLines[i].text !== solutionLines[i].text) {
+                isCorrectOrder = false;
+            } else {
+                this.correctLines += 1;
+            }
+        }
+        return isCorrectOrder
+    }
+
+}

runestone/parsons/js/lineGrader.js

@@ -1,4 +1,4 @@
-export default class LineBasedGrader {
+export default class DAGGrader {
     constructor(problem) {
         this.problem = problem;
     }
@@ -55,6 +55,8 @@ export default class LineBasedGrader {
         this.incorrectIndents = 0;
         var solutionLines = problem.solution;
         var answerLines = problem.answerLines();
+        console.log(solutionLines)
+        console.log(answerLines)
         var i;
         var state;
         this.percentLines =
@@ -72,17 +74,7 @@ export default class LineBasedGrader {
         // Determine whether the code **that is there** is in the correct order
         // If there is too much or too little code this only matters for
         // calculating a percentage score.
-        let isCorrectOrder = true;
-        this.correctLines = 0;
-        this.solutionLength = solutionLines.length;
-        let loopLimit = Math.min(solutionLines.length, answerLines.length);
-        for (i = 0; i < loopLimit; i++) {
-            if (answerLines[i].text !== solutionLines[i].text) {
-                isCorrectOrder = false;
-            } else {
-                this.correctLines += 1;
-            }
-        }
+        let isCorrectOrder = this.checkCorrectOrdering(solutionLines, answerLines)
 
         // Determine whether blocks are indented correctly
         this.indentLeft = [];
@@ -110,9 +102,26 @@ export default class LineBasedGrader {
         }
         this.calculatePercent();
         this.graderState = state;
+
+        console.log(state)
         return state;
     }
 
+    checkCorrectOrdering(solutionLines, answerLines) {
+        let isCorrectOrder = true;
+        this.correctLines = 0;
+        this.solutionLength = solutionLines.length;
+        let loopLimit = Math.min(solutionLines.length, answerLines.length);
+        for (i = 0; i < loopLimit; i++) {
+            if (answerLines[i].text !== solutionLines[i].text) {
+                isCorrectOrder = false;
+            } else {
+                this.correctLines += 1;
+            }
+        }
+        return isCorrectOrder
+    }
+
     calculatePercent() {
         let numLines = this.percentLines * 0.2;
         let lines = this.problem.answerLines().length;

runestone/parsons/js/parsons.js

@@ -28,6 +28,7 @@ import "./prettify.js";
 import "../css/parsons.css";
 import "../css/prettify.css";
 import LineBasedGrader from "./lineGrader";
+import DAGGrader from "./dagGrader";
 import ParsonsLine from "./parsonsLine";
 import ParsonsBlock from "./parsonsBlock";
 
@@ -76,7 +77,7 @@ export default class Parsons extends RunestoneBase {
         //     }
         // }
         this.initializeOptions();
-        this.grader = new LineBasedGrader(this);
+        this.grader = this.options.grader === "dag" ? new DAGGrader(this) : new LineBasedGrader(this);
         this.grader.showfeedback = this.showfeedback;
         var fulltext = $(this.origElem).html();
         this.blockIndex = 0;
@@ -101,7 +102,9 @@ export default class Parsons extends RunestoneBase {
         var noindent = $(this.origElem).data("noindent");
         var adaptive = $(this.origElem).data("adaptive");
         var numbered = $(this.origElem).data("numbered");
+        var grader = $(this.origElem).data("grader");
         options["numbered"] = numbered;
+        options["grader"] = grader;
         if (maxdist !== undefined) {
             options["maxdist"] = maxdist;
         }

runestone/parsons/parsons.py

@@ -41,7 +41,7 @@ def setup(app):
 
 TEMPLATE_END = """
         </div>
-        <pre  class="parsonsblocks" data-question_label="%(question_label)s"  %(adaptive)s %(maxdist)s %(order)s %(noindent)s %(language)s %(numbered)s %(optional)s style="visibility: hidden;">
+        <pre  class="parsonsblocks" data-question_label="%(question_label)s"  %(adaptive)s %(maxdist)s %(order)s %(noindent)s %(language)s %(grader)s %(numbered)s %(optional)s style="visibility: hidden;">
         %(code)s
         </pre>
         </div>
@@ -125,6 +125,7 @@ def findmax(alist):
             "noindent": directives.flag,
             "adaptive": directives.flag,
             "numbered": directives.unchanged,
+            "grader": directives.unchanged
         }
     )
     has_content = True
@@ -199,6 +200,12 @@ def findmax(alist):
             )
         else:
             self.options["language"] = ""
+        if "grader" in self.options:
+            self.options["grader"] = (
+                ' data-grader="' + self.options["grader"] + '"'
+            )
+        else:
+            self.options["grader"] = ""
 
         if "-----" in self.content:
             index = self.content.index("-----")