comparison TrainingScoreManager.h @ 36:146033869165

ISSR fixed
colors for stages
more repetitions

                                          vector<int> startPosition,
                                          vector<int> answer,
                                          int timeAllowed,
                                          int difficulty,
                                          int whichInSequence,
-                                         int presetIndex) {
+                                         int presetIndex,
+                                         int tempoLevel,
+                                         int runNumber) {
         TrainingTestResult result;
         stringstream msg;
         int score = 0;
         // work out euc distance from actual point
-        //for_each(answer.begin(),answer.end(),printThing<int>());
-        //for_each(targetParams.begin(),targetParams.end(),printThing<int>());
-        float initDist = euclideanDistance(startPosition, answer);
+
+        float initDist = euclideanDistance(targetParams, startPosition);
         float dist = euclideanDistance(targetParams, answer);
+        if (initDist <= 0) {
+            initDist = 0.001;
+        }
+        if (dist <= 0) dist = 0.001;
         float TP = calculateThroughput(TOTAL_NUM_PARAMS, dist, initDist, timeAllowed/1000.);
+        cout << "Preset index " << presetIndex << endl;
+        cout << "whichInSequence " << whichInSequence << endl;
         
         auto dimComp = sqrt(TOTAL_NUM_PARAMS);
         int band = -1;
         if (dist < TARGET_SCORE_CC_BAND*dimComp){
      

         }else{
             c = ofColor(0,0,0,255);         // black worst
         }
         result.colorBand = c;
 
-        totalScored += score;
+        if(score > 0) totalScored += score;
+        
         
         vector<int> details;
         
         details.push_back(result.realDistanceToTarget*1000);
         details.push_back(result.targetBandHit);

         details.push_back(result.score); // 10 x throughput
         details.push_back(difficulty);
         details.push_back(whichInSequence);
         details.push_back(initDist*1000);
         details.push_back(presetIndex);
-        
+        details.push_back(tempoLevel);
+        details.push_back(runNumber);
         eventLogger.logEvent(TRAINING_RESULT, details);
         details.clear();
         details.insert(details.begin(), targetParams.begin(), targetParams.end());
         details.insert(details.end(), answer.begin(), answer.end());
         eventLogger.logEvent(TARGET_AND_MATCH, details);
         
         return result;
     }
     
-    int getScore(){return totalScored;};
+    int getScore(){
+        cout << "RUNNING SCORE: " << totalScored << endl;
+        return totalScored;
+    };
     
 private:
     
     
     float calculateThroughput(int numDims, float endDistance, float startDistance, float time) const{
-        if (startDistance == 0) startDistance = 1;
-        if (endDistance == 0) endDistance = 1;
+
         float ISSR = numDims * log2( startDistance / endDistance);
         cout << "==========Result======= " << endl;
         cout << "start: " << startDistance << endl;
         cout << "end:   " << endDistance << endl;
         cout << "ISSR:  " << ISSR << endl;