Commit 29b08623 authored by Davis King's avatar Davis King

Removed unnecessary restrictions on the rbf_network_trainer

object.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%402398
parent e32aa6cf
...@@ -108,14 +108,13 @@ namespace dlib ...@@ -108,14 +108,13 @@ namespace dlib
typedef typename decision_function<kernel_type>::scalar_vector_type scalar_vector_type; typedef typename decision_function<kernel_type>::scalar_vector_type scalar_vector_type;
// make sure requires clause is not broken // make sure requires clause is not broken
DLIB_ASSERT(is_binary_classification_problem(x,y) == true, DLIB_ASSERT(x.nr() > 1 && x.nr() == y.nr() && x.nc() == 1 && y.nc() == 1,
"\tdecision_function rbf_network_trainer::train(x,y)" "\tdecision_function rbf_network_trainer::train(x,y)"
<< "\n\t invalid inputs were given to this function" << "\n\t invalid inputs were given to this function"
<< "\n\t x.nr(): " << x.nr() << "\n\t x.nr(): " << x.nr()
<< "\n\t y.nr(): " << y.nr() << "\n\t y.nr(): " << y.nr()
<< "\n\t x.nc(): " << x.nc() << "\n\t x.nc(): " << x.nc()
<< "\n\t y.nc(): " << y.nc() << "\n\t y.nc(): " << y.nc()
<< "\n\t is_binary_classification_problem(x,y): " << ((is_binary_classification_problem(x,y))? "true":"false")
); );
// first run all the sampes through a kcentroid object to find the rbf centers // first run all the sampes through a kcentroid object to find the rbf centers
......
...@@ -27,8 +27,7 @@ namespace dlib ...@@ -27,8 +27,7 @@ namespace dlib
- get_tolerance() == 0.01 - get_tolerance() == 0.01
WHAT THIS OBJECT REPRESENTS WHAT THIS OBJECT REPRESENTS
This object implements a trainer for radial basis function network for This object implements a trainer for an radial basis function network.
solving binary classification problems.
The implementation of this algorithm follows the normal RBF training The implementation of this algorithm follows the normal RBF training
process. For more details see the code or the Wikipedia article process. For more details see the code or the Wikipedia article
...@@ -94,7 +93,13 @@ namespace dlib ...@@ -94,7 +93,13 @@ namespace dlib
) const ) const
/*! /*!
requires requires
- is_binary_classification_problem(x,y) == true - in_sample_vector_type == a matrix or something convertable to a matrix
via vector_to_matrix()
- in_scalar_vector_type == a matrix or something convertable to a matrix
via vector_to_matrix()
- x.nr() > 1
- x.nr() == y.nr() && x.nc() == 1 && y.nc() == 1
(i.e. x and y are both column vectors of the same length)
ensures ensures
- trains a RBF network given the training samples in x and - trains a RBF network given the training samples in x and
labels in y. labels in y.
......
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