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/ClpDualRowSteepest.cpp

    r17 r19  
    99#include "ClpSimplex.hpp"
    1010#include "ClpDualRowSteepest.hpp"
    11 #include "OsiIndexedVector.hpp"
     11#include "CoinIndexedVector.hpp"
    1212#include "ClpFactorization.hpp"
    1313#include "CoinHelperFunctions.hpp"
    14 #include <stdio.h>
     14#include <cstdio>
    1515
    1616//#############################################################################
     
    4343  model_ = rhs.model_;
    4444  if (rhs.infeasible_) {
    45     infeasible_= new OsiIndexedVector(rhs.infeasible_);
     45    infeasible_= new CoinIndexedVector(rhs.infeasible_);
    4646  } else {
    4747    infeasible_=NULL;
     
    5656  }
    5757  if (rhs.alternateWeights_) {
    58     alternateWeights_= new OsiIndexedVector(rhs.alternateWeights_);
     58    alternateWeights_= new CoinIndexedVector(rhs.alternateWeights_);
    5959  } else {
    6060    alternateWeights_=NULL;
    6161  }
    6262  if (rhs.savedWeights_) {
    63     savedWeights_= new OsiIndexedVector(rhs.savedWeights_);
     63    savedWeights_= new CoinIndexedVector(rhs.savedWeights_);
    6464  } else {
    6565    savedWeights_=NULL;
     
    9494    delete savedWeights_;
    9595    if (rhs.infeasible_!=NULL) {
    96       infeasible_= new OsiIndexedVector(rhs.infeasible_);
     96      infeasible_= new CoinIndexedVector(rhs.infeasible_);
    9797    } else {
    9898      infeasible_=NULL;
     
    107107    }
    108108    if (rhs.alternateWeights_!=NULL) {
    109       alternateWeights_= new OsiIndexedVector(rhs.alternateWeights_);
     109      alternateWeights_= new CoinIndexedVector(rhs.alternateWeights_);
    110110    } else {
    111111      alternateWeights_=NULL;
    112112    }
    113113    if (rhs.savedWeights_!=NULL) {
    114       savedWeights_= new OsiIndexedVector(rhs.savedWeights_);
     114      savedWeights_= new CoinIndexedVector(rhs.savedWeights_);
    115115    } else {
    116116      savedWeights_=NULL;
     
    153153// Updates weights
    154154void
    155 ClpDualRowSteepest::updateWeights(OsiIndexedVector * input,
    156                                   OsiIndexedVector * spare,
    157                                   OsiIndexedVector * updatedColumn)
     155ClpDualRowSteepest::updateWeights(CoinIndexedVector * input,
     156                                  CoinIndexedVector * spare,
     157                                  CoinIndexedVector * updatedColumn)
    158158{
    159159  // clear other region
     
    172172  {
    173173    int numberRows = model_->numberRows();
    174     OsiIndexedVector * temp = new OsiIndexedVector();
     174    CoinIndexedVector * temp = new CoinIndexedVector();
    175175    temp->reserve(numberRows+
    176176                  model_->factorization()->maximumPivots());
     
    265265void
    266266ClpDualRowSteepest::updatePrimalSolution(
    267                                         OsiIndexedVector * primalUpdate,
     267                                        CoinIndexedVector * primalUpdate,
    268268                                        double primalRatio,
    269269                                        double & objectiveChange)
     
    352352      delete alternateWeights_;
    353353      weights_ = new double[numberRows];
    354       alternateWeights_ = new OsiIndexedVector();
     354      alternateWeights_ = new CoinIndexedVector();
    355355      // enough space so can use it for factorization
    356356      alternateWeights_->reserve(numberRows+
     
    362362        }
    363363      } else {
    364         OsiIndexedVector * temp = new OsiIndexedVector();
     364        CoinIndexedVector * temp = new CoinIndexedVector();
    365365        temp->reserve(numberRows+
    366366                      model_->factorization()->maximumPivots());
     
    387387      }
    388388      // create saved weights (not really indexedvector)
    389       savedWeights_ = new OsiIndexedVector();
     389      savedWeights_ = new CoinIndexedVector();
    390390      savedWeights_->reserve(numberRows);
    391391     
     
    428428    // set up infeasibilities
    429429    if (!infeasible_) {
    430       infeasible_ = new OsiIndexedVector();
     430      infeasible_ = new CoinIndexedVector();
    431431      infeasible_->reserve(numberRows);
    432432    }
Note: See TracChangeset for help on using the changeset viewer.