Changeset 765

Timestamp:

Aug 20, 2007 12:03:23 AM (13 years ago)

Author:

andreasw

Message:

merging changes from Bug Squashing Party Aug 2007 to regular trunk

Location:

trunk/Cbc

Files:

• MSVisualStudio/v8/cbcCSosDllSample/cbcCSosDllSample.vcproj (modified) (2 diffs)
• configure (modified) (27 diffs)
• configure.ac (modified) (1 diff)
• src/CbcBranchActual.hpp (modified) (17 diffs)
• src/CbcBranchBase.hpp (modified) (1 diff)
• src/CbcBranchCut.hpp (modified) (7 diffs)
• src/CbcBranchDynamic.hpp (modified) (4 diffs)
• src/CbcBranchLotsize.hpp (modified) (4 diffs)
• src/CbcCompareActual.hpp (modified) (1 diff)
• src/CbcFathomDynamicProgramming.cpp (modified) (14 diffs)
• src/CbcFathomDynamicProgramming.hpp (modified) (5 diffs)
• src/CbcGeneric.cpp (modified) (1 diff)
• src/CbcHeuristic.cpp (modified) (1 diff)
• src/CbcHeuristic.hpp (modified) (2 diffs)
• src/CbcHeuristicFPump.hpp (modified) (1 diff)
• src/CbcHeuristicGreedy.hpp (modified) (2 diffs)
• src/CbcHeuristicLocal.hpp (modified) (1 diff)
• src/CbcHeuristicRINS.hpp (modified) (1 diff)
• src/CbcLinked.hpp (modified) (12 diffs)
• src/CbcMain.cpp (modified) (4 diffs)
• src/CbcModel.cpp (modified) (4 diffs)
• src/CbcModel.hpp (modified) (2 diffs)
• src/CbcSolver.cpp (modified) (10 diffs)
• src/CbcTree.cpp (modified) (10 diffs)
• src/CbcTree.hpp (modified) (1 diff)
• src/CbcTreeLocal.cpp (modified) (3 diffs)
• src/CoinSolve.cpp (modified) (3 diffs)
• src/Makefile.am (modified) (7 diffs)
• src/Makefile.in (modified) (13 diffs)
• src/unitTestClp.cpp (modified) (9 diffs)
• test/Makefile.am (modified) (1 diff)
• test/Makefile.in (modified) (1 diff)

trunk/Cbc/MSVisualStudio/v8/cbcCSosDllSample/cbcCSosDllSample.vcproj

@@ -64 +64 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="cbcCInterfaceDll.lib"
+                                AdditionalDependencies="$(InputDir)..\cbcCInterfaceDll\debug\cbcCInterfaceDll.lib"
                                 LinkIncremental="2"
                                 AdditionalLibraryDirectories="$(SolutionDir)cbcCInterfaceDll\Debug"
@@ -145 +145 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="cbcCInterfaceDll.lib"
+                                AdditionalDependencies="$(InputDir)..\cbcCInterfaceDll\release\cbcCInterfaceDll.lib"
                                 LinkIncremental="1"
                                 AdditionalLibraryDirectories="$(SolutionDir)cbcCInterfaceDll\Release"

trunk/Cbc/configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for Cbc 0.1.
+# Generated by GNU Autoconf 2.59 for Cbc 1.2trunk.
 #
 # Report bugs to <coin-cbc@list.coin-or.org>.
@@ -430 +430 @@
 PACKAGE_NAME='Cbc'
 PACKAGE_TARNAME='cbc'
-PACKAGE_VERSION='0.1'
-PACKAGE_STRING='Cbc 0.1'
+PACKAGE_VERSION='1.2trunk'
+PACKAGE_STRING='Cbc 1.2trunk'
 PACKAGE_BUGREPORT='coin-cbc@list.coin-or.org'
 
