Commit a2cbc771 authored by Davis King's avatar Davis King

Renamed some functions.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%402265
parent e2649f28
...@@ -360,7 +360,7 @@ namespace dlib ...@@ -360,7 +360,7 @@ namespace dlib
typename funct_der, typename funct_der,
typename T typename T
> >
double quasi_newton ( double find_min_quasi_newton (
const funct& f, const funct& f,
const funct_der& der, const funct_der& der,
T& x, T& x,
...@@ -371,7 +371,7 @@ namespace dlib ...@@ -371,7 +371,7 @@ namespace dlib
COMPILE_TIME_ASSERT(is_matrix<T>::value); COMPILE_TIME_ASSERT(is_matrix<T>::value);
DLIB_ASSERT ( DLIB_ASSERT (
min_delta >= 0 && x.nc() == 1, min_delta >= 0 && x.nc() == 1,
"\tdouble quasi_newton()" "\tdouble find_min_quasi_newton()"
<< "\n\tYou have to supply column vectors to this function" << "\n\tYou have to supply column vectors to this function"
<< "\n\tmin_delta: " << min_delta << "\n\tmin_delta: " << min_delta
<< "\n\tx.nc(): " << x.nc() << "\n\tx.nc(): " << x.nc()
...@@ -435,7 +435,7 @@ namespace dlib ...@@ -435,7 +435,7 @@ namespace dlib
typename funct_der, typename funct_der,
typename T typename T
> >
double conjugate_gradient ( double find_min_conjugate_gradient (
const funct& f, const funct& f,
const funct_der& der, const funct_der& der,
T& x, T& x,
...@@ -446,7 +446,7 @@ namespace dlib ...@@ -446,7 +446,7 @@ namespace dlib
COMPILE_TIME_ASSERT(is_matrix<T>::value); COMPILE_TIME_ASSERT(is_matrix<T>::value);
DLIB_ASSERT ( DLIB_ASSERT (
min_delta >= 0 && x.nc() == 1, min_delta >= 0 && x.nc() == 1,
"\tdouble quasi_newton()" "\tdouble find_min_conjugate_gradient()"
<< "\n\tYou have to supply column vectors to this function" << "\n\tYou have to supply column vectors to this function"
<< "\n\tmin_delta: " << min_delta << "\n\tmin_delta: " << min_delta
<< "\n\tx.nc(): " << x.nc() << "\n\tx.nc(): " << x.nc()
......
...@@ -149,7 +149,7 @@ namespace dlib ...@@ -149,7 +149,7 @@ namespace dlib
typename funct_der, typename funct_der,
typename T typename T
> >
double quasi_newton ( double find_min_quasi_newton (
const funct& f, const funct& f,
const funct_der& der, const funct_der& der,
T& x, T& x,
...@@ -181,7 +181,7 @@ namespace dlib ...@@ -181,7 +181,7 @@ namespace dlib
typename funct_der, typename funct_der,
typename T typename T
> >
double conjugate_gradient ( double find_min_conjugate_gradient (
const funct& f, const funct& f,
const funct_der& der, const funct_der& der,
T& x, T& x,
......
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