boost pointers replaced with std pointers

optimizer/Expression/GlobalFunctions.h

@@ -50,7 +50,7 @@ struct _stat_sum {
         double step      = boost::get<double>(args[2]);
         std::string name = boost::get<std::string>(args[3]);
 
-        boost::scoped_ptr<SDDSReader> sim_stats(new SDDSReader(stat_filename_));
+        const std::unique_ptr<SDDSReader> sim_stats(new SDDSReader(stat_filename_));
         try {
             sim_stats->parseFile();
         } catch (OptPilotException &ex) {

optimizer/Expression/MaxNormRadialPeak.h

@@ -60,8 +60,8 @@ struct MaxNormRadialPeak {
 
         bool is_valid = true;
 
-        boost::scoped_ptr<PeakReader> meas_peaks(new PeakReader(meas_filename_));
-        boost::scoped_ptr<PeakReader> sim_peaks(new PeakReader(sim_filename_));
+        const std::unique_ptr<PeakReader> meas_peaks(new PeakReader(meas_filename_));
+        const std::unique_ptr<PeakReader> sim_peaks(new PeakReader(sim_filename_));
         try {
             sim_peaks->parseFile();
             meas_peaks->parseFile();

optimizer/Expression/NumberOfPeaks.h

@@ -52,7 +52,7 @@ struct NumberOfPeaks {
 
         bool is_valid = true;
 
-        boost::scoped_ptr<PeakReader> sim_peaks(new PeakReader(sim_filename_));
+        const std::unique_ptr<PeakReader> sim_peaks(new PeakReader(sim_filename_));
         std::size_t nPeaks = 0;
 
         try {

optimizer/Expression/Parser/requirements.hpp

@@ -11,7 +11,6 @@
 #include "error_handler.hpp"
 #include <set>
 #include <boost/function.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/phoenix/core.hpp>
 #include <boost/phoenix/function.hpp>
 #include <boost/phoenix/operator.hpp>

optimizer/Expression/ProbeVariable.h

@@ -47,7 +47,7 @@ struct ProbeVariable {
 
         bool is_valid = true;
 
-        boost::scoped_ptr<ProbeReader> sim_probe(new ProbeReader(probe_filename_));
+        const std::unique_ptr<ProbeReader> sim_probe(new ProbeReader(probe_filename_));
 
         try {
             sim_probe->parseFile();

optimizer/Expression/RadialPeak.h

@@ -6,7 +6,6 @@
 #include "boost/type_traits/remove_cv.hpp"
 #include "boost/variant/get.hpp"
 #include "boost/variant/variant.hpp"
-#include "boost/smart_ptr.hpp"
 
 #include "Util/Types.h"
 #include "Util/PeakReader.h"
@@ -31,7 +30,7 @@ struct RadialPeak {
 
         bool is_valid = true;
 
-        boost::scoped_ptr<PeakReader> sim_peaks(new PeakReader(peak_filename_));
+        const std::unique_ptr<PeakReader> sim_peaks(new PeakReader(peak_filename_));
         try {
             sim_peaks->parseFile();
         } catch (OptPilotException &ex) {

optimizer/Expression/SDDSVariable.h

@@ -31,7 +31,6 @@
 
 #include "boost/variant/get.hpp"
 #include "boost/variant/variant.hpp"
-#include "boost/smart_ptr.hpp"
 
 #include "Util/Types.h"
 #include "Util/SDDSReader.h"
@@ -68,7 +67,7 @@ struct SDDSVariable {
 
         bool is_valid = true;
 
-        boost::scoped_ptr<SDDSReader> sim_stats(new SDDSReader(stat_filename_));
+        const std::unique_ptr<SDDSReader> sim_stats(new SDDSReader(stat_filename_));
         try {
             sim_stats->parseFile();
         } catch (SDDSParserException &ex) {

optimizer/Expression/SeptumExpr.h

@@ -51,10 +51,10 @@ struct SeptumExpr {
         double result = 0.0;
 
         try {
-            boost::scoped_ptr<PeakReader> sim_peaks(new PeakReader(probe + std::string(".peaks")));
+            const std::unique_ptr<PeakReader> sim_peaks(new PeakReader(probe + std::string(".peaks")));
             sim_peaks->parseFile();
 
-            boost::scoped_ptr<ProbeHistReader> sim_hist(new ProbeHistReader(probe + std::string(".hist")));
+            const std::unique_ptr<ProbeHistReader> sim_hist(new ProbeHistReader(probe + std::string(".hist")));
             sim_hist->parseFile();
 
             double upperBound = 0.0;

optimizer/Expression/SumErrSq.h

@@ -69,7 +69,7 @@ struct SumErrSq {
         parseMeasurements(measurement_filename);
         bool is_valid = true;
 
-        boost::scoped_ptr<SDDSReader> sim_stats(new SDDSReader(stat_filename_));
+        const std::unique_ptr<SDDSReader> sim_stats(new SDDSReader(stat_filename_));
         try {
             sim_stats->parseFile();
         } catch (OptPilotException &ex) {

optimizer/Expression/SumErrSqRadialPeak.h

@@ -35,7 +35,6 @@
 #include "boost/type_traits/remove_cv.hpp"
 #include "boost/variant/get.hpp"
 #include "boost/variant/variant.hpp"
-#include "boost/smart_ptr.hpp"
 
 #include "Util/Types.h"
 #include "Util/PeakReader.h"
@@ -58,8 +57,8 @@ struct SumErrSqRadialPeak {
 
         bool is_valid = true;
 
-        boost::scoped_ptr<PeakReader> meas_peaks(new PeakReader(meas_filename_));
-        boost::scoped_ptr<PeakReader> sim_peaks(new PeakReader(sim_filename_));
+        const std::unique_ptr<PeakReader> meas_peaks(new PeakReader(meas_filename_));
+        const std::unique_ptr<PeakReader> sim_peaks(new PeakReader(sim_filename_));
         try {
             sim_peaks->parseFile();
             meas_peaks->parseFile();

optimizer/Optimizer/EA/BlendCrossover.h

@@ -26,14 +26,13 @@
 // You should have received a copy of the GNU General Public License
 // along with OPAL. If not, see <https://www.gnu.org/licenses/>.
 //
-#include "boost/smart_ptr.hpp"
 #include "Util/CmdArguments.h"
 #include <cmath>
 
 
 template <class T> struct BlendCrossover
 {
-    void crossover(boost::shared_ptr<T> ind1, boost::shared_ptr<T> ind2,
+    void crossover(std::shared_ptr<T> ind1, std::shared_ptr<T> ind2,
                    CmdArguments_t /*args*/) {
 
         // BLX-0.5 performs better than BLX operators with any other \alpha

optimizer/Optimizer/EA/FixedPisaNsga2.h

@@ -55,7 +55,6 @@
 #include "Optimizer/EA/Population.h"
 #include "Optimizer/EA/Variator.h"
 
-#include <boost/smart_ptr.hpp>
 #include <boost/chrono.hpp>
 #include <boost/property_tree/ptree.hpp>
 
@@ -103,7 +102,7 @@ public:
         Variator_t;
     typedef Population< Individual_t > Population_t;
     /// alias for usage in template
-    using individual = boost::shared_ptr<typename FixedPisaNsga2::Individual_t>;
+    using individual = std::shared_ptr<typename FixedPisaNsga2::Individual_t>;
 
 protected:
 
@@ -155,9 +154,9 @@ private:
     PisaState_t curState_m;
 
     /// collect some statistics of rejected and accepted individuals
-    boost::scoped_ptr<Statistics<size_t> > statistics_;
+    const std::unique_ptr<Statistics<size_t> > statistics_;
 
-    boost::scoped_ptr<Variator_t> variator_m;
+    std::unique_ptr<Variator_t> variator_m;
 
     std::vector<unsigned int> pp_all;        ///< IDs of population
     std::vector<unsigned int> parent_queue_; ///< IDs that will make new offspring
@@ -180,7 +179,7 @@ private:
     std::map<size_t, individual > jobmapping_m;
 
     /// population of pareto-front (for final output)
-    boost::shared_ptr<Population_t> paretoFront_m;
+    std::shared_ptr<Population_t> paretoFront_m;
 
     /// indicating if initial population has been created
     bool initialized_m;
@@ -247,8 +246,8 @@ private:
     boost::chrono::system_clock::time_point last_clock_;
 
     // DEBUG output helpers
-    boost::scoped_ptr<Trace> job_trace_;
-    boost::scoped_ptr<Trace> progress_;
+    std::unique_ptr<Trace> job_trace_;
+    std::unique_ptr<Trace> progress_;
 
 
     // entry point for starting the selector side of the PISA state machine
@@ -279,9 +278,9 @@ private:
     bool checkParetoFront(unsigned int id);
     /// Dumps index, objective values and bit string of all individuals in
     /// global_population.
-    void dumpPopulation(boost::shared_ptr<Population_t>);
-    void dumpPopulationToFile(boost::shared_ptr<Population_t>, std::ostringstream& filename, bool dump_offspring);
-    void dumpPopulationToJSON(boost::shared_ptr<Population_t>, std::ostringstream& filename, bool dump_offspring);
+    void dumpPopulation(std::shared_ptr<Population_t>);
+    void dumpPopulationToFile(std::shared_ptr<Population_t>, std::ostringstream& filename, bool dump_offspring);
+    void dumpPopulationToJSON(std::shared_ptr<Population_t>, std::ostringstream& filename, bool dump_offspring);
     void dumpIndividualToFile(int id,
                               individual& ind,
                               std::ofstream& file,

optimizer/Optimizer/EA/FixedPisaNsga2.tcc

@@ -149,16 +149,16 @@ FixedPisaNsga2<CO, MO>::FixedPisaNsga2(
     trace_filename << "opt.trace." << comms_.island_id;
     job_trace_.reset(new Trace("Optimizer Job Trace"));
     job_trace_->registerComponent( "sink",
-            boost::shared_ptr<TraceComponent>(
+            std::shared_ptr<TraceComponent>(
                 new FileSink(trace_filename.str())));
 
     std::ostringstream prog_filename;
     prog_filename << "opt.progress." << comms_.island_id;
     progress_.reset(new Trace("Optimizer Progress"));
     progress_->registerComponent( "timestamp",
-            boost::shared_ptr<TraceComponent>(new Timestamp()));
+            std::shared_ptr<TraceComponent>(new Timestamp()));
     progress_->registerComponent( "sink",
-            boost::shared_ptr<TraceComponent>(
+            std::shared_ptr<TraceComponent>(
                 new FileSink(prog_filename.str())));
 
     statistics_->registerStatistic("accepted", 0);
@@ -698,7 +698,7 @@ void FixedPisaNsga2<CO, MO>::runStateMachine() {
 }
 
 template< template <class> class CO, template <class> class MO >
-void FixedPisaNsga2<CO, MO>::dumpPopulation(boost::shared_ptr<Population_t> population) {
+void FixedPisaNsga2<CO, MO>::dumpPopulation(std::shared_ptr<Population_t> population) {
     std::ostringstream filename;
     int fileNumber = act_gen;
     if (dump_offspring_m == false) fileNumber--; // parents are from generation earlier (keeping filenumbers the same)
@@ -713,7 +713,7 @@ void FixedPisaNsga2<CO, MO>::dumpPopulation(boost::shared_ptr<Population_t> popu
 }
 
 template< template <class> class CO, template <class> class MO >
-void FixedPisaNsga2<CO, MO>::dumpPopulationToFile(boost::shared_ptr<Population_t> population,
+void FixedPisaNsga2<CO, MO>::dumpPopulationToFile(std::shared_ptr<Population_t> population,
                                                   std::ostringstream& filename,
                                                   bool dump_offspring) {
 
@@ -783,7 +783,7 @@ void FixedPisaNsga2<CO, MO>::dumpIndividualToFile(int idx,
 }
 
 template< template <class> class CO, template <class> class MO >
-void FixedPisaNsga2<CO, MO>::dumpPopulationToJSON(boost::shared_ptr<Population_t> population,
+void FixedPisaNsga2<CO, MO>::dumpPopulationToJSON(std::shared_ptr<Population_t> population,
                                                   std::ostringstream& filename,
                                                   bool dump_offspring) {
 

optimizer/Optimizer/EA/IndependentBitMutation.h

@@ -19,12 +19,11 @@
 // You should have received a copy of the GNU General Public License
 // along with OPAL. If not, see <https://www.gnu.org/licenses/>.
 //
-#include "boost/smart_ptr.hpp"
 #include "Util/CmdArguments.h"
 
 template <class T> struct IndependentBitMutation
 {
-    void mutate(boost::shared_ptr<T> ind, CmdArguments_t args) {
+    void mutate(std::shared_ptr<T> ind, CmdArguments_t args) {
 
         const double probability =
             args->getArg<double>("gene-mutation-probability", 0.5);

optimizer/Optimizer/EA/Individual.h

@@ -33,8 +33,6 @@
 
 #include "Expression/Expression.h"
 
-#include "boost/smart_ptr.hpp"
-
 class Individual {
 
 public:
@@ -83,7 +81,7 @@ public:
     }
 
     /// copy another individual
-    Individual(boost::shared_ptr<Individual> individual) {
+    Individual(std::shared_ptr<Individual> individual) {
         genes_m       =       genes_t(individual->genes_m);
         objectives_m  =  objectives_t(individual->objectives_m);
         bounds_m      =      bounds_t(individual->bounds_m);

optimizer/Optimizer/EA/NaiveOnePointCrossover.h

@@ -18,12 +18,11 @@
 // You should have received a copy of the GNU General Public License
 // along with OPAL. If not, see <https://www.gnu.org/licenses/>.
 //
-#include "boost/smart_ptr.hpp"
 #include "Util/CmdArguments.h"
 
 template <class T> struct NaiveOnePointCrossover
 {
-    void crossover(boost::shared_ptr<T> ind1, boost::shared_ptr<T> ind2,
+    void crossover(std::shared_ptr<T> ind1, std::shared_ptr<T> ind2,
                    CmdArguments_t /*args*/) {
 
         typedef typename T::genes_t genes_t;

optimizer/Optimizer/EA/NaiveUniformCrossover.h

@@ -19,12 +19,11 @@
 // You should have received a copy of the GNU General Public License
 // along with OPAL. If not, see <https://www.gnu.org/licenses/>.
 //
-#include "boost/smart_ptr.hpp"
 #include "Util/CmdArguments.h"
 
 template <class T> struct NaiveUniformCrossover
 {
-    void crossover(boost::shared_ptr<T> ind1, boost::shared_ptr<T> ind2,
+    void crossover(std::shared_ptr<T> ind1, std::shared_ptr<T> ind2,
                    CmdArguments_t /*args*/) {
 
         Individual::genes_t genes_ind2 = ind2->genes_m;

optimizer/Optimizer/EA/OneBitMutation.h

@@ -19,12 +19,11 @@
 // You should have received a copy of the GNU General Public License
 // along with OPAL. If not, see <https://www.gnu.org/licenses/>.
 //
-#include "boost/smart_ptr.hpp"
 #include "Util/CmdArguments.h"
 
 template <class T> struct OneBitMutation
 {
-    void mutate(boost::shared_ptr<T> ind, CmdArguments_t /*args*/) {
+    void mutate(std::shared_ptr<T> ind, CmdArguments_t /*args*/) {
 
         int range = ind->genes_m.size();
         int position = static_cast<int>((rand() / (RAND_MAX + 1.0)) * range);

optimizer/Optimizer/EA/Population.h

@@ -36,8 +36,6 @@
 #include <fstream>
 #include <sstream>
 
-#include "boost/smart_ptr.hpp"
-
 #include "extlib/wfgHypervolume/hypervolume.h"
 
 
@@ -52,7 +50,7 @@ public:
     ~Population() {}
 
     typedef typename Individual_t::genes_t          genes_t;
-    typedef boost::shared_ptr<Individual_t>         individual;
+    typedef std::shared_ptr<Individual_t>         individual;
     typedef std::pair< unsigned int, individual >   ind_t;
 
     /// population iterator type

optimizer/Optimizer/EA/SimulatedBinaryCrossover.h

@@ -23,13 +23,12 @@
 //
 #include <cmath>
 
-#include "boost/smart_ptr.hpp"
 #include "Util/CmdArguments.h"
 
 
 template <class T> struct SimulatedBinaryCrossover
 {
-    void crossover(boost::shared_ptr<T> ind1, boost::shared_ptr<T> ind2,
+    void crossover(std::shared_ptr<T> ind1, std::shared_ptr<T> ind2,
                    CmdArguments_t args) {
 
         double nu_c = args->getArg<double>("simbin-crossover-nu", 2.0, false);