Ignore:
Timestamp:
Oct 2, 2003 1:21:02 PM (17 years ago)
Author:
forrest
Message:

lots of stuff

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/pre/include/ClpSimplex.hpp

    r210 r212  
    161161  /// Passes in factorization
    162162  void setFactorization( ClpFactorization & factorization);
    163   /// Sets or unsets scaling, 0 -off, 1 equilibrium, 2 geometric, 3 dynamic(later)
     163  /// Sets or unsets scaling, 0 -off, 1 equilibrium, 2 geometric, 3, auto, 4 dynamic(later)
    164164  void scaling(int mode=1);
    165165  /// Gets scalingFlag
     
    360360    void restoreData(ClpDataSave saved);
    361361  int internalFactorize(int solveType);
     362  /// Clean up status
     363  void cleanStatus();
    362364  /// Factorizes using current basis. For external use
    363365  int factorize();
     
    545547  /// Sanity check on input rim data (after scaling) - returns true if okay
    546548  bool sanityCheck();
    547   /** Get next superbasic (primal) or next free (dual), -1 if none */
    548   int nextSuperBasic();
    549549  //@}
    550550  public:
     
    866866  /// Column scale factors
    867867  double * columnScale_;
    868   /// Scale flag, 0 none, 1 equilibrium, 2 geometric, 3 dynamic
     868  /// Scale flag, 0 none, 1 equilibrium, 2 geometric, 3, auto, 4 dynamic
    869869  int scalingFlag_;
    870870  /// Number of times code has tentatively thought optimal
Note: See TracChangeset for help on using the changeset viewer.