Ignore:
Timestamp:
Jan 14, 2009 4:14:09 PM (12 years ago)
Author:
forrest
Message:

out compiler warnings and stability improvements

File:
1 edited

Legend:

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

    r1311 r1321  
    1919class ClpPrimalColumnPivot;
    2020class ClpFactorization;
     21#include "ClpFactorization.hpp"
    2122class CoinIndexedVector;
    2223class ClpNonLinearCost;
     
    6566  enum FakeBound {
    6667    noFake = 0x00,
    67     bothFake = 0x01,
     68    lowerFake = 0x01,
    6869    upperFake = 0x02,
    69     lowerFake = 0x03
     70    bothFake = 0x03
    7071  };
    7172
     
    709710  /** This sets sum and number of infeasibilities (Dual and Primal) */
    710711  void checkBothSolutions();
     712  /**  If input negative scales objective so maximum <= -value
     713       and returns scale factor used.  If positive unscales and also
     714       redoes dual stuff
     715  */
     716  double scaleObjective(double value);
    711717public:
    712718  /** For advanced use.  When doing iterative solves things can get
     
    754760  inline void setLargestDualError(double value)
    755761          { largestDualError_=value;}
     762  /// Get zero tolerance
     763  inline double zeroTolerance() const
     764  { return zeroTolerance_;/*factorization_->zeroTolerance();*/}
     765  /// Set zero tolerance
     766  inline void setZeroTolerance( double value)
     767  { zeroTolerance_ = value;}
    756768  /// Basic variables pivoting on which rows
    757769  inline int * pivotVariable() const
     
    10181030  /// Progress flag - at present 0 bit says artificials out
    10191031  inline int progressFlag() const
    1020   {return progressFlag_;}
     1032  {return (progressFlag_&3);}
    10211033  /// Force re-factorization early
    10221034  inline void forceFactorization(int value)
     
    11651177  */
    11661178  //@{
    1167   /// Worst column primal infeasibility
    1168   double columnPrimalInfeasibility_;
    1169   /// Worst row primal infeasibility
    1170   double rowPrimalInfeasibility_;
     1179  /** Best possible improvement using djs (primal) or
     1180      obj change by flipping bounds to make dual feasible (dual) */
     1181  double bestPossibleImprovement_;
     1182  /// Zero tolerance
     1183  double zeroTolerance_;
    11711184  /// Sequence of worst (-1 if feasible)
    11721185  int columnPrimalSequence_;
     
    13591372  /// Automatic scaling of objective and rhs and bounds
    13601373  int automaticScale_;
     1374  /// Maximum perturbation array size (take out when code rewritten)
     1375  int maximumPerturbationSize_;
     1376  /// Perturbation array (maximumPerturbationSize_)
     1377  double * perturbationArray_;
    13611378  /// A copy of model with certain state - normally without cuts
    13621379  ClpSimplex * baseModel_;
Note: See TracChangeset for help on using the changeset viewer.