[shark] 52/58: a rebase did some harm..

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository shark.

commit a60e9786916e403dc93616acc525e81af911bb0f
Author: Oswin Krause <oswin.krause at di.ku.dk>
Date:   Mon Feb 29 17:50:35 2016 +0100

    a rebase did some harm..
---
 include/shark/Algorithms/DirectSearch/MOCMA.h            | 2 +-
 include/shark/Algorithms/DirectSearch/RealCodedNSGAII.h  | 4 ++--
 include/shark/Algorithms/DirectSearch/SMS-EMOA.h         | 4 ++--
 include/shark/Algorithms/DirectSearch/SteadyStateMOCMA.h | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/shark/Algorithms/DirectSearch/MOCMA.h b/include/shark/Algorithms/DirectSearch/MOCMA.h
index 2ba5eef..5c63fdf 100644
--- a/include/shark/Algorithms/DirectSearch/MOCMA.h
+++ b/include/shark/Algorithms/DirectSearch/MOCMA.h
@@ -191,7 +191,7 @@ protected:
 		}
 		//copy points randomly
 		for(std::size_t i = numPoints; i != mu; ++i){
-			std::size_t index = discrete(*mpe_rng,0,startingPoints.size()-1);
+			std::size_t index = discrete(*mpe_rng,0,initialSearchPoints.size()-1);
 			m_parents[i] = IndividualType(noVariables,m_individualSuccessThreshold,m_initialSigma);
 			m_parents[i].searchPoint() = initialSearchPoints[index];
 			m_parents[i].penalizedFitness() = functionValues[index];
diff --git a/include/shark/Algorithms/DirectSearch/RealCodedNSGAII.h b/include/shark/Algorithms/DirectSearch/RealCodedNSGAII.h
index cebeaa4..8215cd8 100644
--- a/include/shark/Algorithms/DirectSearch/RealCodedNSGAII.h
+++ b/include/shark/Algorithms/DirectSearch/RealCodedNSGAII.h
@@ -214,8 +214,8 @@ protected:
 		}
 		//copy points randomly
 		for(std::size_t i = numPoints; i != mu; ++i){
-			std::size_t index = discrete(*mpe_rng, 0,startingPoints.size()-1);
-			m_parents[i].searchPoint() = startingPoints[index];
+			std::size_t index = discrete(*mpe_rng, 0,initialSearchPoints.size()-1);
+			m_parents[i].searchPoint() = initialSearchPoints[index];
 			m_parents[i].penalizedFitness() = functionValues[index];
 			m_parents[i].unpenalizedFitness() = functionValues[index];
 		}
diff --git a/include/shark/Algorithms/DirectSearch/SMS-EMOA.h b/include/shark/Algorithms/DirectSearch/SMS-EMOA.h
index 9df1865..d29bc5b 100644
--- a/include/shark/Algorithms/DirectSearch/SMS-EMOA.h
+++ b/include/shark/Algorithms/DirectSearch/SMS-EMOA.h
@@ -193,8 +193,8 @@ protected:
 		}
 		//copy points randomly
 		for(std::size_t i = numPoints; i != mu; ++i){
-			std::size_t index = discrete(*mpe_rng,0,startingPoints.size()-1);
-			m_parents[i].searchPoint() = startingPoints[index];
+			std::size_t index = discrete(*mpe_rng,0,initialSearchPoints.size()-1);
+			m_parents[i].searchPoint() = initialSearchPoints[index];
 			m_parents[i].penalizedFitness() = functionValues[index];
 			m_parents[i].unpenalizedFitness() = functionValues[index];
 		}
diff --git a/include/shark/Algorithms/DirectSearch/SteadyStateMOCMA.h b/include/shark/Algorithms/DirectSearch/SteadyStateMOCMA.h
index 450f121..cea48d8 100644
--- a/include/shark/Algorithms/DirectSearch/SteadyStateMOCMA.h
+++ b/include/shark/Algorithms/DirectSearch/SteadyStateMOCMA.h
@@ -189,7 +189,7 @@ protected:
 		}
 		//copy points randomly
 		for(std::size_t i = numPoints; i != mu; ++i){
-			std::size_t index = discrete(*mpe_rng, 0,startingPoints.size()-1);
+			std::size_t index = discrete(*mpe_rng, 0,initialSearchPoints.size()-1);
 			m_parents[i] = IndividualType(noVariables,m_individualSuccessThreshold,m_initialSigma);
 			m_parents[i].searchPoint() = initialSearchPoints[index];
 			m_parents[i].penalizedFitness() = functionValues[index];

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/shark.git