Skip to content

Commit 0a7412f

Browse files
committed
take out assert and refactorize more on going to primal
1 parent 4cfa8c5 commit 0a7412f

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Clp/src/ClpSimplex.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8886,6 +8886,9 @@ int ClpSimplex::startup(int ifValuesPass, int startFinishOptions)
88868886
int useFactorization = false;
88878887
if ((startFinishOptions & 2) != 0 && (whatsChanged_ & (2 + 512)) == 2 + 512)
88888888
useFactorization = true; // Keep factorization if possible
8889+
// but probably re-factorize if in primal from dual and in cbc
8890+
if ((moreSpecialOptions_&256)!=0&&algorithm_>=0&&(specialOptions_&0x1000000)!=0&&numberIterations_>2)
8891+
useFactorization = false;
88898892
#if 0
88908893
// seems to be needed if rows deleted later in CbcModel!
88918894
if (!solution_ && scaledMatrix_) {

Clp/src/ClpSimplexDual.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3627,8 +3627,8 @@ int ClpSimplexDual::dualColumn0(const CoinIndexedVector *rowArray,
36273627
double oldValue;
36283628
double value;
36293629

3630-
assert(getStatus(iSequence + addSequence) != isFree
3631-
&& getStatus(iSequence + addSequence) != superBasic);
3630+
//assert(getStatus(iSequence + addSequence) != isFree
3631+
//&& getStatus(iSequence + addSequence) != superBasic);
36323632
int iStatus = (statusArray[iSequence] & 3) - 1;
36333633
if (iStatus) {
36343634
double mult = multiplier[iStatus - 1];

0 commit comments

Comments
 (0)