saberbud/q3DMASC
1
0
Fork 0
mirror of https://github.com/dgirardeau/q3DMASC.git synced 2026-08-29 08:34:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

ConfusionMatrix

Browse Source
This commit is contained in:
Paul Leroy
2022-12-14 11:37:29 +01:00
parent 6de0370073
commit 75288dbc52
4 changed files with 175 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
q3DMASCClassifier.cpp
+18 -7
View File
@@ -38,6 +38,8 @@
#include <QProgressDialog>
#include <QtConcurrent>
#include "confusionmatrix.h"
using namespace masc;
Classifier::Classifier()
@@ -123,13 +125,15 @@ bool Classifier::classify( const Feature::Source::Set& featureSources,
//look for the classification field
CCCoreLib::ScalarField* classificationSF = Tools::GetClassificationSF(cloud);
// add a ccConfidence value if needed
int cvConfidenceIdx = cloud->getScalarFieldIndexByName("cvConfidence");
int cvConfidenceIdx = cloud->getScalarFieldIndexByName("Classification_confidence");
if (cvConfidenceIdx > 0) // if the scalar field exists, delete it
cloud->deleteScalarField(cvConfidenceIdx);
else
cvConfidenceIdx = cloud->addScalarField("cvConfidence");
cvConfidenceIdx = cloud->addScalarField("Classification_confidence");
CCCoreLib::ScalarField* cvConfidenceSF = cloud->getScalarField(cvConfidenceIdx);
ccScalarField* classifSFBackup = nullptr;
if (classificationSF)
{
//save previous classification field (if any)
@@ -139,7 +143,7 @@ bool Classifier::classify( const Feature::Source::Set& featureSources,
try
{
ccScalarField* classifSFBackup = new ccScalarField(*static_cast<ccScalarField*>(classificationSF));
classifSFBackup = new ccScalarField(*static_cast<ccScalarField*>(classificationSF));
classifSFBackup->setName("Classification_prev");
cloud->addScalarField(classifSFBackup);
}
@@ -200,8 +204,7 @@ bool Classifier::classify( const Feature::Source::Set& featureSources,
CCCoreLib::NormalizedProgress nProgress(pDlg.data(), cloud->size());
bool success = true;
cv::TermCriteria termCriteria = m_rtrees->getTermCriteria();
int numberOfTrees = termCriteria.maxCount;
int numberOfTrees = m_rtrees->getRoots().size();
#ifndef _DEBUG
#if defined(_OPENMP)
#pragma omp parallel for
@@ -235,13 +238,16 @@ bool Classifier::classify( const Feature::Source::Set& featureSources,
m_rtrees->getVotes(test_data, result, cv::ml::DTrees::PREDICT_MAX_VOTE);
int classIndex = -1;
for (int col = 0; col < result.cols; col++)
if (predictedClass == result.at<float>(0, col))
if (predictedClass == result.at<int>(0, col))
{
classIndex = col;
break;
}
if (classIndex != -1)
cvConfidenceSF->setValue(i, static_cast<ScalarType>(result.at<float>(1, classIndex) / numberOfTrees));
{
float nbVotes = result.at<int>(1, classIndex);
cvConfidenceSF->setValue(i, static_cast<ScalarType>(nbVotes / numberOfTrees));
}
else
cvConfidenceSF->setValue(i, CCCoreLib::NAN_VALUE);
@@ -253,6 +259,7 @@ bool Classifier::classify( const Feature::Source::Set& featureSources,
}
}
classificationSF->computeMinAndMax();
cvConfidenceSF->computeMinAndMax();
//show the classification field by default
{
@@ -267,6 +274,10 @@ bool Classifier::classify( const Feature::Source::Set& featureSources,
QCoreApplication::processEvents();
}
ConfusionMatrix *confusionMatrix = new ConfusionMatrix();
confusionMatrix->compute(*classifSFBackup, *classificationSF);
confusionMatrix->show();
return success;
}