sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Optimise unordered set differencing

Browse Source
This commit is contained in:
Nyall Dawson 2018-07-16 11:10:02 +10:00
parent e46b00d40d
commit 9e03a7e1d3
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/analysis/processing/qgsalgorithmdbscanclustering.cpp
View File

@ -102,16 +102,6 @@ struct KDBushDataHashById
}
};
bool operator <( const QgsSpatialIndexKDBushData &data, const QgsFeatureId id )
{
return data.id < id;
};
bool operator <( const QgsFeatureId id, const QgsSpatialIndexKDBushData &data )
{
return id < data.id;
};
QVariantMap QgsDbscanClusteringAlgorithm::processAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback )
{
std::unique_ptr< QgsProcessingFeatureSource > source( parameterAsSource( parameters, QStringLiteral( "INPUT" ), context ) );
@ -287,10 +277,13 @@ void QgsDbscanClusteringAlgorithm::dbscan( const std::size_t minSize,
if ( within2.size() >= minSize )
{
// expand neighbourhood
std::set_difference( within2.begin(),
within2.end(),
visited.begin(), visited.end(),
std::inserter( within, within.end() ) );
std::copy_if( within2.begin(),
within2.end(),
std::inserter( within, within.end() ),
[&visited]( const QgsSpatialIndexKDBushData & needle )
{
return visited.find( needle.id ) == visited.end();
} );
}
if ( !borderPointsAreNoise || within2.size() >= minSize )
{