diff TrainingScoreManager.h @ 43:4ad0d218f890

can skip runs if it crashed etc.
author Robert Tubb <rt300@eecs.qmul.ac.uk>
date Mon, 15 Dec 2014 12:51:09 +0000
parents 96ff7b41923a
children a62e033117fa
line wrap: on
line diff
--- a/TrainingScoreManager.h	Mon Dec 08 18:29:10 2014 +0000
+++ b/TrainingScoreManager.h	Mon Dec 15 12:51:09 2014 +0000
@@ -58,13 +58,9 @@
         }else if (dist < TARGET_SCORE_CC_BAND*6*dimComp){ // 30
             
             band = 5;
-
-            
         }else if (dist < TARGET_SCORE_CC_BAND*9*dimComp){ // 45
             
-            band = 6;
-
-            
+            band = 6;   
         }else{
             
             band = 7;
@@ -136,7 +132,7 @@
                                          int whichInSequence,
                                          int presetIndex,
                                          int tempoLevel,
-                                         int runNumber) {
+                                         int seqLength) {
         TrainingTestResult result;
         stringstream msg;
         int score = 0;
@@ -162,7 +158,7 @@
         result.realDistanceToTarget = dist;
         result.targetBandHit = band; // eg bullseye = 0 edge = 7
         result.timeAllowed = timeAllowed;
-        result.score = int(round(TP*10.0));
+        result.score = int(round(TP));
         result.displayText = msg.str();
         result.difficultyLevel = difficulty;
         result.colorBand = getColorForBand(band);
@@ -181,7 +177,7 @@
         details.push_back(initDist*1000);
         details.push_back(presetIndex);
         details.push_back(tempoLevel);
-        details.push_back(runNumber);
+        details.push_back(seqLength);
         eventLogger.logEvent(TRAINING_RESULT, details);
         details.clear();
         details.insert(details.begin(), targetParams.begin(), targetParams.end());