Ignore:
Timestamp:
Jan 6, 2019 2:43:06 PM (4 months ago)
Author:
unxusr
Message:

formatting

File:
1 edited

Legend:

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

    r2025 r2385  
    2929
    3030public:
    31 
    32      /**@name Description of algorithm */
    33      //@{
    34      /** Primal algorithms for reduced gradient
     31  /**@name Description of algorithm */
     32  //@{
     33  /** Primal algorithms for reduced gradient
    3534         At present we have two algorithms:
    3635
    3736     */
    38      /// A reduced gradient method.
    39      int primal();
    40      /** Primal algorithm for quadratic
     37  /// A reduced gradient method.
     38  int primal();
     39  /** Primal algorithm for quadratic
    4140         Using a semi-trust region approach as for pooling problem
    4241         This is in because I have it lying around
    4342     */
    44      int primalSLP(int numberPasses, double deltaTolerance,
    45                 int otherOptions=0);
    46      /// May use a cut approach for solving any LP
    47      int primalDualCuts(char * rowsIn, int startUp, int algorithm);
    48      /** Primal algorithm for nonlinear constraints
     43  int primalSLP(int numberPasses, double deltaTolerance,
     44    int otherOptions = 0);
     45  /// May use a cut approach for solving any LP
     46  int primalDualCuts(char *rowsIn, int startUp, int algorithm);
     47  /** Primal algorithm for nonlinear constraints
    4948         Using a semi-trust region approach as for pooling problem
    5049         This is in because I have it lying around
    5150
    5251     */
    53      int primalSLP(int numberConstraints, ClpConstraint ** constraints,
    54                    int numberPasses, double deltaTolerance);
     52  int primalSLP(int numberConstraints, ClpConstraint **constraints,
     53    int numberPasses, double deltaTolerance);
    5554
    56      /** Creates direction vector.  note longArray is long enough
     55  /** Creates direction vector.  note longArray is long enough
    5756         for rows and columns.  If numberNonBasic 0 then is updated
    5857         otherwise mode is ignored and those are used.
    5958         Norms are only for those > 1.0e3*dualTolerance
    6059         If mode is nonzero then just largest dj */
    61      void directionVector (CoinIndexedVector * longArray,
    62                            CoinIndexedVector * spare1, CoinIndexedVector * spare2,
    63                            int mode,
    64                            double & normFlagged, double & normUnflagged,
    65                            int & numberNonBasic);
    66      /// Main part.
    67      int whileIterating (int & pivotMode);
    68      /**
     60  void directionVector(CoinIndexedVector *longArray,
     61    CoinIndexedVector *spare1, CoinIndexedVector *spare2,
     62    int mode,
     63    double &normFlagged, double &normUnflagged,
     64    int &numberNonBasic);
     65  /// Main part.
     66  int whileIterating(int &pivotMode);
     67  /**
    6968         longArray has direction
    7069         pivotMode -
     
    7877         If sequenceIn_ >=0 then that will be incoming variable
    7978     */
    80      int pivotColumn(CoinIndexedVector * longArray,
    81                      CoinIndexedVector * rowArray,
    82                      CoinIndexedVector * columnArray,
    83                      CoinIndexedVector * spare,
    84                      int & pivotMode,
    85                      double & solutionError,
    86                      double * array1);
    87      /**  Refactorizes if necessary
     79  int pivotColumn(CoinIndexedVector *longArray,
     80    CoinIndexedVector *rowArray,
     81    CoinIndexedVector *columnArray,
     82    CoinIndexedVector *spare,
     83    int &pivotMode,
     84    double &solutionError,
     85    double *array1);
     86  /**  Refactorizes if necessary
    8887          Checks if finished.  Updates status.
    8988          lastCleaned refers to iteration at which some objective/feasibility
     
    9493           - 2 restoring from saved
    9594     */
    96      void statusOfProblemInPrimal(int & lastCleaned, int type,
    97                                   ClpSimplexProgress * progress,
    98                                   bool doFactorization,
    99                                   double & bestObjectiveWhenFlagged);
    100      /** Do last half of an iteration.
     95  void statusOfProblemInPrimal(int &lastCleaned, int type,
     96    ClpSimplexProgress *progress,
     97    bool doFactorization,
     98    double &bestObjectiveWhenFlagged);
     99  /** Do last half of an iteration.
    101100         Return codes
    102101         Reasons to come out normal mode
     
    110109
    111110     */
    112      int pivotNonlinearResult();
    113      //@}
    114 
     111  int pivotNonlinearResult();
     112  //@}
    115113};
    116114#endif
    117115
     116/* vi: softtabstop=2 shiftwidth=2 expandtab tabstop=2
     117*/
Note: See TracChangeset for help on using the changeset viewer.