From 0401a9c7120dd0faded99a4b1946169fbb9bcf46 Mon Sep 17 00:00:00 2001
From: Clemens Zeidler <clemens.zeidler@googlemail.com>
Date: Mon, 20 Sep 2010 05:42:31 +0000
Subject: [PATCH] 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 |  4 --
 src/libs/linprog/Constraint.cpp   | 79 +++++++++++++------------------
 src/libs/linprog/LinearSpec.cpp   |  3 +-
 src/libs/linprog/Summand.cpp      |  3 +-
 src/libs/linprog/Variable.cpp     |  1 -
 5 files changed, 36 insertions(+), 54 deletions(-)

diff --git a/headers/libs/linprog/Constraint.h b/headers/libs/linprog/Constraint.h
index 2fae5f932c..69217cc4e1 100644
--- a/headers/libs/linprog/Constraint.h
+++ b/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;
diff --git a/src/libs/linprog/Constraint.cpp b/src/libs/linprog/Constraint.cpp
index c2e7cc69df..931003b6b5 100644
--- a/src/libs/linprog/Constraint.cpp
+++ b/src/libs/linprog/Constraint.cpp
@@ -339,40 +339,41 @@ Constraint::SetLabel(const char* label)
 void
 Constraint::WriteXML(BFile* file)
 {
-	if (file->IsWritable() && fOwner == NULL) {
-		char buffer[200];
+	if (!file->IsWritable())
+		return;
 
-		file->Write(buffer, sprintf(buffer, "\t<constraint>\n"));
-		file->Write(buffer, sprintf(buffer, "\t\t<leftside>\n"));
+	char buffer[200];
 
-		Summand* summand;
-		for (int32 i = 0; i < fLeftSide->CountItems(); i++) {
-			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<constraint>\n"));
+	file->Write(buffer, sprintf(buffer, "\t\t<leftside>\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"));
+	Summand* summand;
+	for (int32 i = 0; i < fLeftSide->CountItems(); i++) {
+		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"));
+
+	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];
diff --git a/src/libs/linprog/LinearSpec.cpp b/src/libs/linprog/LinearSpec.cpp
index e9f4d6e0f9..570b5f6bbb 100644
--- a/src/libs/linprog/LinearSpec.cpp
+++ b/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()),
diff --git a/src/libs/linprog/Summand.cpp b/src/libs/linprog/Summand.cpp
index 5706d515a2..7e2dd8cd44 100644
--- a/src/libs/linprog/Summand.cpp
+++ b/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);
 }
-
diff --git a/src/libs/linprog/Variable.cpp b/src/libs/linprog/Variable.cpp
index 0f40d5ede7..e37532ad23 100644
--- a/src/libs/linprog/Variable.cpp
+++ b/src/libs/linprog/Variable.cpp
@@ -319,7 +319,6 @@ Variable::Invalidate()
 Variable::Variable(LinearSpec* ls)
 	:
 	fLS(ls),
-
 	fValue(NAN),
 	fMin(0),
 	fMax(DBL_MAX),