From a6aba7c40a1296e99c028262fd78eb61eb47e602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernd=20G=C3=A4rtner?= Date: Mon, 30 Apr 2007 10:16:02 +0000 Subject: [PATCH] - fixed file location in include - renamed ...validation_flag() to ...auto_validation() --- .../doc_tex/QP_solver_ref/Quadratic_program_options.tex | 8 ++++---- QP_solver/examples/QP_solver/cycling.cpp | 2 +- QP_solver/include/CGAL/QP_options.h | 6 +++--- QP_solver/include/CGAL/QP_solver/QP__filtered_base.h | 2 +- QP_solver/include/CGAL/QP_solver/QP_functions_impl.h | 2 +- QP_solver/test/QP_solver/test_default_bounds.cpp | 2 +- QP_solver/test/QP_solver/test_random_qp.cpp | 2 +- QP_solver/test/QP_solver/test_random_qp2.cpp | 2 +- QP_solver/test/QP_solver/test_solver.cpp | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/QP_solver/doc_tex/QP_solver_ref/Quadratic_program_options.tex b/QP_solver/doc_tex/QP_solver_ref/Quadratic_program_options.tex index 93e348402a9..097b50676de 100644 --- a/QP_solver/doc_tex/QP_solver_ref/Quadratic_program_options.tex +++ b/QP_solver/doc_tex/QP_solver_ref/Quadratic_program_options.tex @@ -56,15 +56,15 @@ not internally cycle.} \ccHeading{Validation mode} -\ccMethod{void set_validation_flag(bool validate);} -{sets the validation flag of the solver to the value \ccc{validate}. +\ccMethod{void set_auto_validation(bool validate);} +{sets the automatic validation mode of the solver to the value \ccc{validate}. The default is \ccc{false}. By providing value \ccc{true} you can tell the solver to automatically check whether the program has correctly been solved, see the Validity section of the class \ccc{Quadratic_program_solution}.} -\ccMethod{bool get_validation_flag() const;} -{returns the validation flag of \ccVar.} +\ccMethod{bool get_auto_validation() const;} +{returns the validation mode of \ccVar.} \ccExample \ccReferToExampleCode{QP_solver/cycling.cpp} diff --git a/QP_solver/examples/QP_solver/cycling.cpp b/QP_solver/examples/QP_solver/cycling.cpp index 79c45b9c302..4e2f16eec0b 100644 --- a/QP_solver/examples/QP_solver/cycling.cpp +++ b/QP_solver/examples/QP_solver/cycling.cpp @@ -31,7 +31,7 @@ int main() { CGAL::Quadratic_program_options options; options.set_verbosity(1); // verbose mode options.set_pricing_strategy(CGAL::QP_BLAND); // Bland's rule - options.set_validation_flag(true); // automatic self-check + options.set_auto_validation(true); // automatic self-check Solution s = CGAL::solve_nonnegative_linear_program(lp, ET(), options); assert (s.is_valid()); // did the self-check succeed? diff --git a/QP_solver/include/CGAL/QP_options.h b/QP_solver/include/CGAL/QP_options.h index b5050f10378..ed533888652 100644 --- a/QP_solver/include/CGAL/QP_options.h +++ b/QP_solver/include/CGAL/QP_options.h @@ -74,12 +74,12 @@ public: // set/get validation flag // ----------------------- - bool get_validation_flag() const + bool get_auto_validation() const { return validation_flag_; } - void set_validation_flag (bool validate) + void set_auto_validation (bool validate) { validation_flag_ = validate; } @@ -128,7 +128,7 @@ std::ostream& operator<< (std::ostream& o, o << "QP_BLAND"; } o << "\n"; - o << " Validation flag: " << options.get_validation_flag() << std::endl; + o << " Validation flag: " << options.get_auto_validation() << std::endl; return o; } diff --git a/QP_solver/include/CGAL/QP_solver/QP__filtered_base.h b/QP_solver/include/CGAL/QP_solver/QP__filtered_base.h index d6dc0eb7452..7806d580ed3 100644 --- a/QP_solver/include/CGAL/QP_solver/QP__filtered_base.h +++ b/QP_solver/include/CGAL/QP_solver/QP__filtered_base.h @@ -25,7 +25,7 @@ // includes #include -#include +#include #include CGAL_BEGIN_NAMESPACE diff --git a/QP_solver/include/CGAL/QP_solver/QP_functions_impl.h b/QP_solver/include/CGAL/QP_solver/QP_functions_impl.h index a1f82d9217a..2464338ab36 100644 --- a/QP_solver/include/CGAL/QP_solver/QP_functions_impl.h +++ b/QP_solver/include/CGAL/QP_solver/QP_functions_impl.h @@ -355,7 +355,7 @@ namespace QP_functions_detail { Solver; const Solver* s = new Solver(p, options); Quadratic_program_solution solution(s); - if (options.get_validation_flag()) { + if (options.get_auto_validation()) { // validate solution if (options.get_verbosity() > 0) std::cout << "Validating solution...\n"; diff --git a/QP_solver/test/QP_solver/test_default_bounds.cpp b/QP_solver/test/QP_solver/test_default_bounds.cpp index 05ad172cdfe..ee2b38b09ce 100644 --- a/QP_solver/test/QP_solver/test_default_bounds.cpp +++ b/QP_solver/test/QP_solver/test_default_bounds.cpp @@ -36,7 +36,7 @@ int main() { // options CGAL::Quadratic_program_options options; - options.set_validation_flag(true); + options.set_auto_validation(true); for (fl = 0; fl < 2; ++fl) for (fu = 0; fu < 2; ++fu) diff --git a/QP_solver/test/QP_solver/test_random_qp.cpp b/QP_solver/test/QP_solver/test_random_qp.cpp index 8948d8e8387..be0c329dda6 100644 --- a/QP_solver/test/QP_solver/test_random_qp.cpp +++ b/QP_solver/test/QP_solver/test_random_qp.cpp @@ -93,7 +93,7 @@ int tries = 50000; int main() { // options CGAL::Quadratic_program_options options; - options.set_validation_flag(true); + options.set_auto_validation(true); // generate a set of small random qp's for (int i=0; i (options.find("Strategy")->second)); - solver_options.set_validation_flag(true); + solver_options.set_auto_validation(true); CGAL::Quadratic_program_solution solution = CGAL::QP_functions_detail::solve_program @@ -443,7 +443,7 @@ bool process(const std::string& filename, CGAL::Quadratic_program_options local_options; local_options.set_verbosity(0); local_options.set_pricing_strategy(CGAL::QP_DANTZIG); - local_options.set_validation_flag(true); + local_options.set_auto_validation(true); LocalQP qplocal (qp.get_n(), qp.get_m(), qp.get_a(), qp.get_b(), qp.get_r(), qp.get_fl(), qp.get_l(), qp.get_fu(), qp.get_u(),