 Timestamp:
 Nov 9, 2006 10:45:27 AM (13 years ago)
 Location:
 branches/devel/Clp/src
 Files:

 4 edited
Legend:
 Unmodified
 Added
 Removed

branches/devel/Clp/src/ClpSimplex.hpp
r854 r890 206 206 /// Primal initial solve 207 207 int initialPrimalSolve(); 208 /// Barrier initial solve 209 int initialBarrierSolve(); 210 /// Barrier initial solve, not to be followed by crossover 211 int initialBarrierNoCrossSolve(); 208 212 /** Dual algorithm  see ClpSimplexDual.hpp for method. 209 213 ifValuesPass==2 just does values pass and then stops. 
branches/devel/Clp/src/ClpSolve.cpp
r889 r890 45 45 #define FAST_BARRIER 46 46 #endif 47 #ifdef COIN_DEVELOP 47 48 #ifndef FAST_BARRIER 48 49 static int numberBarrier=0; 50 #endif 49 51 #endif 50 52 #ifdef COIN_HAS_VOL … … 1773 1775 scale=true; 1774 1776 } 1777 #ifdef COIN_DEVELOP 1775 1778 #ifndef FAST_BARRIER 1776 1779 if (!numberBarrier) … … 1778 1781 <<"The factorization is being improved"<<std::endl; 1779 1782 numberBarrier++; 1783 #endif 1780 1784 #endif 1781 1785 // If quadratic force KKT … … 2306 2310 return initialSolve(options); 2307 2311 } 2312 // barrier solve, not to be followed by crossover 2313 int 2314 ClpSimplex::initialBarrierNoCrossSolve() 2315 { 2316 ClpSolve options; 2317 // Use primal 2318 options.setSolveType(ClpSolve::useBarrierNoCross); 2319 return initialSolve(options); 2320 } 2321 2322 // General barrier solve 2323 int 2324 ClpSimplex::initialBarrierSolve() 2325 { 2326 ClpSolve options; 2327 // Use primal 2328 options.setSolveType(ClpSolve::useBarrier); 2329 return initialSolve(options); 2330 } 2331 2308 2332 // Default constructor 2309 2333 ClpSolve::ClpSolve ( ) 
branches/devel/Clp/src/Clp_C_Interface.cpp
r778 r890 17 17 #include "CoinHelperFunctions.hpp" 18 18 #include "ClpSimplex.hpp" 19 #include "ClpInterior.hpp" 19 20 #include <cfloat> 20 21 // Get C stuff but with extern C … … 251 252 collb,colub,obj,rowlb,rowub); 252 253 } 254 /* read quadratic part of the objective (the matrix part) */ 255 COINLIBAPI void COINLINKAGE 256 Clp_loadQuadraticObjective(Clp_Simplex * model, 257 const int numberColumns, 258 const CoinBigIndex * start, 259 const int * column, 260 const double * element) 261 { 262 263 model>model_>loadQuadraticObjective(numberColumns, 264 start, column, element); 265 266 } 253 267 /* Read an mps file from the given filename */ 254 268 COINLIBAPI int COINLINKAGE … … 731 745 { 732 746 return model>model_>initialSolve(); 747 } 748 /* Barrier initial solve */ 749 COINLIBAPI int COINLINKAGE 750 Clp_initialBarrierSolve(Clp_Simplex * model0) 751 { 752 ClpSimplex *model = model0>model_; 753 754 return model>initialBarrierSolve(); 755 756 } 757 /* Barrier initial solve */ 758 COINLIBAPI int COINLINKAGE 759 Clp_initialBarrierNoCrossSolve(Clp_Simplex * model0) 760 { 761 ClpSimplex *model = model0>model_; 762 763 return model>initialBarrierNoCrossSolve(); 764 733 765 } 734 766 /* Dual initial solve */ 
branches/devel/Clp/src/Clp_C_Interface.h
r778 r890 53 53 const double* obj, 54 54 const double* rowlb, const double* rowub); 55 56 /* read quadratic part of the objective (the matrix part) */ 57 COINLIBAPI void COINLINKAGE 58 Clp_loadQuadraticObjective(Clp_Simplex * model, 59 const int numberColumns, 60 const CoinBigIndex * start, 61 const int * column, 62 const double * element); 55 63 /** Read an mps file from the given filename */ 56 64 COINLIBAPI int COINLINKAGE Clp_readMps(Clp_Simplex * model,const char *filename, … … 249 257 /** Primal initial solve */ 250 258 COINLIBAPI int COINLINKAGE Clp_initialPrimalSolve(Clp_Simplex * model); 259 /** Barrier initial solve */ 260 COINLIBAPI int COINLINKAGE Clp_initialBarrierSolve(Clp_Simplex * model); 261 /** Barrier initial solve, no crossover */ 262 COINLIBAPI int COINLINKAGE Clp_initialBarrierNoCrossSolve(Clp_Simplex * model); 251 263 /** Dual algorithm  see ClpSimplexDual.hpp for method */ 252 264 COINLIBAPI int COINLINKAGE Clp_dual(Clp_Simplex * model, int ifValuesPass);
Note: See TracChangeset
for help on using the changeset viewer.