Mercurial > hg > tweakathon2ios
diff TestController.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 | 8124f46eda65 |
children | 2bd658b44c2d |
line wrap: on
line diff
--- a/TestController.h Tue Nov 25 18:37:54 2014 +0000 +++ b/TestController.h Wed Nov 26 14:04:05 2014 +0000 @@ -150,22 +150,7 @@ bool isPractice(){ return !scored; }; - float euclideanDistance(vector<int> v1, vector<int> v2) const{ - if (v1.size() != v2.size()){ - cout << "ERROR ERROR: vectors must be same length for Mr Euclid"; - return 0.; - } - vector<float> diff; - - std::transform(v1.begin(), v1.end(), v2.begin(), v1.begin(), difference<float>()); - // sqr diff - - std::transform(v1.begin(), v1.end(), v1.begin(),squared<float>()); - float ans = std::accumulate(v1.begin(),v1.end(),0.0); - - return sqrt(ans); - - }; + TestResult getScoreForAnswer(vector<int> answer, TimerMillisec timeTaken) const { TestResult result;