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

Various updates (remove warnings, improve responsiveness of the UI by lowering the number of threads, et.)

Browse Source
This commit is contained in:
Daniel Girardeau-Montaut
2023-06-07 00:04:44 +02:00
parent d35104d5be
commit 00045e8c6e
7 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
q3DMASCClassifier.cpp
+7 -2
View File
@@ -42,6 +42,10 @@
#include "qTrain3DMASCDialog.h"
#include "confusionmatrix.h"
#if defined(_OPENMP)
#include <omp.h>
#endif
using namespace masc;
Classifier::Classifier()
@@ -197,9 +201,10 @@ bool Classifier::classify( const Feature::Source::Set& featureSources,
CCCoreLib::NormalizedProgress nProgress(pDlg.data(), cloud->size());
bool success = true;
int numberOfTrees = m_rtrees->getRoots().size();
int numberOfTrees = static_cast<int>(m_rtrees->getRoots().size());
#ifndef _DEBUG
#if defined(_OPENMP)
omp_set_num_threads(std::max(1, omp_get_max_threads() - 2));
#pragma omp parallel for
#endif
#endif
@@ -391,7 +396,7 @@ bool Classifier::evaluate(const Feature::Source::Set& featureSources,
}
}
int numberOfTrees = m_rtrees->getRoots().size();
int numberOfTrees = static_cast<int>(m_rtrees->getRoots().size());
//estimate the efficiency of the classifier
std::vector<ScalarType> actualClass(testSampleCount);