Ignore:
Timestamp:
Aug 9, 2007 3:51:21 PM (13 years ago)
Author:
jpfasano
Message:

Modified to remove MS Compiler messages:

ClpDynamicMatrix?.cpp
d:\coin\coinall-trunk\clp\src\clpdynamicmatrix.cpp(182) : warning C4244: '=' : conversion from 'const double' to 'float', possible loss of data
d:\coin\coinall-trunk\clp\src\clpdynamicmatrix.cpp(185) : warning C4244: '=' : conversion from 'const double' to 'float', possible loss of data
d:\coin\coinall-trunk\clp\src\clpdynamicmatrix.cpp(192) : warning C4244: '=' : conversion from 'const double' to 'float', possible loss of data
d:\coin\coinall-trunk\clp\src\clpdynamicmatrix.cpp(199) : warning C4244: '=' : conversion from 'const double' to 'float', possible loss of data
d:\coin\coinall-trunk\clp\src\clpdynamicmatrix.cpp(206) : warning C4244: '=' : conversion from 'const double' to 'float', possible loss of data
d:\coin\coinall-trunk\clp\src\clpdynamicmatrix.cpp(208) : warning C4305: '=' : truncation from 'double' to 'float'
d:\coin\coinall-trunk\clp\src\clpdynamicmatrix.cpp(213) : warning C4244: '=' : conversion from 'const double' to 'float', possible loss of data
d:\coin\coinall-trunk\clp\src\clpdynamicmatrix.cpp(215) : warning C4305: '=' : truncation from 'double' to 'float'
ClpDynamicExampleMatrix?.cpp
d:\coin\coinall-trunk\clp\src\clpdynamicexamplematrix.cpp(126) : warning C4244: '=' : conversion from 'const double' to 'float', possible loss of data
d:\coin\coinall-trunk\clp\src\clpdynamicexamplematrix.cpp(129) : warning C4244: '=' : conversion from 'const double' to 'float', possible loss of data
d:\coin\coinall-trunk\clp\src\clpdynamicexamplematrix.cpp(136) : warning C4244: '=' : conversion from 'const double' to 'float', possible loss of data
d:\coin\coinall-trunk\clp\src\clpdynamicexamplematrix.cpp(148) : warning C4244: '=' : conversion from 'const double' to 'float', possible loss of data
d:\coin\coinall-trunk\clp\src\clpdynamicexamplematrix.cpp(189) : warning C4244: 'argument' : conversion from 'double' to 'float', possible loss of data
d:\coin\coinall-trunk\clp\src\clpdynamicexamplematrix.cpp(209) : warning C4244: 'argument' : conversion from 'double' to 'float', possible loss of data
d:\coin\coinall-trunk\clp\src\clpdynamicexamplematrix.cpp(341) : warning C4244: 'argument' : conversion from 'double' to 'float', possible loss of data
d:\coin\coinall-trunk\clp\src\clpdynamicexamplematrix.cpp(362) : warning C4244: 'argument' : conversion from 'double' to 'float', possible loss of data
d:\coin\coinall-trunk\clp\src\clpdynamicexamplematrix.cpp(650) : warning C4244: 'argument' : conversion from 'double' to 'float', possible loss of data

Attempted to follow John's instructions/guidance.

File:
1 edited

Legend:

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

    r1034 r1072  
    177177  CoinBigIndex numberElements = startColumn_[numberGubColumns_];
    178178  row_ = ClpCopyOfArray(row,numberElements);
    179   element_ = new float[numberElements];
     179  element_ = new double[numberElements];
    180180  CoinBigIndex i;
    181181  for (i=0;i<numberElements;i++)
    182182    element_[i]=element[i];
    183   cost_ = new float[numberGubColumns_];
     183  cost_ = new double[numberGubColumns_];
    184184  for (i=0;i<numberGubColumns_;i++) {
    185185    cost_[i]=cost[i];
     
    188188  }
    189189  if (columnLower) {
    190     columnLower_ = new float[numberGubColumns_];
     190    columnLower_ = new double[numberGubColumns_];
    191191    for (i=0;i<numberGubColumns_;i++)
    192192      columnLower_[i]=columnLower[i];
     
    195195  }
    196196  if (columnUpper) {
    197     columnUpper_ = new float[numberGubColumns_];
     197    columnUpper_ = new double[numberGubColumns_];
    198198    for (i=0;i<numberGubColumns_;i++)
    199199      columnUpper_[i]=columnUpper[i];
     
    201201    columnUpper_=NULL;
    202202  }
    203   lowerSet_ = new float[numberSets_];
     203  lowerSet_ = new double[numberSets_];
    204204  for (i=0;i<numberSets_;i++) {
    205205    if (lower[i]>-1.0e20)
     
    208208      lowerSet_[i] = -1.0e30;
    209209  }
    210   upperSet_ = new float[numberSets_];
     210  upperSet_ = new double[numberSets_];
    211211  for (i=0;i<numberSets_;i++) {
    212212    if (upper[i]<1.0e20)
     
    22182218// Adds in a column to gub structure (called from descendant)
    22192219int
    2220 ClpDynamicMatrix::addColumn(int numberEntries,const int * row, const float * element,
    2221                             float cost, float lower, float upper,int iSet,
     2220ClpDynamicMatrix::addColumn(int numberEntries,const int * row, const double * element,
     2221                            double cost, double lower, double upper,int iSet,
    22222222                            DynamicStatus status)
    22232223{
     
    22272227    if (startColumn_[j+1]-startColumn_[j]==numberEntries) {
    22282228      const int * row2 = row_+startColumn_[j];
    2229       const float * element2 = element_ + startColumn_[j];
     2229      const double * element2 = element_ + startColumn_[j];
    22302230      bool same=true;
    22312231      for (int k=0;k<numberEntries;k++) {
Note: See TracChangeset for help on using the changeset viewer.