Ignore:
Timestamp:
Aug 20, 2007 12:05:19 AM (12 years ago)
Author:
andreasw
Message:

merging changes from Bug Squashing Party Aug 2007 to regular trunk

File:
1 edited

Legend:

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

    r1055 r1088  
    4040  virtual double * rhsOffset(ClpSimplex * model,bool forceRefresh=false,
    4141                                bool check=false);
     42
     43  using ClpPackedMatrix::times ;
    4244    /** Return <code>y + A * scalar *x</code> in <code>y</code>.
    4345        @pre <code>x</code> must be of size <code>numColumns()</code>
     
    9395  void initialProblem();
    9496  /** Adds in a column to gub structure (called from descendant) and returns sequence */
    95   int addColumn(int numberEntries,const int * row, const float * element,
    96                  float cost, float lower, float upper, int iSet,
     97  int addColumn(int numberEntries,const int * row, const double * element,
     98                 double cost, double lower, double upper, int iSet,
    9799                 DynamicStatus status);
    98100  /** If addColumn forces compression then this allows descendant to know what to do.
     
    188190  { return row_;}
    189191  /// elements
    190   inline float * element() const
     192  inline double * element() const
    191193  { return element_;}
    192194  /// costs
    193   inline float * cost() const
     195  inline double * cost() const
    194196  { return cost_;}
    195197  /// ids of active columns (just index here)
     
    197199  { return id_;}
    198200  /// Optional lower bounds on columns
    199   inline float * columnLower() const
     201  inline double * columnLower() const
    200202  { return columnLower_;}
    201203  /// Optional upper bounds on columns
    202   inline float * columnUpper() const
     204  inline double * columnUpper() const
    203205  { return columnUpper_;}
    204206  /// Lower bounds on sets
    205   inline float * lowerSet() const
     207  inline double * lowerSet() const
    206208  { return lowerSet_;}
    207209  /// Upper bounds on sets
    208   inline float * upperSet() const
     210  inline double * upperSet() const
    209211  { return upperSet_;}
    210212  /// size
     
    272274  double objectiveOffset_;
    273275  /// Lower bounds on sets
    274   float * lowerSet_;
     276  double * lowerSet_;
    275277  /// Upper bounds on sets
    276   float * upperSet_;
     278  double * upperSet_;
    277279  /// Status of slack on set
    278280  unsigned char * status_;
     
    318320  int * row_;
    319321  /// elements
    320   float * element_;
     322  double * element_;
    321323  /// costs
    322   float * cost_;
     324  double * cost_;
    323325  /// ids of active columns (just index here)
    324326  int * id_;
     
    326328  unsigned char * dynamicStatus_;
    327329  /// Optional lower bounds on columns
    328   float * columnLower_;
     330  double * columnLower_;
    329331  /// Optional upper bounds on columns
    330   float * columnUpper_;
     332  double * columnUpper_;
    331333   //@}
    332334};
Note: See TracChangeset for help on using the changeset viewer.