use operator= instead of assign() to assign a raw gsl_vector

FlexibleSUSY · Aug 26, 2016 · 6e372c1 · 6e372c1
1 parent 7492236
commit 6e372c1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/gsl_vector.hpp b/src/gsl_vector.hpp
@@ -30,7 +30,7 @@ class GSL_vector {
 public:
    GSL_vector();
    GSL_vector(std::size_t);
-   explicit GSL_vector(const gsl_vector*);
+   GSL_vector(const gsl_vector*);
    GSL_vector(const GSL_vector&);
    GSL_vector(GSL_vector&&) noexcept;
    GSL_vector(std::initializer_list<double>);
@@ -41,7 +41,6 @@ class GSL_vector {
    double& operator[](std::size_t);      ///< element read/write access
    double operator[](std::size_t) const; ///< element read access
 
-   void assign(const gsl_vector*);          ///< assign from gsl_vector
    bool empty() const noexcept;             ///< check if empty
    const gsl_vector* raw() const noexcept;  ///< get raw pointer
    gsl_vector* raw() noexcept;              ///< get raw pointer
@@ -51,6 +50,7 @@ class GSL_vector {
 private:
    gsl_vector* vec;                         ///< raw gsl_vector
 
+   void assign(const gsl_vector*);          ///< assign from gsl_vector
    void move_assign(GSL_vector&&) noexcept; ///< move assign
    void range_check(std::size_t) const;
 };

diff --git a/src/minimizer.hpp b/src/minimizer.hpp
@@ -187,7 +187,7 @@ int Minimizer<dimension>::minimize(const Eigen::VectorXd& start)
 #endif
 
    // save minimum point and function value
-   minimum_point.assign(minimizer->x);
+   minimum_point = minimizer->x;
    minimum_value = minimizer->fval;
 
    gsl_multimin_fminimizer_free(minimizer);

diff --git a/src/root_finder.hpp b/src/root_finder.hpp
@@ -185,7 +185,7 @@ int Root_finder<dimension>::find_root(const Eigen::VectorXd& start)
    std::cout << "\tRoot_finder status = " << gsl_strerror(status) << '\n';
 #endif
 
-   root.assign(solver->x);
+   root = solver->x;
 
    gsl_multiroot_fsolver_free(solver);
 

diff --git a/test/test_gsl_vector.cpp b/test/test_gsl_vector.cpp
@@ -80,7 +80,7 @@ BOOST_AUTO_TEST_CASE( test_gsl_assign )
    gsl_vector_set(v, 2, 3.);
 
    GSL_vector v2(3);
-   v2.assign(v);
+   v2 = v;
 
    gsl_vector_free(v);
 
@@ -98,7 +98,7 @@ BOOST_AUTO_TEST_CASE( test_gsl_empty_assign )
    gsl_vector_set(v, 2, 3.);
 
    GSL_vector v2;
-   v2.assign(v);
+   v2 = v;
 
    gsl_vector_free(v);
 
@@ -111,7 +111,7 @@ BOOST_AUTO_TEST_CASE( test_gsl_null_assign )
 {
    gsl_vector* v = 0;
    GSL_vector v2(3);
-   v2.assign(v);
+   v2 = v;
 
    BOOST_CHECK_EQUAL(v2.size(), 0);
 }