Changeset 1069 for branches


Ignore:
Timestamp:
Aug 9, 2007 12:40:59 PM (12 years ago)
Author:
jpfasano
Message:

Modified to remove MS compiler messages:
ClpGubDynamicMatrix?.cpp
d:\coin\coinall-trunk\clp\src\clpgubdynamicmatrix.cpp(112) : warning C4244: '=' : conversion from 'const double' to 'float', possible loss of data
d:\coin\coinall-trunk\clp\src\clpgubdynamicmatrix.cpp(115) : warning C4244: '=' : conversion from 'const double' to 'float', possible loss of data
d:\coin\coinall-trunk\clp\src\clpgubdynamicmatrix.cpp(122) : warning C4244: '=' : conversion from 'const double' to 'float', possible loss of data
d:\coin\coinall-trunk\clp\src\clpgubdynamicmatrix.cpp(129) : warning C4244: '=' : conversion from 'const double' to 'float', possible loss of data
d:\coin\coinall-trunk\clp\src\clpgubdynamicmatrix.cpp(137) : warning C4244: '=' : conversion from 'const double' to 'float', possible loss of data
d:\coin\coinall-trunk\clp\src\clpgubdynamicmatrix.cpp(139) : warning C4305: '=' : truncation from 'double' to 'float'
d:\coin\coinall-trunk\clp\src\clpgubdynamicmatrix.cpp(144) : warning C4244: '=' : conversion from 'const double' to 'float', possible loss of data
d:\coin\coinall-trunk\clp\src\clpgubdynamicmatrix.cpp(146) : warning C4305: '=' : truncation from 'double' to 'float'

I spoke to John about these warnings and attempted to follow his instructions.

Location:
branches/BSP/trunk/Clp/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/BSP/trunk/Clp/src/ClpGubDynamicMatrix.cpp

    r1054 r1069  
    107107  CoinBigIndex numberElements = startColumn_[numberGubColumns_];
    108108  row_ = ClpCopyOfArray(row,numberElements);
    109   element_ = new float[numberElements];
     109  element_ = new double[numberElements];
    110110  CoinBigIndex i;
    111111  for (i=0;i<numberElements;i++)
    112112    element_[i]=element[i];
    113   cost_ = new float[numberGubColumns_];
     113  cost_ = new double[numberGubColumns_];
    114114  for (i=0;i<numberGubColumns_;i++) {
    115115    cost_[i]=cost[i];
     
    118118  }
    119119  if (lowerColumn) {
    120     lowerColumn_ = new float[numberGubColumns_];
     120    lowerColumn_ = new double[numberGubColumns_];
    121121    for (i=0;i<numberGubColumns_;i++)
    122122      lowerColumn_[i]=lowerColumn[i];
     
    125125  }
    126126  if (upperColumn) {
    127     upperColumn_ = new float[numberGubColumns_];
     127    upperColumn_ = new double[numberGubColumns_];
    128128    for (i=0;i<numberGubColumns_;i++)
    129129      upperColumn_[i]=upperColumn[i];
     
    132132  }
    133133  if (upperColumn||lowerColumn) {
    134     lowerSet_ = new float[numberSets_];
     134    lowerSet_ = new double[numberSets_];
    135135    for (i=0;i<numberSets_;i++) {
    136136      if (lower[i]>-1.0e20)
     
    139139        lowerSet_[i] = -1.0e30;
    140140    }
    141     upperSet_ = new float[numberSets_];
     141    upperSet_ = new double[numberSets_];
    142142    for (i=0;i<numberSets_;i++) {
    143143      if (upper[i]<1.0e20)
  • branches/BSP/trunk/Clp/src/ClpGubDynamicMatrix.hpp

    r1055 r1069  
    126126  { return row_;}
    127127  /// elements
    128   inline float * element() const
     128  inline double * element() const
    129129  { return element_;}
    130130  /// costs
    131   inline float * cost() const
     131  inline double * cost() const
    132132  { return cost_;}
    133133  /// full starts
     
    138138  { return id_;}
    139139  /// Optional lower bounds on columns
    140   inline float * lowerColumn() const
     140  inline double * lowerColumn() const
    141141  { return lowerColumn_;}
    142142  /// Optional upper bounds on columns
    143   inline float * upperColumn() const
     143  inline double * upperColumn() const
    144144  { return upperColumn_;}
    145145  /// Optional true lower bounds on sets
    146   inline float * lowerSet() const
     146  inline double * lowerSet() const
    147147  { return lowerSet_;}
    148148  /// Optional true upper bounds on sets
    149   inline float * upperSet() const
     149  inline double * upperSet() const
    150150  { return upperSet_;}
    151151  /// size
     
    189189  int * row_;
    190190  /// elements
    191   float * element_;
     191  double * element_;
    192192  /// costs
    193   float * cost_;
     193  double * cost_;
    194194  /// full starts
    195195  int * fullStart_;
     
    199199  unsigned char * dynamicStatus_;
    200200  /// Optional lower bounds on columns
    201   float * lowerColumn_;
     201  double * lowerColumn_;
    202202  /// Optional upper bounds on columns
    203   float * upperColumn_;
     203  double * upperColumn_;
    204204  /// Optional true lower bounds on sets
    205   float * lowerSet_;
     205  double * lowerSet_;
    206206  /// Optional true upper bounds on sets
    207   float * upperSet_;
     207  double * upperSet_;
    208208  /// size
    209209  int numberGubColumns_;
Note: See TracChangeset for help on using the changeset viewer.