Ignore:
Timestamp:
May 18, 2004 10:06:56 AM (16 years ago)
Author:
forrest
Message:

improving interior point code

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/ClpInterior.hpp

    r268 r369  
    77   John Tomlin (pdco)
    88   John Forrest (standard predictor-corrector)
     9
     10   Note JJF has added arrays - this takes more memory but makes
     11   flow easier to understand and hopefully easier to extend
    912
    1013 */
     
    418421  /// rhsFixRegion.
    419422  double * rhsFixRegion_;
    420   /// updateRegion.
    421   double * updateRegion_;
    422423  /// upperSlack
    423424  double * upperSlack_;
     
    426427  /// diagonal
    427428  double * diagonal_;
    428   /// weights
    429   double * weights_;
    430429  /// solution
    431430  double * solution_;
    432   /// work1 or deltaZ.
     431  /// work array
     432  double * workArray_;
     433  /// delta X
     434  double * deltaX_;
     435  /// delta Y
     436  double * deltaY_;
     437  /// deltaZ.
    433438  double * deltaZ_;
    434   /// work2 or deltaW.
    435   double * deltaW_;
    436   /// work3 or deltaS.
    437   double * deltaS_;
    438   /// work4 or deltaT.
     439  /// deltaT.
    439440  double * deltaT_;
     441  /// deltaS.
     442  double * deltaSU_;
     443  double * deltaSL_;
     444  /// rhs B
     445  double * rhsB_;
     446  /// rhsU.
     447  double * rhsU_;
     448  /// rhsL.
     449  double * rhsL_;
     450  /// rhsZ.
     451  double * rhsZ_;
     452  /// rhsT.
     453  double * rhsT_;
     454  /// rhs C
     455  double * rhsC_;
    440456  /// zVec
    441457  double * zVec_;
    442   /// wVec
    443   double * wVec_;
     458  /// tVec
     459  double * tVec_;
    444460  /// cholesky.
    445461  ClpCholeskyBase * cholesky_;
    446   /// numberComplementarityPairs;
     462  /// numberComplementarityPairs i.e. ones with lower and/or upper bounds (not fixed)
    447463  int numberComplementarityPairs_;
     464  /// numberComplementarityItems_ i.e. number of active bounds
     465  int numberComplementarityItems_;
    448466  /// Maximum iterations
    449467  int maximumBarrierIterations_;
Note: See TracChangeset for help on using the changeset viewer.