Lines 1-66
Link Here
|
1 |
--- Clp/src/AbcSimplex.cpp.orig 2018-04-16 06:55:57 UTC |
|
|
2 |
+++ Clp/src/AbcSimplex.cpp |
3 |
@@ -368,19 +368,19 @@ AbcSimplex::gutsOfInitialize(int numberR |
4 |
// say Steepest pricing |
5 |
abcDualRowPivot_ = new AbcDualRowSteepest(); |
6 |
abcPrimalColumnPivot_ = new AbcPrimalColumnSteepest(); |
7 |
- internalStatus_ = newArray(reinterpret_cast<unsigned char *>(NULL), |
8 |
+ internalStatus_ = newArray(nullptr, |
9 |
sizeArray+maximumNumberTotal_); |
10 |
- abcLower_ = newArray(reinterpret_cast<double *>(NULL),sizeArray); |
11 |
- abcUpper_ = newArray(reinterpret_cast<double *>(NULL),sizeArray); |
12 |
- abcCost_ = newArray(reinterpret_cast<double *>(NULL),sizeArray+maximumNumberTotal_); |
13 |
- abcDj_ = newArray(reinterpret_cast<double *>(NULL),sizeArray); |
14 |
- abcSolution_ = newArray(reinterpret_cast<double *>(NULL),sizeArray+maximumNumberTotal_); |
15 |
- //fromExternal_ = newArray(reinterpret_cast<int *>(NULL),sizeArray); |
16 |
- //toExternal_ = newArray(reinterpret_cast<int *>(NULL),sizeArray); |
17 |
- scaleFromExternal_ = newArray(reinterpret_cast<double *>(NULL),sizeArray); |
18 |
- offset_ = newArray(reinterpret_cast<double *>(NULL),sizeArray); |
19 |
- abcPerturbation_ = newArray(reinterpret_cast<double *>(NULL),sizeArray); |
20 |
- abcPivotVariable_ = newArray(reinterpret_cast<int *>(NULL),maximumAbcNumberRows_); |
21 |
+ abcLower_ = newArray(nullptr,sizeArray); |
22 |
+ abcUpper_ = newArray(nullptr,sizeArray); |
23 |
+ abcCost_ = newArray(nullptr,sizeArray+maximumNumberTotal_); |
24 |
+ abcDj_ = newArray(nullptr,sizeArray); |
25 |
+ abcSolution_ = newArray(nullptr,sizeArray+maximumNumberTotal_); |
26 |
+ //fromExternal_ = newArray(nullptr,sizeArray); |
27 |
+ //toExternal_ = newArray(nullptr,sizeArray); |
28 |
+ scaleFromExternal_ = newArray(nullptr,sizeArray); |
29 |
+ offset_ = newArray(nullptr,sizeArray); |
30 |
+ abcPerturbation_ = newArray(nullptr,sizeArray); |
31 |
+ abcPivotVariable_ = newArray(nullptr,maximumAbcNumberRows_); |
32 |
// Fill perturbation array |
33 |
setupPointers(maximumAbcNumberRows_,maximumAbcNumberColumns_); |
34 |
fillPerturbation(0,maximumNumberTotal_); |
35 |
@@ -554,19 +554,19 @@ AbcSimplex::createSubProblem(int numberC |
36 |
subProblem->maximumNumberTotal_= maximumAbcNumberRows_+numberColumns; |
37 |
subProblem->numberTotalWithoutFixed_= subProblem->numberTotal_; |
38 |
int sizeArray=2*subProblem->maximumNumberTotal_+maximumAbcNumberRows_; |
39 |
- subProblem->internalStatus_ = newArray(reinterpret_cast<unsigned char *>(NULL), |
40 |
+ subProblem->internalStatus_ = newArray(nullptr, |
41 |
sizeArray+subProblem->maximumNumberTotal_); |
42 |
- subProblem->abcLower_ = newArray(reinterpret_cast<double *>(NULL),sizeArray); |
43 |
- subProblem->abcUpper_ = newArray(reinterpret_cast<double *>(NULL),sizeArray); |
44 |
- subProblem->abcCost_ = newArray(reinterpret_cast<double *>(NULL),sizeArray+subProblem->maximumNumberTotal_); |
45 |
- subProblem->abcDj_ = newArray(reinterpret_cast<double *>(NULL),sizeArray); |
46 |
- subProblem->abcSolution_ = newArray(reinterpret_cast<double *>(NULL),sizeArray+subProblem->maximumNumberTotal_); |
47 |
- //fromExternal_ = newArray(reinterpret_cast<int *>(NULL),sizeArray); |
48 |
- //toExternal_ = newArray(reinterpret_cast<int *>(NULL),sizeArray); |
49 |
- subProblem->scaleFromExternal_ = newArray(reinterpret_cast<double *>(NULL),sizeArray); |
50 |
- subProblem->offset_ = newArray(reinterpret_cast<double *>(NULL),sizeArray); |
51 |
- subProblem->abcPerturbation_ = newArray(reinterpret_cast<double *>(NULL),sizeArray); |
52 |
- subProblem->abcPivotVariable_ = newArray(reinterpret_cast<int *>(NULL),maximumAbcNumberRows_); |
53 |
+ subProblem->abcLower_ = newArray(nullptr,sizeArray); |
54 |
+ subProblem->abcUpper_ = newArray(nullptr,sizeArray); |
55 |
+ subProblem->abcCost_ = newArray(nullptr,sizeArray+subProblem->maximumNumberTotal_); |
56 |
+ subProblem->abcDj_ = newArray(nullptr,sizeArray); |
57 |
+ subProblem->abcSolution_ = newArray(nullptr,sizeArray+subProblem->maximumNumberTotal_); |
58 |
+ //fromExternal_ = newArray(nullptr,sizeArray); |
59 |
+ //toExternal_ = newArray(nullptr,sizeArray); |
60 |
+ subProblem->scaleFromExternal_ = newArray(nullptr,sizeArray); |
61 |
+ subProblem->offset_ = newArray(nullptr,sizeArray); |
62 |
+ subProblem->abcPerturbation_ = newArray(nullptr,sizeArray); |
63 |
+ subProblem->abcPivotVariable_ = newArray(nullptr,maximumAbcNumberRows_); |
64 |
subProblem->setupPointers(maximumAbcNumberRows_,numberColumns); |
65 |
// could use arrays - but for now be safe |
66 |
int * backward = new int [numberFullColumns+numberRows_]; |