From 29e31fb6df78f7eb79614547a3876e8510edc6b0 Mon Sep 17 00:00:00 2001
From: Caner Candan <candan@info.univ-angers.fr>
Date: Mon, 25 Jun 2012 02:18:15 +0200
Subject: [PATCH] =?UTF-8?q?*=20ga/make=5Fop:=C2=A0added=20kbit=20flip=20mu?=
 =?UTF-8?q?tation,=20disabled=20by=20default?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 eo/src/ga/make_op.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/eo/src/ga/make_op.h b/eo/src/ga/make_op.h
index 045148ec..2035a4f8 100644
--- a/eo/src/ga/make_op.h
+++ b/eo/src/ga/make_op.h
@@ -156,11 +156,23 @@ eoGenOp<EOT> & do_make_op(eoParser& _parser, eoState& _state, eoInit<EOT>& _init
     if ( (bitFlipRateParam.value() < 0) )
       throw std::runtime_error("Invalid bitFlipRate");
 
+    // oneBitFlip
     eoValueParam<double> & oneBitRateParam = _parser.createParam(0.01, "oneBitRate", "Relative rate for deterministic bit-flip mutation", 'd', "Variation Operators" );
     // minimum check
     if ( (oneBitRateParam.value() < 0) )
       throw std::runtime_error("Invalid oneBitRate");
 
+    // kBitFlip
+    eoValueParam<unsigned> & kBitParam = _parser.createParam((unsigned)1, "kBit", "Number of bit for deterministic k bit-flip mutation", 0, "Variation Operators" );
+    // minimum check
+    if ( ! kBitParam.value() )
+      throw std::runtime_error("Invalid kBit");
+
+    eoValueParam<double> & kBitRateParam = _parser.createParam(0.0, "kBitRate", "Relative rate for deterministic k bit-flip mutation", 0, "Variation Operators" );
+    // minimum check
+    if ( (kBitRateParam.value() < 0) )
+      throw std::runtime_error("Invalid kBitRate");
+
     // minimum check
     // bool bMut = true; // not used ?
     if (bitFlipRateParam.value()+oneBitRateParam.value()==0)
@@ -184,6 +196,11 @@ eoGenOp<EOT> & do_make_op(eoParser& _parser, eoState& _state, eoInit<EOT>& _init
   _state.storeFunctor(ptMon);
   ptCombinedMonOp->add(*ptMon, oneBitRateParam.value());
 
+  // mutate exactly k bit per individual
+  ptMon = new eoDetBitFlip<EOT>(kBitParam.value());
+  _state.storeFunctor(ptMon);
+  ptCombinedMonOp->add(*ptMon, kBitRateParam.value());
+
   _state.storeFunctor(ptCombinedMonOp);
 
   // now build the eoGenOp: