[shark] 45/58: fixed issue #44

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Wed Mar 16 10:05:33 UTC 2016


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

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

commit 2b289450a345b700d64e6634cb5ccd3ad5ff5907
Author: Oswin Krause <oswin.krause at di.ku.dk>
Date:   Thu Feb 11 12:24:01 2016 +0100

    fixed issue #44
---
 Test/Algorithms/DirectSearch/MOCMA.cpp             |  4 +-
 Test/Algorithms/DirectSearch/SteadyStateMOCMA.cpp  |  4 +-
 include/shark/Algorithms/DirectSearch/CMA.h        |  4 +-
 include/shark/Algorithms/DirectSearch/MOCMA.h      | 49 ++++++++++++----------
 .../Algorithms/DirectSearch/RealCodedNSGAII.h      | 35 +++++++++-------
 .../Algorithms/DirectSearch/SteadyStateMOCMA.h     | 49 ++++++++++++----------
 6 files changed, 79 insertions(+), 66 deletions(-)

diff --git a/Test/Algorithms/DirectSearch/MOCMA.cpp b/Test/Algorithms/DirectSearch/MOCMA.cpp
index 89e0629..664e987 100644
--- a/Test/Algorithms/DirectSearch/MOCMA.cpp
+++ b/Test/Algorithms/DirectSearch/MOCMA.cpp
@@ -82,13 +82,13 @@ BOOST_AUTO_TEST_CASE( MOCMA_SERIALIZATION ) {
 	
 	{
 		std::stringstream ss;
-		boost::archive::text_oarchive oa( ss );
+		TextOutArchive oa( ss );
 
 		BOOST_CHECK_NO_THROW( (oa << mocma) );
 
 		MOCMA mocma2;
 
-		boost::archive::text_iarchive ia( ss );
+		TextInArchive ia( ss );
 		BOOST_CHECK_NO_THROW( (ia >> mocma2) );
 
 		Rng::seed( 1 );
diff --git a/Test/Algorithms/DirectSearch/SteadyStateMOCMA.cpp b/Test/Algorithms/DirectSearch/SteadyStateMOCMA.cpp
index b445146..07ef947 100644
--- a/Test/Algorithms/DirectSearch/SteadyStateMOCMA.cpp
+++ b/Test/Algorithms/DirectSearch/SteadyStateMOCMA.cpp
@@ -81,13 +81,13 @@ BOOST_AUTO_TEST_CASE( ApproximatedHypSteadyStateMOCMA ) {
 	
 	{
 		std::stringstream ss;
-		boost::archive::text_oarchive oa( ss );
+		TextOutArchive oa( ss );
 
 		BOOST_CHECK_NO_THROW( (oa << ssMocma) );
 
 		SteadyStateMOCMA ssMocma2;
 
-		boost::archive::text_iarchive ia( ss );
+		TextInArchive ia( ss );
 		BOOST_CHECK_NO_THROW( (ia >> ssMocma2) );
 
 		Rng::seed( 0 );
diff --git a/include/shark/Algorithms/DirectSearch/CMA.h b/include/shark/Algorithms/DirectSearch/CMA.h
index ed6f7fa..4beaed8 100644
--- a/include/shark/Algorithms/DirectSearch/CMA.h
+++ b/include/shark/Algorithms/DirectSearch/CMA.h
@@ -101,8 +101,8 @@ public:
 	*/
 	SHARK_EXPORT_SYMBOL static std::size_t suggestMu( std::size_t lambda, RecombinationType recomb = SUPERLINEAR ) ;
 
-	void read( InArchive & archive );
-	void write( OutArchive & archive ) const;
+	SHARK_EXPORT_SYMBOL void read( InArchive & archive );
+	SHARK_EXPORT_SYMBOL void write( OutArchive & archive ) const;
 
 	using AbstractSingleObjectiveOptimizer<RealVector >::init;
 	/**
diff --git a/include/shark/Algorithms/DirectSearch/MOCMA.h b/include/shark/Algorithms/DirectSearch/MOCMA.h
index 504c39f..135d2c5 100644
--- a/include/shark/Algorithms/DirectSearch/MOCMA.h
+++ b/include/shark/Algorithms/DirectSearch/MOCMA.h
@@ -61,14 +61,6 @@ public:
 		IndividualBased,
 		PopulationBased
 	};
-private:
-	std::size_t m_mu; ///< Size of parent population
-	
-	IndicatorBasedSelection<Indicator> m_selection; ///< Selection operator relying on the (contributing) hypervolume indicator.
-	
-	NotionOfSuccess m_notionOfSuccess; ///< Flag for deciding whether the improved step-size adaptation shall be used.
-	double m_individualSuccessThreshold;
-	double m_initialSigma;
 public:
 	
 	IndicatorBasedMOCMA() {
@@ -106,21 +98,25 @@ public:
 	NotionOfSuccess& notionOfSuccess(){
 		return m_notionOfSuccess;
 	}
-	/**
-	 * \brief Stores/loads the algorithm's state.
-	 * \tparam Archive The type of the archive.
-	 * \param [in,out] archive The archive to use for loading/storing.
-	 * \param [in] version Currently unused.
-	 */
-	template<typename Archive>
-	void serialize(Archive &archive, const unsigned int version) {
-		archive & BOOST_SERIALIZATION_NVP(m_parents);
-		archive & BOOST_SERIALIZATION_NVP(m_mu);
-		archive & BOOST_SERIALIZATION_NVP(m_best);
+	void read( InArchive & archive ){
+		archive >> BOOST_SERIALIZATION_NVP(m_parents);
+		archive >> BOOST_SERIALIZATION_NVP(m_mu);
+		archive >> BOOST_SERIALIZATION_NVP(m_best);
 		
-		archive & BOOST_SERIALIZATION_NVP(m_notionOfSuccess);
-		archive & BOOST_SERIALIZATION_NVP(m_individualSuccessThreshold);
-		archive & BOOST_SERIALIZATION_NVP(m_initialSigma);
+		archive >> BOOST_SERIALIZATION_NVP(m_selection);
+		archive >> BOOST_SERIALIZATION_NVP(m_notionOfSuccess);
+		archive >> BOOST_SERIALIZATION_NVP(m_individualSuccessThreshold);
+		archive >> BOOST_SERIALIZATION_NVP(m_initialSigma);
+	}
+	void write( OutArchive & archive ) const{
+		archive << BOOST_SERIALIZATION_NVP(m_parents);
+		archive << BOOST_SERIALIZATION_NVP(m_mu);
+		archive << BOOST_SERIALIZATION_NVP(m_best);
+		
+		archive << BOOST_SERIALIZATION_NVP(m_selection);
+		archive << BOOST_SERIALIZATION_NVP(m_notionOfSuccess);
+		archive << BOOST_SERIALIZATION_NVP(m_individualSuccessThreshold);
+		archive << BOOST_SERIALIZATION_NVP(m_initialSigma);
 	}
 	
 	void init( ObjectiveFunctionType& function){
@@ -251,6 +247,15 @@ protected:
 	}
 	
 	std::vector<IndividualType> m_parents; ///< Population of size \f$\mu + 1\f$.
+	
+private:
+	std::size_t m_mu; ///< Size of parent population
+	
+	IndicatorBasedSelection<Indicator> m_selection; ///< Selection operator relying on the (contributing) hypervolume indicator.
+	
+	NotionOfSuccess m_notionOfSuccess; ///< Flag for deciding whether the improved step-size adaptation shall be used.
+	double m_individualSuccessThreshold;
+	double m_initialSigma;
 
 };
 
diff --git a/include/shark/Algorithms/DirectSearch/RealCodedNSGAII.h b/include/shark/Algorithms/DirectSearch/RealCodedNSGAII.h
index 3bf8fea..71958c3 100644
--- a/include/shark/Algorithms/DirectSearch/RealCodedNSGAII.h
+++ b/include/shark/Algorithms/DirectSearch/RealCodedNSGAII.h
@@ -105,22 +105,25 @@ public:
 		return m_mu;
 	}
 
-	/**
-	* \brief Stores/loads the algorithm's state.
-	* \tparam Archive The type of the archive.
-	* \param [in,out] archive The archive to use for loading/storing.
-	* \param [in] version Currently unused.
-	*/
-	template<typename Archive>
-	void serialize( Archive & archive, const unsigned int version ) {
-		archive & m_parents;
-		archive & m_mu;
-		archive & m_best;
-
-		archive & m_crossover;
-		archive & m_mutation;
-
-		archive & m_crossoverProbability;
+	void read( InArchive & archive ){
+		archive >> BOOST_SERIALIZATION_NVP(m_parents);
+		archive >> BOOST_SERIALIZATION_NVP(m_mu);
+		archive >> BOOST_SERIALIZATION_NVP(m_best);
+		
+		archive >> BOOST_SERIALIZATION_NVP( m_selection );
+		archive >> BOOST_SERIALIZATION_NVP(m_crossover);
+		archive >> BOOST_SERIALIZATION_NVP(m_mutation);
+		archive >> BOOST_SERIALIZATION_NVP(m_crossoverProbability);
+	}
+	void write( OutArchive & archive ) const{
+		archive << BOOST_SERIALIZATION_NVP(m_parents);
+		archive << BOOST_SERIALIZATION_NVP(m_mu);
+		archive << BOOST_SERIALIZATION_NVP(m_best);
+		
+		archive << BOOST_SERIALIZATION_NVP( m_selection );
+		archive << BOOST_SERIALIZATION_NVP(m_crossover);
+		archive << BOOST_SERIALIZATION_NVP(m_mutation);
+		archive << BOOST_SERIALIZATION_NVP(m_crossoverProbability);
 	}
 
 	void init( ObjectiveFunctionType& function){
diff --git a/include/shark/Algorithms/DirectSearch/SteadyStateMOCMA.h b/include/shark/Algorithms/DirectSearch/SteadyStateMOCMA.h
index 2f221f3..415c010 100644
--- a/include/shark/Algorithms/DirectSearch/SteadyStateMOCMA.h
+++ b/include/shark/Algorithms/DirectSearch/SteadyStateMOCMA.h
@@ -57,14 +57,6 @@ public:
 		IndividualBased,
 		PopulationBased
 	};
-private:
-	std::size_t m_mu; ///< Size of parent population
-	
-	IndicatorBasedSelection<Indicator> m_selection; ///< Selection operator relying on the (contributing) hypervolume indicator.
-	
-	NotionOfSuccess m_notionOfSuccess; ///< Flag for deciding whether the improved step-size adaptation shall be used.
-	double m_individualSuccessThreshold;
-	double m_initialSigma;
 public:
 	
 	IndicatorBasedSteadyStateMOCMA() {
@@ -102,21 +94,26 @@ public:
 	NotionOfSuccess& notionOfSuccess(){
 		return m_notionOfSuccess;
 	}
-	/**
-	 * \brief Stores/loads the algorithm's state.
-	 * \tparam Archive The type of the archive.
-	 * \param [in,out] archive The archive to use for loading/storing.
-	 * \param [in] version Currently unused.
-	 */
-	template<typename Archive>
-	void serialize(Archive &archive, const unsigned int version) {
-		archive & BOOST_SERIALIZATION_NVP(m_parents);
-		archive & BOOST_SERIALIZATION_NVP(m_mu);
-		archive & BOOST_SERIALIZATION_NVP(m_best);
+	
+	void read( InArchive & archive ){
+		archive >> BOOST_SERIALIZATION_NVP(m_parents);
+		archive >> BOOST_SERIALIZATION_NVP(m_mu);
+		archive >> BOOST_SERIALIZATION_NVP(m_best);
 		
-		archive & BOOST_SERIALIZATION_NVP(m_notionOfSuccess);
-		archive & BOOST_SERIALIZATION_NVP(m_individualSuccessThreshold);
-		archive & BOOST_SERIALIZATION_NVP(m_initialSigma);
+		archive >> BOOST_SERIALIZATION_NVP(m_selection);
+		archive >> BOOST_SERIALIZATION_NVP(m_notionOfSuccess);
+		archive >> BOOST_SERIALIZATION_NVP(m_individualSuccessThreshold);
+		archive >> BOOST_SERIALIZATION_NVP(m_initialSigma);
+	}
+	void write( OutArchive & archive ) const{
+		archive << BOOST_SERIALIZATION_NVP(m_parents);
+		archive << BOOST_SERIALIZATION_NVP(m_mu);
+		archive << BOOST_SERIALIZATION_NVP(m_best);
+		
+		archive << BOOST_SERIALIZATION_NVP(m_selection);
+		archive << BOOST_SERIALIZATION_NVP(m_notionOfSuccess);
+		archive << BOOST_SERIALIZATION_NVP(m_individualSuccessThreshold);
+		archive << BOOST_SERIALIZATION_NVP(m_initialSigma);
 	}
 	
 	void init( ObjectiveFunctionType& function){
@@ -256,6 +253,14 @@ protected:
 	
 	std::vector<IndividualType> m_parents; ///< Population of size \f$\mu + 1\f$.
 private:
+	std::size_t m_mu; ///< Size of parent population
+	
+	IndicatorBasedSelection<Indicator> m_selection; ///< Selection operator relying on the (contributing) hypervolume indicator.
+	
+	NotionOfSuccess m_notionOfSuccess; ///< Flag for deciding whether the improved step-size adaptation shall be used.
+	double m_individualSuccessThreshold;
+	double m_initialSigma;
+
 	/// \brief sorts all individuals with rank one to the front
 	void sortRankOneToFront(){
 		std::size_t start = 0;

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



More information about the debian-science-commits mailing list