Changeset 388


Ignore:
Timestamp:
Jun 3, 2004 2:41:24 PM (15 years ago)
Author:
forrest
Message:

add gamma and delta

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpInterior.cpp

    r382 r388  
    6161  linearPerturbation_(1.0e-12),
    6262  diagonalPerturbation_(1.0e-15),
     63  gamma_(0.0),
     64  delta_(0),
    6365  targetGap_(1.0e-12),
    6466  projectionTolerance_(1.0e-7),
     
    146148    linearPerturbation_(1.0e-12),
    147149    diagonalPerturbation_(1.0e-15),
     150    gamma_(0.0),
     151    delta_(0),
    148152    targetGap_(1.0e-12),
    149153    projectionTolerance_(1.0e-7),
     
    293297  linearPerturbation_(1.0e-12),
    294298  diagonalPerturbation_(1.0e-15),
     299  gamma_(0.0),
     300  delta_(0),
    295301  targetGap_(1.0e-12),
    296302  projectionTolerance_(1.0e-7),
     
    388394  linearPerturbation_ = rhs.linearPerturbation_;
    389395  diagonalPerturbation_ = rhs.diagonalPerturbation_;
     396  gamma_=rhs.gamma_;
     397  delta_=rhs.delta_;
    390398  targetGap_ = rhs.targetGap_;
    391399  projectionTolerance_ = rhs.projectionTolerance_;
  • trunk/include/ClpInterior.hpp

    r382 r388  
    189189  inline void setDiagonalPerturbation(double value)
    190190  { diagonalPerturbation_=value;};
     191  /// gamma
     192  inline double gamma() const
     193  { return gamma_;};
     194  inline void setGamma(double value)
     195  { gamma_=value;};
     196  /// delta
     197  inline double delta() const
     198  { return delta_;};
     199  inline void setDelta(double value)
     200  { delta_=value;};
    191201  /// ComplementarityGap
    192202  inline double complementarityGap() const
     
    400410  /// diagonalPerturbation
    401411  double diagonalPerturbation_;
     412  // gamma from Saunders and Tomlin regularized
     413  double gamma_;
     414  // delta from Saunders and Tomlin regularized
     415  double delta_;
    402416  /// targetGap
    403417  double targetGap_;
Note: See TracChangeset for help on using the changeset viewer.