Removed the old find_min* functions, updated the regression tests, and

modified any code that used the old functions.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%403187

dlib/optimization/optimization.h

@@ -1033,163 +1033,6 @@ namespace dlib
         );
     }
 
-// ----------------------------------------------------------------------------------------
-// ----------------------------------------------------------------------------------------
-// ----------------------------------------------------------------------------------------
-
-    template <
-        typename funct, 
-        typename funct_der, 
-        typename T
-        >
-    void find_min_quasi_newton (
-        const funct& f, 
-        const funct_der& der, 
-        T& x, 
-        double min_f,
-        double min_delta = 1e-7 
-    )
-    {
-        // You get an error on this line when you pass in a global function to this function.
-        // You have to either use a function object or pass a pointer to your global function
-        // by taking its address using the & operator.  (This check is here because gcc 4.0
-        // has a bug that causes it to silently corrupt return values from functions that
-        // invoked through a reference)
-        COMPILE_TIME_ASSERT(is_function<funct>::value == false);
-        COMPILE_TIME_ASSERT(is_function<funct_der>::value == false);
-
-        COMPILE_TIME_ASSERT(is_matrix<T>::value);
-        DLIB_ASSERT (
-            min_delta >= 0 && x.nc() == 1,
-            "\tdouble find_min_quasi_newton()"
-            << "\n\tYou have to supply column vectors to this function"
-            << "\n\tmin_delta: " << min_delta
-            << "\n\tx.nc():    " << x.nc()
-        );
-
-        find_min(
-            bfgs_search_strategy(), 
-            objective_delta_stop_strategy(min_delta), 
-            f, der, x, min_f
-            );
-    }
-
-// ----------------------------------------------------------------------------------------
-
-    template <
-        typename funct,
-        typename funct_der,
-        typename T
-        >
-    void find_min_conjugate_gradient (
-        const funct& f,
-        const funct_der& der,
-        T& x,
-        double min_f,
-        double min_delta = 1e-7
-    )
-    {
-        // You get an error on this line when you pass in a global function to this function.
-        // You have to either use a function object or pass a pointer to your global function
-        // by taking its address using the & operator.  (This check is here because gcc 4.0
-        // has a bug that causes it to silently corrupt return values from functions that
-        // invoked through a reference)
-        COMPILE_TIME_ASSERT(is_function<funct>::value == false);
-        COMPILE_TIME_ASSERT(is_function<funct_der>::value == false);
-
-        COMPILE_TIME_ASSERT(is_matrix<T>::value);
-        DLIB_ASSERT (
-            min_delta >= 0 && x.nc() == 1,
-            "\tdouble find_min_conjugate_gradient()"
-            << "\n\tYou have to supply column vectors to this function"
-            << "\n\tmin_delta: " << min_delta
-            << "\n\tx.nc():    " << x.nc()
-        );
-
-        find_min(
-            cg_search_strategy(), 
-            objective_delta_stop_strategy(min_delta), 
-            f, der, x, min_f
-            );
-    }
-
-// ----------------------------------------------------------------------------------------
-
-    template <
-        typename funct, 
-        typename T
-        >
-    void find_min_quasi_newton2 (
-        const funct& f, 
-        T& x, 
-        double min_f,
-        double min_delta = 1e-7,
-        double derivative_eps = 1e-7
-    )
-    {
-        // You get an error on this line when you pass in a global function to this function.
-        // You have to either use a function object or pass a pointer to your global function
-        // by taking its address using the & operator.  (This check is here because gcc 4.0
-        // has a bug that causes it to silently corrupt return values from functions that
-        // invoked through a reference)
-        COMPILE_TIME_ASSERT(is_function<funct>::value == false);
-
-        COMPILE_TIME_ASSERT(is_matrix<T>::value);
-        DLIB_ASSERT (
-            min_delta >= 0 && x.nc() == 1,
-            "\tdouble find_min_quasi_newton2()"
-            << "\n\tYou have to supply column vectors to this function"
-            << "\n\tmin_delta:      " << min_delta
-            << "\n\tx.nc():         " << x.nc()
-            << "\n\tderivative_eps: " << derivative_eps 
-        );
-
-        find_min_using_approximate_derivatives(
-            bfgs_search_strategy(), 
-            objective_delta_stop_strategy(min_delta), 
-            f, x, min_f, derivative_eps
-            );
-    }
-
-// ----------------------------------------------------------------------------------------
-
-    template <
-        typename funct,
-        typename T
-        >
-    void find_min_conjugate_gradient2 (
-        const funct& f,
-        T& x,
-        double min_f,
-        double min_delta = 1e-7,
-        double derivative_eps = 1e-7
-    )
-    {
-        // You get an error on this line when you pass in a global function to this function.
-        // You have to either use a function object or pass a pointer to your global function
-        // by taking its address using the & operator.  (This check is here because gcc 4.0
-        // has a bug that causes it to silently corrupt return values from functions that
-        // invoked through a reference)
-        COMPILE_TIME_ASSERT(is_function<funct>::value == false);
-
-        COMPILE_TIME_ASSERT(is_matrix<T>::value);
-        DLIB_ASSERT (
-            min_delta >= 0 && x.nc() == 1 && derivative_eps > 0,
-            "\tdouble find_min_conjugate_gradient2()"
-            << "\n\tYou have to supply column vectors to this function"
-            << "\n\tmin_delta:      " << min_delta
-            << "\n\tx.nc():         " << x.nc()
-            << "\n\tderivative_eps: " << derivative_eps 
-        );
-
-        find_min_using_approximate_derivatives(
-            cg_search_strategy(), 
-            objective_delta_stop_strategy(min_delta),
-            f, x, min_f, derivative_eps
-            );
-
-    }
-
 // ----------------------------------------------------------------------------------------
 
 }

dlib/svm/reduced.h

@@ -546,7 +546,9 @@ namespace dlib
 
 
             // perform the actual optimization
-            find_min_conjugate_gradient(obj, obj_der, opt_starting_point, 0, eps); 
+            find_min(lbfgs_search_strategy(20),
+                     objective_delta_stop_strategy(eps),
+                     obj, obj_der, opt_starting_point, 0); 
 
             // now make sure that the final optimized value is loaded into the beta and
             // out_vectors matrices