Minor pct correct grading cleanups

Signed-off-by: Brad Miller <bonelake@mac.com>

Author: bnmnetp

runestone/mchoice/js/mchoice.js

@@ -1,4 +1,4 @@
-/*==========================================
+p; /*==========================================
 ========      Master mchoice.js     =========
 ============================================
 ===  This file contains the JS for the   ===
@@ -453,10 +453,8 @@ export default class MultipleChoice extends RunestoneBase {
         this.correct = numCorrect === numNeeded && numNeeded === numGiven;
         if (numGiven === numNeeded) {
             this.percent = numCorrect / numNeeded;
-        } else if (numGiven < numNeeded) {
-            this.percent = (numCorrect - (numNeeded - numGiven)) / numNeeded;
         } else {
-            this.percent = (numCorrect - (numGiven - numNeeded)) / numNeeded;
+            this.percent = numCorrect / Math.max(numGiven, numNeeded);
         }
     }
 

runestone/parsons/js/parsons.js

@@ -88,7 +88,9 @@ class LineBasedGrader {
         var answerLines = problem.answerLines();
         var i;
         var state;
-        this.percentLines = answerLines.length / solutionLines.length;
+        this.percentLines =
+            Math.min(answerLines.length, solutionLines.length) /
+            Math.max(answerLines.length, solutionLines.length);
         if (answerLines.length < solutionLines.length) {
             state = "incorrectTooShort";
             this.correctLength = false;
@@ -1466,7 +1468,8 @@ export default class Parsons extends RunestoneBase {
                 // Increment Parsons area height based on number of lines of text in the current Parsons block - Vincent Qiu (September 2020)
                 var singleHeight = 40;
                 var additionalHeight = 20;
-                areaHeight += Math.ceil( // For future more accurate height display, this calculation should also be conditionally based on fontFamily
+                areaHeight += Math.ceil(
+                    // For future more accurate height display, this calculation should also be conditionally based on fontFamily
                     singleHeight +
                         (linesItem[linesIndex].children.length - 1) *
                             additionalHeight +