@@ -1002 +1002 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Cbc 0.1 to adapt to many kinds of systems.
+\`configure' configures Cbc 1.2trunk to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1068 +1068 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Cbc 0.1:";;
+     short | recursive ) echo "Configuration of Cbc 1.2trunk:";;
    esac
   cat <<\_ACEOF
@@ -1269 +1269 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-Cbc configure 0.1
+Cbc configure 1.2trunk
 generated by GNU Autoconf 2.59
 
@@ -1289 +1289 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Cbc $as_me 0.1, which was
+It was created by Cbc $as_me 1.2trunk, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
@@ -1849 +1849 @@
   if test "$enable_doscompile" != no; then
      case $build in
-       *-cygwin*) ;;
-       *) { { echo "$as_me:$LINENO: error: --enable-doscompile option makes sense only under Cygwin" >&5
-echo "$as_me: error: --enable-doscompile option makes sense only under Cygwin" >&2;}
+       *-cygwin* | *-mingw*) ;;
+       *) { { echo "$as_me:$LINENO: error: --enable-doscompile option makes sense only under Cygwin or MinGW" >&5
+echo "$as_me: error: --enable-doscompile option makes sense only under Cygwin or MinGW" >&2;}
    { (exit 1); exit 1; }; } ;;
      esac
@@ -1859 +1859 @@
 fi;
  case "$enable_doscompile" in
-   msvc|mingw|no) ;;
+   mingw)
+     case $build in
+       *-mingw*) enable_doscompile=no ;;
+     esac
+     ;;
+   msvc|no) ;;
    yes) enable_doscompile=mingw ;;
    *) { { echo "$as_me:$LINENO: error: Invalid value $enable_doscompile for --enable-doscompile.
@@ -2809 +2814 @@
           xlc* | */xlc* | mpxlc* | */mpxlc*)
             coin_opt_cflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
-            coin_add_cflags="-bmaxdata:0x80000000"
+            coin_add_cflags="-bmaxdata:0x80000000 -qsuppress=1500-036 -qsuppress=1500-029"
             coin_dbg_cflags="-g"
           ;;
@@ -3650 +3655 @@
           xlC* | */xlC* | mpxlC* | */mpxlC*)
             coin_opt_cxxflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
-            coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna"
+            coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna -qsuppress=1500-036 -qsuppress=1500-029"
             coin_dbg_cxxflags="-g"
             ;;
@@ -4346 +4351 @@
 # Define the identity of the package.
  PACKAGE='cbc'
- VERSION='0.1'
+ VERSION='1.2trunk'
 
 
@@ -5648 +5653 @@
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5650 "configure"' > conftest.$ac_ext
+  echo '#line 5655 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -6782 +6787 @@
 
 # Provide some information about the compiler.
-echo "$as_me:6784:" \
+echo "$as_me:6789:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
@@ -7849 +7854 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7851: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7856: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7855: \$? = $ac_status" >&5
+   echo "$as_me:7860: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -8117 +8122 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8119: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8124: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8123: \$? = $ac_status" >&5
+   echo "$as_me:8128: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -8221 +8226 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8223: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8228: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8227: \$? = $ac_status" >&5
+   echo "$as_me:8232: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -10566 +10571 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10568 "configure"
+#line 10573 "configure"
 #include "confdefs.h"
 
@@ -10666 +10671 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10668 "configure"
+#line 10673 "configure"
 #include "confdefs.h"
 
@@ -13010 +13015 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13012: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13017: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13016: \$? = $ac_status" >&5
+   echo "$as_me:13021: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -13114 +13119 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13116: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13121: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13120: \$? = $ac_status" >&5
+   echo "$as_me:13125: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -14684 +14689 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14686: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14691: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14690: \$? = $ac_status" >&5
+   echo "$as_me:14695: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -14788 +14793 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14790: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14795: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14794: \$? = $ac_status" >&5
+   echo "$as_me:14799: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -16995 +17000 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16997: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17002: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17001: \$? = $ac_status" >&5
+   echo "$as_me:17006: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -17263 +17268 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17265: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17270: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17269: \$? = $ac_status" >&5
+   echo "$as_me:17274: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -17367 +17372 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17369: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17374: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17373: \$? = $ac_status" >&5
+   echo "$as_me:17378: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -22959 +22964 @@
 cat >&5 <<_CSEOF
 
-This file was extended by Cbc $as_me 0.1, which was
+This file was extended by Cbc $as_me 1.2trunk, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
@@ -23022 +23027 @@
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Cbc config.status 0.1
+Cbc config.status 1.2trunk
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

trunk/Cbc/configure.ac

@@ -13 +13 @@
 AC_PREREQ(2.59)
 
-AC_INIT([Cbc],[0.1],[coin-cbc@list.coin-or.org])
+AC_INIT([Cbc],[1.2trunk],[coin-cbc@list.coin-or.org])
 
 AC_COPYRIGHT([

trunk/Cbc/src/CbcBranchActual.hpp

@@ -37 +37 @@
   ~CbcClique ();
   
+  using CbcObject::infeasibility ;
   /// Infeasibility - large is 0.5
   virtual double infeasibility(int & preferredWay) const;
 
+  using CbcObject::feasibleRegion ;
   /// This looks at solution and sets bounds to contain solution
   virtual void feasibleRegion();
+
+  using CbcObject::createBranch ;
   /// Creates a branching object
   virtual CbcBranchingObject * createBranch(int way) ;
@@ -122 +126 @@
   ~CbcSOS ();
   
+  using CbcObject::infeasibility ;
   /// Infeasibility - large is 0.5
   virtual double infeasibility(int & preferredWay) const;
 
+  using CbcObject::feasibleRegion ;
   /// This looks at solution and sets bounds to contain solution
   virtual void feasibleRegion();
+
+  using CbcObject::createBranch ;
   /// Creates a branching object
   virtual CbcBranchingObject * createBranch(int way) ;
 
+  using CbcObject::solverBranch ;
   /** Create an OsiSolverBranch object
 
@@ -220 +229 @@
   /// Construct an OsiSimpleInteger object
   OsiSimpleInteger * osiObject() const;
+  using CbcObject::infeasibility ;
   /// Infeasibility - large is 0.5
   virtual double infeasibility(const OsiSolverInterface * solver, 
                                const OsiBranchingInformation * info, int & preferredWay) const;
 
+  using CbcObject::feasibleRegion ;
   /** Set bounds to fix the variable at the current (integer) value.
 
@@ -231 +242 @@
   virtual double feasibleRegion(OsiSolverInterface * solver, const OsiBranchingInformation * info) const;
 
+  using CbcObject::createBranch ;
   /** Create a branching object and indicate which way to branch first.
       
@@ -238 +250 @@
   virtual CbcBranchingObject * createBranch(OsiSolverInterface * solver,
                                             const OsiBranchingInformation * info, int way) ;
+
+  using CbcObject::solverBranch ;
   /** Create an OsiSolverBranch object
 
@@ -343 +357 @@
   void applyConsequence(int iSequence, int state) const;
   
+  using CbcObject::infeasibility ;
   /// Infeasibility - large is 0.5 (and 0.5 will give this)
   virtual double infeasibility(int & preferredWay) const;
 
+  using CbcObject::feasibleRegion ;
   /// This looks at solution and sets bounds to contain solution
   virtual void feasibleRegion();
+
+  using CbcObject::createBranch ;
   /// Creates a branching object
   virtual CbcBranchingObject * createBranch(int way) ;
+
   /// Number of members
   inline int numberMembers() const
@@ -420 +439 @@
   virtual ~CbcIntegerBranchingObject ();
   
+  using CbcBranchingObject::branch ;
   /** \brief Sets the bounds for the variable according to the current arm
              of the branch and advances the object state to the next arm.
@@ -426 +446 @@
   virtual double branch();
 
+  using CbcBranchingObject::print ;
   /** \brief Print something about branch - only if log level high
   */
@@ -470 +491 @@
   ~CbcSimpleIntegerPseudoCost ();
   
+  using CbcObject::infeasibility ;
   /// Infeasibility - large is 0.5
   virtual double infeasibility(int & preferredWay) const;
 
+  using CbcObject::createBranch ;
   /// Creates a branching object
   virtual CbcBranchingObject * createBranch(int way) ;
@@ -580 +603 @@
   virtual ~CbcIntegerPseudoCostBranchingObject ();
   
+  using CbcBranchingObject::branch ;
   /** \brief Sets the bounds for the variable according to the current arm
              of the branch and advances the object state to the next arm.
@@ -631 +655 @@
   virtual ~CbcCliqueBranchingObject ();
   
+  using CbcBranchingObject::branch ;
   /// Does next branch and updates state
   virtual double branch();
 
+  using CbcBranchingObject::print ;
   /** \brief Print something about branch - only if log level high
   */
@@ -676 +702 @@
   virtual ~CbcLongCliqueBranchingObject ();
   
+  using CbcBranchingObject::branch ;
   /// Does next branch and updates state
   virtual double branch();
 
+  using CbcBranchingObject::print ;
   /** \brief Print something about branch - only if log level high
   */
@@ -720 +748 @@
   virtual ~CbcSOSBranchingObject ();
   
+  using CbcBranchingObject::branch ;
   /// Does next branch and updates state
   virtual double branch();
 
+  using CbcBranchingObject::print ;
   /** \brief Print something about branch - only if log level high
   */
@@ -762 +792 @@
   virtual ~CbcNWayBranchingObject ();
   
+  using CbcBranchingObject::branch ;
   /// Does next branch and updates state
   virtual double branch();
 
+  using CbcBranchingObject::print ;
   /** \brief Print something about branch - only if log level high
   */
@@ -905 +937 @@
   ~CbcFollowOn ();
   
+  using CbcObject::infeasibility ;
   /// Infeasibility - large is 0.5
   virtual double infeasibility(int & preferredWay) const;
 
+  using CbcObject::feasibleRegion ;
   /// This looks at solution and sets bounds to contain solution
   virtual void feasibleRegion();
+
+  using CbcObject::createBranch ;
   /// Creates a branching object
   virtual CbcBranchingObject * createBranch(int way) ;
@@ -952 +988 @@
   virtual ~CbcFixingBranchingObject ();
   
+  using CbcBranchingObject::branch ;
   /// Does next branch and updates state
   virtual double branch();
 
+  using CbcBranchingObject::print ;
   /** \brief Print something about branch - only if log level high
   */
@@ -1047 +1085 @@
   virtual ~CbcDummyBranchingObject ();
   
+  using CbcBranchingObject::branch ;
   /** \brief Dummy branch
   */
   virtual double branch();
 
+  using CbcBranchingObject::print ;
   /** \brief Print something about branch - only if log level high
   */

trunk/Cbc/src/CbcBranchBase.hpp

@@ -299 +299 @@
   { return branch();}
 
+  using OsiBranchingObject::print ;
   /** \brief Print something about branch - only if log level high
   */

trunk/Cbc/src/CbcBranchCut.hpp

@@ -34 +34 @@
   ~CbcBranchCut ();
   
+  using CbcObject::infeasibility ;
   /// Infeasibility 
   virtual double infeasibility(int & preferredWay) const;
 
+  using CbcObject::feasibleRegion ;
   /** Set bounds to contain the current solution.
 
@@ -51 +53 @@
   */
   virtual bool boundBranch() const ;
+
+  using CbcObject::createBranch ;
   /// Creates a branching object
   virtual CbcBranchingObject * createBranch(int way) ;
@@ -82 +86 @@
   virtual CbcBranchingObject * notPreferredNewFeasible() const ;
   
+  using CbcObject::resetBounds ;
   /** Reset original upper and lower bound values from the solver.
   
@@ -127 +132 @@
   virtual ~CbcCutBranchingObject ();
   
+  using CbcBranchingObject::branch ;
   /** \brief Sets the bounds for variables or adds a cut depending on the
              current arm of the branch and advances the object state to the next arm.
@@ -133 +139 @@
   virtual double branch();
 
+  using CbcBranchingObject::print ;
   /** \brief Print something about branch - only if log level high
   */
@@ -193 +200 @@
   */
   int shallWe() const;
+
+  using CbcObject::infeasibility ;
   /// Infeasibility - large is 0.5
   virtual double infeasibility(int & preferredWay) const;
 
+  using CbcObject::createBranch ;
   /// Creates a branching object
   virtual CbcBranchingObject * createBranch(int way);
@@ -248 +258 @@
   ~CbcBranchAllDifferent ();
 
+  using CbcObject::infeasibility ;
   /// Infeasibility - large is 0.5
   virtual double infeasibility(int & preferredWay) const;
 
+  using CbcObject::createBranch ;
   /// Creates a branching object
   virtual CbcBranchingObject * createBranch(int way);

trunk/Cbc/src/CbcBranchDynamic.hpp

@@ -47 +47 @@
   ~CbcSimpleIntegerDynamicPseudoCost ();
   
+  using CbcObject::infeasibility ;
   /// Infeasibility - large is 0.5
   virtual double infeasibility(int & preferredWay) const;
 
+  using CbcObject::createBranch ;
   /// Creates a branching object
   virtual CbcBranchingObject * createBranch(int way) ;
+
   /// Infeasibility - large is 0.5
   virtual double infeasibility(const OsiSolverInterface * solver, 
@@ -76 +79 @@
   void copySome(CbcSimpleIntegerDynamicPseudoCost * otherObject);
 
+  using CbcSimpleInteger::solverBranch ;
   /** Create an OsiSolverBranch object
 
@@ -345 +349 @@
   virtual ~CbcDynamicPseudoCostBranchingObject ();
   
+  using CbcBranchingObject::branch ;
   /** \brief Sets the bounds for the variable according to the current arm
              of the branch and advances the object state to the next arm.
@@ -350 +355 @@
   */
   virtual double branch();
+
   /** Some branchingObjects may claim to be able to skip
       strong branching.  If so they have to fill in CbcStrongInfo.

trunk/Cbc/src/CbcBranchLotsize.hpp

@@ -34 +34 @@
   ~CbcLotsize ();
   
+  using CbcObject::infeasibility ;
   /// Infeasibility - large is 0.5
   virtual double infeasibility(int & preferredWay) const;
 
+  using CbcObject::feasibleRegion ;
   /** Set bounds to contain the current solution.
 
@@ -46 +48 @@
   virtual void feasibleRegion();
 
+  using CbcObject::createBranch ;
   /// Creates a branching object
   virtual CbcBranchingObject * createBranch(int way) ;
@@ -188 +191 @@
   virtual ~CbcLotsizeBranchingObject ();
   
+  using CbcBranchingObject::branch ;
   /** \brief Sets the bounds for the variable according to the current arm
              of the branch and advances the object state to the next arm.
@@ -193 +197 @@
   virtual double branch();
 
+  using CbcBranchingObject::print ;
   /** \brief Print something about branch - only if log level high
   */

trunk/Cbc/src/CbcCompareActual.hpp

@@ -85 +85 @@
      weighted value of node x */
   virtual bool test (CbcNode * x, CbcNode * y) ;
+
+  using CbcCompareBase::newSolution ;
   // This allows method to change behavior as it is called
   // after each solution

trunk/Cbc/src/CbcFathomDynamicProgramming.cpp

@@ -259 +259 @@
     numberActive_=numberActive;
     indices_ = new int [numberActive_];
-    cost_ = new float [size_];
-    CoinFillN(cost_,size_,FLT_MAX);
+    cost_ = new double [size_];
+    CoinFillN(cost_,size_,DBL_MAX);
     // but do nothing is okay
     cost_[0]=0.0;
@@ -475 +475 @@
     int i;
     // may be possible
-    double bestAtTarget = FLT_MAX;
+    double bestAtTarget = DBL_MAX;
     for (i=0;i<numberColumns;i++) {
       if (size_>10000000&&(i%100)==0)
@@ -481 +481 @@
       double lowerValue = lower[i];
       assert (lowerValue==floor(lowerValue));
-      float cost = direction * objective[i];
+      double cost = direction * objective[i];
       fixedObj += lowerValue*cost;
       int gap = (int) (upper[i]-lowerValue);
@@ -494 +494 @@
     returnCode=1;
     int needed=0;
-    float bestValue=FLT_MAX;
+    double bestValue=DBL_MAX;
     int iBest=-1;
     if (algorithm_==0) {
@@ -554 +554 @@
       delete [] lower;
     }
-    if (bestValue<FLT_MAX) {
+    if (bestValue<DBL_MAX) {
       bestValue += fixedObj;
       if (model_->messageHandler()->logLevel()>1)
@@ -565 +565 @@
           int n=decodeBitPattern(iBest-back_[iBest],indices_,numberRows);
           // Search for cheapest
-          float bestCost=FLT_MAX;
+          double bestCost=DBL_MAX;
           int iColumn=-1;
           for (i=0;i<numberColumns;i++) {
@@ -632 +632 @@
 bool 
 CbcFathomDynamicProgramming::tryColumn(int numberElements, const int * rows,
-                                          const double * coefficients, float cost,
+                                          const double * coefficients, double cost,
                                           int upper)
 {
@@ -693 +693 @@
 bool 
 CbcFathomDynamicProgramming::addOneColumn0(int numberElements, const int * rows,
-                     float cost)
+                     double cost)
 {
   // build up mask
@@ -708 +708 @@
     int kMask = i&mask;
     if (kMask==0) {
-      float thisCost = cost_[i];
-      if (thisCost!=FLT_MAX) {
+      double thisCost = cost_[i];
+      if (thisCost!=DBL_MAX) {
         // possible
-        float newCost=thisCost+cost;
+        double newCost=thisCost+cost;
         int next = i + mask;
         if (cost_[next]>newCost) {
@@ -740 +740 @@
 bool 
 CbcFathomDynamicProgramming::addOneColumn1(int numberElements, const int * rows,
-                                           const int * coefficients, float cost)
+                                           const int * coefficients, double cost)
 {
   /* build up masks.
@@ -824 +824 @@
       if (good) {
         double thisCost = cost_[i];
-        if (thisCost!=FLT_MAX) {
+        if (thisCost!=DBL_MAX) {
           // possible
           double newCost=thisCost+cost;
@@ -858 +858 @@
 bool 
 CbcFathomDynamicProgramming::addOneColumn1A(int numberElements, const int * rows,
-                                           const int * coefficients, float cost)
+                                           const int * coefficients, double cost)
 {
   /* build up masks.
@@ -899 +899 @@
       int kMask = i&maskA;
       if (kMask==0) {
-        float thisCost = cost_[i];
-        if (thisCost!=FLT_MAX) {
+        double thisCost = cost_[i];
+        if (thisCost!=DBL_MAX) {
           // possible
-          float newCost=thisCost+cost;
+          double newCost=thisCost+cost;
           int next = i + maskAdd;
           if (cost_[next]>newCost) {
@@ -926 +926 @@
         added &= (~maskD);
         if (added == 0) {
-          float thisCost = cost_[i];
-          if (thisCost!=FLT_MAX) {
+          double thisCost = cost_[i];
+          if (thisCost!=DBL_MAX) {
             // possible
-            float newCost=thisCost+cost;
+            double newCost=thisCost+cost;
             int next = i + maskAdd;
             if (cost_[next]>newCost) {

trunk/Cbc/src/CbcFathomDynamicProgramming.hpp

@@ -68 +68 @@
   */
   bool tryColumn(int numberElements, const int * rows,
-                    const double * coefficients, float cost,
+                    const double * coefficients, double cost,
                     int upper=COIN_INT_MAX);
   /// Returns cost array
-  inline const float * cost() const
+  inline const double * cost() const
   { return cost_;}
   /// Returns back array
@@ -90 +90 @@
   */
   bool addOneColumn0(int numberElements, const int * rows,
-                     float cost);
+                     double cost);
   /** Adds one attempt of one column of type 1,
       returns true if was used in making any changes.
@@ -96 +96 @@
   */
   bool addOneColumn1(int numberElements, const int * rows,
-                     const int * coefficients, float cost);
+                     const int * coefficients, double cost);
   /** Adds one attempt of one column of type 1,
       returns true if was used in making any changes.
@@ -103 +103 @@
   */
   bool addOneColumn1A(int numberElements, const int * rows,
-                     const int * coefficients, float cost);
+                     const int * coefficients, double cost);
   /// Gets bit pattern from original column
   int bitPattern(int numberElements, const int * rows,
@@ -121 +121 @@
   */
   int type_;
-  /// Space for states (float as who cares)
-  float * cost_;
+  /// Space for states 
+  double * cost_;
   /// Which state produced this cheapest one
   int * back_;

trunk/Cbc/src/CbcGeneric.cpp

@@ -107 +107 @@
 
   return ; }
-
 
 } // end unnamed namespace

trunk/Cbc/src/CbcHeuristic.cpp

@@ -679 +679 @@
       lastChange=0;
       for (iColumn=0;iColumn<numberColumns;iColumn++) {
-        bool isInteger = integerType[iColumn];
+        bool isInteger = (integerType[iColumn]!=0);
         double currentValue = newSolution[iColumn];
         double lowerValue = lower[iColumn];

trunk/Cbc/src/CbcHeuristic.hpp

@@ -161 +161 @@
   virtual void setModel(CbcModel * model);
   
+  using CbcHeuristic::solution ;
   /** returns 0 if no solution, 1 if valid solution
       with better objective value than one passed in
@@ -220 +221 @@
   virtual void setModel(CbcModel * model);
   
+  using CbcHeuristic::solution ;
   /** returns 0 if no solution, 1 if valid solution.
       Sets solution values if good, sets objective value (only if good)

trunk/Cbc/src/CbcHeuristicFPump.hpp

@@ -38 +38 @@
   virtual void setModel(CbcModel * model);
   
+  using CbcHeuristic::solution ;
   /** returns 0 if no solution, 1 if valid solution
       with better objective value than one passed in

trunk/Cbc/src/CbcHeuristicGreedy.hpp

@@ -35 +35 @@
   virtual void setModel(CbcModel * model);
   
+  using CbcHeuristic::solution ;
   /** returns 0 if no solution, 1 if valid solution.
       Sets solution values if good, sets objective value (only if good)
@@ -113 +114 @@
   virtual void setModel(CbcModel * model);
   
+  using CbcHeuristic::solution ;
   /** returns 0 if no solution, 1 if valid solution.
       Sets solution values if good, sets objective value (only if good)

trunk/Cbc/src/CbcHeuristicLocal.hpp

@@ -40 +40 @@
   virtual void setModel(CbcModel * model);
   
+  using CbcHeuristic::solution ;
   /** returns 0 if no solution, 1 if valid solution.
       Sets solution values if good, sets objective value (only if good)

trunk/Cbc/src/CbcHeuristicRINS.hpp

@@ -41 +41 @@
   virtual void setModel(CbcModel * model);
   
+  using CbcHeuristic::solution ;
   /** returns 0 if no solution, 1 if valid solution.
       Sets solution values if good, sets objective value (only if good)

trunk/Cbc/src/CbcLinked.hpp

@@ -334 +334 @@
     unsigned int type:4; // type of computation
     unsigned int affected:25; // variable or element affected
-    float multiplier; // to use in computation 
+    double multiplier; // to use in computation 
   } boundElementAction;
   
@@ -377 +377 @@
   virtual void setModel(CbcModel * model);
   
+  using CbcHeuristic::solution ;
   /** returns 0 if no solution, 1 if valid solution.
       Sets solution values if good, sets objective value (only if good)
@@ -446 +447 @@
   virtual ~OsiOldLink ();
   
+  using OsiObject::infeasibility ;
   /// Infeasibility - large is 0.5
   virtual double infeasibility(const OsiBranchingInformation * info,int & whichWay) const;
 
+  using OsiObject::feasibleRegion ;
   /** Set bounds to fix the variable at the current (integer) value.
 
@@ -511 +514 @@
   virtual ~OsiOldLinkBranchingObject ();
   
+  using OsiBranchingObject::branch ;
   /// Does next branch and updates state
   virtual double branch(OsiSolverInterface * solver);
 
+  using OsiBranchingObject::print ;
   /** \brief Print something about branch - only if log level high
   */
@@ -592 +597 @@
   virtual ~OsiLink ();
   
+  using OsiObject::infeasibility ;
   /// Infeasibility - large is 0.5
   virtual double infeasibility(const OsiBranchingInformation * info,int & whichWay) const;
 
+  using OsiObject::feasibleRegion ;
   /** Set bounds to fix the variable at the current (integer) value.
 
@@ -664 +671 @@
   virtual ~OsiLinkBranchingObject ();
   
+  using OsiBranchingObject::branch ;
   /// Does next branch and updates state
   virtual double branch(OsiSolverInterface * solver);
 
+  using OsiBranchingObject::print ;
   /** \brief Print something about branch - only if log level high
   */
@@ -719 +728 @@
   virtual ~OsiBiLinear ();
   
+  using OsiObject::infeasibility ;
   /// Infeasibility - large is 0.5
   virtual double infeasibility(const OsiBranchingInformation * info,int & whichWay) const;
 
+  using OsiObject::feasibleRegion ;
   /** Set bounds to fix the variable at the current (integer) value.
 
@@ -943 +954 @@
   virtual ~OsiBiLinearBranchingObject ();
   
+  using OsiBranchingObject::branch ;
   /// Does next branch and updates state
   virtual double branch(OsiSolverInterface * solver);
 
+  using OsiBranchingObject::print ;
   /** \brief Print something about branch - only if log level high
   */
@@ -1041 +1054 @@
   virtual ~OsiSimpleFixedInteger ();
   
+  using OsiObject::infeasibility ;
   /// Infeasibility - large is 0.5
   virtual double infeasibility(const OsiBranchingInformation * info, int & whichWay) const;
+
   /** Creates a branching object
 
@@ -1089 +1104 @@
   virtual ~OsiUsesBiLinear ();
   
+  using OsiObject::infeasibility ;
   /// Infeasibility - large is 0.5
   virtual double infeasibility(const OsiBranchingInformation * info, int & whichWay) const;
+
   /** Creates a branching object
 
@@ -1096 +1113 @@
   */
   virtual OsiBranchingObject * createBranch(OsiSolverInterface * solver, const OsiBranchingInformation * info, int way) const;
+
+  using OsiObject::feasibleRegion ;
   /** Set bounds to fix the variable at the current value.
 
@@ -1102 +1121 @@
   */
   virtual double feasibleRegion(OsiSolverInterface * solver, const OsiBranchingInformation * info) const;
+
   /// Add all bi-linear objects
   void addBiLinearObjects(OsiSolverLink * solver);

trunk/Cbc/src/CbcMain.cpp

@@ -304 +304 @@
       CbcParam("directory","Set Default import directory",
               DIRECTORY);
+    parameters[numberParameters++]=
+      CbcParam("dirSample","Set directory where the COIN-OR sample problems are.",
+               DIRSAMPLE);
+    parameters[numberParameters++]=
+      CbcParam("dirNetlib","Set directory where the netlib problems are.",
+               DIRNETLIB);
+    parameters[numberParameters++]=
+      CbcOrClpParam("dirMiplib","Set directory where the miplib 2003 problems are.",
+                    DIRMIPLIB);
     parameters[numberParameters++]=
       CbcParam("solver!","Set the solver used by cbc",
@@ -726 +735 @@
 
     const char dirsep =  CoinFindDirSeparator();
-    std::string directory = (dirsep == '/' ? "./" : ".\\");
+    std::string directory;
+    std::string dirSample;
+    std::string dirNetlib;
+    std::string dirMiplib;
+    if (dirsep == '/') {
+      directory = "./";
+      dirSample = "../../Data/Sample/";
+      dirNetlib = "../../Data/Netlib/";
+      dirMiplib = "../../Data/miplib3/";
+    } else {
+      directory = ".\\";
+      dirSample = "..\\..\\Data\\Sample\\";
+      dirNetlib = "..\\..\\Data\\Netlib\\";
+      dirMiplib = "..\\..\\Data\\miplib3\\";
+    }
     std::string field;
 /*
@@ -1419 +1442 @@
               directory += '/' ;
             break ; }
+          case DIRSAMPLE:
+          { dirSample = getString(argc,argv);
+            if (dirSample[dirSample.length()-1] != '/')
+              dirSample += '/' ;
+            break ; }
+          case DIRNETLIB:
+          { dirNetlib = getString(argc,argv);
+            if (dirNetlib[dirNetlib.length()-1] != '/')
+              dirNetlib += '/' ;
+            break ; }
+          case DIRMIPLIB:
+          { dirMiplib = getString(argc,argv);
+            if (dirMiplib[dirMiplib.length()-1] != '/')
+              dirMiplib += '/' ;
+            break ; }
           case STDIN:
             read_mode=-1;
@@ -1478 +1516 @@
               // create fields for test
               const char * fields[3];
-              int nFields=1;
+              int nFields=3;
               fields[0]="fake main for miplib";
-              if (directory!="./") {
-                fields[1]=("-miplibDir="+directory).c_str();
-                nFields=2;
-              }
+              std::string mpsfield = "-mpsDir=";
+              mpsfield += dirSample.c_str();
+              fields[1]=mpsfield.c_str();
+              std::string mipfield = "-miplibDir=";
+              mipfield += dirMiplib.c_str();
+              fields[2]=mipfield.c_str();
               mainTest(nFields,fields);
             }

trunk/Cbc/src/CbcModel.cpp

@@ -5382 +5382 @@
         delete basis;
       }
-      feasible = resolve(node ? node->nodeInfo() : NULL,2) ;
+      feasible = ( resolve(node ? node->nodeInfo() : NULL,2) != 0) ;
       if ( getCurrentSeconds() > dblParam_[CbcMaximumSeconds] )
         numberTries=0; // exit
@@ -8271 +8271 @@
   // solve LP
   //solver_->writeMps("bad");
-  bool feasible = resolve(NULL,3);
+  bool feasible = (resolve(NULL,3)!=0);
 
   CbcModel * newModel = NULL;
@@ -8304 +8304 @@
   status_ = 0;
   // solve LP
-  bool feasible = resolve(NULL,3);
+  bool feasible = (resolve(NULL,3)!=0);
 
   bestObjective_=1.0e50;
@@ -8499 +8499 @@
         // just point to solver_
         continuousSolver_ = solver_;
-        feasible=resolve(NULL,3);
+        feasible=(resolve(NULL,3)!=0);
         if (!feasible||!doIntegerPresolve||weak) break;
         // see if we can get solution by heuristics

trunk/Cbc/src/CbcModel.hpp

@@ -2093 +2093 @@
 // When we want to load up CbcModel with options first
 void CbcMain0 (CbcModel & babSolver);
-int CbcMain1 (int argc, const char *argv[],CbcModel & babSolver);
+int CbcMain1 (int argc, const char *argv[],CbcModel & babSolver,
+              int call_CbcClpUnitTest_on_777 = 0);
 // two ways of calling
 int callCbc(const char * input2, CbcModel & babSolver); 
@@ -2103 +2104 @@
 int callCbc1(const char * input2, CbcModel & babSolver, int (CbcModel * currentSolver, int whereFrom)); 
 int callCbc1(const std::string input2, CbcModel & babSolver, int (CbcModel * currentSolver, int whereFrom)); 
-int CbcMain1 (int argc, const char *argv[],CbcModel & babSolver, int (CbcModel * currentSolver, int whereFrom));
+int CbcMain1 (int argc, const char *argv[],CbcModel & babSolver, int (CbcModel * currentSolver, int whereFrom), int call_CbcClpUnitTest_on_777 = 0);
 #endif

trunk/Cbc/src/CbcSolver.cpp

@@ -1662 +1662 @@
 }
 int CbcMain1 (int argc, const char *argv[],
-             CbcModel  & model)
+              CbcModel  & model, int call_CbcClpUnitTest_on_777)
 {
-  return CbcMain1(argc,argv,model,dummyCallBack);
+  return CbcMain1(argc,argv,model,dummyCallBack, call_CbcClpUnitTest_on_777);
 }
 int callCbc1(const std::string input2, CbcModel & babSolver, int callBack(CbcModel * currentSolver, int whereFrom))
@@ -1699 +1699 @@
   establishParams(numberParameters,parameters) ;
   const char dirsep =  CoinFindDirSeparator();
-  std::string directory = (dirsep == '/' ? "./" : ".\\");
+  std::string directory;
+  std::string dirSample;
+  std::string dirNetlib;
+  std::string dirMiplib;
+  if (dirsep == '/') {
+    directory = "./";
+    dirSample = "../../Data/Sample/";
+    dirNetlib = "../../Data/Netlib/";
+    dirMiplib = "../../Data/miplib3/";
+  } else {
+    directory = ".\\";
+    dirSample = "..\\..\\Data\\Sample\\";
+    dirNetlib = "..\\..\\Data\\Netlib\\";
+    dirMiplib = "..\\..\\Data\\miplib3\\";
+  }
   std::string defaultDirectory = directory;
   std::string importFile ="";
@@ -1725 +1739 @@
   parameters[whichParam(PRINTMASK,numberParameters,parameters)].setStringValue(printMask);
   parameters[whichParam(DIRECTORY,numberParameters,parameters)].setStringValue(directory);
+  parameters[whichParam(DIRSAMPLE,numberParameters,parameters)].setStringValue(dirSample);
+  parameters[whichParam(DIRNETLIB,numberParameters,parameters)].setStringValue(dirNetlib);
+  parameters[whichParam(DIRMIPLIB,numberParameters,parameters)].setStringValue(dirMiplib);
   parameters[whichParam(DUALBOUND,numberParameters,parameters)].setDoubleValue(lpSolver->dualBound());
   parameters[whichParam(DUALTOLERANCE,numberParameters,parameters)].setDoubleValue(lpSolver->dualTolerance());
@@ -1795 +1812 @@
   parameters[whichParam(COSTSTRATEGY,numberParameters,parameters)].setCurrentOption("off");
 }
+
 /* 1 - add heuristics to model
    2 - do heuristics (and set cutoff and best solution)
@@ -1981 +1999 @@
   }
 } 
+
+void CbcClpUnitTest (const CbcModel & saveModel,
+                     std::string& dirMiplib, bool unitTestOnly);
+
 /* Meaning of whereFrom:
    1 after initial solve by dualsimplex etc
@@ -1989 +2011 @@
    6 after a user called heuristic phase
 */
+
 int CbcMain1 (int argc, const char *argv[],
-             CbcModel  & model, int callBack(CbcModel * currentSolver, int whereFrom))
+              CbcModel  & model,
+              int callBack(CbcModel * currentSolver, int whereFrom),
+              int call_CbcClpUnitTest_on_777)
 {
   /* Note
@@ -2272 +2297 @@
     double tightenFactor=0.0;
     const char dirsep =  CoinFindDirSeparator();
-    std::string directory = (dirsep == '/' ? "./" : ".\\");
+    std::string directory;
+    std::string dirSample;
+    std::string dirNetlib;
+    std::string dirMiplib;
+    if (dirsep == '/') {
+      directory = "./";
+      dirSample = "../../Data/Sample/";
+      dirNetlib = "../../Data/Netlib/";
+      dirMiplib = "../../Data/miplib3/";
+    } else {
+      directory = ".\\";
+      dirSample = "..\\..\\Data\\Sample\\";
+      dirNetlib = "..\\..\\Data\\Netlib\\";
+      dirMiplib = "..\\..\\Data\\miplib3\\";
+    }
     std::string defaultDirectory = directory;
     std::string importFile ="";
@@ -5309 +5348 @@
                 }
                 model = *babModel;
+                /* LL: this was done in CoinSolve.cpp: main(argc, argv).
+                   I have moved it here so that the miplib directory location
+                   could be passed to CbcClpUnitTest. */
+                if (call_CbcClpUnitTest_on_777 == 777) {
+                  CbcClpUnitTest(model, dirMiplib, false);
+                }
                 return 777;
               } else {
@@ -6571 +6616 @@
             }
             break;
+          case DIRSAMPLE:
+            {
+              std::string name = CoinReadGetString(argc,argv);
+              if (name!="EOL") {
+                int length=name.length();
+                if (name[length-1]=='/'||name[length-1]=='\\')
+                  dirSample=name;
+                else
+                  dirSample = name+"/";
+                parameters[iParam].setStringValue(dirSample);
+              } else {
+                parameters[iParam].printString();
+              }
+            }
+            break;
+          case DIRNETLIB:
+            {
+              std::string name = CoinReadGetString(argc,argv);
+              if (name!="EOL") {
+                int length=name.length();
+                if (name[length-1]=='/'||name[length-1]=='\\')
+                  dirNetlib=name;
+                else
+                  dirNetlib = name+"/";
+                parameters[iParam].setStringValue(dirNetlib);
+              } else {
+                parameters[iParam].printString();
+              }
+            }
+            break;
+          case DIRMIPLIB:
+            {
+              std::string name = CoinReadGetString(argc,argv);
+              if (name!="EOL") {
+                int length=name.length();
+                if (name[length-1]=='/'||name[length-1]=='\\')
+                  dirMiplib=name;
+                else
+                  dirMiplib = name+"/";
+                parameters[iParam].setStringValue(dirMiplib);
+              } else {
+                parameters[iParam].printString();
+              }
+            }
+            break;
           case STDIN:
             CbcOrClpRead_mode=-1;
@@ -6586 +6676 @@
           case UNITTEST:
             {
-              printf("unit test is now only from clp - does same thing\n");
-              //return(22);
+              CbcClpUnitTest(model, dirSample, true);
             }
             break;

trunk/Cbc/src/CbcTree.cpp

@@ -41 +41 @@
 {
   comparison_.test_ = &compare;
-  make_heap(nodes_.begin(), nodes_.end(), comparison_);
+  std::make_heap(nodes_.begin(), nodes_.end(), comparison_);
 }
 
@@ -59 +59 @@
   assert(x->objectiveValue()!=COIN_DBL_MAX&&x->nodeInfo());
   nodes_.push_back(x);
-  push_heap(nodes_.begin(), nodes_.end(), comparison_);
+  std::push_heap(nodes_.begin(), nodes_.end(), comparison_);
 }
 
@@ -65 +65 @@
 void 
 CbcTree::pop() {
-  pop_heap(nodes_.begin(), nodes_.end(), comparison_);
+  std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
   nodes_.pop_back();
 }
@@ -89 +89 @@
 #if 0
       // take off
-      pop_heap(nodes_.begin(), nodes_.end(), comparison_);
+      std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
       nodes_.pop_back();
       delete best;
@@ -119 +119 @@
       // can pop
       // take off
-      pop_heap(nodes_.begin(), nodes_.end(), comparison_);
+      std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
       nodes_.pop_back();
     } else {
@@ -127 +127 @@
   } else if (best) {
     // take off
-    pop_heap(nodes_.begin(), nodes_.end(), comparison_);
+    std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
     nodes_.pop_back();
   }
@@ -330 +330 @@
 CbcTree::pop() {
 #if 0
-  pop_heap(nodes_.begin(), nodes_.end(), comparison_);
+  std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
   nodes_.pop_back();
 #else
@@ -362 +362 @@
 #if 0
       // take off
-      pop_heap(nodes_.begin(), nodes_.end(), comparison_);
+      std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
       nodes_.pop_back();
       delete best;
@@ -392 +392 @@
       // can pop
       // take off
-      pop_heap(nodes_.begin(), nodes_.end(), comparison_);
+      std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
       nodes_.pop_back();
     } else {
@@ -401 +401 @@
     // take off
 #if 0
-    pop_heap(nodes_.begin(), nodes_.end(), comparison_);
+    std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
     nodes_.pop_back();
 #else

trunk/Cbc/src/CbcTree.hpp

@@ -3 +3 @@
 #ifndef CbcTree_H
 #define CbcTree_H
-using namespace std;
-
 
 #include <vector>

trunk/Cbc/src/CbcTreeLocal.cpp

@@ -384 +384 @@
            x->nodeInfo()->nodeNumber(),x,x->nodeInfo());
 #endif
-  push_heap(nodes_.begin(), nodes_.end(), comparison_);
+  std::push_heap(nodes_.begin(), nodes_.end(), comparison_);
 }
 
@@ -390 +390 @@
 void 
 CbcTreeLocal::pop() {
-  pop_heap(nodes_.begin(), nodes_.end(), comparison_);
+  std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
   nodes_.pop_back();
 }
@@ -660 +660 @@
       nodes_.push_back(localNode_);
       localNode_=localNode2;
-      make_heap(nodes_.begin(), nodes_.end(), comparison_);
+      std::make_heap(nodes_.begin(), nodes_.end(), comparison_);
     }
   }

trunk/Cbc/src/CoinSolve.cpp

@@ -190 +190 @@
 //  End any fake main program
 //#############################################################################
-void CbcClpUnitTest (const CbcModel & saveModel);
+// void CbcClpUnitTest (const CbcModel & saveModel);
 int main (int argc, const char *argv[])
 {
@@ -215 +215 @@
   setCbcOrClpPrinting(false);
 #endif
-  int returnCode = CbcMain1 (argc, argv,model);
+  int returnCode = CbcMain1 (argc, argv,model, 777);
+#if 0
+  /* The call to CbcClpUnitTest was moved into CbcMain1. To make sure
+     CbcMain1 behaves as it did before for any other call, I have added one more
+     argument to indicate that it was called from here. */
   if (returnCode!=777) {
     //const CoinWarmStartBasis* debugws =
@@ -227 +231 @@
     return 0;
   }
-}
+#else
+  if (returnCode!=777) {
+    return returnCode;
+  } else {
+    return 0;
+  }
+#endif
+}
+
 /*
   Version 1.00.00 November 16 2005.

trunk/Cbc/src/Makefile.am

@@ -1 @@
-# Copyright (C) 2006 International Business Machines and others.
+# Copyright (C) 2006, 2007 International Business Machines and others.
 # All Rights Reserved.
 # This file is distributed under the Common Public License.
@@ -15 +15 @@
 # Name of the library compiled in this directory.  We want it to be installed
 # in the 'lib' directory
-lib_LTLIBRARIES = libCbc.la
+lib_LTLIBRARIES = libCbc.la libCbcSolver.la
 
 # List all source files for this library, including headers
@@ -42 +42 @@
         CbcModel.cpp CbcModel.hpp \
         CbcNode.cpp CbcNode.hpp \
-        CbcSolver.cpp CbcCbcParam.cpp \
         CbcStatistics.cpp CbcStatistics.hpp \
         CbcStrategy.cpp CbcStrategy.hpp \
         CbcTree.cpp CbcTree.hpp \
+        CbcTreeLocal.cpp CbcTreeLocal.hpp
+
+libCbcSolver_la_SOURCES = \
+        CbcCbcParam.cpp \
+        Cbc_ampl.cpp Cbc_ampl.h \
+        ClpConstraintAmpl.hpp ClpAmplObjective.hpp ClpAmplStuff.cpp \
         CbcLinked.cpp CbcLinked.hpp \
-        CbcTreeLocal.cpp CbcTreeLocal.hpp \
-        ClpConstraintAmpl.hpp ClpAmplObjective.hpp ClpAmplStuff.cpp 
+        unitTestClp.cpp CbcSolver.cpp 
+
+#Stefan: added unitTestClp.cpp because CbcSolver defines reference to it
 
 ## If we have the Ampl solver library, we need to add additional things
 ## also see lower down
 ## new idea is to add in source code anyway
-libCbc_la_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
+##libCbc_la_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
 
 
@@ -59 +65 @@
 
 libCbc_la_LDFLAGS = $(LT_LDFLAGS)
+libCbcSolver_la_LDFLAGS = $(LT_LDFLAGS)
 
 # Some common setup for cbc and cbc-generic.
@@ -82 +89 @@
 # List all source files for this executable, including headers
 cbc_SOURCES = \
-        CoinSolve.cpp \
-        unitTestClp.cpp
+        CoinSolve.cpp
 
 # Additional COIN libraries
-cbc_LDADD = libCbc.la \
+cbc_LDADD = libCbcSolver.la \
+        libCbc.la \
         $(CGLOBJDIR)/src/libCgl.la \
         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
@@ -139 +146 @@
         CbcGenSolvers.cpp
 
-cbc_generic_LDADD = libCbc.la \
+cbc_generic_LDADD = libCbcSolver.la \
+        libCbc.la \
         $(CGLOBJDIR)/src/libCgl.la
 
@@ -218 +226 @@
         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiXpr`
   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
+endif
+
+if COIN_HAS_ASL
+  cbc_generic_LDADD += $(ASLLIB)
+  AM_CPPFLAGS += $(ASL_CPPFLAGS) -DCOIN_HAS_ASL
 endif
 

trunk/Cbc/src/Makefile.in

@@ -15 +15 @@
 @SET_MAKE@
 
-# Copyright (C) 2006 International Business Machines and others.
+# Copyright (C) 2006, 2007 International Business Machines and others.
 # All Rights Reserved.
 # This file is distributed under the Common Public License.
@@ -133 +133 @@
 
 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__append_32 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
+@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__append_33 = $(ASLLIB)
+@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__append_34 = $(ASL_CPPFLAGS) -DCOIN_HAS_ASL
 subdir = src
 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
@@ -162 +164 @@
         CbcHeuristicFPump.lo CbcHeuristicGreedy.lo \
         CbcHeuristicLocal.lo CbcHeuristicRINS.lo CbcMessage.lo \
-        CbcModel.lo CbcNode.lo CbcSolver.lo CbcCbcParam.lo \
-        CbcStatistics.lo CbcStrategy.lo CbcTree.lo CbcLinked.lo \
-        CbcTreeLocal.lo ClpAmplStuff.lo Cbc_ampl.lo
+        CbcModel.lo CbcNode.lo CbcStatistics.lo CbcStrategy.lo \
+        CbcTree.lo CbcTreeLocal.lo
 libCbc_la_OBJECTS = $(am_libCbc_la_OBJECTS)
+libCbcSolver_la_LIBADD =
+am_libCbcSolver_la_OBJECTS = CbcCbcParam.lo Cbc_ampl.lo \
+        ClpAmplStuff.lo CbcLinked.lo unitTestClp.lo CbcSolver.lo
+libCbcSolver_la_OBJECTS = $(am_libCbcSolver_la_OBJECTS)
 @COIN_HAS_CLP_TRUE@am__EXEEXT_1 = cbc$(EXEEXT)
 @CBC_BUILD_CBC_GENERIC_TRUE@am__EXEEXT_2 = cbc-generic$(EXEEXT)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am__cbc_SOURCES_DIST = CoinSolve.cpp unitTestClp.cpp
-@COIN_HAS_CLP_TRUE@am_cbc_OBJECTS = CoinSolve.$(OBJEXT) \
-@COIN_HAS_CLP_TRUE@     unitTestClp.$(OBJEXT)
+am__cbc_SOURCES_DIST = CoinSolve.cpp
+@COIN_HAS_CLP_TRUE@am_cbc_OBJECTS = CoinSolve.$(OBJEXT)
 cbc_OBJECTS = $(am_cbc_OBJECTS)
 am__DEPENDENCIES_1 =
 @COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_2 =  \
 @COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@  $(am__DEPENDENCIES_1)
-@COIN_HAS_CLP_TRUE@cbc_DEPENDENCIES = libCbc.la \
+@COIN_HAS_CLP_TRUE@cbc_DEPENDENCIES = libCbcSolver.la libCbc.la \
 @COIN_HAS_CLP_TRUE@     $(CGLOBJDIR)/src/libCgl.la \
 @COIN_HAS_CLP_TRUE@     $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
@@ -219 +223 @@
 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@ $(VOLOBJDIR)/src/libVol.la
 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__DEPENDENCIES_13 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
-@CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_DEPENDENCIES = libCbc.la \
+@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1)
+@CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_DEPENDENCIES =  \
+@CBC_BUILD_CBC_GENERIC_TRUE@    libCbcSolver.la libCbc.la \
 @CBC_BUILD_CBC_GENERIC_TRUE@    $(CGLOBJDIR)/src/libCgl.la \
 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_3) \
@@ -232 +238 @@
 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_12) \
 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_13) \
+@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_14) \
 @CBC_BUILD_CBC_GENERIC_TRUE@    $(OSIOBJDIR)/src/libOsi.la \
 @CBC_BUILD_CBC_GENERIC_TRUE@    $(COINUTILSOBJDIR)/src/libCoinUtils.la
@@ -252 +259 @@
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
         $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libCbc_la_SOURCES) $(cbc_SOURCES) $(cbc_generic_SOURCES)
-DIST_SOURCES = $(libCbc_la_SOURCES) $(am__cbc_SOURCES_DIST) \
-        $(am__cbc_generic_SOURCES_DIST)
+SOURCES = $(libCbc_la_SOURCES) $(libCbcSolver_la_SOURCES) \
+        $(cbc_SOURCES) $(cbc_generic_SOURCES)
+DIST_SOURCES = $(libCbc_la_SOURCES) $(libCbcSolver_la_SOURCES) \
+        $(am__cbc_SOURCES_DIST) $(am__cbc_generic_SOURCES_DIST)
 includeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(include_HEADERS)
@@ -471 +479 @@
 # Name of the library compiled in this directory.  We want it to be installed
 # in the 'lib' directory
-lib_LTLIBRARIES = libCbc.la
+lib_LTLIBRARIES = libCbc.la libCbcSolver.la
 
 # List all source files for this library, including headers
-libCbc_la_SOURCES = Cbc_C_Interface.cpp Cbc_C_Interface.h CbcConfig.h \
-        CbcBranchActual.cpp CbcBranchActual.hpp CbcBranchBase.cpp \
-        CbcBranchBase.hpp CbcBranchCut.cpp CbcBranchCut.hpp \
-        CbcBranchDynamic.cpp CbcBranchDynamic.hpp CbcBranchLotsize.cpp \
-        CbcBranchLotsize.hpp CbcCompareActual.cpp CbcCompareActual.hpp \
-        CbcCompareBase.hpp CbcCountRowCut.cpp CbcCountRowCut.hpp \
-        CbcCutGenerator.cpp CbcCutGenerator.hpp CbcEventHandler.cpp \
-        CbcEventHandler.hpp CbcFathom.cpp CbcFathom.hpp \
-        CbcFathomDynamicProgramming.cpp \
-        CbcFathomDynamicProgramming.hpp CbcFeasibilityBase.hpp \
-        CbcHeuristic.cpp CbcHeuristic.hpp CbcHeuristicFPump.cpp \
-        CbcHeuristicFPump.hpp CbcHeuristicGreedy.cpp \
-        CbcHeuristicGreedy.hpp CbcHeuristicLocal.cpp \
-        CbcHeuristicLocal.hpp CbcHeuristicRINS.cpp \
-        CbcHeuristicRINS.hpp CbcMessage.cpp CbcMessage.hpp \
-        CbcModel.cpp CbcModel.hpp CbcNode.cpp CbcNode.hpp \
-        CbcSolver.cpp CbcCbcParam.cpp CbcStatistics.cpp \
-        CbcStatistics.hpp CbcStrategy.cpp CbcStrategy.hpp CbcTree.cpp \
-        CbcTree.hpp CbcLinked.cpp CbcLinked.hpp CbcTreeLocal.cpp \
-        CbcTreeLocal.hpp ClpConstraintAmpl.hpp ClpAmplObjective.hpp \
-        ClpAmplStuff.cpp Cbc_ampl.cpp Cbc_ampl.h
+libCbc_la_SOURCES = \
+        Cbc_C_Interface.cpp Cbc_C_Interface.h \
+        CbcConfig.h \
+        CbcBranchActual.cpp CbcBranchActual.hpp \
+        CbcBranchBase.cpp CbcBranchBase.hpp \
+        CbcBranchCut.cpp CbcBranchCut.hpp \
+        CbcBranchDynamic.cpp CbcBranchDynamic.hpp \
+        CbcBranchLotsize.cpp CbcBranchLotsize.hpp \
+        CbcCompareActual.cpp CbcCompareActual.hpp \
+        CbcCompareBase.hpp \
+        CbcCountRowCut.cpp CbcCountRowCut.hpp \
+        CbcCutGenerator.cpp CbcCutGenerator.hpp \
+        CbcEventHandler.cpp CbcEventHandler.hpp \
+        CbcFathom.cpp CbcFathom.hpp \
+        CbcFathomDynamicProgramming.cpp CbcFathomDynamicProgramming.hpp \
+        CbcFeasibilityBase.hpp \
+        CbcHeuristic.cpp CbcHeuristic.hpp \
+        CbcHeuristicFPump.cpp CbcHeuristicFPump.hpp \
+        CbcHeuristicGreedy.cpp CbcHeuristicGreedy.hpp \
+        CbcHeuristicLocal.cpp CbcHeuristicLocal.hpp \
+        CbcHeuristicRINS.cpp CbcHeuristicRINS.hpp \
+        CbcMessage.cpp CbcMessage.hpp \
+        CbcModel.cpp CbcModel.hpp \
+        CbcNode.cpp CbcNode.hpp \
+        CbcStatistics.cpp CbcStatistics.hpp \
+        CbcStrategy.cpp CbcStrategy.hpp \
+        CbcTree.cpp CbcTree.hpp \
+        CbcTreeLocal.cpp CbcTreeLocal.hpp
+
+libCbcSolver_la_SOURCES = \
+        CbcCbcParam.cpp \
+        Cbc_ampl.cpp Cbc_ampl.h \
+        ClpConstraintAmpl.hpp ClpAmplObjective.hpp ClpAmplStuff.cpp \
+        CbcLinked.cpp CbcLinked.hpp \
+        unitTestClp.cpp CbcSolver.cpp 
+
+
+#Stefan: added unitTestClp.cpp because CbcSolver defines reference to it
 
 # This is for libtool (on Windows)
 libCbc_la_LDFLAGS = $(LT_LDFLAGS)
+libCbcSolver_la_LDFLAGS = $(LT_LDFLAGS)
 
 ########################################################################
@@ -513 +539 @@
         $(am__append_17) $(am__append_19) $(am__append_21) \
         $(am__append_23) $(am__append_25) $(am__append_28) \
-        $(am__append_31) -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
-        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglClique` -I`$(CYGPATH_W) \
-        $(CGLSRCDIR)/src/CglDuplicateRow` -I`$(CYGPATH_W) \
-        $(CGLSRCDIR)/src/CglFlowCover` -I`$(CYGPATH_W) \
+        $(am__append_31) $(am__append_34) -I`$(CYGPATH_W) \
+        $(CGLSRCDIR)/src` -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglClique` \
+        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglDuplicateRow` \
+        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglFlowCover` -I`$(CYGPATH_W) \
         $(CGLSRCDIR)/src/CglGomory` -I`$(CYGPATH_W) \
         $(CGLSRCDIR)/src/CglKnapsackCover` -I`$(CYGPATH_W) \
@@ -535 +561 @@
 # List all source files for this executable, including headers
 @COIN_HAS_CLP_TRUE@cbc_SOURCES = \
-@COIN_HAS_CLP_TRUE@     CoinSolve.cpp \
-@COIN_HAS_CLP_TRUE@     unitTestClp.cpp
+@COIN_HAS_CLP_TRUE@     CoinSolve.cpp
 
 
 # Additional COIN libraries
-@COIN_HAS_CLP_TRUE@cbc_LDADD = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
+@COIN_HAS_CLP_TRUE@cbc_LDADD = libCbcSolver.la libCbc.la \
+@COIN_HAS_CLP_TRUE@     $(CGLOBJDIR)/src/libCgl.la \
 @COIN_HAS_CLP_TRUE@     $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
 @COIN_HAS_CLP_TRUE@     $(OSIOBJDIR)/src/libOsi.la \
@@ -566 +592 @@
 
 # Finally the Osi Coin library (many of the above need it)
-@CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_LDADD = libCbc.la \
+@CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_LDADD = libCbcSolver.la \
+@CBC_BUILD_CBC_GENERIC_TRUE@    libCbc.la \
 @CBC_BUILD_CBC_GENERIC_TRUE@    $(CGLOBJDIR)/src/libCgl.la \
 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_8) $(am__append_11) \
@@ -573 +600 @@
 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_22) $(am__append_24) \
 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_26) $(am__append_29) \
-@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_32) \
+@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_32) $(am__append_33) \
 @CBC_BUILD_CBC_GENERIC_TRUE@    $(OSIOBJDIR)/src/libOsi.la \
 @CBC_BUILD_CBC_GENERIC_TRUE@    $(COINUTILSOBJDIR)/src/libCoinUtils.la
@@ -690 +717 @@
 libCbc.la: $(libCbc_la_OBJECTS) $(libCbc_la_DEPENDENCIES) 
         $(CXXLINK) -rpath $(libdir) $(libCbc_la_LDFLAGS) $(libCbc_la_OBJECTS) $(libCbc_la_LIBADD) $(LIBS)
+libCbcSolver.la: $(libCbcSolver_la_OBJECTS) $(libCbcSolver_la_DEPENDENCIES) 
+        $(CXXLINK) -rpath $(libdir) $(libCbcSolver_la_LDFLAGS) $(libCbcSolver_la_OBJECTS) $(libCbcSolver_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
         @$(NORMAL_INSTALL)
@@ -773 +802 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpAmplStuff.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoinSolve.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unitTestClp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unitTestClp.Plo@am__quote@
 
 .cpp.o:

trunk/Cbc/src/unitTestClp.cpp

@@ -2 +2 @@
 // Corporation and others.  All Rights Reserved.
 
-#include "CoinPragma.hpp"
-#include <cassert>
 #include <cstdio>
-#include <cmath>
-#include <cfloat>
 #include <string>
 #include <iostream>
 
-#include "CoinMpsIO.hpp"
-#include "CoinPackedMatrix.hpp"
-#include "CoinPackedVector.hpp"
-#include "CoinHelperFunctions.hpp"
 #include "CoinTime.hpp"
 #include "CbcModel.hpp"
 #include "CbcCutGenerator.hpp"
 #include "OsiClpSolverInterface.hpp"
-#include "ClpFactorization.hpp"
-#include "ClpSimplex.hpp"
-#include "ClpSimplexOther.hpp"
-#include "ClpInterior.hpp"
-#include "ClpLinearObjective.hpp"
-#include "ClpDualRowSteepest.hpp"
-#include "ClpDualRowDantzig.hpp"
-#include "ClpPrimalColumnSteepest.hpp"
-#include "ClpPrimalColumnDantzig.hpp"
-#include "ClpParameters.hpp"
-#include "ClpNetworkMatrix.hpp"
-#include "ClpPlusMinusOneMatrix.hpp"
-#include "MyMessageHandler.hpp"
-#include "MyEventHandler.hpp"
-
-#include "ClpPresolve.hpp"
-#include "Idiot.hpp"
-
 
 //#############################################################################
@@ -43 +17 @@
 #endif
 
-// Function Prototypes. Function definitions is in this file.
-void testingMessage( const char * const msg );
-#if UFL_BARRIER
-static int barrierAvailable=1;
-static std::string nameBarrier="barrier-UFL";
-#elif WSSMP_BARRIER
-static int barrierAvailable=2;
-static std::string nameBarrier="barrier-WSSMP";
-#else
-static int barrierAvailable=0;
-static std::string nameBarrier="barrier-slow";
-#endif
-#define NUMBER_ALGORITHMS 12
-// If you just want a subset then set some to 1
-static int switchOff[NUMBER_ALGORITHMS]={0,0,0,0,0,0,0,0,0,0,0,0};
-// shortName - 0 no , 1 yes
-ClpSolve setupForSolve(int algorithm, std::string & nameAlgorithm,
-                       int shortName)
-{
-  ClpSolve solveOptions;
-  /* algorithms are
-     0 barrier
-     1 dual with volumne crash
-     2,3 dual with and without crash
-     4,5 primal with and without
-     6,7 automatic with and without
-     8,9 primal with idiot 1 and 5
-     10,11 primal with 70, dual with volume
-  */
-  switch (algorithm) {
-  case 0:
-    if (shortName)
-      nameAlgorithm="ba";
-    else
-      nameAlgorithm="nameBarrier";
-    solveOptions.setSolveType(ClpSolve::useBarrier);
-    if (barrierAvailable==1) 
-      solveOptions.setSpecialOption(4,4);
-    else if (barrierAvailable==2) 
-      solveOptions.setSpecialOption(4,2);
-    break;
-  case 1:
-#ifdef COIN_HAS_VOL
-    if (shortName)
-      nameAlgorithm="du-vol-50";
-    else
-      nameAlgorithm="dual-volume-50";
-    solveOptions.setSolveType(ClpSolve::useDual);
-    solveOptions.setSpecialOption(0,2,50); // volume
-#else  
-      solveOptions.setSolveType(ClpSolve::notImplemented);
-#endif
-    break;
-  case 2:
-    if (shortName)
-      nameAlgorithm="du-cr";
-    else
-      nameAlgorithm="dual-crash";
-    solveOptions.setSolveType(ClpSolve::useDual);
-    solveOptions.setSpecialOption(0,1);
-    break;
-  case 3:
-    if (shortName)
-      nameAlgorithm="du";
-    else
-      nameAlgorithm="dual";
-    solveOptions.setSolveType(ClpSolve::useDual);
-    break;
-  case 4:
-    if (shortName)
-      nameAlgorithm="pr-cr";
-    else
-      nameAlgorithm="primal-crash";
-    solveOptions.setSolveType(ClpSolve::usePrimal);
-    solveOptions.setSpecialOption(1,1);
-    break;
-  case 5:
-    if (shortName)
-      nameAlgorithm="pr";
-    else
-      nameAlgorithm="primal";
-    solveOptions.setSolveType(ClpSolve::usePrimal);
-    break;
-  case 6:
-    if (shortName)
-      nameAlgorithm="au-cr";
-    else
-      nameAlgorithm="either-crash";
-    solveOptions.setSolveType(ClpSolve::automatic);
-    solveOptions.setSpecialOption(1,1);
-    break;
-  case 7:
-    if (shortName)
-      nameAlgorithm="au";
-    else
-      nameAlgorithm="either";
-    solveOptions.setSolveType(ClpSolve::automatic);
-    break;
-  case 8:
-    if (shortName)
-      nameAlgorithm="pr-id-1";
-    else
-      nameAlgorithm="primal-idiot-1";
-    solveOptions.setSolveType(ClpSolve::usePrimalorSprint);
-    solveOptions.setSpecialOption(1,2,1); // idiot
-    break;
-  case 9:
-    if (shortName)
-      nameAlgorithm="pr-id-5";
-    else
-      nameAlgorithm="primal-idiot-5";
-    solveOptions.setSolveType(ClpSolve::usePrimalorSprint);
-    solveOptions.setSpecialOption(1,2,5); // idiot
-    break;
-  case 10:
-    if (shortName)
-      nameAlgorithm="pr-id-70";
-    else
-      nameAlgorithm="primal-idiot-70";
-    solveOptions.setSolveType(ClpSolve::usePrimalorSprint);
-    solveOptions.setSpecialOption(1,2,70); // idiot
-    break;
-  case 11:
-#ifdef COIN_HAS_VOL
-    if (shortName)
-      nameAlgorithm="du-vol";
-    else
-      nameAlgorithm="dual-volume";
-    solveOptions.setSolveType(ClpSolve::useDual);
-    solveOptions.setSpecialOption(0,2,3000); // volume
-#else  
-      solveOptions.setSolveType(ClpSolve::notImplemented);
-#endif
-    break;
-  default:
-    abort();
-  }
-  if (shortName) {
-    // can switch off
-    if (switchOff[algorithm])
-      solveOptions.setSolveType(ClpSolve::notImplemented);
-  }
-  return solveOptions;
-}
-//----------------------------------------------------------------
-// unitTest [-mpsDir=V1] [-netlibDir=V2] [-test]
-// 
-// where:
-//   -mpsDir: directory containing mps test files
-//       Default value V1="../../Data/Sample"    
-//   -netlibDir: directory containing netlib files
-//       Default value V2="../../Data/Netlib"
-//   -test
-//       If specified, then netlib test set run
-//
-// All parameters are optional.
-//----------------------------------------------------------------
-int mainTest (int argc, const char *argv[],int algorithm,
-              ClpSimplex empty, bool doPresolve, int switchOffValue,bool doVector)
-{
-  int i;
-
-  if (switchOffValue>0) {
-    // switch off some
-    int iTest;
-    for (iTest=0;iTest<NUMBER_ALGORITHMS;iTest++) {
-      int bottom = switchOffValue%10;
-      assert (bottom==0||bottom==1);
-      switchOffValue/= 10;
-      switchOff[iTest]=0;
-    }
-  }
-
-  // define valid parameter keywords
-  std::set<std::string> definedKeyWords;
-  definedKeyWords.insert("-mpsDir");
-  definedKeyWords.insert("-netlibDir");
-  definedKeyWords.insert("-netlib");
-
-  // Create a map of parameter keys and associated data
-  std::map<std::string,std::string> parms;
-  for ( i=1; i<argc; i++ ) {
-    std::string parm(argv[i]);
-    std::string key,value;
-    unsigned int  eqPos = parm.find('=');
-
-    // Does parm contain and '='
-    if ( eqPos==std::string::npos ) {
-      //Parm does not contain '='
-      key = parm;
-    }
-    else {
-      key=parm.substr(0,eqPos);
-      value=parm.substr(eqPos+1);
-    }
-
-    // Is specifed key valid?
-    if ( definedKeyWords.find(key) == definedKeyWords.end() ) {
-      // invalid key word.
-      // Write help text
-      std::cerr <<"Undefined parameter \"" <<key <<"\".\n";
-      std::cerr <<"Correct usage: \n";
-      std::cerr <<"  unitTest [-mpsDir=V1] [-netlibDir=V2] [-test[=V3]]\n";
-      std::cerr <<"  where:\n";
-      std::cerr <<"    -mpsDir: directory containing mps test files\n";
-      std::cerr <<"        Default value V1=\"../../Data/Sample\"\n";
-      std::cerr <<"    -netlibDir: directory containing netlib files\n";
-      std::cerr <<"        Default value V2=\"../../Data/Netlib\"\n";
-      std::cerr <<"    -test\n";
-      std::cerr <<"        If specified, then netlib testset run.\n";
-      std::cerr <<"        If V3 then taken as single file\n";
-      return 1;
-    }
-    parms[key]=value;
-  }
-  
-  const char dirsep =  CoinFindDirSeparator();
-  // Set directory containing mps data files.
-  std::string mpsDir;
-  if (parms.find("-mpsDir") != parms.end())
-    mpsDir=parms["-mpsDir"] + dirsep;
-  else 
-    mpsDir = dirsep == '/' ? "../../Data/Sample/" : "..\\..\\Data\\Sample\\";
- 
-  // Set directory containing netlib data files.
-  std::string netlibDir;
-  if (parms.find("-netlibDir") != parms.end())
-    netlibDir=parms["-netlibDir"] + dirsep;
-  else 
-    netlibDir = dirsep == '/' ? "../../Data/Netlib/" : "..\\..\\Data\\Netlib\\";
-  if (!empty.numberRows()) {
-    testingMessage( "Testing ClpSimplex\n" );
-    ClpSimplexUnitTest(mpsDir,netlibDir);
-  }
-  if (parms.find("-netlib") != parms.end()||empty.numberRows())
-  {
-    unsigned int m;
-    
-    // Define test problems: 
-    //   mps names, 
-    //   maximization or minimization, 
-    //   Number of rows and columns in problem, and
-    //   objective function value
-    std::vector<std::string> mpsName;
-    std::vector<bool> min;
-    std::vector<int> nRows;
-    std::vector<int> nCols;
-    std::vector<double> objValue;
-    std::vector<double> objValueTol;
-    // 100 added means no presolve
-    std::vector<int> bestStrategy;
-    if(empty.numberRows()) {
-      std::string alg;
-      for (int iTest=0;iTest<NUMBER_ALGORITHMS;iTest++) {
-        ClpSolve solveOptions=setupForSolve(iTest,alg,0);
-        printf("%d %s ",iTest,alg.c_str());
-        if (switchOff[iTest]) 
-          printf("skipped by user\n");
-        else if(solveOptions.getSolveType()==ClpSolve::notImplemented)
-          printf("skipped as not available\n");
-        else
-          printf("will be tested\n");
-      }
-    }
-    if (!empty.numberRows()) {
-      mpsName.push_back("25fv47");
-      min.push_back(true);
-      nRows.push_back(822);
-      nCols.push_back(1571);
-      objValueTol.push_back(1.E-10);
-      objValue.push_back(5.5018458883E+03);
-      bestStrategy.push_back(0);
-      mpsName.push_back("80bau3b");min.push_back(true);nRows.push_back(2263);nCols.push_back(9799);objValueTol.push_back(1.e-10);objValue.push_back(9.8722419241E+05);bestStrategy.push_back(3);
-      mpsName.push_back("blend");min.push_back(true);nRows.push_back(75);nCols.push_back(83);objValueTol.push_back(1.e-10);objValue.push_back(-3.0812149846e+01);bestStrategy.push_back(3);
-      mpsName.push_back("pilotnov");min.push_back(true);nRows.push_back(976);nCols.push_back(2172);objValueTol.push_back(1.e-10);objValue.push_back(-4.4972761882e+03);bestStrategy.push_back(3);
-      mpsName.push_back("maros-r7");min.push_back(true);nRows.push_back(3137);nCols.push_back(9408);objValueTol.push_back(1.e-10);objValue.push_back(1.4971851665e+06);bestStrategy.push_back(2);
-      mpsName.push_back("pilot");min.push_back(true);nRows.push_back(1442);nCols.push_back(3652);objValueTol.push_back(1.e-5);objValue.push_back(/*-5.5740430007e+02*/-557.48972927292);bestStrategy.push_back(3);
-      mpsName.push_back("pilot4");min.push_back(true);nRows.push_back(411);nCols.push_back(1000);objValueTol.push_back(5.e-5);objValue.push_back(-2.5811392641e+03);bestStrategy.push_back(3);
-      mpsName.push_back("pilot87");min.push_back(true);nRows.push_back(2031);nCols.push_back(4883);objValueTol.push_back(1.e-4);objValue.push_back(3.0171072827e+02);bestStrategy.push_back(0);
-      mpsName.push_back("adlittle");min.push_back(true);nRows.push_back(57);nCols.push_back(97);objValueTol.push_back(1.e-10);objValue.push_back(2.2549496316e+05);bestStrategy.push_back(3);
-      mpsName.push_back("afiro");min.push_back(true);nRows.push_back(28);nCols.push_back(32);objValueTol.push_back(1.e-10);objValue.push_back(-4.6475314286e+02);bestStrategy.push_back(3);
-      mpsName.push_back("agg");min.push_back(true);nRows.push_back(489);nCols.push_back(163);objValueTol.push_back(1.e-10);objValue.push_back(-3.5991767287e+07);bestStrategy.push_back(3);
-      mpsName.push_back("agg2");min.push_back(true);nRows.push_back(517);nCols.push_back(302);objValueTol.push_back(1.e-10);objValue.push_back(-2.0239252356e+07);bestStrategy.push_back(3);
-      mpsName.push_back("agg3");min.push_back(true);nRows.push_back(517);nCols.push_back(302);objValueTol.push_back(1.e-10);objValue.push_back(1.0312115935e+07);bestStrategy.push_back(4);
-      mpsName.push_back("bandm");min.push_back(true);nRows.push_back(306);nCols.push_back(472);objValueTol.push_back(1.e-10);objValue.push_back(-1.5862801845e+02);bestStrategy.push_back(2);
-      mpsName.push_back("beaconfd");min.push_back(true);nRows.push_back(174);nCols.push_back(262);objValueTol.push_back(1.e-10);objValue.push_back(3.3592485807e+04);bestStrategy.push_back(0);
-      mpsName.push_back("bnl1");min.push_back(true);nRows.push_back(644);nCols.push_back(1175);objValueTol.push_back(1.e-10);objValue.push_back(1.9776295615E+03);bestStrategy.push_back(3);
-      mpsName.push_back("bnl2");min.push_back(true);nRows.push_back(2325);nCols.push_back(3489);objValueTol.push_back(1.e-10);objValue.push_back(1.8112365404e+03);bestStrategy.push_back(3);
-      mpsName.push_back("boeing1");min.push_back(true);nRows.push_back(/*351*/352);nCols.push_back(384);objValueTol.push_back(1.e-10);objValue.push_back(-3.3521356751e+02);bestStrategy.push_back(3);
-      mpsName.push_back("boeing2");min.push_back(true);nRows.push_back(167);nCols.push_back(143);objValueTol.push_back(1.e-10);objValue.push_back(-3.1501872802e+02);bestStrategy.push_back(3);
-      mpsName.push_back("bore3d");min.push_back(true);nRows.push_back(234);nCols.push_back(315);objValueTol.push_back(1.e-10);objValue.push_back(1.3730803942e+03);bestStrategy.push_back(3);
-      mpsName.push_back("brandy");min.push_back(true);nRows.push_back(221);nCols.push_back(249);objValueTol.push_back(1.e-10);objValue.push_back(1.5185098965e+03);bestStrategy.push_back(3);
-      mpsName.push_back("capri");min.push_back(true);nRows.push_back(272);nCols.push_back(353);objValueTol.push_back(1.e-10);objValue.push_back(2.6900129138e+03);bestStrategy.push_back(3);
-      mpsName.push_back("cycle");min.push_back(true);nRows.push_back(1904);nCols.push_back(2857);objValueTol.push_back(1.e-9);objValue.push_back(-5.2263930249e+00);bestStrategy.push_back(3);
-      mpsName.push_back("czprob");min.push_back(true);nRows.push_back(930);nCols.push_back(3523);objValueTol.push_back(1.e-10);objValue.push_back(2.1851966989e+06);bestStrategy.push_back(3);
-      mpsName.push_back("d2q06c");min.push_back(true);nRows.push_back(2172);nCols.push_back(5167);objValueTol.push_back(1.e-7);objValue.push_back(122784.21557456);bestStrategy.push_back(0);
-      mpsName.push_back("d6cube");min.push_back(true);nRows.push_back(416);nCols.push_back(6184);objValueTol.push_back(1.e-7);objValue.push_back(3.1549166667e+02);bestStrategy.push_back(3);
-      mpsName.push_back("degen2");min.push_back(true);nRows.push_back(445);nCols.push_back(534);objValueTol.push_back(1.e-10);objValue.push_back(-1.4351780000e+03);bestStrategy.push_back(3);
-      mpsName.push_back("degen3");min.push_back(true);nRows.push_back(1504);nCols.push_back(1818);objValueTol.push_back(1.e-10);objValue.push_back(-9.8729400000e+02);bestStrategy.push_back(2);
-      mpsName.push_back("dfl001");min.push_back(true);nRows.push_back(6072);nCols.push_back(12230);objValueTol.push_back(1.e-5);objValue.push_back(1.1266396047E+07);bestStrategy.push_back(5);
-      mpsName.push_back("e226");min.push_back(true);nRows.push_back(224);nCols.push_back(282);objValueTol.push_back(1.e-10);objValue.push_back(-1.8751929066e+01+7.113);bestStrategy.push_back(3); // The correct answer includes -7.113 term. This is a constant in the objective function. See line 1683 of the mps file.
-      mpsName.push_back("etamacro");min.push_back(true);nRows.push_back(401);nCols.push_back(688);objValueTol.push_back(1.e-6);objValue.push_back(-7.5571521774e+02 );bestStrategy.push_back(3);
-      mpsName.push_back("fffff800");min.push_back(true);nRows.push_back(525);nCols.push_back(854);objValueTol.push_back(1.e-6);objValue.push_back(5.5567961165e+05);bestStrategy.push_back(3);
-      mpsName.push_back("finnis");min.push_back(true);nRows.push_back(498);nCols.push_back(614);objValueTol.push_back(1.e-6);objValue.push_back(1.7279096547e+05);bestStrategy.push_back(3);
-      mpsName.push_back("fit1d");min.push_back(true);nRows.push_back(25);nCols.push_back(1026);objValueTol.push_back(1.e-10);objValue.push_back(-9.1463780924e+03);bestStrategy.push_back(3+100);
-      mpsName.push_back("fit1p");min.push_back(true);nRows.push_back(628);nCols.push_back(1677);objValueTol.push_back(1.e-10);objValue.push_back(9.1463780924e+03);bestStrategy.push_back(5+100);
-      mpsName.push_back("fit2d");min.push_back(true);nRows.push_back(26);nCols.push_back(10500);objValueTol.push_back(1.e-10);objValue.push_back(-6.8464293294e+04);bestStrategy.push_back(3+100);
-      mpsName.push_back("fit2p");min.push_back(true);nRows.push_back(3001);nCols.push_back(13525);objValueTol.push_back(1.e-9);objValue.push_back(6.8464293232e+04);bestStrategy.push_back(5+100);
-      mpsName.push_back("forplan");min.push_back(true);nRows.push_back(162);nCols.push_back(421);objValueTol.push_back(1.e-6);objValue.push_back(-6.6421873953e+02);bestStrategy.push_back(3);
-      mpsName.push_back("ganges");min.push_back(true);nRows.push_back(1310);nCols.push_back(1681);objValueTol.push_back(1.e-5);objValue.push_back(-1.0958636356e+05);bestStrategy.push_back(3);
-      mpsName.push_back("gfrd-pnc");min.push_back(true);nRows.push_back(617);nCols.push_back(1092);objValueTol.push_back(1.e-10);objValue.push_back(6.9022359995e+06);bestStrategy.push_back(3);
-      mpsName.push_back("greenbea");min.push_back(true);nRows.push_back(2393);nCols.push_back(5405);objValueTol.push_back(1.e-10);objValue.push_back(/*-7.2462405908e+07*/-72555248.129846);bestStrategy.push_back(3);
-      mpsName.push_back("greenbeb");min.push_back(true);nRows.push_back(2393);nCols.push_back(5405);objValueTol.push_back(1.e-10);objValue.push_back(/*-4.3021476065e+06*/-4302260.2612066);bestStrategy.push_back(3);
-      mpsName.push_back("grow15");min.push_back(true);nRows.push_back(301);nCols.push_back(645);objValueTol.push_back(1.e-10);objValue.push_back(-1.0687094129e+08);bestStrategy.push_back(4+100);
-      mpsName.push_back("grow22");min.push_back(true);nRows.push_back(441);nCols.push_back(946);objValueTol.push_back(1.e-10);objValue.push_back(-1.6083433648e+08);bestStrategy.push_back(4+100);
-      mpsName.push_back("grow7");min.push_back(true);nRows.push_back(141);nCols.push_back(301);objValueTol.push_back(1.e-10);objValue.push_back(-4.7787811815e+07);bestStrategy.push_back(4+100);
-      mpsName.push_back("israel");min.push_back(true);nRows.push_back(175);nCols.push_back(142);objValueTol.push_back(1.e-10);objValue.push_back(-8.9664482186e+05);bestStrategy.push_back(2);
-      mpsName.push_back("kb2");min.push_back(true);nRows.push_back(44);nCols.push_back(41);objValueTol.push_back(1.e-10);objValue.push_back(-1.7499001299e+03);bestStrategy.push_back(3);
-      mpsName.push_back("lotfi");min.push_back(true);nRows.push_back(154);nCols.push_back(308);objValueTol.push_back(1.e-10);objValue.push_back(-2.5264706062e+01);bestStrategy.push_back(3);
-      mpsName.push_back("maros");min.push_back(true);nRows.push_back(847);nCols.push_back(1443);objValueTol.push_back(1.e-10);objValue.push_back(-5.8063743701e+04);bestStrategy.push_back(3);
-      mpsName.push_back("modszk1");min.push_back(true);nRows.push_back(688);nCols.push_back(1620);objValueTol.push_back(1.e-10);objValue.push_back(3.2061972906e+02);bestStrategy.push_back(3);
-      mpsName.push_back("nesm");min.push_back(true);nRows.push_back(663);nCols.push_back(2923);objValueTol.push_back(1.e-5);objValue.push_back(1.4076073035e+07);bestStrategy.push_back(2);
-      mpsName.push_back("perold");min.push_back(true);nRows.push_back(626);nCols.push_back(1376);objValueTol.push_back(1.e-6);objValue.push_back(-9.3807580773e+03);bestStrategy.push_back(3);
-      //mpsName.push_back("qap12");min.push_back(true);nRows.push_back(3193);nCols.push_back(8856);objValueTol.push_back(1.e-6);objValue.push_back(5.2289435056e+02);bestStrategy.push_back(3);
-      //mpsName.push_back("qap15");min.push_back(true);nRows.push_back(6331);nCols.push_back(22275);objValueTol.push_back(1.e-10);objValue.push_back(1.0409940410e+03);bestStrategy.push_back(3);
-      mpsName.push_back("recipe");min.push_back(true);nRows.push_back(92);nCols.push_back(180);objValueTol.push_back(1.e-10);objValue.push_back(-2.6661600000e+02);bestStrategy.push_back(3);
-      mpsName.push_back("sc105");min.push_back(true);nRows.push_back(106);nCols.push_back(103);objValueTol.push_back(1.e-10);objValue.push_back(-5.2202061212e+01);bestStrategy.push_back(3);
-      mpsName.push_back("sc205");min.push_back(true);nRows.push_back(206);nCols.push_back(203);objValueTol.push_back(1.e-10);objValue.push_back(-5.2202061212e+01);bestStrategy.push_back(3);
-      mpsName.push_back("sc50a");min.push_back(true);nRows.push_back(51);nCols.push_back(48);objValueTol.push_back(1.e-10);objValue.push_back(-6.4575077059e+01);bestStrategy.push_back(3);
-      mpsName.push_back("sc50b");min.push_back(true);nRows.push_back(51);nCols.push_back(48);objValueTol.push_back(1.e-10);objValue.push_back(-7.0000000000e+01);bestStrategy.push_back(3);
-      mpsName.push_back("scagr25");min.push_back(true);nRows.push_back(472);nCols.push_back(500);objValueTol.push_back(1.e-10);objValue.push_back(-1.4753433061e+07);bestStrategy.push_back(3);
-      mpsName.push_back("scagr7");min.push_back(true);nRows.push_back(130);nCols.push_back(140);objValueTol.push_back(1.e-6);objValue.push_back(-2.3313892548e+06);bestStrategy.push_back(3);
-      mpsName.push_back("scfxm1");min.push_back(true);nRows.push_back(331);nCols.push_back(457);objValueTol.push_back(1.e-10);objValue.push_back(1.8416759028e+04);bestStrategy.push_back(3);
-      mpsName.push_back("scfxm2");min.push_back(true);nRows.push_back(661);nCols.push_back(914);objValueTol.push_back(1.e-10);objValue.push_back(3.6660261565e+04);bestStrategy.push_back(3);
-      mpsName.push_back("scfxm3");min.push_back(true);nRows.push_back(991);nCols.push_back(1371);objValueTol.push_back(1.e-10);objValue.push_back(5.4901254550e+04);bestStrategy.push_back(3);
-      mpsName.push_back("scorpion");min.push_back(true);nRows.push_back(389);nCols.push_back(358);objValueTol.push_back(1.e-10);objValue.push_back(1.8781248227e+03);bestStrategy.push_back(3);
-      mpsName.push_back("scrs8");min.push_back(true);nRows.push_back(491);nCols.push_back(1169);objValueTol.push_back(1.e-5);objValue.push_back(9.0429998619e+02);bestStrategy.push_back(2);
-      mpsName.push_back("scsd1");min.push_back(true);nRows.push_back(78);nCols.push_back(760);objValueTol.push_back(1.e-10);objValue.push_back(8.6666666743e+00);bestStrategy.push_back(3+100);
-      mpsName.push_back("scsd6");min.push_back(true);nRows.push_back(148);nCols.push_back(1350);objValueTol.push_back(1.e-10);objValue.push_back(5.0500000078e+01);bestStrategy.push_back(3+100);
-      mpsName.push_back("scsd8");min.push_back(true);nRows.push_back(398);nCols.push_back(2750);objValueTol.push_back(1.e-10);objValue.push_back(9.0499999993e+02);bestStrategy.push_back(1+100);
-      mpsName.push_back("sctap1");min.push_back(true);nRows.push_back(301);nCols.push_back(480);objValueTol.push_back(1.e-10);objValue.push_back(1.4122500000e+03);bestStrategy.push_back(3);
-      mpsName.push_back("sctap2");min.push_back(true);nRows.push_back(1091);nCols.push_back(1880);objValueTol.push_back(1.e-10);objValue.push_back(1.7248071429e+03);bestStrategy.push_back(3);
-      mpsName.push_back("sctap3");min.push_back(true);nRows.push_back(1481);nCols.push_back(2480);objValueTol.push_back(1.e-10);objValue.push_back(1.4240000000e+03);bestStrategy.push_back(3);
-      mpsName.push_back("seba");min.push_back(true);nRows.push_back(516);nCols.push_back(1028);objValueTol.push_back(1.e-10);objValue.push_back(1.5711600000e+04);bestStrategy.push_back(3);
-      mpsName.push_back("share1b");min.push_back(true);nRows.push_back(118);nCols.push_back(225);objValueTol.push_back(1.e-10);objValue.push_back(-7.6589318579e+04);bestStrategy.push_back(3);
-      mpsName.push_back("share2b");min.push_back(true);nRows.push_back(97);nCols.push_back(79);objValueTol.push_back(1.e-10);objValue.push_back(-4.1573224074e+02);bestStrategy.push_back(3);
-      mpsName.push_back("shell");min.push_back(true);nRows.push_back(537);nCols.push_back(1775);objValueTol.push_back(1.e-10);objValue.push_back(1.2088253460e+09);bestStrategy.push_back(3);
-      mpsName.push_back("ship04l");min.push_back(true);nRows.push_back(403);nCols.push_back(2118);objValueTol.push_back(1.e-10);objValue.push_back(1.7933245380e+06);bestStrategy.push_back(3);
-      mpsName.push_back("ship04s");min.push_back(true);nRows.push_back(403);nCols.push_back(1458);objValueTol.push_back(1.e-10);objValue.push_back(1.7987147004e+06);bestStrategy.push_back(3);
-      mpsName.push_back("ship08l");min.push_back(true);nRows.push_back(779);nCols.push_back(4283);objValueTol.push_back(1.e-10);objValue.push_back(1.9090552114e+06);bestStrategy.push_back(3);
-      mpsName.push_back("ship08s");min.push_back(true);nRows.push_back(779);nCols.push_back(2387);objValueTol.push_back(1.e-10);objValue.push_back(1.9200982105e+06);bestStrategy.push_back(2);
-      mpsName.push_back("ship12l");min.push_back(true);nRows.push_back(1152);nCols.push_back(5427);objValueTol.push_back(1.e-10);objValue.push_back(1.4701879193e+06);bestStrategy.push_back(3);
-      mpsName.push_back("ship12s");min.push_back(true);nRows.push_back(1152);nCols.push_back(2763);objValueTol.push_back(1.e-10);objValue.push_back(1.4892361344e+06);bestStrategy.push_back(2);
-      mpsName.push_back("sierra");min.push_back(true);nRows.push_back(1228);nCols.push_back(2036);objValueTol.push_back(1.e-10);objValue.push_back(1.5394362184e+07);bestStrategy.push_back(3);
-      mpsName.push_back("stair");min.push_back(true);nRows.push_back(357);nCols.push_back(467);objValueTol.push_back(1.e-10);objValue.push_back(-2.5126695119e+02);bestStrategy.push_back(3);
-      mpsName.push_back("standata");min.push_back(true);nRows.push_back(360);nCols.push_back(1075);objValueTol.push_back(1.e-10);objValue.push_back(1.2576995000e+03);bestStrategy.push_back(3);
-      //mpsName.push_back("standgub");min.push_back(true);nRows.push_back(362);nCols.push_back(1184);objValueTol.push_back(1.e-10);objValue.push_back(1257.6995); bestStrategy.push_back(3);
-      mpsName.push_back("standmps");min.push_back(true);nRows.push_back(468);nCols.push_back(1075);objValueTol.push_back(1.e-10);objValue.push_back(1.4060175000E+03); bestStrategy.push_back(3);
-      mpsName.push_back("stocfor1");min.push_back(true);nRows.push_back(118);nCols.push_back(111);objValueTol.push_back(1.e-10);objValue.push_back(-4.1131976219E+04);bestStrategy.push_back(3);
-      mpsName.push_back("stocfor2");min.push_back(true);nRows.push_back(2158);nCols.push_back(2031);objValueTol.push_back(1.e-10);objValue.push_back(-3.9024408538e+04);bestStrategy.push_back(3);
-      //mpsName.push_back("stocfor3");min.push_back(true);nRows.push_back(16676);nCols.push_back(15695);objValueTol.push_back(1.e-10);objValue.push_back(-3.9976661576e+04);bestStrategy.push_back(3);
-      //mpsName.push_back("truss");min.push_back(true);nRows.push_back(1001);nCols.push_back(8806);objValueTol.push_back(1.e-10);objValue.push_back(4.5881584719e+05);bestStrategy.push_back(3);
-      mpsName.push_back("tuff");min.push_back(true);nRows.push_back(334);nCols.push_back(587);objValueTol.push_back(1.e-10);objValue.push_back(2.9214776509e-01);bestStrategy.push_back(3);
-      mpsName.push_back("vtpbase");min.push_back(true);nRows.push_back(199);nCols.push_back(203);objValueTol.push_back(1.e-10);objValue.push_back(1.2983146246e+05);bestStrategy.push_back(3);
-      mpsName.push_back("wood1p");min.push_back(true);nRows.push_back(245);nCols.push_back(2594);objValueTol.push_back(5.e-5);objValue.push_back(1.4429024116e+00);bestStrategy.push_back(3);
-      mpsName.push_back("woodw");min.push_back(true);nRows.push_back(1099);nCols.push_back(8405);objValueTol.push_back(1.e-10);objValue.push_back(1.3044763331E+00);bestStrategy.push_back(3);
-    } else {
-      // Just testing one
-      mpsName.push_back(empty.problemName());min.push_back(true);nRows.push_back(-1);
-      nCols.push_back(-1);objValueTol.push_back(1.e-10);
-      objValue.push_back(0.0);bestStrategy.push_back(0);
-      int iTest;
-      std::string alg;
-      for (iTest=0;iTest<NUMBER_ALGORITHMS;iTest++) {
-        ClpSolve solveOptions=setupForSolve(iTest,alg,0);
-        printf("%d %s ",iTest,alg.c_str());
-        if (switchOff[iTest]) 
-          printf("skipped by user\n");
-        else if(solveOptions.getSolveType()==ClpSolve::notImplemented)
-          printf("skipped as not available\n");
-        else
-          printf("will be tested\n");
-      }
-    }
-
-    double timeTaken =0.0;
-    if( !barrierAvailable)
-      switchOff[0]=1;
-  // Loop once for each Mps File
-    for (m=0; m<mpsName.size(); m++ ) {
-      std::cerr <<"  processing mps file: " <<mpsName[m] 
-                <<" (" <<m+1 <<" out of " <<mpsName.size() <<")" <<std::endl;
-
-      ClpSimplex solutionBase=empty;
-      std::string fn = netlibDir+mpsName[m];
-      if (!empty.numberRows()||algorithm<6) {
-        // Read data mps file,
-        CoinMpsIO mps;
-        mps.readMps(fn.c_str(),"mps");
-        solutionBase.loadProblem(*mps.getMatrixByCol(),mps.getColLower(),
-                                 mps.getColUpper(),
-                                 mps.getObjCoefficients(),
-                                 mps.getRowLower(),mps.getRowUpper());
-        
-        solutionBase.setDblParam(ClpObjOffset,mps.objectiveOffset());
-      } 
-      
-      // Runs through strategies
-      if (algorithm==6||algorithm==7) {
-        // algorithms tested are at top of file
-        double testTime[NUMBER_ALGORITHMS];
-        std::string alg[NUMBER_ALGORITHMS];
-        int iTest;
-        for (iTest=0;iTest<NUMBER_ALGORITHMS;iTest++) {
-          ClpSolve solveOptions=setupForSolve(iTest,alg[iTest],1);
-          if (solveOptions.getSolveType()!=ClpSolve::notImplemented) {
-            double time1 = CoinCpuTime();
-            ClpSimplex solution=solutionBase;
-            if (solution.maximumSeconds()<0.0)
-              solution.setMaximumSeconds(120.0);
-            if (doVector) {
-              ClpMatrixBase * matrix = solution.clpMatrix();
-              if (dynamic_cast< ClpPackedMatrix*>(matrix)) {
-                ClpPackedMatrix * clpMatrix = dynamic_cast< ClpPackedMatrix*>(matrix);
-                clpMatrix->makeSpecialColumnCopy();
-              }
-            }
-            solution.initialSolve(solveOptions);
-            double time2 = CoinCpuTime()-time1;
-            testTime[iTest]=time2;
-            printf("Took %g seconds - status %d\n",time2,solution.problemStatus());
-            if (solution.problemStatus()) 
-              testTime[iTest]=1.0e20;
-          } else {
-            testTime[iTest]=1.0e30;
-          }
-        }
-        int iBest=-1;
-        double dBest=1.0e10;
-        printf("%s",fn.c_str());
-        for (iTest=0;iTest<NUMBER_ALGORITHMS;iTest++) {
-          if (testTime[iTest]<1.0e30) {
-            printf(" %s %g",
-                   alg[iTest].c_str(),testTime[iTest]);
-            if (testTime[iTest]<dBest) {
-              dBest=testTime[iTest];
-              iBest=iTest;
-            }
-          }
-        }
-        printf("\n");
-        if (iBest>=0)
-          printf("Best strategy for %s is %s (%d) which takes %g seconds\n",
-                 fn.c_str(),alg[iBest].c_str(),iBest,testTime[iBest]);
-        else
-          printf("No strategy finished in time limit\n");
-        continue;
-      }
-      double time1 = CoinCpuTime();
-      ClpSimplex solution=solutionBase;
-#if 0
-      solution.setOptimizationDirection(-1);
-      {
-        int j;
-        double * obj = solution.objective();
-        int n=solution.numberColumns();
-        for (j=0;j<n;j++) 
-          obj[j] *= -1.0;
-      }
-#endif
-      ClpSolve::SolveType method;
-      ClpSolve::PresolveType presolveType;
-      ClpSolve solveOptions;
-      if (doPresolve)
-        presolveType=ClpSolve::presolveOn;
-      else
-        presolveType=ClpSolve::presolveOff;
-      solveOptions.setPresolveType(presolveType,5);
-      std::string nameAlgorithm;
-      if (algorithm!=5) {
-        if (algorithm==0) {
-          method=ClpSolve::useDual;
-          nameAlgorithm="dual";
-        } else if (algorithm==1) {
-          method=ClpSolve::usePrimalorSprint;
-          nameAlgorithm="primal";
-        } else if (algorithm==3) {
-          method=ClpSolve::automatic;
-          nameAlgorithm="either";
-        } else {
-          nameAlgorithm="barrier-slow";
-#ifdef UFL_BARRIER
-          solveOptions.setSpecialOption(4,4);
-          nameAlgorithm="barrier-UFL";
-#endif
-#ifdef WSSMP_BARRIER
-          solveOptions.setSpecialOption(4,2);
-          nameAlgorithm="barrier-WSSMP";
-#endif
-          method = ClpSolve::useBarrier;
-        }
-        solveOptions.setSolveType(method);
-      } else {
-        int iAlg = bestStrategy[m];
-        int presolveOff=iAlg/100;
-        iAlg=iAlg % 100;
-        if( !barrierAvailable&&iAlg==0) {
-          if (nRows[m]!=2172)
-            iAlg = 5; // try primal
-          else
-            iAlg=3; // d2q06c
-        }
-        solveOptions=setupForSolve(iAlg,nameAlgorithm,0);
-        if (presolveOff)
-          solveOptions.setPresolveType(ClpSolve::presolveOff);
-      }
-      if (doVector) {
-        ClpMatrixBase * matrix = solution.clpMatrix();
-        if (dynamic_cast< ClpPackedMatrix*>(matrix)) {
-          ClpPackedMatrix * clpMatrix = dynamic_cast< ClpPackedMatrix*>(matrix);
-          clpMatrix->makeSpecialColumnCopy();
-        }
-      }
-      solution.initialSolve(solveOptions);
-      double time2 = CoinCpuTime()-time1;
-      timeTaken += time2;
-      printf("%s took %g seconds using algorithm %s\n",fn.c_str(),time2,nameAlgorithm.c_str());
-      // Test objective solution value
-      {
-        double soln = solution.objectiveValue();
-        CoinRelFltEq eq(objValueTol[m]);
-        std::cerr <<soln <<",  " <<objValue[m] <<" diff "<<
-          soln-objValue[m]<<std::endl;
-        if(!eq(soln,objValue[m]))
-          printf("** difference fails\n");
-      }
-    }
-    printf("Total time %g seconds\n",timeTaken);
-  }
-  else {
-    testingMessage( "***Skipped Testing on netlib    ***\n" );
-    testingMessage( "***use -netlib to test class***\n" );
-  }
-  
-  testingMessage( "All tests completed successfully\n" );
-  return 0;
-}
-
- 
+//#############################################################################
+
 // Display message on stdout and stderr
 void testingMessage( const char * const msg )
 {
-  std::cerr <<msg;
+  std::cout <<msg;
   //cout <<endl <<"*****************************************"
   //     <<endl <<msg <<endl;
 }
 
-//--------------------------------------------------------------------------
-// test factorization methods and simplex method and simple barrier
-void
-ClpSimplexUnitTest(const std::string & mpsDir,
-                   const std::string & netlibDir)
-{
-  
-  CoinRelFltEq eq(0.000001);
-
-  {
-    ClpSimplex solution;
-  
-    // matrix data
-    //deliberate hiccup of 2 between 0 and 1
-    CoinBigIndex start[5]={0,4,7,8,9};
-    int length[5]={2,3,1,1,1};
-    int rows[11]={0,2,-1,-1,0,1,2,0,1,2};
-    double elements[11]={7.0,2.0,1.0e10,1.0e10,-2.0,1.0,-2.0,1,1,1};
-    CoinPackedMatrix matrix(true,3,5,8,elements,rows,start,length);
-    
-    // rim data
-    double objective[7]={-4.0,1.0,0.0,0.0,0.0,0.0,0.0};
-    double rowLower[5]={14.0,3.0,3.0,1.0e10,1.0e10};
-    double rowUpper[5]={14.0,3.0,3.0,-1.0e10,-1.0e10};
-    double colLower[7]={0.0,0.0,0.0,0.0,0.0,0.0,0.0};
-    double colUpper[7]={100.0,100.0,100.0,100.0,100.0,100.0,100.0};
-    
-    // basis 1
-    int rowBasis1[3]={-1,-1,-1};
-    int colBasis1[5]={1,1,-1,-1,1};
-    solution.loadProblem(matrix,colLower,colUpper,objective,
-                         rowLower,rowUpper);
-    int i;
-    solution.createStatus();
-    for (i=0;i<3;i++) {
-      if (rowBasis1[i]<0) {
-        solution.setRowStatus(i,ClpSimplex::atLowerBound);
-      } else {
-        solution.setRowStatus(i,ClpSimplex::basic);
-      }
-    }
-    for (i=0;i<5;i++) {
-      if (colBasis1[i]<0) {
-        solution.setColumnStatus(i,ClpSimplex::atLowerBound);
-      } else {
-        solution.setColumnStatus(i,ClpSimplex::basic);
-      }
-    }
-    solution.setLogLevel(3+4+8+16+32);
-    solution.primal();
-    for (i=0;i<3;i++) {
-      if (rowBasis1[i]<0) {
-        solution.setRowStatus(i,ClpSimplex::atLowerBound);
-      } else {
-        solution.setRowStatus(i,ClpSimplex::basic);
-      }
-    }
-    for (i=0;i<5;i++) {
-      if (colBasis1[i]<0) {
-        solution.setColumnStatus(i,ClpSimplex::atLowerBound);
-      } else {
-        solution.setColumnStatus(i,ClpSimplex::basic);
-      }
-    }
-    // intricate stuff does not work with scaling
-    solution.scaling(0);
-    int returnCode = solution.factorize ( );
-    assert(!returnCode);
-    const double * colsol = solution.primalColumnSolution();
-    const double * rowsol = solution.primalRowSolution();
-    solution.getSolution(rowsol,colsol);
-    double colsol1[5]={20.0/7.0,3.0,0.0,0.0,23.0/7.0};
-    for (i=0;i<5;i++) {
-      assert(eq(colsol[i],colsol1[i]));
-    }
-    // now feed in again without actually doing factorization
-    ClpFactorization factorization2 = *solution.factorization();
-    ClpSimplex solution2 = solution;
-    solution2.setFactorization(factorization2);
-    solution2.createStatus();
-    for (i=0;i<3;i++) {
-      if (rowBasis1[i]<0) {
-        solution2.setRowStatus(i,ClpSimplex::atLowerBound);
-      } else {
-        solution2.setRowStatus(i,ClpSimplex::basic);
-      }
-    }
-    for (i=0;i<5;i++) {
-      if (colBasis1[i]<0) {
-        solution2.setColumnStatus(i,ClpSimplex::atLowerBound);
-      } else {
-        solution2.setColumnStatus(i,ClpSimplex::basic);
-      }
-    }
-    // intricate stuff does not work with scaling
-    solution2.scaling(0);
-    solution2.getSolution(rowsol,colsol);
-    colsol = solution2.primalColumnSolution();
-    rowsol = solution2.primalRowSolution();
-    for (i=0;i<5;i++) {
-      assert(eq(colsol[i],colsol1[i]));
-    }
-    solution2.setDualBound(0.1);
-    solution2.dual();
-    objective[2]=-1.0;
-    objective[3]=-0.5;
-    objective[4]=10.0;
-    solution.dual();
-    for (i=0;i<3;i++) {
-      rowLower[i]=-1.0e20;
-      colUpper[i+2]=0.0;
-    }
-    solution.setLogLevel(3);
-    solution.dual();
-    double rowObjective[]={1.0,0.5,-10.0};
-    solution.loadProblem(matrix,colLower,colUpper,objective,
-                         rowLower,rowUpper,rowObjective);
-    solution.dual();
-    solution.loadProblem(matrix,colLower,colUpper,objective,
-                         rowLower,rowUpper,rowObjective);
-    solution.primal();
-  }
-#ifndef COIN_NO_CLP_MESSAGE
-  {    
-    CoinMpsIO m;
-    std::string fn = mpsDir+"exmip1";
-    m.readMps(fn.c_str(),"mps");
-    ClpSimplex solution;
-    solution.loadProblem(*m.getMatrixByCol(),m.getColLower(),m.getColUpper(),
-                         m.getObjCoefficients(),
-                         m.getRowLower(),m.getRowUpper());
-    solution.dual();
-    // Test event handling
-    MyEventHandler handler;
-    solution.passInEventHandler(&handler);
-    int numberRows=solution.numberRows();
-    // make sure values pass has something to do
-    for (int i=0;i<numberRows;i++)
-      solution.setRowStatus(i,ClpSimplex::basic);
-    solution.primal(1);
-    assert (solution.secondaryStatus()==102); // Came out at end of pass
-  }
-  // Test Message handler
-  {    
-    CoinMpsIO m;
-    std::string fn = mpsDir+"exmip1";
-    //fn = "Test/subGams4";
-    m.readMps(fn.c_str(),"mps");
-    ClpSimplex model;
-    model.loadProblem(*m.getMatrixByCol(),m.getColLower(),m.getColUpper(),
-                         m.getObjCoefficients(),
-                         m.getRowLower(),m.getRowUpper());
-    // Message handler
-    MyMessageHandler messageHandler(&model);
-    std::cout<<"Testing derived message handler"<<std::endl;
-    model.passInMessageHandler(&messageHandler);
-    model.messagesPointer()->setDetailMessage(1,102);
-    model.setFactorizationFrequency(10);
-    model.primal();
-
-    // Write saved solutions
-    int nc = model.getNumCols();
-    int s; 
-    std::deque<StdVectorDouble> fep = messageHandler.getFeasibleExtremePoints();
-    int numSavedSolutions = fep.size();
-    for ( s=0; s<numSavedSolutions; ++s ) {
-      const StdVectorDouble & solnVec = fep[s];
-      for ( int c=0; c<nc; ++c ) {
-        if (fabs(solnVec[c])>1.0e-8)
-          std::cout <<"Saved Solution: " <<s <<" ColNum: " <<c <<" Value: " <<solnVec[c] <<std::endl;
-      }
-    }
-    // Solve again without scaling
-    // and maximize then minimize
-    messageHandler.clearFeasibleExtremePoints();
-    model.scaling(0);
-    model.setOptimizationDirection(-1);
-    model.primal();
-    model.setOptimizationDirection(1);
-    model.primal();
-    fep = messageHandler.getFeasibleExtremePoints();
-    numSavedSolutions = fep.size();
-    for ( s=0; s<numSavedSolutions; ++s ) {
-      const StdVectorDouble & solnVec = fep[s];
-      for ( int c=0; c<nc; ++c ) {
-        if (fabs(solnVec[c])>1.0e-8)
-          std::cout <<"Saved Solution: " <<s <<" ColNum: " <<c <<" Value: " <<solnVec[c] <<std::endl;
-      }
-    }
-  }
-#endif
-  // Test dual ranging
-  {    
-    CoinMpsIO m;
-    std::string fn = mpsDir+"exmip1";
-    m.readMps(fn.c_str(),"mps");
-    ClpSimplex model;
-    model.loadProblem(*m.getMatrixByCol(),m.getColLower(),m.getColUpper(),
-                         m.getObjCoefficients(),
-                         m.getRowLower(),m.getRowUpper());
-    model.primal();
-    int which[13] = {0,1,2,3,4,5,6,7,8,9,10,11,12};
-    double costIncrease[13];
-    int sequenceIncrease[13];
-    double costDecrease[13];
-    int sequenceDecrease[13];
-    // ranging
-    model.dualRanging(13,which,costIncrease,sequenceIncrease,
-                      costDecrease,sequenceDecrease);
-    int i;
-    for ( i=0;i<13;i++)
-      printf("%d increase %g %d, decrease %g %d\n",
-             i,costIncrease[i],sequenceIncrease[i],
-             costDecrease[i],sequenceDecrease[i]);
-    assert (fabs(costDecrease[3])<1.0e-4);
-    assert (fabs(costIncrease[7]-1.0)<1.0e-4);
-    model.setOptimizationDirection(-1);
-    {
-      int j;
-      double * obj = model.objective();
-      int n=model.numberColumns();
-      for (j=0;j<n;j++) 
-        obj[j] *= -1.0;
-    }
-    double costIncrease2[13];
-    int sequenceIncrease2[13];
-    double costDecrease2[13];
-    int sequenceDecrease2[13];
-    // ranging
-    model.dualRanging(13,which,costIncrease2,sequenceIncrease2,
-                      costDecrease2,sequenceDecrease2);
-    for (i=0;i<13;i++) {
-      assert (fabs(costIncrease[i]-costDecrease2[i])<1.0e-6);
-      assert (fabs(costDecrease[i]-costIncrease2[i])<1.0e-6);
-      assert (sequenceIncrease[i]==sequenceDecrease2[i]);
-      assert (sequenceDecrease[i]==sequenceIncrease2[i]);
-    }
-    // Now delete all rows and see what happens
-    model.deleteRows(model.numberRows(),which);
-    model.primal();
-    // ranging
-    if (!model.dualRanging(8,which,costIncrease,sequenceIncrease,
-                           costDecrease,sequenceDecrease)) {
-      for (i=0;i<8;i++) {
-        printf("%d increase %g %d, decrease %g %d\n",
-               i,costIncrease[i],sequenceIncrease[i],
-               costDecrease[i],sequenceDecrease[i]);
-      }
-    }
-  }
-  // Test primal ranging
-  {    
-    CoinMpsIO m;
-    std::string fn = mpsDir+"exmip1";
-    m.readMps(fn.c_str(),"mps");
-    ClpSimplex model;
-    model.loadProblem(*m.getMatrixByCol(),m.getColLower(),m.getColUpper(),
-                         m.getObjCoefficients(),
-                         m.getRowLower(),m.getRowUpper());
-    model.primal();
-    int which[13] = {0,1,2,3,4,5,6,7,8,9,10,11,12};
-    double valueIncrease[13];
-    int sequenceIncrease[13];
-    double valueDecrease[13];
-    int sequenceDecrease[13];
-    // ranging
-    model.primalRanging(13,which,valueIncrease,sequenceIncrease,
-                      valueDecrease,sequenceDecrease);
-    int i;
-    for ( i=0;i<13;i++)
-      printf("%d increase %g %d, decrease %g %d\n",
-             i,valueIncrease[i],sequenceIncrease[i],
-             valueDecrease[i],sequenceDecrease[i]);
-    assert (fabs(valueDecrease[3]-0.642857)<1.0e-4);
-    assert (fabs(valueDecrease[8]-2.95113)<1.0e-4);
-#if 0
-    // out until I find optimization bug
-    // Test parametrics
-    ClpSimplexOther * model2 = (ClpSimplexOther *) (&model);
-    double rhs[]={ 1.0,2.0,3.0,4.0,5.0};
-    double endingTheta=1.0;
-    model2->scaling(0);
-    model2->setLogLevel(63);
-    model2->parametrics(0.0,endingTheta,0.1,
-                        NULL,NULL,rhs,rhs,NULL);
-#endif
-  }
-  // Test binv etc
-  {    
-    /* 
-       Wolsey : Page 130
-       max 4x1 -  x2
-       7x1 - 2x2    <= 14
-       x2    <= 3
-       2x1 - 2x2    <= 3
-       x1 in Z+, x2 >= 0
-
-       note slacks are -1 in Clp so signs may be different
-    */
-    
-    int n_cols = 2;
-    int n_rows = 3;
-    
-    double obj[2] = {-4.0, 1.0};
-    double collb[2] = {0.0, 0.0};
-    double colub[2] = {COIN_DBL_MAX, COIN_DBL_MAX};
-    double rowlb[3] = {-COIN_DBL_MAX, -COIN_DBL_MAX, -COIN_DBL_MAX};
-    double rowub[3] = {14.0, 3.0, 3.0};
-    
-    int rowIndices[5] =  {0,     2,    0,    1,    2};
-    int colIndices[5] =  {0,     0,    1,    1,    1};
-    double elements[5] = {7.0, 2.0, -2.0,  1.0, -2.0};
-    CoinPackedMatrix M(true, rowIndices, colIndices, elements, 5);
-
-    ClpSimplex model;
-    model.loadProblem(M, collb, colub, obj, rowlb, rowub);
-    model.dual(0,1); // keep factorization 
-    
-    //check that the tableau matches wolsey (B-1 A)
-    // slacks in second part of binvA
-    double * binvA = (double*) malloc((n_cols+n_rows) * sizeof(double));
-    
-    printf("B-1 A by row\n");
-    int i;
-    for( i = 0; i < n_rows; i++){
-      model.getBInvARow(i, binvA,binvA+n_cols);
-      printf("row: %d -> ",i);
-      for(int j=0; j < n_cols+n_rows; j++){
-        printf("%g, ", binvA[j]);
-      }
-      printf("\n");
-    }
-    // See if can re-use factorization AND arrays
-    model.primal(0,3+4); // keep factorization
-    // And do by column
-    printf("B-1 A by column\n");
-    for( i = 0; i < n_rows+n_cols; i++){
-      model.getBInvACol(i, binvA);
-      printf("column: %d -> ",i);
-      for(int j=0; j < n_rows; j++){
-        printf("%g, ", binvA[j]);
-      }
-      printf("\n");
-    }
-    free(binvA);
-    model.setColUpper(1,2.0);
-    model.dual(0,2+4); // use factorization and arrays
-    model.dual(0,2); // hopefully will not use factorization
-    model.primal(0,3+4); // keep factorization
-    // but say basis has changed
-    model.setWhatsChanged(model.whatsChanged()&(~512));
-    model.dual(0,2); // hopefully will not use factorization
-  }
-  // test steepest edge
-  {    
-    CoinMpsIO m;
-    std::string fn = netlibDir+"finnis";
-    int returnCode = m.readMps(fn.c_str(),"mps");
-    if (returnCode) {
-      // probable cause is that gz not there
-      fprintf(stderr,"Unable to open finnis.mps in Data/Netlib!\n");
-      fprintf(stderr,"Most probable cause is finnis.mps is gzipped i.e. finnis.mps.gz and libz has not been activated\n");
-      fprintf(stderr,"Either gunzip files or edit Makefiles/Makefile.location to get libz\n");
-      exit(999);
-    }
-    ClpModel model;
-    model.loadProblem(*m.getMatrixByCol(),m.getColLower(),
-                    m.getColUpper(),
-                    m.getObjCoefficients(),
-                    m.getRowLower(),m.getRowUpper());
-    ClpSimplex solution(model);
-
-    solution.scaling(1); 
-    solution.setDualBound(1.0e8);
-    //solution.factorization()->maximumPivots(1);
-    //solution.setLogLevel(3);
-    solution.setDualTolerance(1.0e-7);
-    // set objective sense,
-    ClpDualRowSteepest steep;
-    solution.setDualRowPivotAlgorithm(steep);
-    solution.setDblParam(ClpObjOffset,m.objectiveOffset());
-    solution.dual();
-  }
-  // test normal solution
-  {    
-    CoinMpsIO m;
-    std::string fn = netlibDir+"afiro";
-    m.readMps(fn.c_str(),"mps");
-    ClpSimplex solution;
-    ClpModel model;
-    // do twice - without and with scaling
-    int iPass;
-    for (iPass=0;iPass<2;iPass++) {
-      // explicit row objective for testing
-      int nr = m.getNumRows();
-      double * rowObj = new double[nr];
-      CoinFillN(rowObj,nr,0.0);
-      model.loadProblem(*m.getMatrixByCol(),m.getColLower(),m.getColUpper(),
-                      m.getObjCoefficients(),
-                      m.getRowLower(),m.getRowUpper(),rowObj);
-      delete [] rowObj;
-      solution = ClpSimplex(model);
-      if (iPass) {
-        solution.scaling();
-      }
-      solution.dual();
-      solution.dual();
-      // test optimal
-      assert (solution.status()==0);
-      int numberColumns = solution.numberColumns();
-      int numberRows = solution.numberRows();
-      CoinPackedVector colsol(numberColumns,solution.primalColumnSolution());
-      double * objective = solution.objective();
-      double objValue = colsol.dotProduct(objective);
-      CoinRelFltEq eq(1.0e-8);
-      assert(eq(objValue,-4.6475314286e+02));
-      // Test auxiliary model
-      //solution.scaling(0);
-      solution.auxiliaryModel(63-2); // bounds may change
-      solution.dual();
-      solution.primal();
-      solution.allSlackBasis();
-      solution.dual();
-      assert(eq(solution.objectiveValue(),-4.6475314286e+02));
-      solution.auxiliaryModel(-1);
-      solution.dual();
-      assert(eq(solution.objectiveValue(),-4.6475314286e+02));
-      double * lower = solution.columnLower();
-      double * upper = solution.columnUpper();
-      double * sol = solution.primalColumnSolution();
-      double * result = new double[numberColumns];
-      CoinFillN ( result, numberColumns,0.0);
-      solution.matrix()->transposeTimes(solution.dualRowSolution(), result);
-      int iRow , iColumn;
-      // see if feasible and dual feasible
-      for (iColumn=0;iColumn<numberColumns;iColumn++) {
-        double value = sol[iColumn];
-        assert(value<upper[iColumn]+1.0e-8);
-        assert(value>lower[iColumn]-1.0e-8);
-        value = objective[iColumn]-result[iColumn];
-        assert (value>-1.0e-5);
-        if (sol[iColumn]>1.0e-5)
-          assert (value<1.0e-5);
-      }
-      delete [] result;
-      result = new double[numberRows];
-      CoinFillN ( result, numberRows,0.0);
-      solution.matrix()->times(colsol, result);
-      lower = solution.rowLower();
-      upper = solution.rowUpper();
-      sol = solution.primalRowSolution();
-      for (iRow=0;iRow<numberRows;iRow++) {
-        double value = result[iRow];
-        assert(eq(value,sol[iRow]));
-        assert(value<upper[iRow]+1.0e-8);
-        assert(value>lower[iRow]-1.0e-8);
-      }
-      delete [] result;
-      // test row objective
-      double * rowObjective = solution.rowObjective();
-      CoinDisjointCopyN(solution.dualRowSolution(),numberRows,rowObjective);
-      CoinDisjointCopyN(solution.dualColumnSolution(),numberColumns,objective);
-      // this sets up all slack basis
-      solution.createStatus();
-      solution.dual();
-      CoinFillN(rowObjective,numberRows,0.0);
-      CoinDisjointCopyN(m.getObjCoefficients(),numberColumns,objective);
-      solution.dual();
-    }
-  }
-  // test unbounded
-  {    
-    CoinMpsIO m;
-    std::string fn = netlibDir+"brandy";
-    m.readMps(fn.c_str(),"mps");
-    ClpSimplex solution;
-    // do twice - without and with scaling
-    int iPass;
-    for (iPass=0;iPass<2;iPass++) {
-      solution.loadProblem(*m.getMatrixByCol(),m.getColLower(),m.getColUpper(),
-                      m.getObjCoefficients(),
-                      m.getRowLower(),m.getRowUpper());
-      if (iPass)
-        solution.scaling();
-      solution.setOptimizationDirection(-1);
-      // test unbounded and ray
-#ifdef DUAL
-      solution.setDualBound(100.0);
-      solution.dual();
-#else
-      solution.primal();
-#endif
-      assert (solution.status()==2);
-      int numberColumns = solution.numberColumns();
-      int numberRows = solution.numberRows();
-      double * lower = solution.columnLower();
-      double * upper = solution.columnUpper();
-      double * sol = solution.primalColumnSolution();
-      double * ray = solution.unboundedRay();
-      double * objective = solution.objective();
-      double objChange=0.0;
-      int iRow , iColumn;
-      // make sure feasible and columns form ray
-      for (iColumn=0;iColumn<numberColumns;iColumn++) {
-        double value = sol[iColumn];
-        assert(value<upper[iColumn]+1.0e-8);
-        assert(value>lower[iColumn]-1.0e-8);
-        value = ray[iColumn];
-        if (value>0.0)
-          assert(upper[iColumn]>1.0e30);
-        else if (value<0.0)
-          assert(lower[iColumn]<-1.0e30);
-        objChange += value*objective[iColumn];
-      }
-      // make sure increasing objective
-      assert(objChange>0.0);
-      double * result = new double[numberRows];
-      CoinFillN ( result, numberRows,0.0);
-      solution.matrix()->times(sol, result);
-      lower = solution.rowLower();
-      upper = solution.rowUpper();
-      sol = solution.primalRowSolution();
-      for (iRow=0;iRow<numberRows;iRow++) {
-        double value = result[iRow];
-        assert(eq(value,sol[iRow]));
-        assert(value<upper[iRow]+2.0e-8);
-        assert(value>lower[iRow]-2.0e-8);
-      }
-      CoinFillN ( result, numberRows,0.0);
-      solution.matrix()->times(ray, result);
-      // there may be small differences (especially if scaled)
-      for (iRow=0;iRow<numberRows;iRow++) {
-        double value = result[iRow];
-        if (value>1.0e-8)
-          assert(upper[iRow]>1.0e30);
-        else if (value<-1.0e-8)
-          assert(lower[iRow]<-1.0e30);
-      }
-      delete [] result;
-      delete [] ray;
-    }
-  }
-  // test infeasible
-  {    
-    CoinMpsIO m;
-    std::string fn = netlibDir+"brandy";
-    m.readMps(fn.c_str(),"mps");
-    ClpSimplex solution;
-    // do twice - without and with scaling
-    int iPass;
-    for (iPass=0;iPass<2;iPass++) {
-      solution.loadProblem(*m.getMatrixByCol(),m.getColLower(),m.getColUpper(),
-                      m.getObjCoefficients(),
-                      m.getRowLower(),m.getRowUpper());
-      if (iPass)
-        solution.scaling();
-      // test infeasible and ray
-      solution.columnUpper()[0]=0.0;
-#ifdef DUAL
-      solution.setDualBound(100.0);
-      solution.dual();
-#else
-      solution.primal();
-#endif
-      assert (solution.status()==1);
-      int numberColumns = solution.numberColumns();
-      int numberRows = solution.numberRows();
-      double * lower = solution.rowLower();
-      double * upper = solution.rowUpper();
-      double * ray = solution.infeasibilityRay();
-      assert(ray);
-      // construct proof of infeasibility
-      int iRow , iColumn;
-      double lo=0.0,up=0.0;
-      int nl=0,nu=0;
-      for (iRow=0;iRow<numberRows;iRow++) {
-        if (lower[iRow]>-1.0e20) {
-          lo += ray[iRow]*lower[iRow];
-        } else {
-          if (ray[iRow]>1.0e-8) 
-            nl++;
-        }
-        if (upper[iRow]<1.0e20) {
-          up += ray[iRow]*upper[iRow];
-        } else {
-          if (ray[iRow]>1.0e-8) 
-            nu++;
-        }
-      }
-      if (nl)
-        lo=-1.0e100;
-      if (nu)
-        up=1.0e100;
-      double * result = new double[numberColumns];
-      double lo2=0.0,up2=0.0;
-      CoinFillN ( result, numberColumns,0.0);
-      solution.matrix()->transposeTimes(ray, result);
-      lower = solution.columnLower();
-      upper = solution.columnUpper();
-      nl=nu=0;
-      for (iColumn=0;iColumn<numberColumns;iColumn++) {
-        if (result[iColumn]>1.0e-8) {
-          if (lower[iColumn]>-1.0e20)
-            lo2 += result[iColumn]*lower[iColumn];
-          else
-            nl++;
-          if (upper[iColumn]<1.0e20)
-            up2 += result[iColumn]*upper[iColumn];
-          else
-            nu++;
-        } else if (result[iColumn]<-1.0e-8) {
-          if (lower[iColumn]>-1.0e20)
-            up2 += result[iColumn]*lower[iColumn];
-          else
-            nu++;
-          if (upper[iColumn]<1.0e20)
-            lo2 += result[iColumn]*upper[iColumn];
-          else
-            nl++;
-        }
-      }
-      if (nl)
-        lo2=-1.0e100;
-      if (nu)
-        up2=1.0e100;
-      // make sure inconsistency
-      assert(lo2>up||up2<lo);
-      delete [] result;
-      delete [] ray;
-    }
-  }
-  // test delete and add
-  {    
-    CoinMpsIO m;
-    std::string fn = netlibDir+"brandy";
-    m.readMps(fn.c_str(),"mps");
-    ClpSimplex solution;
-    solution.loadProblem(*m.getMatrixByCol(),m.getColLower(),m.getColUpper(),
-                         m.getObjCoefficients(),
-                         m.getRowLower(),m.getRowUpper());
-    solution.dual();
-    CoinRelFltEq eq(1.0e-8);
-    assert(eq(solution.objectiveValue(),1.5185098965e+03));
-
-    int numberColumns = solution.numberColumns();
-    int numberRows = solution.numberRows();
-    double * saveObj = new double [numberColumns];
-    double * saveLower = new double[numberRows+numberColumns];
-    double * saveUpper = new double[numberRows+numberColumns];
-    int * which = new int [numberRows+numberColumns];
-
-    int numberElements = m.getMatrixByCol()->getNumElements();
-    int * starts = new int[numberRows+numberColumns];
-    int * index = new int[numberElements];
-    double * element = new double[numberElements];
-
-    const CoinBigIndex * startM;
-    const int * lengthM;
-    const int * indexM;
-    const double * elementM;
-
-    int n,nel;
-
-    // delete non basic columns
-    n=0;
-    nel=0;
-    int iRow , iColumn;
-    const double * lower = m.getColLower();
-    const double * upper = m.getColUpper();
-    const double * objective = m.getObjCoefficients();
-    startM = m.getMatrixByCol()->getVectorStarts();
-    lengthM = m.getMatrixByCol()->getVectorLengths();
-    indexM = m.getMatrixByCol()->getIndices();
-    elementM = m.getMatrixByCol()->getElements();
-    starts[0]=0;
-    for (iColumn=0;iColumn<numberColumns;iColumn++) {
-      if (solution.getColumnStatus(iColumn)!=ClpSimplex::basic) {
-        saveObj[n]=objective[iColumn];
-        saveLower[n]=lower[iColumn];
-        saveUpper[n]=upper[iColumn];
-        int j;
-        for (j=startM[iColumn];j<startM[iColumn]+lengthM[iColumn];j++) {
-          index[nel]=indexM[j];
-          element[nel++]=elementM[j];
-        }
-        which[n++]=iColumn;
-        starts[n]=nel;
-      }
-    }
-    solution.deleteColumns(n,which);
-    solution.dual();
-    // Put back
-    solution.addColumns(n,saveLower,saveUpper,saveObj,
-                        starts,index,element);
-    solution.dual();
-    assert(eq(solution.objectiveValue(),1.5185098965e+03));
-    // Delete all columns and add back
-    n=0;
-    nel=0;
-    starts[0]=0;
-    lower = m.getColLower();
-    upper = m.getColUpper();
-    objective = m.getObjCoefficients();
-    for (iColumn=0;iColumn<numberColumns;iColumn++) {
-      saveObj[n]=objective[iColumn];
-      saveLower[n]=lower[iColumn];
-      saveUpper[n]=upper[iColumn];
-      int j;
-      for (j=startM[iColumn];j<startM[iColumn]+lengthM[iColumn];j++) {
-        index[nel]=indexM[j];
-        element[nel++]=elementM[j];
-      }
-      which[n++]=iColumn;
-      starts[n]=nel;
-    }
-    solution.deleteColumns(n,which);
-    solution.dual();
-    // Put back
-    solution.addColumns(n,saveLower,saveUpper,saveObj,
-                        starts,index,element);
-    solution.dual();
-    assert(eq(solution.objectiveValue(),1.5185098965e+03));
-
-    // reload with original
-    solution.loadProblem(*m.getMatrixByCol(),m.getColLower(),m.getColUpper(),
-                         m.getObjCoefficients(),
-                         m.getRowLower(),m.getRowUpper());
-    // delete half rows
-    n=0;
-    nel=0;
-    lower = m.getRowLower();
-    upper = m.getRowUpper();
-    startM = m.getMatrixByRow()->getVectorStarts();
-    lengthM = m.getMatrixByRow()->getVectorLengths();
-    indexM = m.getMatrixByRow()->getIndices();
-    elementM = m.getMatrixByRow()->getElements();
-    starts[0]=0;
-    for (iRow=0;iRow<numberRows;iRow++) {
-      if ((iRow&1)==0) {
-        saveLower[n]=lower[iRow];
-        saveUpper[n]=upper[iRow];
-        int j;
-        for (j=startM[iRow];j<startM[iRow]+lengthM[iRow];j++) {
-          index[nel]=indexM[j];
-          element[nel++]=elementM[j];
-        }
-        which[n++]=iRow;
-        starts[n]=nel;
-      }
-    }
-    solution.deleteRows(n,which);
-    solution.dual();
-    // Put back
-    solution.addRows(n,saveLower,saveUpper,
-                        starts,index,element);
-    solution.dual();
-    assert(eq(solution.objectiveValue(),1.5185098965e+03));
-    solution.writeMps("yy.mps");
-    // Delete all rows
-    n=0;
-    nel=0;
-    lower = m.getRowLower();
-    upper = m.getRowUpper();
-    starts[0]=0;
-    for (iRow=0;iRow<numberRows;iRow++) {
-      saveLower[n]=lower[iRow];
-      saveUpper[n]=upper[iRow];
-      int j;
-      for (j=startM[iRow];j<startM[iRow]+lengthM[iRow];j++) {
-        index[nel]=indexM[j];
-        element[nel++]=elementM[j];
-      }
-      which[n++]=iRow;
-      starts[n]=nel;
-    }
-    solution.deleteRows(n,which);
-    solution.dual();
-    // Put back
-    solution.addRows(n,saveLower,saveUpper,
-                        starts,index,element);
-    solution.dual();
-    solution.writeMps("xx.mps");
-    assert(eq(solution.objectiveValue(),1.5185098965e+03));
-    // Zero out status array to give some interest
-    memset(solution.statusArray()+numberColumns,0,numberRows);
-    solution.primal(1);
-    assert(eq(solution.objectiveValue(),1.5185098965e+03));
-    // Delete all columns and rows
-    n=0;
-    for (iColumn=0;iColumn<numberColumns;iColumn++) {
-      which[n++]=iColumn;
-      starts[n]=nel;
-    }
-    solution.deleteColumns(n,which);
-    n=0;
-    for (iRow=0;iRow<numberRows;iRow++) {
-      which[n++]=iRow;
-      starts[n]=nel;
-    }
-    solution.deleteRows(n,which);
-
-    delete [] saveObj;
-    delete [] saveLower;
-    delete [] saveUpper;
-    delete [] which;
-    delete [] starts;
-    delete [] index;
-    delete [] element;
-  }
-#if 1
-  // Test barrier
-  {
-    CoinMpsIO m;
-    std::string fn = mpsDir+"exmip1";
-    m.readMps(fn.c_str(),"mps");
-    ClpInterior solution;
-    solution.loadProblem(*m.getMatrixByCol(),m.getColLower(),m.getColUpper(),
-                         m.getObjCoefficients(),
-                         m.getRowLower(),m.getRowUpper());
-    solution.primalDual();
-  }
-#endif
-  // test network 
-#define QUADRATIC
-  if (1) {    
-    std::string fn = mpsDir+"input.130";
-    int numberColumns;
-    int numberRows;
-    
-    FILE * fp = fopen(fn.c_str(),"r");
-    if (!fp) {
-      // Try in Data
-      fn = "Data/Sample/input.130";
-      fp = fopen(fn.c_str(),"r");
-    }
-    if (!fp) {
-      fprintf(stderr,"Unable to open file input.130 in mpsDir or Data/Sample directory\n");
-    } else {
-      int problem;
-      char temp[100];
-      // read and skip 
-      fscanf(fp,"%s",temp);
-      assert (!strcmp(temp,"BEGIN"));
-      fscanf(fp,"%*s %*s %d %d %*s %*s %d %*s",&problem, &numberRows, 
-             &numberColumns);
-      // scan down to SUPPLY
-      while (fgets(temp,100,fp)) {
-        if (!strncmp(temp,"SUPPLY",6))
-          break;
-      }
-      if (strncmp(temp,"SUPPLY",6)) {
-        fprintf(stderr,"Unable to find SUPPLY\n");
-        exit(2);
-      }
-      // get space for rhs
-      double * lower = new double[numberRows];
-      double * upper = new double[numberRows];
-      int i;
-      for (i=0;i<numberRows;i++) {
-        lower[i]=0.0;
-        upper[i]=0.0;
-      }
-      // ***** Remember to convert to C notation
-      while (fgets(temp,100,fp)) {
-        int row;
-        int value;
-        if (!strncmp(temp,"ARCS",4))
-          break;
-        sscanf(temp,"%d %d",&row,&value);
-        upper[row-1]=-value;
-        lower[row-1]=-value;
-      }
-      if (strncmp(temp,"ARCS",4)) {
-        fprintf(stderr,"Unable to find ARCS\n");
-        exit(2);
-      }
-      // number of columns may be underestimate
-      int * head = new int[2*numberColumns];
-      int * tail = new int[2*numberColumns];
-      int * ub = new int[2*numberColumns];
-      int * cost = new int[2*numberColumns];
-      // ***** Remember to convert to C notation
-      numberColumns=0;
-      while (fgets(temp,100,fp)) {
-        int iHead;
-        int iTail;
-        int iUb;
-        int iCost;
-        if (!strncmp(temp,"DEMAND",6))
-          break;
-        sscanf(temp,"%d %d %d %d",&iHead,&iTail,&iCost,&iUb);
-        iHead--;
-        iTail--;
-        head[numberColumns]=iHead;
-        tail[numberColumns]=iTail;
-        ub[numberColumns]=iUb;
-        cost[numberColumns]=iCost;
-        numberColumns++;
-      }
-      if (strncmp(temp,"DEMAND",6)) {
-        fprintf(stderr,"Unable to find DEMAND\n");
-        exit(2);
-      }
-      // ***** Remember to convert to C notation
-      while (fgets(temp,100,fp)) {
-        int row;
-        int value;
-        if (!strncmp(temp,"END",3))
-          break;
-        sscanf(temp,"%d %d",&row,&value);
-        upper[row-1]=value;
-        lower[row-1]=value;
-      }
-      if (strncmp(temp,"END",3)) {
-        fprintf(stderr,"Unable to find END\n");
-        exit(2);
-      }
-      printf("Problem %d has %d rows and %d columns\n",problem,
-             numberRows,numberColumns);
-      fclose(fp);
-      ClpSimplex  model;
-      // now build model
-      
-      double * objective =new double[numberColumns];
-      double * lowerColumn = new double[numberColumns];
-      double * upperColumn = new double[numberColumns];
-      
-      double * element = new double [2*numberColumns];
-      CoinBigIndex * start = new CoinBigIndex [numberColumns+1];
-      int * row = new int[2*numberColumns];
-      start[numberColumns]=2*numberColumns;
-      for (i=0;i<numberColumns;i++) {
-        start[i]=2*i;
-        element[2*i]=-1.0;
-        element[2*i+1]=1.0;
-        row[2*i]=head[i];
-        row[2*i+1]=tail[i];
-        lowerColumn[i]=0.0;
-        upperColumn[i]=ub[i];
-        objective[i]=cost[i];
-      }
-      // Create Packed Matrix
-      CoinPackedMatrix matrix;
-      int * lengths = NULL;
-      matrix.assignMatrix(true,numberRows,numberColumns,
-                          2*numberColumns,element,row,start,lengths);
-      // load model
-      model.loadProblem(matrix,
-                        lowerColumn,upperColumn,objective,
-                        lower,upper);
-      model.factorization()->maximumPivots(200+model.numberRows()/100);
-      model.createStatus();
-      double time1 = CoinCpuTime();
-      model.dual();
-      std::cout<<"Network problem, ClpPackedMatrix took "<<CoinCpuTime()-time1<<" seconds"<<std::endl;
-      ClpPlusMinusOneMatrix * plusMinus = new ClpPlusMinusOneMatrix(matrix);
-      assert (plusMinus->getIndices()); // would be zero if not +- one
-      //ClpPlusMinusOneMatrix *plusminus_matrix;
-
-      //plusminus_matrix = new ClpPlusMinusOneMatrix;
-
-      //plusminus_matrix->passInCopy(numberRows, numberColumns, true, plusMinus->getMutableIndices(),
-      //                         plusMinus->startPositive(),plusMinus->startNegative());
-      model.loadProblem(*plusMinus,
-                        lowerColumn,upperColumn,objective,
-                        lower,upper);
-      //model.replaceMatrix( plusminus_matrix , true);
-      delete plusMinus;
-      //model.createStatus();
-      //model.initialSolve();
-      //model.writeMps("xx.mps");
-      
-      model.factorization()->maximumPivots(200+model.numberRows()/100);
-      model.createStatus();
-      time1 = CoinCpuTime();
-      model.dual();
-      std::cout<<"Network problem, ClpPlusMinusOneMatrix took "<<CoinCpuTime()-time1<<" seconds"<<std::endl;
-      ClpNetworkMatrix network(numberColumns,head,tail);
-      model.loadProblem(network,
-                        lowerColumn,upperColumn,objective,
-                        lower,upper);
-      
-      model.factorization()->maximumPivots(200+model.numberRows()/100);
-      model.createStatus();
-      time1 = CoinCpuTime();
-      model.dual();
-      std::cout<<"Network problem, ClpNetworkMatrix took "<<CoinCpuTime()-time1<<" seconds"<<std::endl;
-      delete [] lower;
-      delete [] upper;
-      delete [] head;
-      delete [] tail;
-      delete [] ub;
-      delete [] cost;
-      delete [] objective;
-      delete [] lowerColumn;
-      delete [] upperColumn;
-    }
-  }
-#ifdef QUADRATIC
-  // Test quadratic to solve linear
-  if (1) {    
-    CoinMpsIO m;
-    std::string fn = mpsDir+"exmip1";
-    m.readMps(fn.c_str(),"mps");
-    ClpSimplex solution;
-    solution.loadProblem(*m.getMatrixByCol(),m.getColLower(),m.getColUpper(),
-                         m.getObjCoefficients(),
-                         m.getRowLower(),m.getRowUpper());
-    //solution.dual();
-    // get quadratic part
-    int numberColumns=solution.numberColumns();
-    int * start=new int [numberColumns+1];
-    int * column = new int[numberColumns];
-    double * element = new double[numberColumns];
-    int i;
-    start[0]=0;
-    int n=0;
-    int kk=numberColumns-1;
-    int kk2=numberColumns-1;
-    for (i=0;i<numberColumns;i++) {
-      if (i>=kk) {
-        column[n]=i;
-        if (i>=kk2)
-          element[n]=1.0e-1;
-        else
-          element[n]=0.0;
-        n++;
-      }
-      start[i+1]=n;
-    }
-    // Load up objective
-    solution.loadQuadraticObjective(numberColumns,start,column,element);
-    delete [] start;
-    delete [] column;
-    delete [] element;
-    //solution.quadraticSLP(50,1.0e-4);
-    double objValue = solution.getObjValue();
-    CoinRelFltEq eq(1.0e-4);
-    //assert(eq(objValue,820.0));
-    //solution.setLogLevel(63);
-    solution.primal();
-    int numberRows = solution.numberRows();
-
-    double * rowPrimal = solution.primalRowSolution();
-    double * rowDual = solution.dualRowSolution();
-    double * rowLower = solution.rowLower();
-    double * rowUpper = solution.rowUpper();
-    
-    int iRow;
-    printf("Rows\n");
-    for (iRow=0;iRow<numberRows;iRow++) {
-      printf("%d primal %g dual %g low %g up %g\n",
-             iRow,rowPrimal[iRow],rowDual[iRow],
-             rowLower[iRow],rowUpper[iRow]);
-    }
-    double * columnPrimal = solution.primalColumnSolution();
-    double * columnDual = solution.dualColumnSolution();
-    double * columnLower = solution.columnLower();
-    double * columnUpper = solution.columnUpper();
-    objValue = solution.getObjValue();
-    int iColumn;
-    printf("Columns\n");
-    for (iColumn=0;iColumn<numberColumns;iColumn++) {
-      printf("%d primal %g dual %g low %g up %g\n",
-             iColumn,columnPrimal[iColumn],columnDual[iColumn],
-             columnLower[iColumn],columnUpper[iColumn]);
-    }
-    //assert(eq(objValue,3.2368421));
-    //exit(77);
-  }
-  // Test quadratic
-  if (1) {    
-    CoinMpsIO m;
-    std::string fn = mpsDir+"share2qp";
-    //fn = "share2qpb";
-    m.readMps(fn.c_str(),"mps");
-    ClpSimplex model;
-    model.loadProblem(*m.getMatrixByCol(),m.getColLower(),m.getColUpper(),
-                         m.getObjCoefficients(),
-                         m.getRowLower(),m.getRowUpper());
-    model.dual();
-    // get quadratic part
-    int * start=NULL;
-    int * column = NULL;
-    double * element = NULL;
-    m.readQuadraticMps(NULL,start,column,element,2);
-    int column2[200];
-    double element2[200];
-    int start2[80];
-    int j;
-    start2[0]=0;
-    int nel=0;
-    bool good=false;
-    for (j=0;j<79;j++) {
-      if (start[j]==start[j+1]) {
-        column2[nel]=j;
-        element2[nel]=0.0;
-        nel++;
-      } else {
-        int i;
-        for (i=start[j];i<start[j+1];i++) {
-          column2[nel]=column[i];
-          element2[nel++]=element[i];
-        }
-      }
-      start2[j+1]=nel;
-    }
-    // Load up objective
-    if (good)
-      model.loadQuadraticObjective(model.numberColumns(),start2,column2,element2);
-    else
-      model.loadQuadraticObjective(model.numberColumns(),start,column,element);
-    delete [] start;
-    delete [] column;
-    delete [] element;
-    int numberColumns=model.numberColumns();
-#if 0
-    model.nonlinearSLP(50,1.0e-4);
-#else
-    // Get feasible
-    ClpObjective * saveObjective = model.objectiveAsObject()->clone();
-    ClpLinearObjective zeroObjective(NULL,numberColumns);
-    model.setObjective(&zeroObjective);
-    model.dual();
-    model.setObjective(saveObjective);
-    delete saveObjective;
-#endif
-    //model.setLogLevel(63);
-    //exit(77);
-    model.setFactorizationFrequency(10);
-    model.primal();
-    double objValue = model.getObjValue();
-    CoinRelFltEq eq(1.0e-4);
-    assert(eq(objValue,-400.92));
-  }
-  if (0) {    
-    CoinMpsIO m;
-    std::string fn = "./beale";
-    //fn = "./jensen";
-    m.readMps(fn.c_str(),"mps");
-    ClpSimplex solution;
-    solution.loadProblem(*m.getMatrixByCol(),m.getColLower(),m.getColUpper(),
-                         m.getObjCoefficients(),
-                         m.getRowLower(),m.getRowUpper());
-    solution.setDblParam(ClpObjOffset,m.objectiveOffset());
-    solution.dual();
-    // get quadratic part
-    int * start=NULL;
-    int * column = NULL;
-    double * element = NULL;
-    m.readQuadraticMps(NULL,start,column,element,2);
-    // Load up objective
-    solution.loadQuadraticObjective(solution.numberColumns(),start,column,element);
-    delete [] start;
-    delete [] column;
-    delete [] element;
-    solution.primal(1);
-    solution.nonlinearSLP(50,1.0e-4);
-    double objValue = solution.getObjValue();
-    CoinRelFltEq eq(1.0e-4);
-    assert(eq(objValue,0.5));
-    solution.primal();
-    objValue = solution.getObjValue();
-    assert(eq(objValue,0.5));
-  }
-#endif  
-}
-void CbcClpUnitTest (const CbcModel & saveModel)
+//#############################################################################
+
+void CbcClpUnitTest (const CbcModel & saveModel, std::string& miplibDir,
+                     bool unitTestOnly)
 {
   unsigned int m ;
@@ -1773 +36 @@
   FILE * fp;
   bool doTest=false;
-  const char dirsep =  CoinFindDirSeparator();
- 
+
   // Set directory containing miplib data files.
-  std::string miplibDir;
-  miplibDir = dirsep == '/' ? "../../Data/miplib3/" : "..\\..\\Data\\miplib3\\";
   std::string test1 = miplibDir +"p0033";
   fp=fopen(test1.c_str(),"r");
@@ -1819 +79 @@
   strategy.push_back(zz_strategy_zz) ; \
   objValue.push_back(zz_objValue_zz) ;
-  
-  /*
-    Load up the problem vector. Note that the row counts here include the
-    objective function.
-    
-  */
-  // 0 for no test, 1 for some, 2 for many, 3 for all
+
+  if (unitTestOnly) {
+    PUSH_MPS("p0033",16,33,3089,2520.57,7);
+    PUSH_MPS("p0201",133,201,7615,6875.0,7);
+    PUSH_MPS("p0548",176,548,8691,315.29,7);
+  } else {
+    /*
+      Load up the problem vector. Note that the row counts here include the
+      objective function.
+    */
+    // 0 for no test, 1 for some, 2 for many, 3 for all
 #define HOWMANY 2
 #if HOWMANY
 #if HOWMANY>1
-  PUSH_MPS("10teams",230,2025,924,917,7);
-#endif
-  PUSH_MPS("air03",124,10757,340160,338864.25,7);
-#if HOWMANY==3
-  PUSH_MPS("air04",823,8904,56137,55535.436,8);
-  PUSH_MPS("air05",426,7195,26374,25877.609,8);
+    PUSH_MPS("10teams",230,2025,924,917,7);
+#endif
+    PUSH_MPS("air03",124,10757,340160,338864.25,7);
+#if HOWMANY==3
+    PUSH_MPS("air04",823,8904,56137,55535.436,8);
+    PUSH_MPS("air05",426,7195,26374,25877.609,8);
 #endif
   //    PUSH_MPS("arki001",1048,1388,7580813.0459,7579599.80787,7);
-  PUSH_MPS("bell3a",123,133,878430.32,862578.64,7);
-#if HOWMANY>1
-  PUSH_MPS("bell5",91,104,8966406.49,8608417.95,7);
-#endif
-  PUSH_MPS("blend2",274,353,7.598985,6.9156751140,7);
-#if HOWMANY>1
-  PUSH_MPS("cap6000",2176,6000,-2451377,-2451537.325,7);
-#endif
-  //    PUSH_MPS("dano3mip",3202,13873,728.1111,576.23162474,7);
-  //PUSH_MPS("danoint",664,521,65.67,62.637280418,7);
-  PUSH_MPS("dcmulti",290,548,188182,183975.5397,7);
-  PUSH_MPS("dsbmip",1182,1886,-305.19817501,-305.19817501,7);
-  PUSH_MPS("egout",98,141,568.101,149.589,7);
-  PUSH_MPS("enigma",21,100,0.0,0.0,7);
-#if HOWMANY==3
-  PUSH_MPS("fast0507",507,63009,174,172.14556668,7);
-#endif
-  PUSH_MPS("fiber",363,1298,405935.18000,156082.51759,7);
-#if HOWMANY>1
-  PUSH_MPS("fixnet6",478,878,3983,1200.88,7);
-#endif
-  PUSH_MPS("flugpl",18,18,1201500,1167185.7,7);
-  PUSH_MPS("gen",780,870,112313,112130.0,7);
-#if HOWMANY>1
-  PUSH_MPS("gesa2",1392,1224,25779856.372,25476489.678,7);
-  PUSH_MPS("gesa2_o",1248,1224,25779856.372,25476489.678,7);
-#endif
-  PUSH_MPS("gesa3",1368,1152,27991042.648,27833632.451,7);
-  PUSH_MPS("gesa3_o",1224,1152,27991042.648,27833632.451,7);
-  PUSH_MPS("gt2",29,188,21166.000,13460.233074,7);
-#if HOWMANY==3
-  PUSH_MPS("harp2",112,2993,-73899798.00,-74353341.502,7);
-#endif
-  PUSH_MPS("khb05250",101,1350,106940226,95919464.0,7);
-#if HOWMANY>1
-  PUSH_MPS("l152lav",97,1989,4722,4656.36,7);
-#endif
-  PUSH_MPS("lseu",28,89,1120,834.68,7);
-  PUSH_MPS("misc03",96,160,3360,1910.,7);
-  PUSH_MPS("misc06",820,1808,12850.8607,12841.6,7);
-#if HOWMANY>1
-  PUSH_MPS("misc07",212,260,2810,1415.0,7);
-  PUSH_MPS("mitre",2054,10724,115155,114740.5184,7);
-#endif
-  PUSH_MPS("mod008",6,319,307,290.9,7);
-  PUSH_MPS("mod010",146,2655,6548,6532.08,7);
-#if HOWMANY==3
-  PUSH_MPS("mod011",4480,10958,-54558535,-62121982.55,7);
-  PUSH_MPS("modglob",291,422,20740508,20430947.,7);
-  PUSH_MPS("noswot",182,128,-43,-43.0,7);
-#endif
-#if HOWMANY>1
-  PUSH_MPS("nw04",36,87482,16862,16310.66667,7);
-#endif
-  PUSH_MPS("p0033",16,33,3089,2520.57,7);
-  PUSH_MPS("p0201",133,201,7615,6875.0,7);
-  PUSH_MPS("p0282",241,282,258411,176867.50,7);
-  PUSH_MPS("p0548",176,548,8691,315.29,7);
-  PUSH_MPS("p2756",755,2756,3124,2688.75,7);
-#if HOWMANY==3
-  PUSH_MPS("pk1",45,86,11.0,0.0,7);
-#endif
-#if HOWMANY>1
-  PUSH_MPS("pp08a",136,240,7350.0,2748.3452381,7);
-  PUSH_MPS("pp08aCUTS",246,240,7350.0,5480.6061563,7);
-#endif
-#if HOWMANY==3
-  PUSH_MPS("qiu",1192,840,-132.873137,-931.638857,7);
-#endif
-  PUSH_MPS("qnet1",503,1541,16029.692681,14274.102667,7);
-  PUSH_MPS("qnet1_o",456,1541,16029.692681,12095.571667,7);
-  PUSH_MPS("rentacar",6803,9557,30356761,28806137.644,7);
-  PUSH_MPS("rgn",24,180,82.1999,48.7999,7);
-#if HOWMANY==3
-  PUSH_MPS("rout",291,556,1077.56,981.86428571,7);
-  PUSH_MPS("set1ch",492,712,54537.75,32007.73,7);
-#endif
-  //    PUSH_MPS("seymour",4944,1372,423,403.84647413,7);
-  PUSH_MPS("stein27",118,27,18,13.0,7);
-#if HOWMANY>1
-  PUSH_MPS("stein45",331,45,30,22.0,7);
-#endif
-  PUSH_MPS("vpm1",234,378,20,15.4167,7);
-  PUSH_MPS("vpm2",234,378,13.75,9.8892645972,7);
-#endif
+    PUSH_MPS("bell3a",123,133,878430.32,862578.64,7);
+#if HOWMANY>1
+    PUSH_MPS("bell5",91,104,8966406.49,8608417.95,7);
+#endif
+    PUSH_MPS("blend2",274,353,7.598985,6.9156751140,7);
+#if HOWMANY>1
+    PUSH_MPS("cap6000",2176,6000,-2451377,-2451537.325,7);
+#endif
+    //    PUSH_MPS("dano3mip",3202,13873,728.1111,576.23162474,7);
+    //PUSH_MPS("danoint",664,521,65.67,62.637280418,7);
+    PUSH_MPS("dcmulti",290,548,188182,183975.5397,7);
+    PUSH_MPS("dsbmip",1182,1886,-305.19817501,-305.19817501,7);
+    PUSH_MPS("egout",98,141,568.101,149.589,7);
+    PUSH_MPS("enigma",21,100,0.0,0.0,7);
+#if HOWMANY==3
+    PUSH_MPS("fast0507",507,63009,174,172.14556668,7);
+#endif
+    PUSH_MPS("fiber",363,1298,405935.18000,156082.51759,7);
+#if HOWMANY>1
+    PUSH_MPS("fixnet6",478,878,3983,1200.88,7);
+#endif
+    PUSH_MPS("flugpl",18,18,1201500,1167185.7,7);
+    PUSH_MPS("gen",780,870,112313,112130.0,7);
+#if HOWMANY>1
+    PUSH_MPS("gesa2",1392,1224,25779856.372,25476489.678,7);
+    PUSH_MPS("gesa2_o",1248,1224,25779856.372,25476489.678,7);
+#endif
+    PUSH_MPS("gesa3",1368,1152,27991042.648,27833632.451,7);
+    PUSH_MPS("gesa3_o",1224,1152,27991042.648,27833632.451,7);
+    PUSH_MPS("gt2",29,188,21166.000,13460.233074,7);
+#if HOWMANY==3
+    PUSH_MPS("harp2",112,2993,-73899798.00,-74353341.502,7);
+#endif
+    PUSH_MPS("khb05250",101,1350,106940226,95919464.0,7);
+#if HOWMANY>1
+    PUSH_MPS("l152lav",97,1989,4722,4656.36,7);
+#endif
+    PUSH_MPS("lseu",28,89,1120,834.68,7);
+    PUSH_MPS("misc03",96,160,3360,1910.,7);
+    PUSH_MPS("misc06",820,1808,12850.8607,12841.6,7);
+#if HOWMANY>1
+    PUSH_MPS("misc07",212,260,2810,1415.0,7);
+    PUSH_MPS("mitre",2054,10724,115155,114740.5184,7);
+#endif
+    PUSH_MPS("mod008",6,319,307,290.9,7);
+    PUSH_MPS("mod010",146,2655,6548,6532.08,7);
+#if HOWMANY==3
+    PUSH_MPS("mod011",4480,10958,-54558535,-62121982.55,7);
+    PUSH_MPS("modglob",291,422,20740508,20430947.,7);
+    PUSH_MPS("noswot",182,128,-43,-43.0,7);
+#endif
+#if HOWMANY>1
+    PUSH_MPS("nw04",36,87482,16862,16310.66667,7);
+#endif
+    PUSH_MPS("p0033",16,33,3089,2520.57,7);
+    PUSH_MPS("p0201",133,201,7615,6875.0,7);
+    PUSH_MPS("p0282",241,282,258411,176867.50,7);
+    PUSH_MPS("p0548",176,548,8691,315.29,7);
+    PUSH_MPS("p2756",755,2756,3124,2688.75,7);
+#if HOWMANY==3
+    PUSH_MPS("pk1",45,86,11.0,0.0,7);
+#endif
+#if HOWMANY>1
+    PUSH_MPS("pp08a",136,240,7350.0,2748.3452381,7);
+    PUSH_MPS("pp08aCUTS",246,240,7350.0,5480.6061563,7);
+#endif
+#if HOWMANY==3
+    PUSH_MPS("qiu",1192,840,-132.873137,-931.638857,7);
+#endif
+    PUSH_MPS("qnet1",503,1541,16029.692681,14274.102667,7);
+    PUSH_MPS("qnet1_o",456,1541,16029.692681,12095.571667,7);
+    PUSH_MPS("rentacar",6803,9557,30356761,28806137.644,7);
+    PUSH_MPS("rgn",24,180,82.1999,48.7999,7);
+#if HOWMANY==3
+    PUSH_MPS("rout",291,556,1077.56,981.86428571,7);
+    PUSH_MPS("set1ch",492,712,54537.75,32007.73,7);
+#endif
+    //    PUSH_MPS("seymour",4944,1372,423,403.84647413,7);
+    PUSH_MPS("stein27",118,27,18,13.0,7);
+#if HOWMANY>1
+    PUSH_MPS("stein45",331,45,30,22.0,7);
+#endif
+    PUSH_MPS("vpm1",234,378,20,15.4167,7);
+    PUSH_MPS("vpm2",234,378,13.75,9.8892645972,7);
+#endif
+  }
 #undef PUSH_MPS
     
@@ -1931 +196 @@
   */
   for (m = 0 ; m < mpsName.size() ; m++) {
-    std::cerr << "  processing mps file: " << mpsName[m] 
-              << " (" << m+1 << " out of " << mpsName.size() << ")" << std::endl ;
+    std::cout << "  processing mps file: " << mpsName[m] 
+              << " (" << m+1 << " out of " << mpsName.size() << ")\n";
     /*
       Stage 1: Read the MPS
@@ -1941 +206 @@
     std::string fn = miplibDir+mpsName[m] ;
     model->solver()->readMps(fn.c_str(),"") ;
-    int nr = model->getNumRows() ;
-    int nc = model->getNumCols() ;
-    assert(nr == nRows[m]) ;
-    assert(nc == nCols[m]) ;
+    assert(model->getNumRows() == nRows[m]) ;
+    assert(model->getNumCols() == nCols[m]) ;
+
     /*
       Stage 2: Call solver to solve the problem.
-      
       then check the return code and objective.
-      
     */
 
     double startTime = CoinCpuTime()+CoinCpuTimeJustChildren();
-    if (model->getMaximumNodes()>200000)
+    if (model->getMaximumNodes()>200000) {
       model->setMaximumNodes(200000);
+    }
     OsiClpSolverInterface * si =
       dynamic_cast<OsiClpSolverInterface *>(model->solver()) ;
@@ -1981 +244 @@
           below *= multiplier;
         }
-        if (above<1.0e12)
+        if (above<1.0e12) {
           largest = CoinMax(largest,above);
-        if (below<1.0e12)
+        }
+        if (below<1.0e12) {
           largest = CoinMax(largest,below);
+        }
       }
       
@@ -2002 +267 @@
           below *= multiplier;
         }
