Set tolerance of response criterion.

concord-consortium · Apr 19, 2012 · b554458 · b554458
1 parent cc95697
commit b554458
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 21 deletions.
diff --git a/example-data/expected-ouput/numeric-sequence-no-visual-prompts.json b/example-data/expected-ouput/numeric-sequence-no-visual-prompts.json
@@ -49,12 +49,13 @@
       "responseBranches": [
         {
           "criterion": [
-            "=",
+          "withinAbsTolerance",
             [
               "responseField",
               1
             ],
-            600
+            600,
+            0.03
           ],
           "step": "/shared/numeric-sequence/page/1-introduction/step/5"
         }
@@ -80,12 +81,13 @@
       "responseBranches": [
         {
           "criterion": [
-            "=",
+          "withinAbsTolerance",
             [
               "responseField",
               1
             ],
-            600
+            600,
+            0.03
           ],
           "step": "/shared/numeric-sequence/page/1-introduction/step/5"
         }
@@ -111,12 +113,13 @@
       "responseBranches": [
         {
           "criterion": [
-            "=",
+          "withinAbsTolerance",
             [
               "responseField",
               1
             ],
-            600
+            600,
+            0.03
           ],
           "step": "/shared/numeric-sequence/page/1-introduction/step/5"
         }

diff --git a/example-data/expected-ouput/numeric-sequence-range-visual-prompts.json b/example-data/expected-ouput/numeric-sequence-range-visual-prompts.json
@@ -72,12 +72,13 @@
       "responseBranches": [
         {
           "criterion": [
-            "=",
+            "withinAbsTolerance",
             [
               "responseField",
               1
             ],
-            600
+            600,
+            0.01
           ],
           "step": "/shared/numeric-sequence/page/1-introduction/step/5"
         }
@@ -123,12 +124,13 @@
       "responseBranches": [
         {
           "criterion": [
-            "=",
+            "withinAbsTolerance",
             [
               "responseField",
               1
             ],
-            600
+            600,
+            0.01
           ],
           "step": "/shared/numeric-sequence/page/1-introduction/step/5"
         }
@@ -175,12 +177,13 @@
       "responseBranches": [
         {
           "criterion": [
-            "=",
+            "withinAbsTolerance",
             [
               "responseField",
               1
             ],
-            600
+            600,
+            0.01
           ],
           "step": "/shared/numeric-sequence/page/1-introduction/step/5"
         }

diff --git a/example-data/expected-ouput/point-circle-visual-prompt.json b/example-data/expected-ouput/point-circle-visual-prompt.json
@@ -266,12 +266,13 @@
       "responseBranches": [
         {
           "criterion": [
-            "=",
+            "withinAbsTolerance",
             [
               "responseField",
               1
             ],
-            4
+            4,
+            0.01
           ],
           "step": "/shared/point-circles/page/2-numeric/step/4"
         }
@@ -311,12 +312,13 @@
       "responseBranches": [
         {
           "criterion": [
-            "=",
+             "withinAbsTolerance",
             [
               "responseField",
               1
             ],
-            4
+            4,
+            0.01
           ],
           "step": "/shared/point-circles/page/2-numeric/step/4"
         }

diff --git a/example-data/input/numeric-sequence-no-visual-prompts.json b/example-data/input/numeric-sequence-no-visual-prompts.json
@@ -13,6 +13,7 @@
           "text": "<p>What is the x-coordinate at the 3-time unit mark?</p>"
         },
         "correctAnswer": 600.0,
+        "tolerance": 0.03,
         "giveUp": {
           "text": "<p>Take a closer look, it's 600 units of distance.</p>"
         },

diff --git a/lib/author/sequences.js b/lib/author/sequences.js
diff --git a/src/author/sequences.coffee b/src/author/sequences.coffee
@@ -78,16 +78,18 @@ Sequence.classFor['ConstructedResponseSequence'] = class ConstructedResponseSequ
 
 Sequence.classFor['MultipleChoiceWithCustomHintsSequence'] = class MultipleChoiceWithCustomHintsSequence
 
-  constructor: ({@initialPrompt, @choices, @correctAnswerIndex, @hints, @confirmCorrect,  @page}) ->
+  constructor: ({@initialPrompt, @choices, @correctAnswerIndex, @hints, @confirmCorrect, @page}) ->
     [@initialPrompt, @confirmCorrect] = [@initialPrompt, @confirmCorrect].map asObject
 
     # FIXME? Underscore would be handy here.
     indexed = []
     indexed[hint.choiceIndex] = hint for hint in @hints
+
     @orderedHints = (hint for hint in indexed when hint?)
 
   getCriterionForChoice: (choiceIndex) ->
     ["=", ["responseField", 1], 1 + choiceIndex]
+
 
   appendSteps: (runtimePage) ->
     runtimeActivity = runtimePage.activity
@@ -242,11 +244,14 @@ Sequence.classFor['PickAPointSequence'] = class PickAPointSequence extends Corre
 
 Sequence.classFor['NumericSequence'] = class NumericSequence extends CorrectableSequenceWithFeedback
 
-  constructor: ({@correctAnswer}) ->
+  constructor: ({@correctAnswer, @tolerance}) ->
+    @tolerance = @tolerance ? 0.01
     super arguments...
+
 
   getCriterion: ->
-    ["=",["responseField", 1], @correctAnswer]
+    ["withinAbsTolerance",["responseField", 1], @correctAnswer, @tolerance]
+
 
   appendSteps: (runtimePage) ->
     runtimeActivity = runtimePage.activity