i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Search for the correct constraint when removing an inequality constraint. This finally deletes the slack variable and the helper constraint.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42422 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler
2011-07-14 07:13:35 +00:00
parent f7d98b0923
commit 1245d875a3
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/linprog/QPSolverInterface.cpp
+2 -1
View File
@@ -45,6 +45,7 @@ QPSolverInterface::ConstraintAdded(Constraint* constraint)
data.minSlackConstraint = fLinearSpec->AddConstraint(1., data.minSlackConstraint = fLinearSpec->AddConstraint(1.,
data.slack->Var(), kEQ, 0., constraint->PenaltyNeg(), data.slack->Var(), kEQ, 0., constraint->PenaltyNeg(),
constraint->PenaltyPos()); constraint->PenaltyPos());
data.constraint = constraint;
fInEqSlackConstraints.push_back(data); fInEqSlackConstraints.push_back(data);
SummandList* leftSide = constraint->LeftSide(); SummandList* leftSide = constraint->LeftSide();
@@ -63,7 +64,7 @@ QPSolverInterface::ConstraintRemoved(Constraint* constraint)
for (unsigned int i = 0; i < fInEqSlackConstraints.size(); i++) { for (unsigned int i = 0; i < fInEqSlackConstraints.size(); i++) {
SoftInEqData& data = fInEqSlackConstraints[i]; SoftInEqData& data = fInEqSlackConstraints[i];
if (data.minSlackConstraint != constraint) if (data.constraint != constraint)
continue; continue;
SummandList* leftSide = constraint->LeftSide(); SummandList* leftSide = constraint->LeftSide();
src/libs/linprog/QPSolverInterface.h
+1
View File
@@ -27,6 +27,7 @@ public:
private: private:
struct SoftInEqData { struct SoftInEqData {
Summand* slack; Summand* slack;
Constraint* constraint;
Constraint* minSlackConstraint; Constraint* minSlackConstraint;
}; };