X-Git-Url: https://ruin.nu/git/?p=germs.git;a=blobdiff_plain;f=src%2Fmodelidentifier.h;h=ee163e315d278d427ce646f8a52b29ec98052271;hp=a42e0efb7097fe05ed34a8175c9a05633baf5d18;hb=f8575ea6c0982bba5ccf42771b2994d19500c0a3;hpb=67df9f01df85be7e0ddcc0d53c89534aae009ed9

diff --git a/src/modelidentifier.h b/src/modelidentifier.h
index a42e0ef..ee163e3 100644
--- a/src/modelidentifier.h
+++ b/src/modelidentifier.h
@@ -23,11 +23,13 @@
 
 #include "geneorder.h"
 
-#include <map>
+#include <queue>
 #include <string>
 #include <stdexcept>
 
 struct fann;
+class Model;
+
 
 /**
  * Identifies the model this gene order belongs to
@@ -35,9 +37,6 @@ struct fann;
  */
 class ModelIdentifier{
 	public:
-		//TODO: Make a Model class with functions for scoring SortActions
-		//one subclass for each model. Possibly storing name as string too.
-		enum Model{Whirl,X,FatX,Zipper,Cloud};
 
 		/**
 		 * Creates a new identifier given an artificial neural network
@@ -54,9 +53,7 @@ class ModelIdentifier{
 		 *
 		 * \returns a map with the model as key and the score between -1 and 1
 		 */
-		std::map<Model,double> identify(const GeneOrder& go);
-
-		static std::string modelName(Model m);
+		std::priority_queue<std::pair<double,Model> > identify(const GeneOrder& go);
 
 		~ModelIdentifier();
 	private: