First iteration of DAG checker working

Author: SethPoulsen

runestone/parsons/js/dagGrader.js

@@ -3,20 +3,28 @@ import LineBasedGrader from "./lineGrader";
 export default class DAGGrader extends LineBasedGrader {
 
     inverseLISIndices(arr) {
-        throw new Error("LIS algorithm for DAG grader not yet implemented.")
+        // TODO implement this properly for the DAG grader so that it is the shortest edit distance
+        // to ANY of the correct solutions instead of just to the model solution
+        return super.inverseLISIndices(arr)
     }
 
     checkCorrectOrdering(solutionLines, answerLines) {
+        let seen = new Set();
         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 {
+        for (let i = 0; i < loopLimit; i++) {
+            let line = answerLines[i];
+            for (let j = 0; j < line.depends.length; j++) {
+                if (!seen.has(line.depends[j])) {
+                    isCorrectOrder = false;
+                }
+            }
+            if (isCorrectOrder) {
                 this.correctLines += 1;
             }
+            seen.add(line.tag)
         }
         return isCorrectOrder
     }

runestone/parsons/js/lineGrader.js

@@ -1,4 +1,4 @@
-export default class DAGGrader {
+export default class LineBasedGrader {
     constructor(problem) {
         this.problem = problem;
     }
@@ -55,8 +55,6 @@ export default class DAGGrader {
         this.incorrectIndents = 0;
         var solutionLines = problem.solution;
         var answerLines = problem.answerLines();
-        console.log(solutionLines)
-        console.log(answerLines)
         var i;
         var state;
         this.percentLines =
@@ -79,6 +77,7 @@ export default class DAGGrader {
         // Determine whether blocks are indented correctly
         this.indentLeft = [];
         this.indentRight = [];
+        let loopLimit = Math.min(solutionLines.length, answerLines.length);
         for (i = 0; i < loopLimit; i++) {
             if (answerLines[i].viewIndent() < solutionLines[i].indent) {
                 this.indentRight.push(answerLines[i]);
@@ -103,7 +102,6 @@ export default class DAGGrader {
         this.calculatePercent();
         this.graderState = state;
 
-        console.log(state)
         return state;
     }
 
@@ -112,7 +110,7 @@ export default class DAGGrader {
         this.correctLines = 0;
         this.solutionLength = solutionLines.length;
         let loopLimit = Math.min(solutionLines.length, answerLines.length);
-        for (i = 0; i < loopLimit; i++) {
+        for (let i = 0; i < loopLimit; i++) {
             if (answerLines[i].text !== solutionLines[i].text) {
                 isCorrectOrder = false;
             } else {

runestone/parsons/js/parsons.js

@@ -285,6 +285,10 @@ export default class Parsons extends RunestoneBase {
             var options = {};
             var distractIndex;
             var distractHelptext = "";
+            var tagIndex;
+            var tag;
+            var dependsIndex;
+            var depends = [];
             if (textBlock.includes("#paired:")) {
                 distractIndex = textBlock.indexOf("#paired:");
                 distractHelptext = textBlock
@@ -297,9 +301,17 @@ export default class Parsons extends RunestoneBase {
                     .substring(distractIndex + 12, textBlock.length)
                     .trim();
                 textBlock = textBlock.substring(0, distractIndex + 11);
+
+            // TODO make this parsing more robust after finalizing the syntax
+            } else if (textBlock.includes("#tag:")) {
+                tagIndex = textBlock.indexOf("#tag:");
+                tag = textBlock.substring(tagIndex + 5, tagIndex + 6);
+                dependsIndex = textBlock.indexOf(";depends:");
+                let dependsString = textBlock.substring(dependsIndex + 9, textBlock.indexOf(";", dependsIndex + 9));
+                depends = dependsString.length > 0 ? dependsString.split(",") : [];
             }
             textBlock = textBlock.replace(
-                /#(paired|distractor)/,
+                /#(paired|distractor|tag:[0-9]+;depends:[0-9,]*;)/,
                 function (mystring, arg1) {
                     options[arg1] = true;
                     return "";
@@ -325,6 +337,10 @@ export default class Parsons extends RunestoneBase {
                     } else {
                         line.distractor = false;
                         line.paired = false;
+                        if (this.options.grader === "dag") {
+                            line.tag = tag;
+                            line.depends = depends;
+                        }
                         solution.push(line);
                     }
                     if ($.inArray(line.indent, indents) == -1) {