r612:7ab97e2a0c33
Wed, 01 Apr 2009 22:54:00
[Not Reviewed]
0 comments (0 inline)
0
2
0
53
5
7
1
| ... | ... |
@@ -535,2 +535,3 @@ |
| 535 | 535 |
messageLevel(MESSAGE_NO_OUTPUT); |
| 536 |
presolver(false); |
|
| 536 | 537 |
} |
| ... | ... |
@@ -540,2 +541,3 @@ |
| 540 | 541 |
messageLevel(MESSAGE_NO_OUTPUT); |
| 542 |
presolver(false); |
|
| 541 | 543 |
} |
| ... | ... |
@@ -576,4 +578,20 @@ |
| 576 | 578 |
} |
| 579 |
smcp.presolve = _presolve; |
|
| 577 | 580 |
|
| 578 |
|
|
| 581 |
// If the basis is not valid we get an error return value. |
|
| 582 |
// In this case we can try to create a new basis. |
|
| 583 |
switch (glp_simplex(lp, &smcp)) {
|
|
| 584 |
case 0: |
|
| 585 |
break; |
|
| 586 |
case GLP_EBADB: |
|
| 587 |
case GLP_ESING: |
|
| 588 |
case GLP_ECOND: |
|
| 589 |
lpx_set_int_parm(lp, LPX_K_MSGLEV, smcp.msg_lev); |
|
| 590 |
glp_adv_basis(lp, 0); |
|
| 591 |
if (glp_simplex(lp, &smcp) != 0) return UNSOLVED; |
|
| 592 |
break; |
|
| 593 |
default: |
|
| 594 |
return UNSOLVED; |
|
| 595 |
} |
|
| 596 |
|
|
| 579 | 597 |
return SOLVED; |
| ... | ... |
@@ -602,4 +620,19 @@ |
| 602 | 620 |
smcp.meth = GLP_DUAL; |
| 621 |
smcp.presolve = _presolve; |
|
| 603 | 622 |
|
| 604 |
|
|
| 623 |
// If the basis is not valid we get an error return value. |
|
| 624 |
// In this case we can try to create a new basis. |
|
| 625 |
switch (glp_simplex(lp, &smcp)) {
|
|
| 626 |
case 0: |
|
| 627 |
break; |
|
| 628 |
case GLP_EBADB: |
|
| 629 |
case GLP_ESING: |
|
| 630 |
case GLP_ECOND: |
|
| 631 |
lpx_set_int_parm(lp, LPX_K_MSGLEV, smcp.msg_lev); |
|
| 632 |
glp_adv_basis(lp, 0); |
|
| 633 |
if (glp_simplex(lp, &smcp) != 0) return UNSOLVED; |
|
| 634 |
break; |
|
| 635 |
default: |
|
| 636 |
return UNSOLVED; |
|
| 637 |
} |
|
| 605 | 638 |
return SOLVED; |
| ... | ... |
@@ -821,4 +854,4 @@ |
| 821 | 854 |
|
| 822 |
void GlpkLp::presolver(bool b) {
|
|
| 823 |
lpx_set_int_parm(lp, LPX_K_PRESOL, b ? 1 : 0); |
|
| 855 |
void GlpkLp::presolver(bool presolve) {
|
|
| 856 |
_presolve = presolve; |
|
| 824 | 857 |
} |
| ... | ... |
@@ -883,3 +916,18 @@ |
| 883 | 916 |
|
| 884 |
|
|
| 917 |
// If the basis is not valid we get an error return value. |
|
| 918 |
// In this case we can try to create a new basis. |
|
| 919 |
switch (glp_simplex(lp, &smcp)) {
|
|
| 920 |
case 0: |
|
| 921 |
break; |
|
| 922 |
case GLP_EBADB: |
|
| 923 |
case GLP_ESING: |
|
| 924 |
case GLP_ECOND: |
|
| 925 |
lpx_set_int_parm(lp, LPX_K_MSGLEV, smcp.msg_lev); |
|
| 926 |
glp_adv_basis(lp, 0); |
|
| 927 |
if (glp_simplex(lp, &smcp) != 0) return UNSOLVED; |
|
| 928 |
break; |
|
| 929 |
default: |
|
| 930 |
return UNSOLVED; |
|
| 931 |
} |
|
| 932 |
|
|
| 885 | 933 |
if (glp_get_status(lp) != GLP_OPT) return SOLVED; |
0 comments (0 inline)