Commit d737ca8a authored by Davis King's avatar Davis King

Minor tweaks and fixes.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%403626
parent 5dbab3f5
...@@ -35,7 +35,7 @@ namespace dlib ...@@ -35,7 +35,7 @@ namespace dlib
ekm_stale = true; ekm_stale = true;
initial_basis_size = 5; initial_basis_size = 5;
basis_size_increment = 5; basis_size_increment = 10;
max_basis_size = 300; max_basis_size = 300;
} }
...@@ -57,7 +57,7 @@ namespace dlib ...@@ -57,7 +57,7 @@ namespace dlib
ekm_stale = true; ekm_stale = true;
initial_basis_size = 5; initial_basis_size = 5;
basis_size_increment = 5; basis_size_increment = 10;
max_basis_size = 300; max_basis_size = 300;
} }
...@@ -181,6 +181,8 @@ namespace dlib ...@@ -181,6 +181,8 @@ namespace dlib
); );
max_basis_size = max_basis_size_; max_basis_size = max_basis_size_;
if (initial_basis_size > max_basis_size)
initial_basis_size = max_basis_size;
} }
unsigned long get_initial_basis_size ( unsigned long get_initial_basis_size (
...@@ -202,6 +204,9 @@ namespace dlib ...@@ -202,6 +204,9 @@ namespace dlib
); );
initial_basis_size = initial_basis_size_; initial_basis_size = initial_basis_size_;
if (initial_basis_size > max_basis_size)
max_basis_size = initial_basis_size;
} }
unsigned long get_basis_size_increment ( unsigned long get_basis_size_increment (
......
...@@ -46,7 +46,7 @@ namespace dlib ...@@ -46,7 +46,7 @@ namespace dlib
- #get_epsilon() == 0.001 - #get_epsilon() == 0.001
- #basis_loaded() == false - #basis_loaded() == false
- #get_initial_basis_size() == 5 - #get_initial_basis_size() == 5
- #get_basis_size_increment() == 5 - #get_basis_size_increment() == 10
- #get_max_basis_size() == 300 - #get_max_basis_size() == 300
- this object will not be verbose unless be_verbose() is called - this object will not be verbose unless be_verbose() is called
!*/ !*/
...@@ -66,7 +66,7 @@ namespace dlib ...@@ -66,7 +66,7 @@ namespace dlib
- #get_epsilon() == 0.001 - #get_epsilon() == 0.001
- #basis_loaded() == false - #basis_loaded() == false
- #get_initial_basis_size() == 5 - #get_initial_basis_size() == 5
- #get_basis_size_increment() == 5 - #get_basis_size_increment() == 10
- #get_max_basis_size() == 300 - #get_max_basis_size() == 300
- this object will not be verbose unless be_verbose() is called - this object will not be verbose unless be_verbose() is called
!*/ !*/
...@@ -192,7 +192,7 @@ namespace dlib ...@@ -192,7 +192,7 @@ namespace dlib
- max_basis_size > 0 - max_basis_size > 0
ensures ensures
- #get_max_basis_size() == max_basis_size - #get_max_basis_size() == max_basis_size
- if (get_initial_basis_size() < max_basis_size) then - if (get_initial_basis_size() > max_basis_size) then
- #get_initial_basis_size() == max_basis_size - #get_initial_basis_size() == max_basis_size
!*/ !*/
......
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