Skip to content

GitLab

You need to sign in or sign up before continuing.
Commit db07f07d authored by Davis King's avatar Davis King
Browse files

Made the asserts that checks if the inputs to the optimization functions are 

column vectors always enabled since violating this is a common user error.
parent 382c3d97
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
dlib/optimization/optimization.h
View file @ db07f07d
...@@ -184,7 +184,7 @@ namespace dlib ...@@ -184,7 +184,7 @@ namespace dlib
// The starting point (i.e. x) must be a column vector. // The starting point (i.e. x) must be a column vector.
COMPILE_TIME_ASSERT(T::NC <= 1); COMPILE_TIME_ASSERT(T::NC <= 1);
DLIB_ASSERT ( DLIB_CASSERT (
is_col_vector(x), is_col_vector(x),
"\tdouble find_min()" "\tdouble find_min()"
<< "\n\tYou have to supply column vectors to this function" << "\n\tYou have to supply column vectors to this function"
...@@ -244,7 +244,7 @@ namespace dlib ...@@ -244,7 +244,7 @@ namespace dlib
// The starting point (i.e. x) must be a column vector. // The starting point (i.e. x) must be a column vector.
COMPILE_TIME_ASSERT(T::NC <= 1); COMPILE_TIME_ASSERT(T::NC <= 1);
DLIB_ASSERT ( DLIB_CASSERT (
is_col_vector(x), is_col_vector(x),
"\tdouble find_max()" "\tdouble find_max()"
<< "\n\tYou have to supply column vectors to this function" << "\n\tYou have to supply column vectors to this function"
...@@ -311,7 +311,7 @@ namespace dlib ...@@ -311,7 +311,7 @@ namespace dlib
// The starting point (i.e. x) must be a column vector. // The starting point (i.e. x) must be a column vector.
COMPILE_TIME_ASSERT(T::NC <= 1); COMPILE_TIME_ASSERT(T::NC <= 1);
DLIB_ASSERT ( DLIB_CASSERT (
is_col_vector(x) && derivative_eps > 0, is_col_vector(x) && derivative_eps > 0,
"\tdouble find_min_using_approximate_derivatives()" "\tdouble find_min_using_approximate_derivatives()"
<< "\n\tYou have to supply column vectors to this function" << "\n\tYou have to supply column vectors to this function"
...@@ -374,7 +374,7 @@ namespace dlib ...@@ -374,7 +374,7 @@ namespace dlib
// The starting point (i.e. x) must be a column vector. // The starting point (i.e. x) must be a column vector.
COMPILE_TIME_ASSERT(T::NC <= 1); COMPILE_TIME_ASSERT(T::NC <= 1);
DLIB_ASSERT ( DLIB_CASSERT (
is_col_vector(x) && derivative_eps > 0, is_col_vector(x) && derivative_eps > 0,
"\tdouble find_max_using_approximate_derivatives()" "\tdouble find_max_using_approximate_derivatives()"
<< "\n\tYou have to supply column vectors to this function" << "\n\tYou have to supply column vectors to this function"
...@@ -478,7 +478,7 @@ namespace dlib ...@@ -478,7 +478,7 @@ namespace dlib
// The starting point (i.e. x) must be a column vector. // The starting point (i.e. x) must be a column vector.
COMPILE_TIME_ASSERT(T::NC <= 1); COMPILE_TIME_ASSERT(T::NC <= 1);
DLIB_ASSERT ( DLIB_CASSERT (
is_col_vector(x) && is_col_vector(x_lower) && is_col_vector(x_upper) && is_col_vector(x) && is_col_vector(x_lower) && is_col_vector(x_upper) &&
x.size() == x_lower.size() && x.size() == x_upper.size(), x.size() == x_lower.size() && x.size() == x_upper.size(),
"\tdouble find_min_box_constrained()" "\tdouble find_min_box_constrained()"
...@@ -602,7 +602,7 @@ namespace dlib ...@@ -602,7 +602,7 @@ namespace dlib
// The starting point (i.e. x) must be a column vector. // The starting point (i.e. x) must be a column vector.
COMPILE_TIME_ASSERT(T::NC <= 1); COMPILE_TIME_ASSERT(T::NC <= 1);
DLIB_ASSERT ( DLIB_CASSERT (
is_col_vector(x) && is_col_vector(x_lower) && is_col_vector(x_upper) && is_col_vector(x) && is_col_vector(x_lower) && is_col_vector(x_upper) &&
x.size() == x_lower.size() && x.size() == x_upper.size(), x.size() == x_lower.size() && x.size() == x_upper.size(),
"\tdouble find_max_box_constrained()" "\tdouble find_max_box_constrained()"
......
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