flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-06 02:16:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #484 Optimize getClosestObjects by using CSequence::partiallySort.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-10-19 02:07:21 +01:00
parent eb45d7a409
commit c45157078f
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/blackmisc/geo/geoobjectlist.cpp
View File

@@ -48,6 +48,17 @@ namespace BlackMisc
}); });
} }
template <class OBJ, class CONTAINER>
CONTAINER IGeoObjectList<OBJ, CONTAINER>::findClosest(int number, const ICoordinateGeodetic &coordinate) const
{
CONTAINER closest = this->container().partiallySorted(number, [ & ](const OBJ & a, const OBJ & b)
{
return calculateEuclideanDistanceSquared(a, coordinate) < calculateEuclideanDistanceSquared(b, coordinate);
});
closest.truncate(number);
return closest;
}
template <class OBJ, class CONTAINER> template <class OBJ, class CONTAINER>
void IGeoObjectWithRelativePositionList<OBJ, CONTAINER>::calculcateDistanceAndBearingToPosition(const ICoordinateGeodetic &position) void IGeoObjectWithRelativePositionList<OBJ, CONTAINER>::calculcateDistanceAndBearingToPosition(const ICoordinateGeodetic &position)
{ {
@@ -82,13 +93,19 @@ namespace BlackMisc
this->container().sort([ & ](const OBJ & a, const OBJ & b) { return a.getDistanceToOwnAircraft() < b.getDistanceToOwnAircraft(); }); this->container().sort([ & ](const OBJ & a, const OBJ & b) { return a.getDistanceToOwnAircraft() < b.getDistanceToOwnAircraft(); });
} }
template <class OBJ, class CONTAINER>
void IGeoObjectWithRelativePositionList<OBJ, CONTAINER>::partiallySortByDistanceToOwnAircraft(int number)
{
this->container().partiallySort(number, [ & ](const OBJ & a, const OBJ & b) { return a.getDistanceToOwnAircraft() < b.getDistanceToOwnAircraft(); });
}
template <class OBJ, class CONTAINER> template <class OBJ, class CONTAINER>
CONTAINER IGeoObjectWithRelativePositionList<OBJ, CONTAINER>::getClosestObjects(int number) const CONTAINER IGeoObjectWithRelativePositionList<OBJ, CONTAINER>::getClosestObjects(int number) const
{ {
if (number < 1) { return CONTAINER(); } if (number < 1) { return CONTAINER(); }
if (this->container().size() >= number) { return (this->container()); } if (this->container().size() >= number) { return (this->container()); }
CONTAINER closest(this->container()); CONTAINER closest(this->container());
closest.sortByDistanceToOwnAircraft(); closest.partiallySortByDistanceToOwnAircraft(number);
closest.truncate(number); closest.truncate(number);
return closest; return closest;
} }

8
src/blackmisc/geo/geoobjectlist.h
View File

@@ -50,6 +50,11 @@ namespace BlackMisc
*/ */
CONTAINER findWithinRange(const BlackMisc::Geo::ICoordinateGeodetic &coordinate, const BlackMisc::PhysicalQuantities::CLength &range) const; CONTAINER findWithinRange(const BlackMisc::Geo::ICoordinateGeodetic &coordinate, const BlackMisc::PhysicalQuantities::CLength &range) const;
/*!
* Find 0..n objects closest to the given coordinate.
*/
CONTAINER findClosest(int number, const BlackMisc::Geo::ICoordinateGeodetic &coordinate) const;
protected: protected:
//! Constructor //! Constructor
IGeoObjectList(); IGeoObjectList();
@@ -79,6 +84,9 @@ namespace BlackMisc
//! If distance is already set, just sort //! If distance is already set, just sort
void sortByDistanceToOwnAircraft(); void sortByDistanceToOwnAircraft();
//! Sort the first n closest objects
void partiallySortByDistanceToOwnAircraft(int number);
//! Get n closest objects //! Get n closest objects
CONTAINER getClosestObjects(int number) const; CONTAINER getClosestObjects(int number) const;