critical_struggle fixes; added system_misuse

d19fe8 · Jun 26, 2017 · 5e0b496 · 5e0b496
1 parent 1b74d81
commit 5e0b496
Show file tree

Hide file tree

Showing 2 changed files with 320 additions and 27 deletions.
diff --git a/HTML/Assets/Detectors/Lumilo/Critical_Struggle/critical_struggle.js b/HTML/Assets/Detectors/Lumilo/Critical_Struggle/critical_struggle.js
@@ -22,7 +22,7 @@ var attemptWindow;
 var skillLevelsAttempts;
 
 //declare and/or initialize any other custom global variables for this detector here...
-var stepCounter;
+var stepCounter = {};
 var help_model_output;
 var help_variables = {"lastAction": "null",
 					  "lastActionTime": "",
@@ -36,8 +36,8 @@ var timerId; var timerId2; var timerId3; var timerId4; var timerId5;
 var windowSize = 7;
 var threshold = 1;
 var wheelSpinningAttemptThreshold = 10; //following Beck and Gong's wheel-spinning work
-var errorThreshold = 3; //currently arbitrary
-var newStepThreshold = 3; //currently arbitrary
+var errorThreshold = 2; //currently arbitrary
+var newStepThreshold = 1; //currently arbitrary
 var familiarityThreshold = 0.4;
 var senseOfWhatToDoThreshold = 0.6;
 var hintIsHelpfulPlaceholder = true; //currently a dummy value (assumption that hint is always helpful...)
@@ -248,8 +248,10 @@ function updateHistory(e){
 function updateSkillLevelsAttempts(e, rawSkills, currStepCount){
 	for (var skill in rawSkills) {
 
-		if( (rawSkills[skill].name in skillLevelsAttempts) && (currStepCount==1) ){
-			skillLevelsAttempts[rawSkills[skill].name][0] += 1;
+		if( rawSkills[skill].name in skillLevelsAttempts ){
+			if(currStepCount==1){
+				skillLevelsAttempts[rawSkills[skill].name][0] += 1;
+			}
 			skillLevelsAttempts[rawSkills[skill].name][1] = parseFloat(rawSkills[skill].pKnown);
 		}
 		else{