comparison TrainingScoreManager.h @ 34:3af380769779

small fixes, logging now sensible.
author Robert Tubb <rt300@eecs.qmul.ac.uk>
date Wed, 26 Nov 2014 14:04:05 +0000
parents 75202498bee9
children 3b10a26da293
comparison
equal deleted inserted replaced
33:93317878abef 34:3af380769779
126 details.push_back(result.targetBandHit); 126 details.push_back(result.targetBandHit);
127 details.push_back(result.timeAllowed); 127 details.push_back(result.timeAllowed);
128 details.push_back(result.score); // 10 x throughput 128 details.push_back(result.score); // 10 x throughput
129 129
130 eventLogger.logEvent(TRAINING_RESULT, details); 130 eventLogger.logEvent(TRAINING_RESULT, details);
131 131 details.clear();
132 details.insert(details.begin(), targetParams.begin(), targetParams.end());
133 details.insert(details.end(), answer.begin(), answer.end());
134 eventLogger.logEvent(TARGET_AND_MATCH, details);
132 135
133 return result; 136 return result;
134 } 137 }
135 138
136 int getScore(){return totalScored;}; 139 int getScore(){return totalScored;};
148 cout << "time: " << time << endl; 151 cout << "time: " << time << endl;
149 float TP = ISSR / time; 152 float TP = ISSR / time;
150 cout << "TP: " << TP << endl; 153 cout << "TP: " << TP << endl;
151 return TP; 154 return TP;
152 } 155 }
153 float euclideanDistance(vector<int> v1, vector<int> v2) const{ 156
154 if (v1.size() != v2.size()){
155 cout << "ERROR ERROR: vectors must be same length for Mr Euclid";
156 return 0.;
157 }
158 vector<float> diff;
159
160 std::transform(v1.begin(), v1.end(), v2.begin(), v1.begin(), difference<float>());
161 // sqr diff
162
163 std::transform(v1.begin(), v1.end(), v1.begin(),squared<float>());
164 float ans = std::accumulate(v1.begin(),v1.end(),0.0);
165
166 return sqrt(ans);
167
168 };
169 int totalScored; 157 int totalScored;
170 158
171 }; 159 };
172 #endif /* defined(__riftathon__TrainingScoreManager__) */ 160 #endif /* defined(__riftathon__TrainingScoreManager__) */