Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Soft constraints can now be weighted.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40940 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler 2011-03-14 00:17:30 +00:00
parent f6c4812a09
commit 66c782cdc0
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libs/linprog/LayoutOptimizer.cpp
View File

@ -538,7 +538,17 @@ LayoutOptimizer::SetConstraints(const ConstraintList& list, int32 variableCount)
rightSide[c] = 0;
continue;
}
rightSide[c] = _RightSide(constraint);
double weight = 0;
double negPenalty = constraint->PenaltyNeg();
if (negPenalty > 0)
weight += negPenalty;
double posPenalty = constraint->PenaltyPos();
if (posPenalty > 0)
weight += posPenalty;
if (negPenalty > 0 && posPenalty > 0)
weight /= 2;
rightSide[c] = _RightSide(constraint) * weight;
SummandList* summands = constraint->LeftSide();
for (int32 s = 0; s < summands->CountItems(); s++) {
Summand* summand = summands->ItemAt(s);
@ -547,6 +557,7 @@ LayoutOptimizer::SetConstraints(const ConstraintList& list, int32 variableCount)
fSoftConstraints[c][variable] = -summand->Coeff();
else
fSoftConstraints[c][variable] = summand->Coeff();
fSoftConstraints[c][variable] *= weight;
}
}