1.1 --- a/src/lemon/lp_glpk.cc Thu May 05 15:34:43 2005 +0000
1.2 +++ b/src/lemon/lp_glpk.cc Thu May 05 15:43:43 2005 +0000
1.3 @@ -175,91 +175,91 @@
1.4 }
1.5 }
1.6
1.7 - void LpGlpk::_setRowLowerBound(int i, Value lo)
1.8 - {
1.9 - if (lo==INF) {
1.10 - //FIXME error
1.11 - }
1.12 - int b=lpx_get_row_type(lp, i);
1.13 - double up=lpx_get_row_ub(lp, i);
1.14 - if (lo==-INF) {
1.15 - switch (b) {
1.16 - case LPX_FR:
1.17 - case LPX_LO:
1.18 - lpx_set_row_bnds(lp, i, LPX_FR, lo, up);
1.19 - break;
1.20 - case LPX_UP:
1.21 - break;
1.22 - case LPX_DB:
1.23 - case LPX_FX:
1.24 - lpx_set_row_bnds(lp, i, LPX_UP, lo, up);
1.25 - break;
1.26 - default: ;
1.27 - //FIXME error
1.28 - }
1.29 - } else {
1.30 - switch (b) {
1.31 - case LPX_FR:
1.32 - case LPX_LO:
1.33 - lpx_set_row_bnds(lp, i, LPX_LO, lo, up);
1.34 - break;
1.35 - case LPX_UP:
1.36 - case LPX_DB:
1.37 - case LPX_FX:
1.38 - if (lo==up)
1.39 - lpx_set_row_bnds(lp, i, LPX_FX, lo, up);
1.40 - else
1.41 - lpx_set_row_bnds(lp, i, LPX_DB, lo, up);
1.42 - break;
1.43 - default: ;
1.44 - //FIXME error
1.45 - }
1.46 - }
1.47 - }
1.48 +// void LpGlpk::_setRowLowerBound(int i, Value lo)
1.49 +// {
1.50 +// if (lo==INF) {
1.51 +// //FIXME error
1.52 +// }
1.53 +// int b=lpx_get_row_type(lp, i);
1.54 +// double up=lpx_get_row_ub(lp, i);
1.55 +// if (lo==-INF) {
1.56 +// switch (b) {
1.57 +// case LPX_FR:
1.58 +// case LPX_LO:
1.59 +// lpx_set_row_bnds(lp, i, LPX_FR, lo, up);
1.60 +// break;
1.61 +// case LPX_UP:
1.62 +// break;
1.63 +// case LPX_DB:
1.64 +// case LPX_FX:
1.65 +// lpx_set_row_bnds(lp, i, LPX_UP, lo, up);
1.66 +// break;
1.67 +// default: ;
1.68 +// //FIXME error
1.69 +// }
1.70 +// } else {
1.71 +// switch (b) {
1.72 +// case LPX_FR:
1.73 +// case LPX_LO:
1.74 +// lpx_set_row_bnds(lp, i, LPX_LO, lo, up);
1.75 +// break;
1.76 +// case LPX_UP:
1.77 +// case LPX_DB:
1.78 +// case LPX_FX:
1.79 +// if (lo==up)
1.80 +// lpx_set_row_bnds(lp, i, LPX_FX, lo, up);
1.81 +// else
1.82 +// lpx_set_row_bnds(lp, i, LPX_DB, lo, up);
1.83 +// break;
1.84 +// default: ;
1.85 +// //FIXME error
1.86 +// }
1.87 +// }
1.88 +// }
1.89
1.90 - void LpGlpk::_setRowUpperBound(int i, Value up)
1.91 - {
1.92 - if (up==-INF) {
1.93 - //FIXME error
1.94 - }
1.95 - int b=lpx_get_row_type(lp, i);
1.96 - double lo=lpx_get_row_lb(lp, i);
1.97 - if (up==INF) {
1.98 - switch (b) {
1.99 - case LPX_FR:
1.100 - case LPX_LO:
1.101 - break;
1.102 - case LPX_UP:
1.103 - lpx_set_row_bnds(lp, i, LPX_FR, lo, up);
1.104 - break;
1.105 - case LPX_DB:
1.106 - case LPX_FX:
1.107 - lpx_set_row_bnds(lp, i, LPX_LO, lo, up);
1.108 - break;
1.109 - default: ;
1.110 - //FIXME error
1.111 - }
1.112 - } else {
1.113 - switch (b) {
1.114 - case LPX_FR:
1.115 - lpx_set_row_bnds(lp, i, LPX_UP, lo, up);
1.116 - break;
1.117 - case LPX_UP:
1.118 - lpx_set_row_bnds(lp, i, LPX_UP, lo, up);
1.119 - break;
1.120 - case LPX_LO:
1.121 - case LPX_DB:
1.122 - case LPX_FX:
1.123 - if (lo==up)
1.124 - lpx_set_row_bnds(lp, i, LPX_FX, lo, up);
1.125 - else
1.126 - lpx_set_row_bnds(lp, i, LPX_DB, lo, up);
1.127 - break;
1.128 - default: ;
1.129 - //FIXME error
1.130 - }
1.131 - }
1.132 - }
1.133 +// void LpGlpk::_setRowUpperBound(int i, Value up)
1.134 +// {
1.135 +// if (up==-INF) {
1.136 +// //FIXME error
1.137 +// }
1.138 +// int b=lpx_get_row_type(lp, i);
1.139 +// double lo=lpx_get_row_lb(lp, i);
1.140 +// if (up==INF) {
1.141 +// switch (b) {
1.142 +// case LPX_FR:
1.143 +// case LPX_LO:
1.144 +// break;
1.145 +// case LPX_UP:
1.146 +// lpx_set_row_bnds(lp, i, LPX_FR, lo, up);
1.147 +// break;
1.148 +// case LPX_DB:
1.149 +// case LPX_FX:
1.150 +// lpx_set_row_bnds(lp, i, LPX_LO, lo, up);
1.151 +// break;
1.152 +// default: ;
1.153 +// //FIXME error
1.154 +// }
1.155 +// } else {
1.156 +// switch (b) {
1.157 +// case LPX_FR:
1.158 +// lpx_set_row_bnds(lp, i, LPX_UP, lo, up);
1.159 +// break;
1.160 +// case LPX_UP:
1.161 +// lpx_set_row_bnds(lp, i, LPX_UP, lo, up);
1.162 +// break;
1.163 +// case LPX_LO:
1.164 +// case LPX_DB:
1.165 +// case LPX_FX:
1.166 +// if (lo==up)
1.167 +// lpx_set_row_bnds(lp, i, LPX_FX, lo, up);
1.168 +// else
1.169 +// lpx_set_row_bnds(lp, i, LPX_DB, lo, up);
1.170 +// break;
1.171 +// default: ;
1.172 +// //FIXME error
1.173 +// }
1.174 +// }
1.175 +// }
1.176
1.177 void LpGlpk::_setRowBounds(int i, Value lb, Value ub)
1.178 {