Changeset 1461 for stable


Ignore:
Timestamp:
Nov 6, 2009 2:06:43 PM (10 years ago)
Author:
stefan
Message:

fix compiler warnings declaration of XXX shadows a member of YYY; remove unnecessary include to avoid warnings from CoinFactorization?

Location:
stable/1.11/Clp/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • stable/1.11/Clp/src/ClpDualRowPivot.hpp

    r1458 r1461  
    9696 
    9797  /// Sets model (normally to NULL)
    98   inline void setModel(ClpSimplex * model)
    99   { model_=model;}
     98  inline void setModel(ClpSimplex * newmodel)
     99  { model_=newmodel;}
    100100 
    101101  /// Returns type (above 63 is extra information)
  • stable/1.11/Clp/src/ClpMatrixBase.hpp

    r1458 r1461  
    353353  { return type_;}
    354354  /// Sets type
    355   void setType(int type) {type_=type;}
     355  void setType(int newtype) {type_=newtype;}
    356356  /// Sets up an effective RHS
    357357  void useEffectiveRhs(ClpSimplex * model);
  • stable/1.11/Clp/src/ClpModel.hpp

    r1458 r1461  
    345345   inline int numberIterations() const  { return numberIterations_; }
    346346   inline int getIterationCount() const { return numberIterations_; }
    347   inline void setNumberIterations(int numberIterations)
    348   { numberIterations_ = numberIterations;}
     347  inline void setNumberIterations(int numberIterationsNew)
     348  { numberIterations_ = numberIterationsNew;}
    349349  /** Solve type - 1 simplex, 2 simplex interface, 3 Interior.*/
    350350  inline int solveType() const
     
    372372   inline int problemStatus() const            { return problemStatus_; }
    373373  /// Set problem status
    374   inline void setProblemStatus(int problemStatus)
    375   { problemStatus_ = problemStatus;}
     374  inline void setProblemStatus(int problemStatusNew)
     375  { problemStatus_ = problemStatusNew;}
    376376   /** Secondary status of problem - may get extended
    377377       0 - none
     
    389389   */
    390390   inline int secondaryStatus() const            { return secondaryStatus_; }
    391   inline void setSecondaryStatus(int status)
    392   { secondaryStatus_ = status;}
     391  inline void setSecondaryStatus(int newstatus)
     392  { secondaryStatus_ = newstatus;}
    393393   /// Are there a numerical difficulties?
    394394   inline bool isAbandoned() const             { return problemStatus_==4; }
     
    615615      to ClpPackedMatrix.  ClpModel takes ownership.
    616616  */
    617    inline void replaceMatrix(CoinPackedMatrix * matrix,
     617   inline void replaceMatrix(CoinPackedMatrix * newmatrix,
    618618                             bool deleteCurrent=false)
    619   { replaceMatrix(new ClpPackedMatrix(matrix),deleteCurrent);}
     619  { replaceMatrix(new ClpPackedMatrix(newmatrix),deleteCurrent);}
    620620   /// Objective value
    621621   inline double objectiveValue() const {
     
    744744  { return objective_;}
    745745  void setObjective(ClpObjective * objective);
    746   inline void setObjectivePointer(ClpObjective * objective)
    747   { objective_ = objective;}
     746  inline void setObjectivePointer(ClpObjective * newobjective)
     747  { objective_ = newobjective;}
    748748  /** Solve a problem with no elements - return status and
    749749      dual and primal infeasibilites */
  • stable/1.11/Clp/src/ClpPrimalColumnPivot.hpp

    r1458 r1461  
    110110  { return model_;}
    111111  /// Sets model
    112   inline void setModel(ClpSimplex * model)
    113   { model_=model;}
     112  inline void setModel(ClpSimplex * newmodel)
     113  { model_=newmodel;}
    114114 
    115115  /// Returns type (above 63 is extra information)
  • stable/1.11/Clp/src/ClpSimplex.hpp

    r1458 r1461  
    2020class ClpPrimalColumnPivot;
    2121class ClpFactorization;
    22 #include "ClpFactorization.hpp"
    2322class CoinIndexedVector;
    2423class ClpNonLinearCost;
     
    857856  inline Status getStatus(int sequence) const
    858857  {return static_cast<Status> (status_[sequence]&7);}
    859   inline void setStatus(int sequence, Status status)
     858  inline void setStatus(int sequence, Status newstatus)
    860859  {
    861860    unsigned char & st_byte = status_[sequence];
    862861    st_byte = static_cast<unsigned char>(st_byte & ~7);
    863     st_byte = static_cast<unsigned char>(st_byte | status);
     862    st_byte = static_cast<unsigned char>(st_byte | newstatus);
    864863  }
    865864  /// Start or reset using maximumRows_ and Columns_ - true if change
     
    980979  inline FakeBound getFakeBound(int sequence) const
    981980  {return static_cast<FakeBound> ((status_[sequence]>>3)&3);}
    982   inline void setRowStatus(int sequence, Status status)
     981  inline void setRowStatus(int sequence, Status newstatus)
    983982  {
    984983    unsigned char & st_byte = status_[sequence+numberColumns_];
    985984    st_byte = static_cast<unsigned char>(st_byte & ~7);
    986     st_byte = static_cast<unsigned char>(st_byte | status);
     985    st_byte = static_cast<unsigned char>(st_byte | newstatus);
    987986  }
    988987  inline Status getRowStatus(int sequence) const
    989988  {return static_cast<Status> (status_[sequence+numberColumns_]&7);}
    990   inline void setColumnStatus(int sequence, Status status)
     989  inline void setColumnStatus(int sequence, Status newstatus)
    991990  {
    992991    unsigned char & st_byte = status_[sequence];
    993992    st_byte = static_cast<unsigned char>(st_byte & ~7);
    994     st_byte = static_cast<unsigned char>(st_byte | status);
     993    st_byte = static_cast<unsigned char>(st_byte | newstatus);
    995994  }
    996995  inline Status getColumnStatus(int sequence) const
     
    11331132      /** Set a single column lower and upper bound */
    11341133      inline void setColBounds( int elementIndex,
    1135         double lower, double upper )
    1136        { setColumnBounds(elementIndex, lower, upper);}
     1134        double newlower, double newupper )
     1135       { setColumnBounds(elementIndex, newlower, newupper);}
    11371136
    11381137      /** Set the bounds on a number of columns simultaneously<br>
  • stable/1.11/Clp/src/ClpSolve.hpp

    r1458 r1461  
    122122  inline bool doDual() const
    123123  { return (independentOptions_[1]&1)==0;}
    124   inline void setDoDual(bool doDual)
    125   { if (doDual) independentOptions_[1]  &= ~1; else independentOptions_[1] |= 1;}
     124  inline void setDoDual(bool doDual_)
     125  { if (doDual_) independentOptions_[1]  &= ~1; else independentOptions_[1] |= 1;}
    126126  /// Whether we want to do singleton part of presolve
    127127  inline bool doSingleton() const
    128128  { return (independentOptions_[1]&2)==0;}
    129   inline void setDoSingleton(bool doSingleton)
    130   { if (doSingleton) independentOptions_[1]  &= ~2; else independentOptions_[1] |= 2;}
     129  inline void setDoSingleton(bool doSingleton_)
     130  { if (doSingleton_) independentOptions_[1]  &= ~2; else independentOptions_[1] |= 2;}
    131131  /// Whether we want to do doubleton part of presolve
    132132  inline bool doDoubleton() const
    133133  { return (independentOptions_[1]&4)==0;}
    134   inline void setDoDoubleton(bool doDoubleton)
    135   { if (doDoubleton) independentOptions_[1]  &= ~4; else independentOptions_[1] |= 4;}
     134  inline void setDoDoubleton(bool doDoubleton_)
     135  { if (doDoubleton_) independentOptions_[1]  &= ~4; else independentOptions_[1] |= 4;}
    136136  /// Whether we want to do tripleton part of presolve
    137137  inline bool doTripleton() const
    138138  { return (independentOptions_[1]&8)==0;}
    139   inline void setDoTripleton(bool doTripleton)
    140   { if (doTripleton) independentOptions_[1]  &= ~8; else independentOptions_[1] |= 8;}
     139  inline void setDoTripleton(bool doTripleton_)
     140  { if (doTripleton_) independentOptions_[1]  &= ~8; else independentOptions_[1] |= 8;}
    141141  /// Whether we want to do tighten part of presolve
    142142  inline bool doTighten() const
    143143  { return (independentOptions_[1]&16)==0;}
    144   inline void setDoTighten(bool doTighten)
    145   { if (doTighten) independentOptions_[1]  &= ~16; else independentOptions_[1] |= 16;}
     144  inline void setDoTighten(bool doTighten_)
     145  { if (doTighten_) independentOptions_[1]  &= ~16; else independentOptions_[1] |= 16;}
    146146  /// Whether we want to do forcing part of presolve
    147147  inline bool doForcing() const
    148148  { return (independentOptions_[1]&32)==0;}
    149   inline void setDoForcing(bool doForcing)
    150   { if (doForcing) independentOptions_[1]  &= ~32; else independentOptions_[1] |= 32;}
     149  inline void setDoForcing(bool doForcing_)
     150  { if (doForcing_) independentOptions_[1]  &= ~32; else independentOptions_[1] |= 32;}
    151151  /// Whether we want to do impliedfree part of presolve
    152152  inline bool doImpliedFree() const
     
    157157  inline bool doDupcol() const
    158158  { return (independentOptions_[1]&128)==0;}
    159   inline void setDoDupcol(bool doDupcol)
    160   { if (doDupcol) independentOptions_[1]  &= ~128; else independentOptions_[1] |= 128;}
     159  inline void setDoDupcol(bool doDupcol_)
     160  { if (doDupcol_) independentOptions_[1]  &= ~128; else independentOptions_[1] |= 128;}
    161161  /// Whether we want to do duprow part of presolve
    162162  inline bool doDuprow() const
    163163  { return (independentOptions_[1]&256)==0;}
    164   inline void setDoDuprow(bool doDuprow)
    165   { if (doDuprow) independentOptions_[1]  &= ~256; else independentOptions_[1] |= 256;}
     164  inline void setDoDuprow(bool doDuprow_)
     165  { if (doDuprow_) independentOptions_[1]  &= ~256; else independentOptions_[1] |= 256;}
    166166  /// Whether we want to do singleton column part of presolve
    167167  inline bool doSingletonColumn() const
    168168  { return (independentOptions_[1]&512)==0;}
    169   inline void setDoSingletonColumn(bool doSingleton)
    170   { if (doSingleton) independentOptions_[1]  &= ~512; else independentOptions_[1] |= 512;}
     169  inline void setDoSingletonColumn(bool doSingleton_)
     170  { if (doSingleton_) independentOptions_[1]  &= ~512; else independentOptions_[1] |= 512;}
    171171  /// Set whole group
    172172  inline int presolveActions() const
Note: See TracChangeset for help on using the changeset viewer.