Changeset 1958 for trunk


Ignore:
Timestamp:
May 15, 2013 9:03:28 AM (6 years ago)
Author:
forrest
Message:

allow better handling of odd addColumns

Location:
trunk/Clp/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/CbcOrClpParam.cpp

    r1932 r1958  
    19371937     parameters[numberParameters-1].setLonghelp
    19381938     (
    1939           "This command solves the current model using the dual steepest edge algorithm.\
     1939          "This command solves the continuous relaxation of the current model using the dual steepest edge algorithm.\
    19401940The time and iterations may be affected by settings such as presolve, scaling, crash\
    19411941 and also by dual pivot method, fake bound on variables and dual and primal tolerances."
     
    19591959     parameters[numberParameters-1].setLonghelp
    19601960     (
    1961           "This command solves the current model using the dual or primal algorithm,\
     1961          "This command solves the continuous relaxation of the current model using the dual or primal algorithm,\
    19621962 based on a dubious analysis of model."
    19631963     );
     
    29632963     parameters[numberParameters-1].setLonghelp
    29642964     (
    2965           "This command solves the current model using the primal algorithm.\
     2965          "This command solves the continuous relaxation of the current model using the primal algorithm.\
    29662966  The default is to use exact devex.\
    29672967 The time and iterations may be affected by settings such as presolve, scaling, crash\
  • trunk/Clp/src/ClpModel.cpp

    r1939 r1958  
    22862286          }
    22872287#endif
    2288           if (elements)
    2289             matrix_->appendMatrix(number, 1, columnStarts, rows, elements);
     2288          // Do even if elements NULL (to resize)
     2289          matrix_->appendMatrix(number, 1, columnStarts, rows, elements);
    22902290     }
    22912291}
  • trunk/Clp/src/ClpPackedMatrix.cpp

    r1926 r1958  
    49114911          if (!matrix_->isColOrdered() && numberOther > matrix_->getNumRows())
    49124912               matrix_->setDimensions(numberOther, -1);
    4913           numberErrors = matrix_->appendCols(number, starts, index, element, numberOther);
     4913          if (element)
     4914            numberErrors = matrix_->appendCols(number, starts, index, element, numberOther);
     4915          else
     4916            matrix_->setDimensions(-1,matrix_->getNumCols()+number); // resize
    49144917     }
    49154918     clearCopies();
Note: See TracChangeset for help on using the changeset viewer.