cleanup function calls

Author: SethPoulsen

runestone/parsons/js/dagGrader.js

@@ -2,10 +2,9 @@ import LineBasedGrader from "./lineGrader";
 import { DiGraph } from "jsnetworkx/node/classes";
 import { hasPath } from "jsnetworkx/node/algorithms/shortestPaths/generic";
 
-function graphToNX(answerBlocks) {
+function graphToNX(answerLines) {
     var graph = new DiGraph();
-    for (let block of answerBlocks) {
-        let line = block.lines[0]; // FIXME assume each block only has one line, won't work with adaptivity
+    for (let line of answerLines) {
         graph.addNode(line.tag);
         for (let line2 of line.depends) {
             // the depends graph lists the *incoming* edges of a node
@@ -48,9 +47,13 @@ function allSubsets(arr) {
 export default class DAGGrader extends LineBasedGrader {
 
 
-    inverseLISIndices(answerBlocks, solution) {
+    inverseLISIndices(arr) {
         // For more details and a proof of the correctness of the algorithm, see the paper: https://arxiv.org/abs/2204.04196
-        let graph = graphToNX(answerBlocks);
+
+        var solution = this.problem.solution;
+        var answerLines = this.problem.answerLines();
+
+        let graph = graphToNX(answerLines);
         console.log(allSubsets([1,2,3]))
 
         let seen = new Set();
@@ -96,7 +99,7 @@ export default class DAGGrader extends LineBasedGrader {
 
         // TODO implement the algorithm 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(answerBlocks, solution)
+        return super.inverseLISIndices(arr)
     }
 
     checkCorrectOrdering(solutionLines, answerLines) {

runestone/parsons/js/lineGrader.js

@@ -4,22 +4,7 @@ export default class LineBasedGrader {
     }
     // Use a LIS (Longest Increasing Subsequence) algorithm to return the indexes
     // that are not part of that subsequence.
-    inverseLISIndices(answerBlocks, solution) {
-        var inSolution = [];
-        var inSolutionIndexes = [];
-        var notInSolution = [];
-        for (let i = 0; i < answerBlocks.length; i++) {
-            var block = answerBlocks[i];
-            var index = solution.indexOf(block.lines[0]);
-            if (index == -1) {
-                notInSolution.push(block);
-            } else {
-                inSolution.push(block);
-                inSolutionIndexes.push(index);
-            }
-        }
-        let arr = inSolutionIndexes;
-
+    inverseLISIndices(arr) {
         // Get all subsequences
         var allSubsequences = [];
         for (var i = 0; i < arr.length; i++) {

runestone/parsons/js/parsons.js

@@ -1424,7 +1424,7 @@ export default class Parsons extends RunestoneBase {
                     inSolutionIndexes.push(index);
                 }
             }
-            var lisIndexes = this.grader.inverseLISIndices(this.answerBlocks(), this.solution);
+            var lisIndexes = this.grader.inverseLISIndices(inSolutionIndexes);
             for (let i = 0; i < lisIndexes.length; i++) {
                 notInSolution.push(inSolution[lisIndexes[i]]);
             }