Changeset 1732 for trunk/Clp/src/ClpDualRowSteepest.cpp
 Timestamp:
 May 31, 2011 4:09:41 AM (8 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/Clp/src/ClpDualRowSteepest.cpp
r1665 r1732 236 236 double * upper = model_>upperRegion(); 237 237 // do last pivot row one here 238 //#define COLUMN_BIAS 4.0 239 //#define FIXED_BIAS 10.0 238 //#define CLP_DUAL_FIXED_COLUMN_MULTIPLIER 10.0 240 239 if (lastPivotRow >= 0 && lastPivotRow < model_>numberRows()) { 241 #ifdef C OLUMN_BIAS240 #ifdef CLP_DUAL_COLUMN_MULTIPLIER 242 241 int numberColumns = model_>numberColumns(); 243 242 #endif … … 249 248 value = upper; 250 249 value *= value; 251 #ifdef C OLUMN_BIAS250 #ifdef CLP_DUAL_COLUMN_MULTIPLIER 252 251 if (iPivot < numberColumns) 253 value *= COLUMN_BIAS; // bias towards columns 254 k 252 value *= CLP_DUAL_COLUMN_MULTIPLIER; // bias towards columns 255 253 #endif 256 254 // store square in list … … 262 260 value = lower; 263 261 value *= value; 264 #ifdef C OLUMN_BIAS262 #ifdef CLP_DUAL_COLUMN_MULTIPLIER 265 263 if (iPivot < numberColumns) 266 value *= C OLUMN_BIAS; // bias towards columns264 value *= CLP_DUAL_COLUMN_MULTIPLIER; // bias towards columns 267 265 #endif 268 266 // store square in list … … 685 683 const double * COIN_RESTRICT lowerModel = model_>lowerRegion(); 686 684 const double * COIN_RESTRICT upperModel = model_>upperRegion(); 687 #ifdef C OLUMN_BIAS685 #ifdef CLP_DUAL_COLUMN_MULTIPLIER 688 686 int numberColumns = model_>numberColumns(); 689 687 #endif … … 704 702 value = lower; 705 703 value *= value; 706 #ifdef C OLUMN_BIAS704 #ifdef CLP_DUAL_COLUMN_MULTIPLIER 707 705 if (iPivot < numberColumns) 708 value *= C OLUMN_BIAS; // bias towards columns709 #endif 710 #ifdef FIXED_BIAS706 value *= CLP_DUAL_COLUMN_MULTIPLIER; // bias towards columns 707 #endif 708 #ifdef CLP_DUAL_FIXED_COLUMN_MULTIPLIER 711 709 if (lower == upper) 712 value *= FIXED_BIAS; // bias towards taking out fixed variables710 value *= CLP_DUAL_FIXED_COLUMN_MULTIPLIER; // bias towards taking out fixed variables 713 711 #endif 714 712 // store square in list … … 720 718 value = upper; 721 719 value *= value; 722 #ifdef C OLUMN_BIAS720 #ifdef CLP_DUAL_COLUMN_MULTIPLIER 723 721 if (iPivot < numberColumns) 724 value *= C OLUMN_BIAS; // bias towards columns725 #endif 726 #ifdef FIXED_BIAS722 value *= CLP_DUAL_COLUMN_MULTIPLIER; // bias towards columns 723 #endif 724 #ifdef CLP_DUAL_FIXED_COLUMN_MULTIPLIER 727 725 if (lower == upper) 728 value *= FIXED_BIAS; // bias towards taking out fixed variables726 value *= CLP_DUAL_FIXED_COLUMN_MULTIPLIER; // bias towards taking out fixed variables 729 727 #endif 730 728 // store square in list … … 754 752 value = lower; 755 753 value *= value; 756 #ifdef C OLUMN_BIAS754 #ifdef CLP_DUAL_COLUMN_MULTIPLIER 757 755 if (iPivot < numberColumns) 758 value *= C OLUMN_BIAS; // bias towards columns759 #endif 760 #ifdef FIXED_BIAS756 value *= CLP_DUAL_COLUMN_MULTIPLIER; // bias towards columns 757 #endif 758 #ifdef CLP_DUAL_FIXED_COLUMN_MULTIPLIER 761 759 if (lower == upper) 762 value *= FIXED_BIAS; // bias towards taking out fixed variables760 value *= CLP_DUAL_FIXED_COLUMN_MULTIPLIER; // bias towards taking out fixed variables 763 761 #endif 764 762 // store square in list … … 770 768 value = upper; 771 769 value *= value; 772 #ifdef C OLUMN_BIAS770 #ifdef CLP_DUAL_COLUMN_MULTIPLIER 773 771 if (iPivot < numberColumns) 774 value *= C OLUMN_BIAS; // bias towards columns775 #endif 776 #ifdef FIXED_BIAS772 value *= CLP_DUAL_COLUMN_MULTIPLIER; // bias towards columns 773 #endif 774 #ifdef CLP_DUAL_FIXED_COLUMN_MULTIPLIER 777 775 if (lower == upper) 778 value *= FIXED_BIAS; // bias towards taking out fixed variables776 value *= CLP_DUAL_FIXED_COLUMN_MULTIPLIER; // bias towards taking out fixed variables 779 777 #endif 780 778 // store square in list … … 979 977 value = lower; 980 978 value *= value; 981 #ifdef C OLUMN_BIAS979 #ifdef CLP_DUAL_COLUMN_MULTIPLIER 982 980 if (iPivot < numberColumns) 983 value *= C OLUMN_BIAS; // bias towards columns984 #endif 985 #ifdef FIXED_BIAS981 value *= CLP_DUAL_COLUMN_MULTIPLIER; // bias towards columns 982 #endif 983 #ifdef CLP_DUAL_FIXED_COLUMN_MULTIPLIER 986 984 if (lower == upper) 987 value *= FIXED_BIAS; // bias towards taking out fixed variables985 value *= CLP_DUAL_FIXED_COLUMN_MULTIPLIER; // bias towards taking out fixed variables 988 986 #endif 989 987 // store square in list … … 992 990 value = upper; 993 991 value *= value; 994 #ifdef C OLUMN_BIAS992 #ifdef CLP_DUAL_COLUMN_MULTIPLIER 995 993 if (iPivot < numberColumns) 996 value *= C OLUMN_BIAS; // bias towards columns997 #endif 998 #ifdef FIXED_BIAS994 value *= CLP_DUAL_COLUMN_MULTIPLIER; // bias towards columns 995 #endif 996 #ifdef CLP_DUAL_FIXED_COLUMN_MULTIPLIER 999 997 if (lower == upper) 1000 value *= FIXED_BIAS; // bias towards taking out fixed variables998 value *= CLP_DUAL_FIXED_COLUMN_MULTIPLIER; // bias towards taking out fixed variables 1001 999 #endif 1002 1000 // store square in list
Note: See TracChangeset
for help on using the changeset viewer.