songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug fixed in removal of slack variable from basis

This commit is contained in:
Bernd Gärtner 2006-08-14 12:55:21 +00:00
parent 010ae7e63b
commit 2f86e14527
6 changed files with 91 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitattributes vendored
View File

@ -1495,7 +1495,10 @@ QP_solver/test/QP_solver/data_to_mps-rational.cin -text
QP_solver/test/QP_solver/data_to_mps.cin -text
QP_solver/test/QP_solver/test_solver_data/derivatives/QPTEST_free.mps -text
QP_solver/test/QP_solver/test_solver_data/derivatives/QPTEST_shifted.mps -text
QP_solver/test/QP_solver/test_solver_data/derivatives/ZECEVIC2_free.mps -text
QP_solver/test/QP_solver/test_solver_data/derivatives/ZECEVIC2_shifted.mps -text
QP_solver/test/QP_solver/test_solver_data/masters/cgal/QPTEST.mps -text
QP_solver/test/QP_solver/test_solver_data/masters/cgal/ZECEVIC2.mps -text
Qt_widget/doc_tex/Qt_widget/standard_toolbar.eps -text svneol=unset#application/postscript
Qt_widget/doc_tex/Qt_widget/standard_toolbar.gif -text svneol=unset#image/gif
Qt_widget/doc_tex/Qt_widget/standard_toolbar.pdf -text svneol=unset#application/pdf

4
QP_solver/include/CGAL/QP_solver/QP_solver_impl.h
View File

@ -1845,8 +1845,8 @@ leave_variable( )
leave_variable_slack_upd_w_r(Is_in_standard_form());
// leave slack variable [ out: i ]
in_B [ i ] = -1;
in_B [ B_S.back()] = k;
in_B [ B_S.back()] = k; // former last var moves to position k
in_B [ i ] = -1; // i gets deleted
B_S[ k] = B_S.back(); B_S.pop_back();
S_B[ k] = S_B.back(); S_B.pop_back();

2
QP_solver/test/QP_solver/test_solver.cin
View File

File diff suppressed because one or more lines are too long

40
QP_solver/test/QP_solver/test_solver_data/derivatives/ZECEVIC2_free.mps Normal file
View File

@ -0,0 +1,40 @@
* Number-type: floating-point
* Description: Freed instance of original file
* Generated-by: master_mps_to_derivatives-create_free_instance
NAME ZECEVIC2
ROWS
N obj
L c0
L c1
G c2
L c3
G c4
L c5
COLUMNS
x0 obj -2
x0 c0 1
x0 c1 1
x0 c2 1
x0 c3 1
x0 c4 0
x0 c5 0
x1 obj -3
x1 c0 1
x1 c1 4
x1 c2 0
x1 c3 0
x1 c4 1
x1 c5 1
RHS
rhs c0 2
rhs c1 4
rhs c2 0
rhs c3 10
rhs c4 0
rhs c5 10
BOUNDS
MI BND x0
MI BND x1
QMATRIX
x1 x1 4
ENDATA

26
QP_solver/test/QP_solver/test_solver_data/derivatives/ZECEVIC2_shifted.mps Normal file
View File

@ -0,0 +1,26 @@
* Number-type: floating-point
* Description: Shifted instance of original file
* Generated-by: master_mps_to_derivatives-create_shifted_instance
NAME ZECEVIC2
ROWS
N obj
L c0
L c1
COLUMNS
x0 obj -2
x0 c0 1
x0 c1 1
x1 obj -11
x1 c0 1
x1 c1 4
RHS
rhs c0 5
rhs c1 13
BOUNDS
LO BND x0 1
UP BND x0 11
LO BND x1 2
UP BND x1 12
QMATRIX
x1 x1 4
ENDATA

19
QP_solver/test/QP_solver/test_solver_data/masters/cgal/ZECEVIC2.mps Normal file
View File

@ -0,0 +1,19 @@
NAME ZECEVIC2
ROWS
N OBJ.FUNC
L R------1
L R------2
COLUMNS
C------1 OBJ.FUNC -.200000e+01 R------1 0.100000e+01
C------1 R------2 0.100000e+01
C------2 OBJ.FUNC -.300000e+01 R------1 0.100000e+01
C------2 R------2 0.400000e+01
RHS
RHS R------1 0.200000e+01
RHS R------2 0.400000e+01
BOUNDS
UP BOUNDS C------1 0.100000e+02
UP BOUNDS C------2 0.100000e+02
QUADOBJ
C------2 C------2 0.400000e+01
ENDATA