[PPL-devel] [GIT] ppl/ppl(pip): Switched the default cut generation strategy to first row.

[François Galea]

Module: ppl/ppl
Branch: pip
Commit: 129b74f12cf5069f0f24ed3d48ae26e13f2474c9
URL:    http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=129b74f12cf5069f0f24ed3d48ae26e13f2474c9

Author: François Galea <francois.galea at uvsq.fr>
Date:   Fri Nov 13 19:12:50 2009 +0100

Switched the default cut generation strategy to first row.

---

 demos/ppl_pips/ppl_pips.cc |    6 +++---
 src/PIP_Problem.cc         |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/demos/ppl_pips/ppl_pips.cc b/demos/ppl_pips/ppl_pips.cc
index 997df16..3cecd4f 100644
--- a/demos/ppl_pips/ppl_pips.cc
+++ b/demos/ppl_pips/ppl_pips.cc
@@ -106,7 +106,7 @@ ppl_set_GMP_memory_allocation_functions(void) {
 namespace {
 
 PPL::PIP_Problem_Control_Parameter_Value cutting_strategy
-    = PPL::PIP_CUTTING_STRATEGY_DEEPEST;
+    = PPL::PIP_CUTTING_STRATEGY_FIRST;
 
 void
 pip_display_sol(std::ostream& out,
@@ -464,8 +464,8 @@ static const char* usage_string
 "  -cPATH, --check=PATH    checks if the result is equal to what is in PATH\n"
 #endif
 "\nCut generation options:\n"
-"  -d, --deepest           try to generate the deepest cut (default)\n"
-"  -f, --first             use the first non-integer row\n"
+"  -f, --first             use the first non-integer row (default)\n"
+"  -d, --deepest           try to generate the deepest cut\n"
 #ifndef PPL_HAVE_GETOPT_H
 "\n"
 "NOTE: this version does not support long options.\n"
diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc
index afb3984..ef641ed 100644
--- a/src/PIP_Problem.cc
+++ b/src/PIP_Problem.cc
@@ -73,7 +73,7 @@ PPL::PIP_Problem::~PIP_Problem() {
 
 void
 PPL::PIP_Problem::control_parameters_init() {
-  control_parameters[PIP_CUTTING_STRATEGY] = PIP_CUTTING_STRATEGY_DEEPEST;
+  control_parameters[PIP_CUTTING_STRATEGY] = PIP_CUTTING_STRATEGY_FIRST;
 }
 
 void