More help output

[germs.git] / src / models.cpp

diff --git a/src/models.cpp b/src/models.cpp
index 9e6c2c36e9750245738d3604ff3e0aaf2a5e5196..0511dd4726b231e38b3521981d01ba3ccf793831 100644 (file)
--- a/src/models.cpp
+++ b/src/models.cpp
@@ -36,6 +36,17 @@ const char* ModelImpl::name(){
 }
 
 
+double Whirl::score(const SortAction& sa, const GeneOrder& go){
+       const ReverseAction* ra = dynamic_cast<const ReverseAction*>(&sa.impl());
+
+       if (ra){
+               return 1;
+       }
+       return -1;
+}
+const char* Whirl::name(){
+       return "Whirl";
+}
 
 double X::score(const SortAction& sa, const GeneOrder& go){
        const ReverseAction* ra = dynamic_cast<const ReverseAction*>(&sa.impl());
@@ -53,7 +64,12 @@ const char* X::name(){
 }
 
 double Zipper::score(const SortAction& sa, const GeneOrder& go){
-       return 1;
+       const ReverseAction* ra = dynamic_cast<const ReverseAction*>(&sa.impl());
+
+       if (ra){
+               return 1.0/(((ra->j()-ra->i())/static_cast<double>(go.size()))+1.0);
+       }
+       return -1;
 }
 const char* Zipper::name(){
        return "Zipper";