Changeset 57

Ignore:
Timestamp:
Nov 25, 2002 1:41:10 PM (17 years ago)
Message:

Yet more changes for Visual C++

Location:
trunk
Files:
19 edited

Unmodified
Removed
• trunk/ClpSimplex.cpp

 r50 ClpSimplex::sparseFactorization() const { return factorization_->sparseThreshold(); return factorization_->sparseThreshold()!=0; } void
• trunk/ClpSimplexPrimal.cpp

 r56 // for this we need clean basis so it is after factorize numberThrownOut=gutsOfSolution(rowActivityWork_,columnActivityWork_, ifValuesPass); ifValuesPass!=0); totalNumberThrownOut+= numberThrownOut;
• trunk/Presolve.cpp

 r50 if (!prob->status_) { const bool slackd = ATOI("SLACKD"); //const bool forcing = ATOI("FORCING"); const bool doubleton = ATOI("DOUBLETON"); const bool forcing = ATOI("off"); const bool ifree = ATOI("off"); const bool zerocost = ATOI("off"); const bool dupcol = ATOI("off"); const bool duprow = ATOI("off"); const bool dual = ATOI("off"); const bool slackd = ATOI("SLACKD")!=0; //const bool forcing = ATOI("FORCING")!=0; const bool doubleton = ATOI("DOUBLETON")!=0; const bool forcing = ATOI("off")!=0; const bool ifree = ATOI("off")!=0; const bool zerocost = ATOI("off")!=0; const bool dupcol = ATOI("off")!=0; const bool duprow = ATOI("off")!=0; const bool dual = ATOI("off")!=0; // some things are expensive so just do once (normally)
• trunk/PresolveDoubleton.cpp

 r56 delete[]zeros; delete[]fixed; delete [] actions; deleteAction(actions); return (next); delete[]actions_[i].indy; } delete[]actions_; deleteAction(actions_); }
• trunk/PresolveDupcol.cpp

 r56 next = new dupcol_action(nactions, copyOfArray(actions,nactions), next); } delete [] actions; deleteAction(actions); if (nfixed_down) next = make_fixed_action::presolve(prob, fixed_down, nfixed_down, next = new duprow_action(nactions, copyOfArray(actions,nactions), next); } delete [] actions; deleteAction(actions); return (next); }
• trunk/PresolveFixed.cpp

 r56 remove_fixed_action * nextAction =  new remove_fixed_action(nfcols, actions, next); delete [] actions; delete [] (void *) actions; return nextAction; #else delete[]actions_[i].colels; } delete[]actions_; deleteAction(actions_); }
• trunk/PresolveForcing.cpp

 r56 int lk = krs;   // load fix-to-down in front int uk = kre;   // load fix-to-up in back for (CoinBigIndex k=krs; kaddCol(jcol); copyOfArray(actions,nactions), next); } delete [] actions; deleteAction(actions); if (nuseless_rows) { next = useless_constraint_action::presolve(prob, double maxup = 0.0; double maxdown = 0.0; for (CoinBigIndex k=krs; k
• trunk/PresolveImpliedFree.cpp

 r56 next = new implied_free_action(nactions, copyOfArray(actions,nactions), next); } delete [] actions; deleteAction(actions); delete[]ilbound;
• trunk/PresolveIsolated.cpp

 r56 return NULL; } for (CoinBigIndex k = krs; k
• trunk/PresolveSubst.cpp

 r56 int nfill = -hinrow[bestrowy_row]; CoinBigIndex kcol1 = krs1; for (CoinBigIndex kk=krs; kk
• trunk/PresolveTighten.cpp

 r56 PRESOLVEASSERT(prob->getColumnStatus(jcol)!=PrePostsolveMatrix::basic); for (int i=0;i
• trunk/PresolveZeros.cpp

 r55 typedef dropped_zero action; int nactions = 0; int i; for (int i=0; i
• trunk/Test/ClpMain.cpp

 r55 break; case SPARSEFACTOR: models[iModel].setSparseFactorization(1-action); models[iModel].setSparseFactorization((1-action)!=0); break; case ERRORSALLOWED: if (canOpen) { int status =models[iModel].readMps(fileName.c_str(), keepImportNames, allowImportErrors); keepImportNames!=0, allowImportErrors!=0); if (!status||(status>0&&allowImportErrors)) { goodModels[iModel]=true;
• trunk/include/PresolveEmpty.hpp

 r50 void postsolve(PostsolveMatrix *prob) const; ~drop_empty_cols_action() { delete[]actions_; } ~drop_empty_cols_action() { deleteAction(actions_); } }; void postsolve(PostsolveMatrix *prob) const; ~drop_empty_rows_action() { delete[]actions_; } ~drop_empty_rows_action() { deleteAction(actions_); } }; #endif
• trunk/include/PresolveFixed.hpp

 r50 void postsolve(PostsolveMatrix *prob) const; ~make_fixed_action() { delete[]actions_; delete faction_;}; ~make_fixed_action() { deleteAction(actions_); delete faction_;}; };
• trunk/include/PresolveForcing.hpp

 r50 void postsolve(PostsolveMatrix *prob) const; ~forcing_constraint_action() { delete[]actions_; } ~forcing_constraint_action() { deleteAction(actions_); } };
• trunk/include/PresolveImpliedFree.hpp

 r50 void postsolve(PostsolveMatrix *prob) const; ~implied_free_action() { delete[]actions_; } ~implied_free_action() { deleteAction(actions_); } };
• trunk/include/PresolveMatrix.hpp

 r56 #define max(a,b)  (((a) > (b)) ? (a) : (b)) #endif #define bcopy(dest, src, count) memcpy(dest, src, count) #define bzero(dest, count) memset(dest, 0, count) // Visual C++ has bad bug on delete [] #define deleteAction(array) delete [] (void *) array #else using std::min; using std::max; // Visual C++ has bad bug on delete [] #define deleteAction(array) delete [] array # #endif
• trunk/include/PresolveSingleton.hpp

 r50 ~slack_doubleton_action() { delete[]actions_; } ~slack_doubleton_action() { deleteAction(actions_); } }; #endif
Note: See TracChangeset for help on using the changeset viewer.