From 0f9434387e599da518b115ed6e12e31e3144d4ef Mon Sep 17 00:00:00 2001
From: verel <verel@mariner.local>
Date: Thu, 20 Dec 2012 16:36:19 +0100
Subject: [PATCH] some small changes on tutorial after fusion

---
 eo/tutorial/Lesson2/FirstBitEA.cpp       | 2 +-
 eo/tutorial/Lesson2/FirstRealEA.cpp      | 2 +-
 eo/tutorial/Lesson2/exercise2.3.cpp      | 2 +-
 eo/tutorial/Lesson3/SecondBitEA.cpp      | 2 +-
 eo/tutorial/Lesson3/SecondRealEA.cpp     | 2 +-
 eo/tutorial/Lesson3/exercise3.1.cpp      | 2 +-
 mo/tutorial/Lesson1/lesson1_simpleHC.cpp | 3 ++-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/eo/tutorial/Lesson2/FirstBitEA.cpp b/eo/tutorial/Lesson2/FirstBitEA.cpp
index fd508a55c..dfb98bb12 100644
--- a/eo/tutorial/Lesson2/FirstBitEA.cpp
+++ b/eo/tutorial/Lesson2/FirstBitEA.cpp
@@ -125,7 +125,7 @@ void main_function(int argc, char **argv)
   // Combine them with relative rates
   eoPropCombinedQuadOp<Indi> xover(xover1, onePointRate);
   xover.add(xoverU, URate);
-  xover.add(xover2, twoPointsRate, true);
+  xover.add(xover2, twoPointsRate);
 
 // MUTATION
   // standard bit-flip mutation for bitstring
diff --git a/eo/tutorial/Lesson2/FirstRealEA.cpp b/eo/tutorial/Lesson2/FirstRealEA.cpp
index 6c259b3bf..2d22e5756 100644
--- a/eo/tutorial/Lesson2/FirstRealEA.cpp
+++ b/eo/tutorial/Lesson2/FirstRealEA.cpp
@@ -122,7 +122,7 @@ void main_function(int argc, char **argv)
   eoHypercubeCrossover<Indi> xoverA;
   // Combine them with relative weights
   eoPropCombinedQuadOp<Indi> xover(xoverS, segmentRate);
-  xover.add(xoverA, hypercubeRate, true);
+  xover.add(xoverA, hypercubeRate);
 
 // MUTATION
   // offspring(i) uniformly chosen in [parent(i)-epsilon, parent(i)+epsilon]
diff --git a/eo/tutorial/Lesson2/exercise2.3.cpp b/eo/tutorial/Lesson2/exercise2.3.cpp
index c1b51aa00..0768450db 100644
--- a/eo/tutorial/Lesson2/exercise2.3.cpp
+++ b/eo/tutorial/Lesson2/exercise2.3.cpp
@@ -131,7 +131,7 @@ void main_function(int argc, char **argv)
   // Combine them with relative rates
   eoPropCombinedQuadOp<Indi> xover(xover1, onePointRate);
   xover.add(xoverU, URate);
-  xover.add(xover2, twoPointsRate, true);
+  xover.add(xover2, twoPointsRate);
 
 // MUTATION
   // standard bit-flip mutation for bitstring
diff --git a/eo/tutorial/Lesson3/SecondBitEA.cpp b/eo/tutorial/Lesson3/SecondBitEA.cpp
index 92e181284..cb7ac9c9d 100644
--- a/eo/tutorial/Lesson3/SecondBitEA.cpp
+++ b/eo/tutorial/Lesson3/SecondBitEA.cpp
@@ -214,7 +214,7 @@ void main_function(int argc, char **argv)
   // Combine them with relative rates
   eoPropCombinedQuadOp<Indi> xover(xover1, onePointRate);
   xover.add(xoverU, URate);
-  xover.add(xover2, twoPointsRate, true);
+  xover.add(xover2, twoPointsRate);
 
 // MUTATION
   // standard bit-flip mutation for bitstring
diff --git a/eo/tutorial/Lesson3/SecondRealEA.cpp b/eo/tutorial/Lesson3/SecondRealEA.cpp
index b5ca0c800..1116682f3 100644
--- a/eo/tutorial/Lesson3/SecondRealEA.cpp
+++ b/eo/tutorial/Lesson3/SecondRealEA.cpp
@@ -191,7 +191,7 @@ void main_function(int argc, char **argv)
   eoHypercubeCrossover<Indi> xoverA;
   // Combine them with relative weights
   eoPropCombinedQuadOp<Indi> xover(xoverS, segmentRate);
-  xover.add(xoverA, hypercubeRate, true);
+  xover.add(xoverA, hypercubeRate);
 
 // MUTATION
   // offspring(i) uniformly chosen in [parent(i)-epsilon, parent(i)+epsilon]
diff --git a/eo/tutorial/Lesson3/exercise3.1.cpp b/eo/tutorial/Lesson3/exercise3.1.cpp
index f21e5930e..dc37479d4 100644
--- a/eo/tutorial/Lesson3/exercise3.1.cpp
+++ b/eo/tutorial/Lesson3/exercise3.1.cpp
@@ -219,7 +219,7 @@ void main_function(int argc, char **argv)
   // Combine them with relative rates
   eoPropCombinedQuadOp<Indi> xover(xover1, onePointRate);
   xover.add(xoverU, URate);
-  xover.add(xover2, twoPointsRate, true);
+  xover.add(xover2, twoPointsRate);
 
 // MUTATION
   // standard bit-flip mutation for bitstring
diff --git a/mo/tutorial/Lesson1/lesson1_simpleHC.cpp b/mo/tutorial/Lesson1/lesson1_simpleHC.cpp
index 199b0556c..013b6731e 100644
--- a/mo/tutorial/Lesson1/lesson1_simpleHC.cpp
+++ b/mo/tutorial/Lesson1/lesson1_simpleHC.cpp
@@ -34,7 +34,8 @@ using namespace std;
 
 //-----------------------------------------------------------------------------
 // neighborhood description
-#include <neighborhood/moOrderNeighborhood.h> // visit all neighbors in increasing order of bit index
+#include <neighborhood/moRndWithReplNeighborhood.h> // visit all neighbors in random order with neighbor
+#include <neighborhood/moOrderNeighborhood.h> // visit all neighbors in order with neighbor
 
 //-----------------------------------------------------------------------------
 // the simple Hill-Climbing local search