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/ClpPrimalColumnSteepest.hpp

    r210 r212  
    2626 
    2727  /** Returns pivot column, -1 if none.
    28       updateArray has cost updates (also use pivotRow_ from last iteration)
     28      updateArray has cost updates (also use pivotRow_ from last iteration).
     29      Parts of operation split out into seperate functions for
     30      profiling and speed
    2931  */
    3032  virtual int pivotColumn(CoinIndexedVector * updates,
     
    3335                          CoinIndexedVector * spareColumn1,
    3436                          CoinIndexedVector * spareColumn2);
     37  /// For quadratic or funny nonlinearities
     38  int pivotColumnOldMethod(CoinIndexedVector * updates,
     39                          CoinIndexedVector * spareRow1,
     40                          CoinIndexedVector * spareRow2,
     41                          CoinIndexedVector * spareColumn1,
     42                          CoinIndexedVector * spareColumn2);
     43  /// Just update djs
     44  void justDjs(CoinIndexedVector * updates,
     45               CoinIndexedVector * spareRow1,
     46               CoinIndexedVector * spareRow2,
     47               CoinIndexedVector * spareColumn1,
     48               CoinIndexedVector * spareColumn2);
     49  /// Update djs, weights for Devex using djs
     50  void djsAndDevex(CoinIndexedVector * updates,
     51               CoinIndexedVector * spareRow1,
     52               CoinIndexedVector * spareRow2,
     53               CoinIndexedVector * spareColumn1,
     54               CoinIndexedVector * spareColumn2);
     55  /// Update djs, weights for Steepest using djs
     56  void djsAndSteepest(CoinIndexedVector * updates,
     57               CoinIndexedVector * spareRow1,
     58               CoinIndexedVector * spareRow2,
     59               CoinIndexedVector * spareColumn1,
     60               CoinIndexedVector * spareColumn2);
     61  /// Update djs, weights for Devex using pivot row
     62  void djsAndDevex2(CoinIndexedVector * updates,
     63               CoinIndexedVector * spareRow1,
     64               CoinIndexedVector * spareRow2,
     65               CoinIndexedVector * spareColumn1,
     66               CoinIndexedVector * spareColumn2);
     67  /// Update djs, weights for Steepest using pivot row
     68  void djsAndSteepest2(CoinIndexedVector * updates,
     69               CoinIndexedVector * spareRow1,
     70               CoinIndexedVector * spareRow2,
     71               CoinIndexedVector * spareColumn1,
     72               CoinIndexedVector * spareColumn2);
     73  /// Update weights for Devex
     74  void justDevex(CoinIndexedVector * updates,
     75               CoinIndexedVector * spareRow1,
     76               CoinIndexedVector * spareRow2,
     77               CoinIndexedVector * spareColumn1,
     78               CoinIndexedVector * spareColumn2);
     79  /// Update weights for Steepest
     80  void justSteepest(CoinIndexedVector * updates,
     81               CoinIndexedVector * spareRow1,
     82               CoinIndexedVector * spareRow2,
     83               CoinIndexedVector * spareColumn1,
     84               CoinIndexedVector * spareColumn2);
    3585
    3686  /// Updates weights - part 1 - also checks accuracy
     
    68118      0 is exact devex, 1 full steepest, 2 is partial exact devex
    69119      3 switches between 0 and 2 depending on factorization
    70       4 starts as partial dantzig but then may switch between 0 and 2.
     120      4 starts as partial dantzig/devex but then may switch between 0 and 2.
    71121      By partial exact devex is meant that the weights are updated as normal
    72122      but only part of the nonbasic variables are scanned. 
     
    130180      0 is exact devex, 1 full steepest, 2 is partial exact devex
    131181      3 switches between 0 and 2 depending on factorization
    132       4 starts as partial dantzig but then may switch between 0 and 2.
     182      4 starts as partial dantzig/devex but then may switch between 0 and 2.
    133183      By partial exact devex is meant that the weights are updated as normal
    134184      but only part of the nonbasic variables are scanned. 
Note: See TracChangeset for help on using the changeset viewer.