Refactor LinearSpec a bit, make it more difficult to leak the objective function.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38888 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/libs/linprog/LinearSpec.h

@@ -79,9 +79,12 @@ public:
 			PenaltyFunction*	AddPenaltyFunction(Variable* var, BList* xs,
 									BList* gs);
 
-			SummandList*		ObjFunction();
+			SummandList*		ObjectiveFunction();
-			void				SetObjFunction(SummandList* summands);
+			//! Caller takes ownership of the Summand's and the SummandList.
-			void				UpdateObjFunction();
+			SummandList*		ReplaceObjectiveFunction(
+									SummandList* objFunction);
+			void				SetObjectiveFunction(SummandList* objFunction);
+			void				UpdateObjectiveFunction();
 
 			ResultType			Presolve();
 			void				RemovePresolved();

src/libs/alm/ALMLayout.cpp

@@ -798,17 +798,13 @@ BALMLayout::_CalculateMinSize()
 {
 	_UpdateAreaConstraints();
 
-	SummandList* oldObjFunction = fSolver.ObjFunction();
 	SummandList* newObjFunction = new SummandList(2);
 	newObjFunction->AddItem(new Summand(1.0, fRight));
 	newObjFunction->AddItem(new Summand(1.0, fBottom));
-	fSolver.SetObjFunction(newObjFunction);
+	SummandList* oldObjFunction = fSolver.ReplaceObjectiveFunction(
+		newObjFunction);
 	_SolveLayout();
-	fSolver.SetObjFunction(oldObjFunction);
+	fSolver.SetObjectiveFunction(oldObjFunction);
-	fSolver.UpdateObjFunction();
-	delete newObjFunction->ItemAt(0);
-	delete newObjFunction->ItemAt(1);
-	delete newObjFunction;
 
 	if (fSolver.Result() == UNBOUNDED)
 		return kMinSize;
@@ -831,17 +827,13 @@ BALMLayout::_CalculateMaxSize()
 {
 	_UpdateAreaConstraints();
 
-	SummandList* oldObjFunction = fSolver.ObjFunction();
 	SummandList* newObjFunction = new SummandList(2);
 	newObjFunction->AddItem(new Summand(-1.0, fRight));
 	newObjFunction->AddItem(new Summand(-1.0, fBottom));
-	fSolver.SetObjFunction(newObjFunction);
+	SummandList* oldObjFunction = fSolver.ReplaceObjectiveFunction(
+		newObjFunction);
 	_SolveLayout();
-	fSolver.SetObjFunction(oldObjFunction);
+	fSolver.SetObjectiveFunction(oldObjFunction);
-	fSolver.UpdateObjFunction();
-	delete newObjFunction->ItemAt(0);
-	delete newObjFunction->ItemAt(1);
-	delete newObjFunction;
 
 	if (fSolver.Result() == UNBOUNDED)
 		return kMaxSize;

src/libs/linprog/Constraint.cpp

@@ -97,7 +97,7 @@ Constraint::UpdateLeftSide()
 	if (!set_rowex(fLS->fLP, this->Index(), i, &coeffs[0], &varIndexes[0]))
 		STRACE(("Error in set_rowex."));
 
-	fLS->UpdateObjFunction();
+	fLS->UpdateObjectiveFunction();
 	fLS->RemovePresolved();
 }
 
@@ -266,9 +266,9 @@ Constraint::SetPenaltyNeg(double value)
 
 	if (fDNegObjSummand == NULL) {
 		fDNegObjSummand = new Summand(value, new Variable(fLS));
-		fLS->ObjFunction()->AddItem(fDNegObjSummand);
+		fLS->ObjectiveFunction()->AddItem(fDNegObjSummand);
 		UpdateLeftSide();
-		fLS->UpdateObjFunction();
+		fLS->UpdateObjectiveFunction();
 		return;
 	}
 
@@ -276,7 +276,7 @@ Constraint::SetPenaltyNeg(double value)
 		return;
 
 	fDNegObjSummand->SetCoeff(value);
-	fLS->UpdateObjFunction();
+	fLS->UpdateObjectiveFunction();
 }
 
 
@@ -308,9 +308,9 @@ Constraint::SetPenaltyPos(double value)
 
 	if (fDPosObjSummand == NULL) {
 		fDPosObjSummand = new Summand(value, new Variable(fLS));
-		fLS->ObjFunction()->AddItem(fDPosObjSummand);
+		fLS->ObjectiveFunction()->AddItem(fDPosObjSummand);
 		UpdateLeftSide();
-		fLS->UpdateObjFunction();
+		fLS->UpdateObjectiveFunction();
 		return;
 	}
 
@@ -318,7 +318,7 @@ Constraint::SetPenaltyPos(double value)
 		return;
 
 	fDPosObjSummand->SetCoeff(value);
