Changeset 182 for branches/pre
- Timestamp:
- Jul 18, 2003 3:49:05 PM (18 years ago)
- Location:
- branches/pre
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/pre/ClpSimplex.cpp
r180 r182 2787 2787 return ((ClpSimplexPrimal *) this)->primal(ifValuesPass); 2788 2788 } 2789 #ifdef QUADRATIC2790 2789 #include "ClpSimplexPrimalQuadratic.hpp" 2791 2790 /* Solves quadratic problem using SLP - may be used as crash … … 2803 2802 return ((ClpSimplexPrimalQuadratic *) this)->primalQuadratic(phase); 2804 2803 } 2805 #endif2806 2804 /* For strong branching. On input lower and upper are new bounds 2807 2805 while on output they are objective function values (>1.0e50 infeasible). -
branches/pre/ClpSimplexPrimalQuadratic.cpp
r180 r182 8 8 #include "CoinHelperFunctions.hpp" 9 9 #include "ClpSimplexPrimalQuadratic.hpp" 10 #ifdef QUADRATIC11 10 #include "ClpPrimalQuadraticDantzig.hpp" 12 #endif13 11 #include "ClpFactorization.hpp" 14 12 #include "ClpNonLinearCost.hpp" -
branches/pre/Makefile.Clp
r170 r182 32 32 LIBSRC += ClpSimplexPrimal.cpp 33 33 LIBSRC += ClpSimplexPrimalQuadratic.cpp 34 #LIBSRC += ClpPrimalQuadraticDantzig.cpp34 LIBSRC += ClpPrimalQuadraticDantzig.cpp 35 35 # and Presolve stuff 36 LIBSRC += Presolve.cpp 37 LIBSRC += PresolveDoubleton.cpp 38 LIBSRC += PresolveEmpty.cpp 39 LIBSRC += PresolveFixed.cpp 40 LIBSRC += PresolveMatrix.cpp 41 LIBSRC += PresolvePsdebug.cpp 42 LIBSRC += PresolveSingleton.cpp 43 LIBSRC += PresolveZeros.cpp 44 LIBSRC += PresolveDual.cpp 45 LIBSRC += PresolveDupcol.cpp 46 LIBSRC += PresolveForcing.cpp 47 LIBSRC += PresolveImpliedFree.cpp 48 LIBSRC += PresolveIsolated.cpp 49 LIBSRC += PresolveSubst.cpp 50 LIBSRC += PresolveTighten.cpp 51 LIBSRC += PresolveUseless.cpp 36 LIBSRC += ClpPresolve.cpp 52 37 53 38 LIBSRC += Idiot.cpp … … 64 49 CXXFLAGS += -DCLP_IDIOT 65 50 CXXFLAGS += -DUSE_PRESOLVE 66 #CXXFLAGS += -DQUADRATIC67 51 ifeq ($(OptLevel),-g) 68 52 # CXXFLAGS += -DCLP_DEBUG -
branches/pre/Test/Makefile.test
r175 r182 28 28 # Pick up any include files in Test 29 29 CXXFLAGS += -I. 30 #CXXFLAGS += -DQUADRATIC31 30 #ifeq ($(OPTFLAG),-g) 32 31 # CXXFLAGS += -DCLP_DEBUG -DPRESOLVE_SUMMARY=1
Note: See TracChangeset
for help on using the changeset viewer.