Changeset 1957
 Timestamp:
 May 15, 2013 4:58:19 AM (6 years ago)
 Location:
 stable/1.15/Clp/src
 Files:

 3 edited
Legend:
 Unmodified
 Added
 Removed

stable/1.15/Clp/src/CbcOrClpParam.cpp
r1933 r1957 1937 1937 parameters[numberParameters1].setLonghelp 1938 1938 ( 1939 "This command solves the c urrent model using the dual steepest edge algorithm.\1939 "This command solves the continuous relaxation of the current model using the dual steepest edge algorithm.\ 1940 1940 The time and iterations may be affected by settings such as presolve, scaling, crash\ 1941 1941 and also by dual pivot method, fake bound on variables and dual and primal tolerances." … … 1959 1959 parameters[numberParameters1].setLonghelp 1960 1960 ( 1961 "This command solves the c urrent model using the dual or primal algorithm,\1961 "This command solves the continuous relaxation of the current model using the dual or primal algorithm,\ 1962 1962 based on a dubious analysis of model." 1963 1963 ); … … 2963 2963 parameters[numberParameters1].setLonghelp 2964 2964 ( 2965 "This command solves the c urrent model using the primal algorithm.\2965 "This command solves the continuous relaxation of the current model using the primal algorithm.\ 2966 2966 The default is to use exact devex.\ 2967 2967 The time and iterations may be affected by settings such as presolve, scaling, crash\ 
stable/1.15/Clp/src/ClpModel.cpp
r1941 r1957 1803 1803 #endif 1804 1804 if (rowStarts) { 1805 1806 1805 // Make sure matrix has correct number of columns 1806 matrix_>getPackedMatrix()>reserve(numberColumns_, 0, true); 1807 1807 matrix_>appendMatrix(number, 0, rowStarts, columns, elements); 1808 1808 } … … 2286 2286 } 2287 2287 #endif 2288 if (elements)2289 2288 // Do even if elements NULL (to resize) 2289 matrix_>appendMatrix(number, 1, columnStarts, rows, elements); 2290 2290 } 2291 2291 } 
stable/1.15/Clp/src/ClpPackedMatrix.cpp
r1928 r1957 4911 4911 if (!matrix_>isColOrdered() && numberOther > matrix_>getNumRows()) 4912 4912 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 4914 4917 } 4915 4918 clearCopies();
Note: See TracChangeset
for help on using the changeset viewer.