-        if (above<1.0e12)
+        if (above<1.0e12) {
           largest = CoinMax(largest,above);
-        if (below<1.0e12)
+        }
+        if (below<1.0e12) {
           largest = CoinMax(largest,below);
+        }
       }
       //std::cout<<"Largest (scaled) away from bound "<<largest<<std::endl;
-      modelC->setDualBound(CoinMax(1.0001e8,CoinMin(1000.0*largest,1.00001e10)));
+      modelC->setDualBound(CoinMax(1.0001e8,
+                                   CoinMin(1000.0*largest,1.00001e10)));
     }
     model->setMinimumDrop(min(5.0e-2,
-                                 fabs(model->getMinimizationObjValue())*1.0e-3+1.0e-4));
-    if (model->getNumCols()<500)
+                              fabs(model->getMinimizationObjValue())*1.0e-3+1.0e-4));
+    if (model->getNumCols()<500) {
       model->setMaximumCutPassesAtRoot(-100); // always do 100 if possible
-    else if (model->getNumCols()<5000)
+    } else if (model->getNumCols()<5000) {
       model->setMaximumCutPassesAtRoot(100); // use minimum drop
-    else
+    } else {
       model->setMaximumCutPassesAtRoot(20);
+    }
     // If defaults then increase trust for small models
     if (model->numberStrong()==5&&model->numberBeforeTrust()==10) {
       int numberColumns = model->getNumCols();
-      if (numberColumns<=50)
+      if (numberColumns<=50) {
         model->setNumberBeforeTrust(1000);
-      else if (numberColumns<=100)
+      } else if (numberColumns<=100) {
         model->setNumberBeforeTrust(100);
-      else if (numberColumns<=300)
+      } else if (numberColumns<=300) {
         model->setNumberBeforeTrust(50);
+      }
     }
     model->branchAndBound();
