X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=src%2Fmodels.cpp;h=0511dd4726b231e38b3521981d01ba3ccf793831;hb=HEAD;hp=9c13090647ca294bebf752405e6f10a245a83b0c;hpb=d7c119fefaf9cce07974afbefb4b6a017689a961;p=germs.git

diff --git a/src/models.cpp b/src/models.cpp
index 9c13090..0511dd4 100644
--- a/src/models.cpp
+++ b/src/models.cpp
@@ -36,16 +36,40 @@ 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){
-	return 1;
+	const ReverseAction* ra = dynamic_cast<const ReverseAction*>(&sa.impl());
+
+	if (ra){
+		int l1 = go.size()/2 - ra->i();
+		int l2 = ra->j() - go.size()/2;
+		double C = abs(l1 - l2)/static_cast<double>(go.size());
+		return 1/(C+1);
+	}
+	return -1;
 }
 const char* X::name(){
 	return "X";
 }
 
 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";