Remove unused fOwner variable. Cleanup.

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

headers/libs/linprog/Constraint.h

@@ -62,9 +62,6 @@ public:
 			Variable*			DNeg() const;
 			Variable*			DPos() const;
 
-			void				SetOwner(void* owner);
-			void*				Owner() const;
-
 			bool				IsValid();
 			void				Invalidate();
 
@@ -85,7 +82,6 @@ private:
 			double				fRightSide;
 			Summand*			fDNegObjSummand;
 			Summand*			fDPosObjSummand;
-			void*				fOwner;
 			BString				fLabel;
 
 			bool				fIsValid;

src/libs/linprog/Constraint.cpp

@@ -339,40 +339,41 @@ Constraint::SetLabel(const char* label)
 void
 Constraint::WriteXML(BFile* file)
 {
-	if (file->IsWritable() && fOwner == NULL) {
+	if (!file->IsWritable())
-		char buffer[200];
+		return;
 
-		file->Write(buffer, sprintf(buffer, "\t<constraint>\n"));
+	char buffer[200];
-		file->Write(buffer, sprintf(buffer, "\t\t<leftside>\n"));
 
-		Summand* summand;
+	file->Write(buffer, sprintf(buffer, "\t<constraint>\n"));
-		for (int32 i = 0; i < fLeftSide->CountItems(); i++) {
+	file->Write(buffer, sprintf(buffer, "\t\t<leftside>\n"));
-			summand = (Summand*)fLeftSide->ItemAt(i);
-			file->Write(buffer, sprintf(buffer, "\t\t\t<summand>\n"));
-			file->Write(buffer, sprintf(buffer, "\t\t\t\t<coeff>%f</coeff>\n",
-				summand->Coeff()));
-			BString varStr = *(summand->Var());
-			file->Write(buffer, sprintf(buffer, "\t\t\t\t<var>%s</var>\n",
-				varStr.String()));
-			file->Write(buffer, sprintf(buffer, "\t\t\t</summand>\n"));
-		}
 
-		file->Write(buffer, sprintf(buffer, "\t\t</leftside>\n"));
+	Summand* summand;
-
+	for (int32 i = 0; i < fLeftSide->CountItems(); i++) {
-		const char* op = "??";
+		summand = (Summand*)fLeftSide->ItemAt(i);
-		if (fOp == OperatorType(EQ))
+		file->Write(buffer, sprintf(buffer, "\t\t\t<summand>\n"));
-			op = "EQ";
+		file->Write(buffer, sprintf(buffer, "\t\t\t\t<coeff>%f</coeff>\n",
-		else if (fOp == OperatorType(LE))
+			summand->Coeff()));
-			op = "LE";
+		BString varStr = *(summand->Var());
-		else if (fOp == OperatorType(GE))
+		file->Write(buffer, sprintf(buffer, "\t\t\t\t<var>%s</var>\n",
-			op = "GE";
+			varStr.String()));
-
+		file->Write(buffer, sprintf(buffer, "\t\t\t</summand>\n"));
-		file->Write(buffer, sprintf(buffer, "\t\t<op>%s</op>\n", op));
-		file->Write(buffer, sprintf(buffer, "\t\t<rightside>%f</rightside>\n", fRightSide));
-		//~ file->Write(buffer, sprintf(buffer, "\t\t<penaltyneg>%s</penaltyneg>\n", PenaltyNeg()));
-		//~ file->Write(buffer, sprintf(buffer, "\t\t<penaltypos>%s</penaltypos>\n", PenaltyPos()));
-		file->Write(buffer, sprintf(buffer, "\t</constraint>\n"));
 	}
+
+	file->Write(buffer, sprintf(buffer, "\t\t</leftside>\n"));
+
+	const char* op = "??";
+	if (fOp == OperatorType(EQ))
+		op = "EQ";
+	else if (fOp == OperatorType(LE))
+		op = "LE";
+	else if (fOp == OperatorType(GE))
+		op = "GE";
+
+	file->Write(buffer, sprintf(buffer, "\t\t<op>%s</op>\n", op));
+	file->Write(buffer, sprintf(buffer, "\t\t<rightside>%f</rightside>\n", fRightSide));
+	//~ file->Write(buffer, sprintf(buffer, "\t\t<penaltyneg>%s</penaltyneg>\n", PenaltyNeg()));
+	//~ file->Write(buffer, sprintf(buffer, "\t\t<penaltypos>%s</penaltypos>\n", PenaltyPos()));
+	file->Write(buffer, sprintf(buffer, "\t</constraint>\n"));
 }
 
 
@@ -404,20 +405,6 @@ Constraint::DPos() const
 }
 
 
-void
-Constraint::SetOwner(void* owner)
-{
-	fOwner = owner;
-}
-
-
-void*
-Constraint::Owner() const
-{
-	return fOwner;
-}
-
-
 bool
 Constraint::IsValid()
 {
@@ -497,11 +484,11 @@ Constraint::GetString(BString& string) const
  */
 Constraint::Constraint(LinearSpec* ls, BList* summands, OperatorType op,
 	double rightSide, double penaltyNeg, double penaltyPos)
-	: fLS(ls),
+	:
+	fLS(ls),
 	fLeftSide(summands),
 	fOp(op),
 	fRightSide(rightSide),
-	fOwner(NULL),
 	fIsValid(true)
 {
 	double coeffs[summands->CountItems() + 2];

src/libs/linprog/LinearSpec.cpp

@@ -12,7 +12,8 @@
  * Creates a new specification for a linear programming problem.
  */
 LinearSpec::LinearSpec()
-	: fCountColumns(0),
+	:
+	fCountColumns(0),
 	fLpPresolved(NULL),
 	fOptimization(MINIMIZE),
 	fObjFunction(new BList()),

src/libs/linprog/Summand.cpp

@@ -4,9 +4,9 @@
  * Distributed under the terms of the MIT License.
  */
 
+#include "LinearSpec.h"
 #include "Summand.h"
 #include "Variable.h"
-#include "LinearSpec.h"
 
 
 /**
@@ -76,4 +76,3 @@ Summand::Summand(double coeff, Variable* var)
 	fUsedInPenaltyFunction = false;
 	fVar->fUsingSummands.AddItem(this);
 }
-

src/libs/linprog/Variable.cpp

@@ -319,7 +319,6 @@ Variable::Invalidate()
 Variable::Variable(LinearSpec* ls)
 	:
 	fLS(ls),
-
 	fValue(NAN),
 	fMin(0),
 	fMax(DBL_MAX),