Changeset 1390 for trunk/Clp


Ignore:
Timestamp:
Jul 8, 2009 12:03:14 PM (10 years ago)
Author:
forrest
Message:

compiler warnings

Location:
trunk/Clp/src
Files:
2 edited

Legend:

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

    r1370 r1390  
    101101      default does not allow scaling
    102102      returns non-zero if no scaling done */
    103   virtual int scale(ClpModel * model, const ClpSimplex * baseModel=NULL) const
     103  virtual int scale(ClpModel * , const ClpSimplex * =NULL) const
    104104  { return 1;}
    105105  /** Scales rowCopy if column copy scaled
    106106      Only called if scales already exist */
    107   virtual void scaleRowCopy(ClpModel * model) const
     107  virtual void scaleRowCopy(ClpModel * ) const
    108108  { }
    109109  /// Returns true if can create row copy
     
    113113      Only called if scales already exist.
    114114      Up to user to delete */
    115   inline virtual ClpMatrixBase * scaledColumnCopy(ClpModel * model) const
     115  inline virtual ClpMatrixBase * scaledColumnCopy(ClpModel * ) const
    116116  { return this->clone();}
    117117 
     
    126126      8 - report on large and small
    127127  */
    128   virtual bool allElementsInRange(ClpModel * model,
    129                                   double smallest, double largest,
    130                                   int check=15)
     128  virtual bool allElementsInRange(ClpModel * ,
     129                                  double , double ,
     130                                  int =15)
    131131  { return true;}
    132132  /** Set the dimensions of the matrix. In effect, append new empty
     
    157157      Returns non-zero if any changes.
    158158  */
    159   virtual int refresh(ClpSimplex * model)
     159  virtual int refresh(ClpSimplex * )
    160160  { return 0;}
    161161 
     
    304304  /** Returns true if can combine transposeTimes and subsetTransposeTimes
    305305      and if it would be faster */
    306   virtual bool canCombine(const ClpSimplex * model,
    307                           const CoinIndexedVector * pi) const {return false;}
     306  virtual bool canCombine(const ClpSimplex * ,
     307                          const CoinIndexedVector * ) const {return false;}
    308308  /// Updates two arrays for steepest and does devex weights (need not be coded)
    309309  virtual void transposeTimes2(const ClpSimplex * model,
  • trunk/Clp/src/Clp_C_Interface.cpp

    r1370 r1390  
    1 /* $Id$ */
    21// Copyright (C) 2003, International Business Machines
    32// Corporation and others.  All Rights Reserved.
     
    241240      prefix, numcols, numrows);
    242241    printf("%s model = %p, start = %p, index = %p, value = %p\n",
    243       prefix, (void*)model, (void*)start, (void*)index, (void*)value);
     242           prefix, reinterpret_cast<const void *>(model), reinterpret_cast<const void *>(start), reinterpret_cast<const void *>(index), reinterpret_cast<const void *>(value));
    244243    printf("%s collb = %p, colub = %p, obj = %p, rowlb = %p, rowub = %p\n",
    245       prefix, (void*)collb, (void*)colub, (void*)obj, (void*)rowlb, (void*)rowub);
     244           prefix, reinterpret_cast<const void *>(collb), reinterpret_cast<const void *>(colub), reinterpret_cast<const void *>(obj), reinterpret_cast<const void *>(rowlb), reinterpret_cast<const void *>(rowub));
    246245  }
    247246  model->model_->loadProblem(numcols,numrows,start,index,value,
     
    11311130    prefix, numcols, numrows, numelem);
    11321131  printf("%s model = %p, start = %p, index = %p, value = %p\n",
    1133     prefix, (void*)model, (void*)start, (void*)index, (void*)value);
     1132         prefix, reinterpret_cast<const void *>(model), reinterpret_cast<const void *>(start), reinterpret_cast<const void *>(index), reinterpret_cast<const void *>(value));
    11341133  clp_simplex->matrix()->dumpMatrix(NULL);
    11351134  {
     
    11431142 
    11441143  printf("%s collb = %p, colub = %p, obj = %p, rowlb = %p, rowub = %p\n",
    1145     prefix, (void*)collb, (void*)colub, (void*)obj, (void*)rowlb, (void*)rowub);
     1144         prefix, reinterpret_cast<const void *>(collb), reinterpret_cast<const void *>(colub), reinterpret_cast<const void *>(obj), reinterpret_cast<const void *>(rowlb), reinterpret_cast<const void *>(rowub));
    11461145  printf("%s optimization direction = %g\n",prefix, Clp_optimizationDirection(model));
    11471146  printf("  (1 - minimize, -1 - maximize, 0 - ignore)\n");
Note: See TracChangeset for help on using the changeset viewer.