Commit 97126928 authored by Davis King's avatar Davis King

merged

parents 38353610 9ab8b8b0
...@@ -78,7 +78,7 @@ namespace dlib ...@@ -78,7 +78,7 @@ namespace dlib
if (is_matrix<feature_vector_type>::value) if (is_matrix<feature_vector_type>::value)
{ {
DLIB_CASSERT(psi.size() == (unsigned long)prob->get_num_dimensions(), DLIB_CASSERT((long)psi.size() == prob->get_num_dimensions(),
"The dimensionality of your PSI vector doesn't match get_num_dimensions()"); "The dimensionality of your PSI vector doesn't match get_num_dimensions()");
} }
} }
...@@ -136,7 +136,7 @@ namespace dlib ...@@ -136,7 +136,7 @@ namespace dlib
prob->separation_oracle(sample_idx, current_solution, out_loss, out_psi); prob->separation_oracle(sample_idx, current_solution, out_loss, out_psi);
if (is_matrix<feature_vector_type>::value) if (is_matrix<feature_vector_type>::value)
{ {
DLIB_CASSERT(out_psi.size() == (unsigned long)prob->get_num_dimensions(), DLIB_CASSERT((long)out_psi.size() == prob->get_num_dimensions(),
"The dimensionality of your PSI vector doesn't match get_num_dimensions()"); "The dimensionality of your PSI vector doesn't match get_num_dimensions()");
} }
......
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