-	fLS->UpdateObjFunction();
+	fLS->UpdateObjectiveFunction();
 }
 
 
@@ -428,13 +428,13 @@ Constraint::Invalidate()
 	fLeftSide = NULL;
 
 	if (fDNegObjSummand) {
-		fLS->ObjFunction()->RemoveItem(fDNegObjSummand);
+		fLS->ObjectiveFunction()->RemoveItem(fDNegObjSummand);
 		delete fDNegObjSummand->Var();
 		delete fDNegObjSummand;
 		fDNegObjSummand = NULL;
 	}
 	if (fDPosObjSummand) {
-		fLS->ObjFunction()->RemoveItem(fDPosObjSummand);
+		fLS->ObjectiveFunction()->RemoveItem(fDPosObjSummand);
 		delete fDPosObjSummand->Var();
 		delete fDPosObjSummand;
 		fDPosObjSummand = NULL;
@@ -528,7 +528,7 @@ Constraint::Constraint(LinearSpec* ls, SummandList* summands, OperatorType op,
 			: LE), rightSide))
 		STRACE(("Error in add_constraintex."));
 
-	fLS->UpdateObjFunction();
+	fLS->UpdateObjectiveFunction();
 	fLS->Constraints()->AddItem(this);
 }
 

src/libs/linprog/LinearSpec.cpp

@@ -342,26 +342,39 @@ LinearSpec::AddPenaltyFunction(Variable* var, BList* xs, BList* gs)
 /**
  * Gets the objective function.
  *
- * @return BList containing the objective function's summands
+ * @return SummandList containing the objective function's summands
  */
 SummandList*
-LinearSpec::ObjFunction()
+LinearSpec::ObjectiveFunction()
 {
 	return fObjFunction;
 }
 
 
+SummandList*
+LinearSpec::ReplaceObjectiveFunction(SummandList* objFunction)
+{
+	SummandList* list = fObjFunction;
+	fObjFunction = objFunction;
+	UpdateObjectiveFunction();
+	return list;
+}
+
+
 /**
  * Sets a new objective function.
- * The old objective function summands are NOT deleted.
  *
- * @param summands	BList containing the objective function's summands
+ * @param summands	SummandList containing the objective function's summands
  */
 void
-LinearSpec::SetObjFunction(SummandList* summands)
+LinearSpec::SetObjectiveFunction(SummandList* objFunction)
 {
-	fObjFunction = summands;
+	for (int32 i = 0; i < fObjFunction->CountItems(); i++)
-	UpdateObjFunction();
+		delete (Summand*)fObjFunction->ItemAt(i);
+	delete fObjFunction;
+
+	fObjFunction = objFunction;
+	UpdateObjectiveFunction();
 }
 
 
@@ -370,7 +383,7 @@ LinearSpec::SetObjFunction(SummandList* summands)
  * Must be called whenever the summands of the objective function are changed.
  */
 void
-LinearSpec::UpdateObjFunction()
+LinearSpec::UpdateObjectiveFunction()
 {
 	int32 size = fObjFunction->CountItems();
 	double coeffs[size];

src/libs/linprog/PenaltyFunction.cpp

@@ -45,10 +45,10 @@ PenaltyFunction::PenaltyFunction(LinearSpec* ls, Variable* var, BList* xs, BList
 			*(double*)(xs->ItemAt(i))));
 		
 		Summand* objSummand =  new Summand(*(double*)(gs->ItemAt(i + 1)) - *(double*)(gs->ItemAt(i)), dPos);
-		ls->ObjFunction()->AddItem(objSummand);
+		ls->ObjectiveFunction()->AddItem(objSummand);
 		fObjFunctionSummands->AddItem(objSummand);
 	}
-	ls->UpdateObjFunction();
+	ls->UpdateObjectiveFunction();
 }
 
 

src/tests/libs/alm/Pinwheel.cpp

@@ -28,13 +28,9 @@ public:
 		textView1 = new BTextView("textView1");
 		textView1->SetText("5");	
 
-		button1->SetExplicitMinSize(BSize(0, 0));
 		button1->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNLIMITED));
-		button2->SetExplicitMinSize(BSize(0, 0));
 		button2->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNLIMITED));
-		button3->SetExplicitMinSize(BSize(0, 0));
 		button3->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNLIMITED));
-		button4->SetExplicitMinSize(BSize(0, 0));
 		button4->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNLIMITED));
 
 		// create a new BALMLayout and use  it for this window
@@ -76,6 +72,11 @@ public:
 		a1->SetWidthAs(a3);
 		a1->SetHeightAs(a3);
 		*/
+
+		// test size limits
+		BSize min = layout->MinSize();
+		BSize max = layout->MaxSize();
+		SetSizeLimits(min.Width(), max.Width(), min.Height(), max.Height());
 	}
 
 private: