- Timestamp:
- Mar 23, 2010 10:36:16 AM (10 years ago)
- Location:
- stable/1.11/Clp/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
stable/1.11/Clp/src/ClpEventHandler.hpp
r1458 r1532 37 37 treeStatus, // for Cbc 38 38 solution, // for Cbc 39 theta // hit in parametrics 39 theta, // hit in parametrics 40 pivotRow // used to choose pivot row 40 41 }; 41 42 /**@name Virtual method that the derived classe should provide. -
stable/1.11/Clp/src/ClpSimplex.hpp
r1461 r1532 595 595 inline CoinIndexedVector * columnArray(int index) const 596 596 { return columnArray_[index];} 597 /// Sets firstFree_ 598 inline void setFirstFree(int value) 599 { firstFree_=value;} 597 600 //@} 598 601 … … 618 621 const double * lower, const double * gradient); 619 622 /// dual row pivot choice 620 ClpDualRowPivot * dualRowPivot() const623 inline ClpDualRowPivot * dualRowPivot() const 621 624 { return dualRowPivot_;} 625 /// primal column pivot choice 626 inline ClpPrimalColumnPivot * primalColumnPivot() const 627 { return primalColumnPivot_;} 622 628 /// Returns true if model looks OK 623 629 inline bool goodAccuracy() const … … 893 899 inline double valueOut() const 894 900 { return valueOut_;} 901 /// Set value of out variable 902 inline void setValueOut(double value) 903 { valueOut_=value;} 904 /// Set lower of out variable 905 inline void setLowerOut(double value) 906 { lowerOut_=value;} 907 /// Set upper of out variable 908 inline void setUpperOut(double value) 909 { upperOut_=value;} 910 /// Set theta of out variable 911 inline void setTheta(double value) 912 { theta_=value;} 895 913 /// Returns 1 if sequence indicates column 896 914 inline int isColumn(int sequence) const … … 952 970 128 bit - no objective, 0-1 and in B&B 953 971 256 bit - in primal from dual or vice versa 972 512 bit - alternative use of solveType_ 954 973 */ 955 974 inline int moreSpecialOptions() const … … 965 984 128 bit - no objective, 0-1 and in B&B 966 985 256 bit - in primal from dual or vice versa 986 512 bit - alternative use of solveType_ 967 987 */ 968 988 inline void setMoreSpecialOptions(int value) -
stable/1.11/Clp/src/ClpSimplexPrimal.cpp
r1498 r1532 755 755 int factorStatus = internalFactorize(1); 756 756 if (factorStatus) { 757 if (solveType_==2 +8) {757 if (solveType_==2) { 758 758 // say odd 759 759 problemStatus_=5; … … 2755 2755 matrix_->extendUpdated(this,rowArray_[1],0); 2756 2756 // do ratio test and re-compute dj 2757 primalRow(rowArray_[1],rowArray_[3],rowArray_[2], 2758 ifValuesPass); 2757 #ifdef CLP_USER_DRIVEN 2758 if (solveType_!=2||(moreSpecialOptions_&512)==0) { 2759 #endif 2760 primalRow(rowArray_[1],rowArray_[3],rowArray_[2], 2761 ifValuesPass); 2762 #ifdef CLP_USER_DRIVEN 2763 } else { 2764 int status = eventHandler_->event(ClpEventHandler::pivotRow); 2765 if (status>=0) { 2766 problemStatus_=5; 2767 secondaryStatus_=ClpEventHandler::pivotRow; 2768 break; 2769 } 2770 } 2771 #endif 2759 2772 if (ifValuesPass) { 2760 2773 saveDj=dualIn_; … … 2847 2860 } 2848 2861 if (pivotRow_>=0) { 2849 if (solveType_==2 ) {2862 if (solveType_==2&&(moreSpecialOptions_&512)==0) { 2850 2863 // **** Coding for user interface 2851 2864 // do ray … … 2925 2938 clearAll(); 2926 2939 pivotRow_=-1; 2927 if (solveType_==1 ) {2940 if (solveType_==1||(moreSpecialOptions_&512)!=0) { 2928 2941 returnCode=-4; 2929 2942 break; … … 2986 2999 // do ray 2987 3000 primalRay(rowArray_[1]); 2988 } else if (solveType_==2 ) {3001 } else if (solveType_==2&&(moreSpecialOptions_&512)==0) { 2989 3002 // refactorize 2990 3003 int lastCleaned=0; … … 3093 3106 } 3094 3107 } 3095 if (solveType_==2&&(returnCode == -2||returnCode==-3)) { 3108 if ((solveType_==2&&(moreSpecialOptions_&512)==0)&& 3109 (returnCode == -2||returnCode==-3)) { 3096 3110 // refactorize here 3097 3111 int lastCleaned=0;
Note: See TracChangeset
for help on using the changeset viewer.