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

Rename ReplaceObjectiveFunction to SwapObjectiveFunction I think this makes it more clear that the old function is not deleted.

Browse Source 
Cleanup Jamfile.



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38960 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler
2010-10-13 05:44:52 +00:00
parent 8ecf0b8b09
commit c2f0a314a0
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/libs/linprog/LinearSpec.h
+1 -1
View File
@@ -87,7 +87,7 @@ public:
SummandList* ObjectiveFunction(); SummandList* ObjectiveFunction();
//! Caller takes ownership of the Summand's and the SummandList. //! Caller takes ownership of the Summand's and the SummandList.
SummandList* ReplaceObjectiveFunction( SummandList* SwapObjectiveFunction(
SummandList* objFunction); SummandList* objFunction);
void SetObjectiveFunction(SummandList* objFunction); void SetObjectiveFunction(SummandList* objFunction);
void UpdateObjectiveFunction(); void UpdateObjectiveFunction();
src/libs/alm/ALMLayout.cpp
+2 -2
View File
@@ -818,7 +818,7 @@ BALMLayout::_CalculateMinSize()
SummandList* newObjFunction = new SummandList(2); SummandList* newObjFunction = new SummandList(2);
newObjFunction->AddItem(new Summand(1.0, fRight)); newObjFunction->AddItem(new Summand(1.0, fRight));
newObjFunction->AddItem(new Summand(1.0, fBottom)); newObjFunction->AddItem(new Summand(1.0, fBottom));
SummandList* oldObjFunction = fSolver.ReplaceObjectiveFunction( SummandList* oldObjFunction = fSolver.SwapObjectiveFunction(
newObjFunction); newObjFunction);
_SolveLayout(); _SolveLayout();
fSolver.SetObjectiveFunction(oldObjFunction); fSolver.SetObjectiveFunction(oldObjFunction);
@@ -847,7 +847,7 @@ BALMLayout::_CalculateMaxSize()
SummandList* newObjFunction = new SummandList(2); SummandList* newObjFunction = new SummandList(2);
newObjFunction->AddItem(new Summand(-1.0, fRight)); newObjFunction->AddItem(new Summand(-1.0, fRight));
newObjFunction->AddItem(new Summand(-1.0, fBottom)); newObjFunction->AddItem(new Summand(-1.0, fBottom));
SummandList* oldObjFunction = fSolver.ReplaceObjectiveFunction( SummandList* oldObjFunction = fSolver.SwapObjectiveFunction(
newObjFunction); newObjFunction);
_SolveLayout(); _SolveLayout();
fSolver.SetObjectiveFunction(oldObjFunction); fSolver.SetObjectiveFunction(oldObjFunction);
src/libs/linprog/LinearSpec.cpp
+1 -1
View File
@@ -422,7 +422,7 @@ LinearSpec::ObjectiveFunction()
SummandList* SummandList*
LinearSpec::ReplaceObjectiveFunction(SummandList* objFunction) LinearSpec::SwapObjectiveFunction(SummandList* objFunction)
{ {
SummandList* list = fObjFunction; SummandList* list = fObjFunction;
fObjFunction = objFunction; fObjFunction = objFunction;
src/tests/libs/alm/Jamfile
-2
View File
@@ -1,7 +1,5 @@
SubDir HAIKU_TOP src tests libs alm ; SubDir HAIKU_TOP src tests libs alm ;
SetSubDirSupportedPlatformsBeOSCompatible ;
UseLibraryHeaders lp_solve linprog alm ; UseLibraryHeaders lp_solve linprog alm ;
UsePrivateHeaders shared ; UsePrivateHeaders shared ;