Changeset 891


Ignore:
Timestamp:
Nov 9, 2006 10:47:03 AM (14 years ago)
Author:
forrest
Message:

barrier and verbosity

Location:
trunk/Clp/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpSimplex.hpp

    r805 r891  
    210210  /// Primal initial solve
    211211  int initialPrimalSolve();
     212 /// Barrier initial solve
     213  int initialBarrierSolve();
     214  /// Barrier initial solve, not to be followed by crossover
     215  int initialBarrierNoCrossSolve();
     216
    212217  /** Dual algorithm - see ClpSimplexDual.hpp for method.
    213218      ifValuesPass==2 just does values pass and then stops.
  • trunk/Clp/src/ClpSolve.cpp

    r864 r891  
    22092209  return initialSolve(options);
    22102210}
     2211// barrier solve, not to be followed by crossover
     2212int
     2213ClpSimplex::initialBarrierNoCrossSolve()
     2214{
     2215  ClpSolve options;
     2216  // Use primal
     2217  options.setSolveType(ClpSolve::useBarrierNoCross);
     2218  return initialSolve(options);
     2219}
     2220
     2221// General barrier solve
     2222int
     2223ClpSimplex::initialBarrierSolve()
     2224{
     2225  ClpSolve options;
     2226  // Use primal
     2227  options.setSolveType(ClpSolve::useBarrier);
     2228  return initialSolve(options);
     2229}
     2230
     2231
    22112232// Default constructor
    22122233ClpSolve::ClpSolve (  )
  • trunk/Clp/src/Clp_C_Interface.cpp

    r778 r891  
    1717#include "CoinHelperFunctions.hpp"
    1818#include "ClpSimplex.hpp"
     19#include "ClpInterior.hpp"
    1920#include <cfloat>
    2021// Get C stuff but with extern C
     
    251252                             collb,colub,obj,rowlb,rowub);
    252253}
     254/* read quadratic part of the objective (the matrix part) */
     255COINLIBAPI void COINLINKAGE
     256Clp_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}
    253267/* Read an mps file from the given filename */
    254268COINLIBAPI int COINLINKAGE
     
    731745{
    732746  return model->model_->initialSolve();
     747}
     748/* Barrier initial solve */
     749COINLIBAPI int COINLINKAGE
     750Clp_initialBarrierSolve(Clp_Simplex * model0)
     751{
     752   ClpSimplex *model = model0->model_;
     753
     754   return model->initialBarrierSolve();
     755   
     756}
     757/* Barrier initial solve */
     758COINLIBAPI int COINLINKAGE
     759Clp_initialBarrierNoCrossSolve(Clp_Simplex * model0)
     760{
     761   ClpSimplex *model = model0->model_;
     762
     763   return model->initialBarrierNoCrossSolve();
     764   
    733765}
    734766/* Dual initial solve */
  • trunk/Clp/src/Clp_C_Interface.h

    r778 r891  
    5353                      const double* obj,
    5454                      const double* rowlb, const double* rowub);
     55
     56/* read quadratic part of the objective (the matrix part) */
     57COINLIBAPI void COINLINKAGE
     58Clp_loadQuadraticObjective(Clp_Simplex * model, 
     59                           const int numberColumns,
     60                           const CoinBigIndex * start,
     61                           const int * column,
     62                           const double * element);
    5563  /** Read an mps file from the given filename */
    5664  COINLIBAPI int COINLINKAGE Clp_readMps(Clp_Simplex * model,const char *filename,
     
    249257  /** Primal initial solve */
    250258  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);
    251263  /** Dual algorithm - see ClpSimplexDual.hpp for method */
    252264  COINLIBAPI int COINLINKAGE Clp_dual(Clp_Simplex * model, int ifValuesPass);
Note: See TracChangeset for help on using the changeset viewer.