Changeset 2969


Ignore:
Timestamp:
Apr 5, 2020 1:14:48 PM (3 months ago)
Author:
stefan
Message:

matrix start is CoinBigIndex?

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/Cbc_C_Interface.cpp

    r2962 r2969  
    192192  double *rUB;
    193193  int rElementsSpace;
    194   int *rStart;
     194  CoinBigIndex *rStart;
    195195  int *rIdx;
    196196  double *rCoef;
     
    669669  if (model->nCols)
    670670  {
    671     int *starts = new int[model->nCols+1];
     671    CoinBigIndex *starts = new CoinBigIndex[model->nCols+1];
    672672    for ( int i=0 ; (i<model->nCols+1) ; ++i )
    673673      starts[i] = 0;
     
    816816    // allocating buffer
    817817    model->rowSpace = 8192;
    818     model->rStart = (int *)xmalloc(sizeof(int)*model->rowSpace);
     818    model->rStart = (CoinBigIndex *)xmalloc(sizeof(CoinBigIndex)*model->rowSpace);
    819819    model->rStart[0] = 0;
    820820    model->rLB = (double *)xmalloc(sizeof(double)*model->rowSpace);
     
    839839      {
    840840        model->rowSpace *= 2;
    841         model->rStart = (int *)xrealloc(model->rStart, sizeof(int)*model->rowSpace);
     841        model->rStart = (CoinBigIndex *)xrealloc(model->rStart, sizeof(CoinBigIndex)*model->rowSpace);
    842842        model->rLB = (double *)xrealloc(model->rLB, sizeof(double)*model->rowSpace);
    843843        model->rUB = (double *)xrealloc(model->rUB, sizeof(double)*model->rowSpace);
  • trunk/test/gamsTest.cpp

    r2900 r2969  
    6060  int numrows = 1;
    6161  int nnz = 3;
    62   CoinBigIndex *start = new int[numcols + 1];
     62  CoinBigIndex *start = new CoinBigIndex[numcols + 1];
    6363  int *index = new int[nnz];
    6464  double *value = new double[nnz];
     
    164164  int numrows = 6; // wsum, xdef, fxdef, defwLo, gapplus, gapminus
    165165  int nnz = 16;
    166   CoinBigIndex *start = new int[numcols + 1];
     166  CoinBigIndex *start = new CoinBigIndex[numcols + 1];
    167167  int *index = new int[nnz];
    168168  double *value = new double[nnz];
     
    358358  int numrows = 3; // bigx, smallx, f
    359359  int nnz = 6;
    360   CoinBigIndex *start = new int[numcols + 1];
     360  CoinBigIndex *start = new CoinBigIndex[numcols + 1];
    361361  int *index = new int[nnz];
    362362  double *value = new double[nnz];
     
    567567  int numrows = 3; // bigx, smallx, f
    568568  int nnz = 6;
    569   CoinBigIndex *start = new int[numcols + 1];
     569  CoinBigIndex *start = new CoinBigIndex[numcols + 1];
    570570  int *index = new int[nnz];
    571571  double *value = new double[nnz];
Note: See TracChangeset for help on using the changeset viewer.