@@ -2050 +320 @@
       CoinRelFltEq eq(1.0e-3) ;
       if (eq(soln,objValue[m])) { 
-        std::cerr 
+        std::cout 
           <<"cbc_clp"<<" "
           << soln << " = " << objValue[m] << " ; okay";
         numProbSolved++;
       } else  { 
-        std::cerr <<"cbc_clp" <<" " <<soln << " != " <<objValue[m] << "; error=" ;
-        std::cerr <<fabs(objValue[m] - soln); 
+        std::cout <<"cbc_clp" <<" " <<soln << " != " <<objValue[m]
+                  << "; error=" << fabs(objValue[m] - soln); 
       }
     } else {
-      std::cerr << "error; too many nodes" ;
-    }
-    std::cerr<<" - took " <<timeOfSolution<<" seconds."<<std::endl; 
+      std::cout << "error; too many nodes" ;
+    }
+    std::cout<<" - took " <<timeOfSolution<<" seconds.\n";
     timeTaken += timeOfSolution;
     delete model;
   }
-  std::cerr 
+  std::cout 
     <<"cbc_clp" 
     <<" solved " 

trunk/Cbc/test/Makefile.am

@@ -27 +27 @@
 
 test_cbc: ../src/cbc$(EXEEXT)
-        cd ../../Data/Netlib; make uncompress
-        cd ../../Data/miplib3; make uncompress
-        ../src/cbc$(EXEEXT) -unitTest -netlib -miplib
+        if test x"$(DIRMIPLIB)" != x; then \
+                MIPLIBARG="-dirMiplib $(DIRMIPLIB) -miplib"; \
+        fi; \
+        if test x"$(DIRSAMPLE)" != x; then \
+                SAMPLEARG="-dirSample $(DIRSAMPLE)"; \
+        fi; \
+        ../src/cbc$(EXEEXT) $$SAMPLEARG -unitTest $$MIPLIBARG
 
 test_cbc_generic: ../src/cbc-generic$(EXEEXT)
         echo "A minimal test is all that cbc-generic can manage just yet."
         ../src/cbc-generic$(EXEEXT) \
-            -directory ../../Data/miplib3 -import p0033 -branch
+            -directory ../../Data/Sample -import p0033 -branch
 
 .PHONY: test

trunk/Cbc/test/Makefile.in

@@ -437 +437 @@
 
 test_cbc: ../src/cbc$(EXEEXT)
-        cd ../../Data/Netlib; make uncompress
-        cd ../../Data/miplib3; make uncompress
-        ../src/cbc$(EXEEXT) -unitTest -netlib -miplib
+        if test x"$(DIRMIPLIB)" != x; then \
+                MIPLIBARG="-dirMiplib $(DIRMIPLIB) -miplib"; \
+        fi; \
+        if test x"$(DIRSAMPLE)" != x; then \
+                SAMPLEARG="-dirSample $(DIRSAMPLE)"; \
+        fi; \
+        ../src/cbc$(EXEEXT) $$SAMPLEARG -unitTest $$MIPLIBARG
 
 test_cbc_generic: ../src/cbc-generic$(EXEEXT)
         echo "A minimal test is all that cbc-generic can manage just yet."
         ../src/cbc-generic$(EXEEXT) \
-            -directory ../../Data/miplib3 -import p0033 -branch
+            -directory ../../Data/Sample -import p0033 -branch
 
 .PHONY: test