Changeset 59


Ignore:
Timestamp:
Nov 26, 2002 1:38:14 PM (17 years ago)
Author:
forrest
Message:

Take out bcopy and bzero

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Presolve.cpp

    r57 r59  
    432432static int ATOI(const char *name)
    433433{
    434   return true;
     434 return true;
    435435#if     DEBUG_PRESOLVE || PRESOLVE_SUMMARY
    436436  if (getenv(name)) {
  • trunk/PresolveDoubleton.cpp

    r57 r59  
    113113
    114114    // move the column - 1:  copy the entries
    115     bcopy((void*)&hrow[kcsx], (void*)&hrow[newkcsx], hincol[icolx] * sizeof(int));
    116     bcopy((void*)&colels[kcsx], (void*)&colels[newkcsx], hincol[icolx] * sizeof(double));
     115    memcpy((void*)&hrow[kcsx], (void*)&hrow[newkcsx], hincol[icolx] * sizeof(int));
     116    memcpy((void*)&colels[kcsx], (void*)&colels[newkcsx], hincol[icolx] * sizeof(double));
    117117
    118118    // move the column - 2:  update the memory-order linked list
  • trunk/PresolveImpliedFree.cpp

    r58 r59  
    7979
    8080  char *implied_free = new char[ncols];
    81   bzero(implied_free, ncols*sizeof(char));
     81  memset(implied_free, 0, ncols*sizeof(char));
    8282
    8383  double *ilbound = new double[ncols];
  • trunk/PresolveMatrix.cpp

    r55 r59  
    115115{
    116116  double *d1 = (double*)*end_mmapp;
    117   bcopy(d, d1, n*sizeof(double));
     117  memcpy(d, d1, n*sizeof(double));
    118118  *end_mmapp += ALIGN_DOUBLE(n*sizeof(double));
    119119  return (d1);
     
    122122{
    123123  int *d1 = (int*)*end_mmapp;
    124   bcopy(d, d1, n*sizeof(int));
     124  memcpy(d, d1, n*sizeof(int));
    125125  *end_mmapp += ALIGN_DOUBLE(n*sizeof(int));
    126126  return (d1);
     
    130130{
    131131  double *d1 = (double*)*end_mmapp;
    132   bcopy(d, d1, n*sizeof(double));
     132  memcpy(d, d1, n*sizeof(double));
    133133  *end_mmapp += ALIGN_DOUBLE(n2*sizeof(double));
    134134  return (d1);
     
    137137{
    138138  int *d1 = (int*)*end_mmapp;
    139   bcopy(d, d1, n*sizeof(int));
     139  memcpy(d, d1, n*sizeof(int));
    140140  *end_mmapp += ALIGN_DOUBLE(n2*sizeof(int));
    141141  return (d1);
  • trunk/PresolveSubst.cpp

    r57 r59  
    113113
    114114    // move the column - 1:  copy the entries
    115     bcopy((void*)&hrow[kcsx], (void*)&hrow[newkcsx], hincol[icolx] * sizeof(int));
    116     bcopy((void*)&colels[kcsx], (void*)&colels[newkcsx], hincol[icolx] * sizeof(double));
     115    memcpy((void*)&hrow[kcsx], (void*)&hrow[newkcsx], hincol[icolx] * sizeof(int));
     116    memcpy((void*)&colels[kcsx], (void*)&colels[newkcsx], hincol[icolx] * sizeof(double));
    117117
    118118    // move the column - 2:  update the memory-order linked list
     
    766766              ap->coeffxs[k-kcs] = colels[k];
    767767
    768               bcopy(&hcol[krs], &ap->rowcolsxs[nel], hinrow[irow]*sizeof(int));
    769               bcopy(&rowels[krs], &ap->rowelsxs[nel], hinrow[irow]*sizeof(double));
     768              memcpy(&hcol[krs], &ap->rowcolsxs[nel], hinrow[irow]*sizeof(int));
     769              memcpy(&rowels[krs], &ap->rowelsxs[nel], hinrow[irow]*sizeof(double));
    770770              nel += hinrow[irow];
    771771            }
     
    973973
    974974            // the addition of rows may have created zero coefficients
    975             bcopy(&hcol[mrstrt[rowy]], &zerocols[nzerocols], hinrow[rowy]*sizeof(int));
     975            memcpy(&hcol[mrstrt[rowy]], &zerocols[nzerocols], hinrow[rowy]*sizeof(int));
    976976            nzerocols += hinrow[rowy];
    977977           
  • trunk/include/PresolveMatrix.hpp

    r57 r59  
    1717#define max(a,b)  (((a) > (b)) ? (a) : (b))
    1818#endif
    19 #define bcopy(dest, src, count) memcpy(dest, src, count)
    20 #define bzero(dest, count) memset(dest, 0, count)
    2119// Visual C++ has bad bug on delete []
    2220#define deleteAction(array) delete [] (void *) array
Note: See TracChangeset for help on using the changeset viewer.