Commit 5dd12132 by Francois Gygi

changed back to using inner_product

git-svn-id: cba15fb0-1239-40c8-b417-11db7ca47a34
parent 70f786e1
......@@ -31,6 +31,7 @@ class CGOptimizer
std::valarray<double> x0_, p_;
double f0_, fp0_, g0norm2_, alpha_, beta_max_;
LineMinimizer linmin_;
double norm2(std::valarray<double>& v);
......@@ -55,6 +56,6 @@ class CGOptimizer
double alpha_start(void) const { return linmin_.alpha_start(); }
double beta_max(void) const { return beta_max_; }
void compute_xp(const std::valarray<double>& x, const double f,
const std::valarray<double>& g, std::valarray<double>& xp);
std::valarray<double>& g, std::valarray<double>& xp);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment