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

Refined architecture

Browse Source
This commit is contained in:
Daniel Girardeau-Montaut
2018-11-04 11:21:50 +01:00
parent 24a0220e41
commit 5c2308393e
10 changed files with 1711 additions and 1671 deletions
Download Patch File Download Diff File Expand all files Collapse all files
q3DMASCClassifier.cpp
+4 -10
View File
@@ -42,7 +42,7 @@ bool Classifier::isValid() const
return (m_rtrees && m_rtrees->isTrained());
}
static QSharedPointer<IScalarFieldWrapper> GetSource(const Feature::Shared& f, ccPointCloud* cloud)
static QSharedPointer<IScalarFieldWrapper> GetSource(const Feature::Shared& f, const ccPointCloud* cloud)
{
QSharedPointer<IScalarFieldWrapper> source(nullptr);
if (!f)
@@ -208,19 +208,18 @@ bool Classifier::evaluate(const Feature::Set& features, CCLib::ReferenceCloud* t
return true;
}
bool Classifier::train(const RandomTreesParams& params, const Feature::Set& features, QString& errorMessage, CCLib::ReferenceCloud* trainSubset/*=nullptr*/, QWidget* parentWidget/*=nullptr*/)
bool Classifier::train(const ccPointCloud* cloud, const RandomTreesParams& params, const Feature::Set& features, QString& errorMessage, CCLib::ReferenceCloud* trainSubset/*=nullptr*/, QWidget* parentWidget/*=nullptr*/)
{
if (features.empty())
{
errorMessage = QObject::tr("Training method called without any feature?!");
return false;
}
if (!features.front() || !features.front()->cloud)
if (!cloud)
{
errorMessage = QObject::tr("Invalid feature (no associated point cloud)");
errorMessage = QObject::tr("Invalid input cloud");
return false;
}
ccPointCloud* cloud = features.front()->cloud;
if (trainSubset && trainSubset->getAssociatedCloud() != cloud)
{
@@ -281,11 +280,6 @@ bool Classifier::train(const RandomTreesParams& params, const Feature::Set& feat
for (int fIndex = 0; fIndex < attributesPerSample; ++fIndex)
{
const Feature::Shared &f = features[fIndex];
if (f->cloud != cloud)
{
errorMessage = QObject::tr("Invalid feature (%1): associated cloud is different than the others").arg(f->toString());
return false;
}
QSharedPointer<IScalarFieldWrapper> source = GetSource(f, cloud);
if (!source || !source->isValid())