- Timestamp:
- Mar 23, 2010 11:26:32 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property
svn:mergeinfo
set to
/stable/1.11 merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/Clp/src/ClpEventHandler.hpp
r1525 r1533 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. -
trunk/Clp/src/ClpSimplex.hpp
r1525 r1533 642 642 const double * lower, const double * gradient); 643 643 /// dual row pivot choice 644 ClpDualRowPivot * dualRowPivot() const {644 inline ClpDualRowPivot * dualRowPivot() const { 645 645 return dualRowPivot_; 646 } 647 /// primal column pivot choice 648 inline ClpPrimalColumnPivot * primalColumnPivot() const { 649 return primalColumnPivot_; 646 650 } 647 651 /// Returns true if model looks OK … … 972 976 return valueOut_; 973 977 } 978 /// Set value of out variable 979 inline void setValueOut(double value) { 980 valueOut_=value; 981 } 982 /// Set lower of out variable 983 inline void setLowerOut(double value) { 984 lowerOut_=value; 985 } 986 /// Set upper of out variable 987 inline void setUpperOut(double value) { 988 upperOut_=value; 989 } 990 /// Set theta of out variable 991 inline void setTheta(double value) { 992 theta_=value; 993 } 974 994 /// Returns 1 if sequence indicates column 975 995 inline int isColumn(int sequence) const { … … 1050 1070 128 bit - no objective, 0-1 and in B&B 1051 1071 256 bit - in primal from dual or vice versa 1072 512 bit - alternative use of solveType_ 1052 1073 */ 1053 1074 inline int moreSpecialOptions() const { … … 1064 1085 128 bit - no objective, 0-1 and in B&B 1065 1086 256 bit - in primal from dual or vice versa 1087 512 bit - alternative use of solveType_ 1066 1088 */ 1067 1089 inline void setMoreSpecialOptions(int value) { -
trunk/Clp/src/ClpSimplexPrimal.cpp
r1525 r1533 2756 2756 matrix_->extendUpdated(this, rowArray_[1], 0); 2757 2757 // do ratio test and re-compute dj 2758 primalRow(rowArray_[1], rowArray_[3], rowArray_[2], 2758 #ifdef CLP_USER_DRIVEN 2759 if (solveType_!=2||(moreSpecialOptions_&512)==0) { 2760 #endif 2761 primalRow(rowArray_[1], rowArray_[3], rowArray_[2], 2759 2762 ifValuesPass); 2763 #ifdef CLP_USER_DRIVEN 2764 } else { 2765 int status = eventHandler_->event(ClpEventHandler::pivotRow); 2766 if (status>=0) { 2767 problemStatus_=5; 2768 secondaryStatus_=ClpEventHandler::pivotRow; 2769 break; 2770 } 2771 } 2772 #endif 2760 2773 if (ifValuesPass) { 2761 2774 saveDj = dualIn_; … … 2853 2866 } 2854 2867 if (pivotRow_ >= 0) { 2855 if (solveType_ == 2) {2868 if (solveType_==2&&(moreSpecialOptions_&512)==0) { 2856 2869 // **** Coding for user interface 2857 2870 // do ray … … 2931 2944 clearAll(); 2932 2945 pivotRow_ = -1; 2933 if (solveType_ == 1) {2946 if (solveType_==1||(moreSpecialOptions_&512)!=0) { 2934 2947 returnCode = -4; 2935 2948 break; … … 2992 3005 // do ray 2993 3006 primalRay(rowArray_[1]); 2994 } else if (solveType_ == 2) {3007 } else if (solveType_==2&&(moreSpecialOptions_&512)==0) { 2995 3008 // refactorize 2996 3009 int lastCleaned = 0; … … 3099 3112 } 3100 3113 } 3101 if (solveType_ == 2 && (returnCode == -2 || returnCode == -3)) { 3114 if ((solveType_==2&&(moreSpecialOptions_&512)==0)&& 3115 (returnCode == -2||returnCode==-3)) { 3102 3116 // refactorize here 3103 3117 int lastCleaned = 0;
Note: See TracChangeset
for help on using the changeset viewer.