check bounds in lbfgs::GetMinimizedVars

ptools · Aug 29, 2008 · 71f50c6 · 71f50c6
1 parent 74f6344
commit 71f50c6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/minimizers/lbfgs_interface.cpp b/minimizers/lbfgs_interface.cpp
@@ -190,16 +190,30 @@ void Lbfgs::minimize(int maxiter)
 
 
     std::cout << m_opt->task  << " |  " << m_opt->niter << " iterations\n";
+}
 
 
 
 
-
+std::vector<double>Lbfgs::GetMinimizedVarsAtIter(uint iter)
+{
+if (iter>=m_vars_over_time.size())
+  {
+   std::string msg = "";
+   msg+= iter;
+   msg += " is out of range (max: ";
+   msg += m_vars_over_time.size()-1 ;
+   msg += " )\n"; 
+   throw std::out_of_range(msg);
+  }
+return m_vars_over_time[iter];
 }
 
 
 
 
+
+
 } //namespace lbfgs
 
 

diff --git a/minimizers/lbfgs_interface.h b/minimizers/lbfgs_interface.h
@@ -25,7 +25,7 @@ class Lbfgs
             void minimize(int maxiter);
             std::vector<double> GetMinimizedVars() const {return x;};
 
-            std::vector<double> GetMinimizedVarsAtIter(uint iter){return m_vars_over_time[iter];}
+            std::vector<double> GetMinimizedVarsAtIter(uint iter);
             int GetNumberIter() {return m_opt->niter;}