a little more refactoring, name might just as well return const char* since it's...

[germs.git] / src / models.h

diff --git a/src/models.h b/src/models.h
index 6a61506ffe38efb0ea87778fc392b47826130220..8d7f9e8a7a7980ffe10634dcc7eb732de43ae2de 100644 (file)
--- a/src/models.h
+++ b/src/models.h
@@ -21,9 +21,8 @@
 #ifndef __MODELS_H__
 #define __MODELS_H__
 
-#include <string>
-
 class SortAction;
+class GeneOrder;
 
 namespace Models {
 
@@ -31,38 +30,38 @@ class ModelImpl {
        public:
                virtual ~ModelImpl();
 
-               virtual double score(const SortAction& sa);
+               virtual double score(const SortAction& sa, const GeneOrder& go);
 
-               virtual std::string name();
+               virtual const char* name();
 };
 
 
 class X : public ModelImpl {
        public:
-               double score(const SortAction& sa);
+               double score(const SortAction& sa, const GeneOrder& go);
 
-               std::string name();
+               const char* name();
 };
 
 class Zipper : public ModelImpl {
        public:
-               double score(const SortAction& sa);
+               double score(const SortAction& sa, const GeneOrder& go);
 
-               std::string name();
+               const char* name();
 };
 
 class Cloud : public ModelImpl {
        public:
-               double score(const SortAction& sa);
+               double score(const SortAction& sa, const GeneOrder& go);
 
-               std::string name();
+               const char* name();
 };
 
 class FatX : public ModelImpl {
        public:
-               double score(const SortAction& sa);
+               double score(const SortAction& sa, const GeneOrder& go);
 
-               std::string name();
+               const char* name();
 };
 
 }