Ignore:
Timestamp:
Sep 16, 2002 1:54:29 AM (18 years ago)
Author:
ladanyi
Message:

reordering Clp

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/devel-1/ClpSimplexDual.cpp

    r17 r19  
    9797#include "ClpSimplexDual.hpp"
    9898#include "ClpFactorization.hpp"
    99 #include "OsiPackedMatrix.hpp"
    100 #include "OsiIndexedVector.hpp"
    101 #include "OsiWarmStartBasis.hpp"
     99#include "CoinPackedMatrix.hpp"
     100#include "CoinIndexedVector.hpp"
     101#include "CoinWarmStartBasis.hpp"
    102102#include "ClpDualRowDantzig.hpp"
    103103#include "ClpMessage.hpp"
     
    237237
    238238  algorithm_ = -1;
    239   dualTolerance_=dblParam_[OsiDualTolerance];
    240   primalTolerance_=dblParam_[OsiPrimalTolerance];
     239  dualTolerance_=dblParam_[ClpDualTolerance];
     240  primalTolerance_=dblParam_[ClpPrimalTolerance];
    241241
    242242  // put in standard form (and make row copy)
     
    266266    handler_->message(CLP_SINGULARITIES,messages_)
    267267    <<factorizationStatus
    268     <<OsiMessageEol;
     268    <<CoinMessageEol;
    269269
    270270  // If user asked for perturbation - do it
     
    342342  handler_->message(CLP_SIMPLEX_FINISHED+problemStatus_,messages_)
    343343    <<objectiveValue()
    344     <<OsiMessageEol;
     344    <<CoinMessageEol;
    345345  // Restore any saved stuff
    346346  perturbation_ = savePerturbation;
     
    442442      handler_->message(CLP_SIMPLEX_PIVOTROW,messages_)
    443443        <<pivotRow_
    444         <<OsiMessageEol;
     444        <<CoinMessageEol;
    445445      // check accuracy of weights
    446446      dualRowPivot_->checkAccuracy();
     
    475475            <<btranAlpha
    476476            <<alpha_
    477             <<OsiMessageEol;
     477            <<CoinMessageEol;
    478478          dualRowPivot_->unrollWeights();
    479479          if (factorization_->pivots()) {
     
    492492              handler_->message(CLP_SIMPLEX_FLAG,messages_)
    493493                <<x<<sequenceWithin(sequenceOut_)
    494                 <<OsiMessageEol;
     494                <<CoinMessageEol;
    495495              setFlagged(sequenceOut_);
    496496              lastBadIteration_ = numberIterations_; // say be more cautious
     
    584584            handler_->message(CLP_SIMPLEX_FLAG,messages_)
    585585              <<x<<sequenceWithin(sequenceOut_)
    586               <<OsiMessageEol;
     586              <<CoinMessageEol;
    587587            setFlagged(sequenceOut_);
    588588            lastBadIteration_ = numberIterations_; // say be more cautious
     
    691691   The output vector has movement (row length array) */
    692692int
    693 ClpSimplexDual::updateDualsInDual(OsiIndexedVector * rowArray,
    694                                   OsiIndexedVector * columnArray,
    695                                   OsiIndexedVector * outputArray,
     693ClpSimplexDual::updateDualsInDual(CoinIndexedVector * rowArray,
     694                                  CoinIndexedVector * columnArray,
     695                                  CoinIndexedVector * outputArray,
    696696                                  double theta,
    697697                                  double & objectiveChange)
     
    915915int
    916916ClpSimplexDual::changeBounds(bool initialize,
    917                                  OsiIndexedVector * outputArray,
     917                                 CoinIndexedVector * outputArray,
    918918                                 double & changeCost)
    919919{
     
    10461046*/
    10471047void
    1048 ClpSimplexDual::dualColumn(OsiIndexedVector * rowArray,
    1049                        OsiIndexedVector * columnArray,
    1050                        OsiIndexedVector * spareArray,
    1051                        OsiIndexedVector * spareArray2)
     1048ClpSimplexDual::dualColumn(CoinIndexedVector * rowArray,
     1049                       CoinIndexedVector * columnArray,
     1050                       CoinIndexedVector * spareArray,
     1051                       CoinIndexedVector * spareArray2)
    10521052{
    10531053  double * work;
     
    16331633  }
    16341634  if (thisIncrease) {
    1635     newTolerance = dualTolerance_+1.0e-4*dblParam_[OsiDualTolerance];
     1635    newTolerance = dualTolerance_+1.0e-4*dblParam_[ClpDualTolerance];
    16361636  }
    16371637
     
    16471647   Returns -3 if not, 2 if is unbounded */
    16481648int
    1649 ClpSimplexDual::checkUnbounded(OsiIndexedVector * ray,
    1650                                    OsiIndexedVector * spare,
     1649ClpSimplexDual::checkUnbounded(CoinIndexedVector * ray,
     1650                                   CoinIndexedVector * spare,
    16511651                                   double changeCost)
    16521652{
     
    17921792                       <<numberDualInfeasibilities_-
    17931793    numberDualInfeasibilitiesWithoutFree_;
    1794   handler_->message()<<OsiMessageEol;
     1794  handler_->message()<<CoinMessageEol;
    17951795  while (problemStatus_<=-3) {
    17961796    bool cleanDuals=false;
     
    18051805        handler_->message(CLP_DUAL_BOUNDS,messages_)
    18061806          <<dualBound_
    1807           <<OsiMessageEol;
     1807          <<CoinMessageEol;
    18081808        // save solution in case unbounded
    18091809        CoinDisjointCopyN(columnActivityWork_,numberColumns_,
     
    18271827            if (lastCleaned<numberIterations_) {
    18281828              handler_->message(CLP_SIMPLEX_GIVINGUP,messages_)
    1829                 <<OsiMessageEol;
     1829                <<CoinMessageEol;
    18301830            }
    18311831          }
     
    18621862        handler_->message(CLP_DUAL_CHECKB,messages_)
    18631863          <<dualBound_
    1864           <<OsiMessageEol;
     1864          <<CoinMessageEol;
    18651865        numberChangedBounds=changeBounds(false,NULL,changeCost);
    18661866        if (numberChangedBounds<=0||dualBound_>1.0e20||
     
    18841884        lastCleaned=numberIterations_;
    18851885        handler_->message(CLP_DUAL_ORIGINAL,messages_)
    1886           <<OsiMessageEol;
     1886          <<CoinMessageEol;
    18871887
    18881888        perturbation_=102; // stop any perturbations
     
    19621962*/
    19631963void
    1964 ClpSimplexDual::flipBounds(OsiIndexedVector * rowArray,
    1965                   OsiIndexedVector * columnArray,
     1964ClpSimplexDual::flipBounds(CoinIndexedVector * rowArray,
     1965                  CoinIndexedVector * columnArray,
    19661966                  double change)
    19671967{
     
    21162116  handler_->message(CLP_SIMPLEX_PERTURB,messages_)
    21172117    <<perturbation
    2118     <<OsiMessageEol;
     2118    <<CoinMessageEol;
    21192119  for (iRow=0;iRow<numberRows_;iRow++) {
    21202120    double value = perturbation;
     
    21972197    handler_->message(CLP_SINGULARITIES,messages_)
    21982198      <<factorizationStatus
    2199       <<OsiMessageEol;
     2199      <<CoinMessageEol;
    22002200  if (saveSparse) {
    22012201    // use default at present
     
    24362436{
    24372437  algorithm_ = -1;
    2438   dualTolerance_=dblParam_[OsiDualTolerance];
    2439   primalTolerance_=dblParam_[OsiPrimalTolerance];
     2438  dualTolerance_=dblParam_[ClpDualTolerance];
     2439  primalTolerance_=dblParam_[ClpPrimalTolerance];
    24402440
    24412441  // save dual bound
     
    25092509      if (!alwaysFinish&&returnCode<1) {
    25102510        double limit = 0.0;
    2511         getDblParam(OsiDualObjectiveLimit, limit);
     2511        getDblParam(ClpDualObjectiveLimit, limit);
    25122512        if(objectiveValue()*optimizationDirection_<limit||
    25132513           numberAtFakeBound()) {
Note: See TracChangeset for help on using the changeset viewer.