songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make evaluation comply with Range concept

This commit is contained in:
Simon Giraudot 2020-04-02 08:01:23 +02:00
parent 92bba3c700
commit dfee57ab3d
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Classification/include/CGAL/Classification/Evaluation.h
View File

@ -16,6 +16,11 @@
#include <CGAL/Classification/Label.h> #include <CGAL/Classification/Label.h>
#include <CGAL/Classification/Label_set.h> #include <CGAL/Classification/Label_set.h>
#include <CGAL/Iterator_range.h>
#include <boost/iterator/zip_iterator.hpp>
#include <map> #include <map>
#include <cmath> // for std::isnan #include <cmath> // for std::isnan
@ -115,10 +120,13 @@ public:
void append (const GroundTruthIndexRange& ground_truth, void append (const GroundTruthIndexRange& ground_truth,
const ResultIndexRange& result) const ResultIndexRange& result)
{ {
for (std::size_t i = 0; i < ground_truth.size(); ++ i)
for (const auto& p : CGAL::make_range
(boost::make_zip_iterator(boost::make_tuple(ground_truth.begin(), result.begin())),
boost::make_zip_iterator(boost::make_tuple(ground_truth.end(), result.end()))))
{ {
int gt = static_cast<int>(ground_truth[i]); int gt = static_cast<int>(get<0>(p));
int res = static_cast<int>(result[i]); int res = static_cast<int>(get<1>(p));
if (gt == -1 || res == -1) if (gt == -1 || res == -1)
continue; continue;