Context-based features with kNN neighbors are now considering only the specified class number

This commit is contained in:
Daniel Girardeau-Montaut
2019-04-05 17:03:47 +02:00
parent 7950151cb5
commit b2363385a9
2 changed files with 134 additions and 111 deletions
+9 -10
View File
@@ -496,6 +496,15 @@ bool PointFeature::prepare( const CorePoints& corePoints,
return false;
}
resultSFName += QString("_") + Feature::StatToString(stat);
//prepare the corresponding scalar field
statSF1 = PrepareSF(corePoints.cloud, qPrintable(resultSFName), generatedScalarFields);
if (!statSF1)
{
error = QString("Failed to prepare scalar field for field '%1' @ scale %2").arg(field1->getName()).arg(scale);
return false;
}
source.name = statSF1->getName();
}
else //not scaled
{
@@ -523,16 +532,6 @@ bool PointFeature::prepare( const CorePoints& corePoints,
resultSFName += "@" + QString::number(scale);
}
//prepare the corresponding scalar field
assert(!statSF1);
statSF1 = PrepareSF(corePoints.cloud, qPrintable(resultSFName), generatedScalarFields);
if (!statSF1)
{
error = QString("Failed to prepare scalar field for field '%1' @ scale %2").arg(field1->getName()).arg(scale);
return false;
}
source.name = statSF1->getName();
if (isScaled)
{
if (field2 && op != Feature::NO_OPERATION)