Commit d0f2eb43 authored by Davis King's avatar Davis King

Renamed max_index_value_plus_one() (a function for working with graphs) to

max_index_plus_one() so that it uses the same name as the essentially identical
function for working with sparse vectors.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%404168
parent d8e7ee4c
...@@ -415,7 +415,7 @@ namespace dlib ...@@ -415,7 +415,7 @@ namespace dlib
template < template <
typename vector_type typename vector_type
> >
unsigned long max_index_value_plus_one ( unsigned long max_index_plus_one (
const vector_type& pairs const vector_type& pairs
) )
{ {
......
...@@ -146,7 +146,7 @@ namespace dlib ...@@ -146,7 +146,7 @@ namespace dlib
template < template <
typename vector_type typename vector_type
> >
unsigned long max_index_value_plus_one ( unsigned long max_index_plus_one (
const vector_type& pairs const vector_type& pairs
); );
/*! /*!
......
...@@ -216,13 +216,13 @@ namespace dlib ...@@ -216,13 +216,13 @@ namespace dlib
// make sure requires clause is not broken // make sure requires clause is not broken
DLIB_ASSERT(edges.size() > 0 && DLIB_ASSERT(edges.size() > 0 &&
contains_duplicate_pairs(edges) == false && contains_duplicate_pairs(edges) == false &&
max_index_value_plus_one(edges) <= samples.size(), max_index_plus_one(edges) <= samples.size(),
"\t void linear_manifold_regularizer::build()" "\t void linear_manifold_regularizer::build()"
<< "\n\t Invalid inputs were given to this function." << "\n\t Invalid inputs were given to this function."
<< "\n\t edges.size(): " << edges.size() << "\n\t edges.size(): " << edges.size()
<< "\n\t samples.size(): " << samples.size() << "\n\t samples.size(): " << samples.size()
<< "\n\t contains_duplicate_pairs(edges): " << contains_duplicate_pairs(edges) << "\n\t contains_duplicate_pairs(edges): " << contains_duplicate_pairs(edges)
<< "\n\t max_index_value_plus_one(edges): " << max_index_value_plus_one(edges) << "\n\t max_index_plus_one(edges): " << max_index_plus_one(edges)
); );
......
...@@ -85,7 +85,7 @@ namespace dlib ...@@ -85,7 +85,7 @@ namespace dlib
it must in turn contain objects with an interface compatible with dlib::sample_pair it must in turn contain objects with an interface compatible with dlib::sample_pair
- edges.size() > 0 - edges.size() > 0
- contains_duplicate_pairs(edges) == false - contains_duplicate_pairs(edges) == false
- max_index_value_plus_one(edges) <= samples.size() - max_index_plus_one(edges) <= samples.size()
- weight_funct(edges[i]) must be a valid expression that evaluates to a - weight_funct(edges[i]) must be a valid expression that evaluates to a
floating point number >= 0 floating point number >= 0
ensures ensures
......
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