X-Git-Url: https://ruin.nu/git/?p=germs.git;a=blobdiff_plain;f=src%2Fmodels.cpp;h=9c13090647ca294bebf752405e6f10a245a83b0c;hp=0a7577a4ae308767f1a77c2018cf4cafd2b8baa4;hb=d7c119fefaf9cce07974afbefb4b6a017689a961;hpb=efe42ca948704593c847996d0ae8da71d15bb75b diff --git a/src/models.cpp b/src/models.cpp index 0a7577a..9c13090 100644 --- a/src/models.cpp +++ b/src/models.cpp @@ -20,6 +20,7 @@ #include "models.h" #include "reverseaction.h" +#include "geneorder.h" using namespace std; @@ -27,40 +28,40 @@ namespace Models{ ModelImpl::~ModelImpl(){} -double ModelImpl::score(const SortAction& sa){ +double ModelImpl::score(const SortAction& sa, const GeneOrder& go){ return 1; } -string ModelImpl::name(){ +const char* ModelImpl::name(){ return "Standard"; } -double X::score(const SortAction& sa){ +double X::score(const SortAction& sa, const GeneOrder& go){ return 1; } -string X::name(){ +const char* X::name(){ return "X"; } -double Zipper::score(const SortAction& sa){ +double Zipper::score(const SortAction& sa, const GeneOrder& go){ return 1; } -string Zipper::name(){ +const char* Zipper::name(){ return "Zipper"; } -double Cloud::score(const SortAction& sa){ +double Cloud::score(const SortAction& sa, const GeneOrder& go){ return 1; } -string Cloud::name(){ +const char* Cloud::name(){ return "Cloud"; } -double FatX::score(const SortAction& sa){ +double FatX::score(const SortAction& sa, const GeneOrder& go){ return 1; } -string FatX::name(){ +const char* FatX::name(){ return "FatX"; }