diff -r 397870c6ed38 -r 9e9c52ca955e src/misc/RingFinder.cc --- a/src/misc/RingFinder.cc Sun Mar 09 14:04:06 2014 +0200 +++ b/src/misc/RingFinder.cc Sun Mar 09 14:59:46 2014 +0200 @@ -22,15 +22,6 @@ RingFinder g_RingFinder; // ============================================================================= -// This is the main algorithm of the ring finder. It tries to use math to find -// the one ring between r0 and r1. If it fails (the ring number is non-integral), -// it finds an intermediate radius (ceil of the ring number times scale) and -// splits the radius at this point, calling this function again to try find the -// rings between r0 - r and r - r1. -// -// This does not always yield into usable results. If at some point r == r0 or -// r == r1, there is no hope of finding the rings, at least with this algorithm, -// as it would fall into an infinite recursion. // bool RingFinder::findRingsRecursor (double r0, double r1, Solution& currentSolution) { @@ -133,7 +124,7 @@ { const Solution& sol = *solp; - if (m_bestSolution == null || sol.isBetterThan (m_bestSolution)) + if (m_bestSolution == null || sol.isSuperiorTo (m_bestSolution)) m_bestSolution = / } @@ -142,7 +133,7 @@ // ============================================================================= // -bool RingFinder::Solution::isBetterThan (const Solution* other) const +bool RingFinder::Solution::isSuperiorTo (const Solution* other) const { // If this solution has less components than the other one, this one // is definitely better.