Mercurial > ldforge / file diff

--- a/src/misc.h	Wed Oct 16 19:34:12 2013 +0300
+++ b/src/misc.h	Wed Oct 16 23:07:59 2013 +0300
@@ -22,6 +22,7 @@
 #include "config.h"
 #include "common.h"
 #include "types.h"
+#include <qvector.h>
 
 #define NUM_PRIMES 500
 
@@ -93,18 +94,39 @@
 // =============================================================================
 class RingFinder
 {	public:
-	struct SolutionComponent
+	struct Component
 	{	int num;
 		double scale;
 	};
 
-	typedef QList<SolutionComponent> SolutionType;
+	class Solution
+	{	public:
+			// Components of this solution
+			inline const QVector<Component>& components() const
+			{	return m_components;
+			}
+
+			// Add a component to this solution
+			void addComponent (const Component& a)
+			{	m_components.push_back (a);
+			}
+
+			// Compare solutions
+			bool operator> (const Solution& other) const;
+
+	private:
+		QVector<Component> m_components;
+	};
 
 	RingFinder() {}
 	bool findRings (double r0, double r1);
 
-	inline const SolutionType& solution()
-	{	return m_solution;
+	inline const Solution* bestSolution()
+	{	return m_bestSolution;
+	}
+
+	inline const QVector<Solution>& allSolutions() const
+	{	return m_solutions;
 	}
 
 	inline bool operator() (double r0, double r1)
@@ -112,9 +134,11 @@
 	}
 
 private:
-	SolutionType m_solution;
+	QVector<Solution> m_solutions;
+	const Solution*   m_bestSolution;
+	int               m_stack;
 
-	bool findRingsRecursor (double r0, double r1);
+	bool findRingsRecursor (double r0, double r1, Solution& currentSolution);
 };
 
 extern RingFinder g_RingFinder;