[haiku-commits] r38740 - in haiku/trunk: headers/libs/linprog src/libs/linprog
- From: clemens.zeidler@xxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 20 Sep 2010 07:42:32 +0200 (CEST)
Author: czeidler
Date: 2010-09-20 07:42:31 +0200 (Mon, 20 Sep 2010)
New Revision: 38740
Changeset: http://dev.haiku-os.org/changeset/38740
Modified:
haiku/trunk/headers/libs/linprog/Constraint.h
haiku/trunk/src/libs/linprog/Constraint.cpp
haiku/trunk/src/libs/linprog/LinearSpec.cpp
haiku/trunk/src/libs/linprog/Summand.cpp
haiku/trunk/src/libs/linprog/Variable.cpp
Log:
Remove unused fOwner variable. Cleanup.
Modified: haiku/trunk/headers/libs/linprog/Constraint.h
===================================================================
--- haiku/trunk/headers/libs/linprog/Constraint.h 2010-09-20 05:40:49 UTC
(rev 38739)
+++ haiku/trunk/headers/libs/linprog/Constraint.h 2010-09-20 05:42:31 UTC
(rev 38740)
@@ -62,9 +62,6 @@
Variable* DNeg() const;
Variable* DPos() const;
- void SetOwner(void* owner);
- void* Owner() const;
-
bool IsValid();
void Invalidate();
@@ -85,7 +82,6 @@
double fRightSide;
Summand* fDNegObjSummand;
Summand* fDPosObjSummand;
- void* fOwner;
BString fLabel;
bool fIsValid;
Modified: haiku/trunk/src/libs/linprog/Constraint.cpp
===================================================================
--- haiku/trunk/src/libs/linprog/Constraint.cpp 2010-09-20 05:40:49 UTC (rev
38739)
+++ haiku/trunk/src/libs/linprog/Constraint.cpp 2010-09-20 05:42:31 UTC (rev
38740)
@@ -339,40 +339,41 @@
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"));
+ 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"));
+ }
- 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</leftside>\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"));
- }
+ 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 @@
}
-void
-Constraint::SetOwner(void* owner)
-{
- fOwner = owner;
-}
-
-
-void*
-Constraint::Owner() const
-{
- return fOwner;
-}
-
-
bool
Constraint::IsValid()
{
@@ -497,11 +484,11 @@
*/
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];
Modified: haiku/trunk/src/libs/linprog/LinearSpec.cpp
===================================================================
--- haiku/trunk/src/libs/linprog/LinearSpec.cpp 2010-09-20 05:40:49 UTC (rev
38739)
+++ haiku/trunk/src/libs/linprog/LinearSpec.cpp 2010-09-20 05:42:31 UTC (rev
38740)
@@ -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()),
Modified: haiku/trunk/src/libs/linprog/Summand.cpp
===================================================================
--- haiku/trunk/src/libs/linprog/Summand.cpp 2010-09-20 05:40:49 UTC (rev
38739)
+++ haiku/trunk/src/libs/linprog/Summand.cpp 2010-09-20 05:42:31 UTC (rev
38740)
@@ -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 @@
fUsedInPenaltyFunction = false;
fVar->fUsingSummands.AddItem(this);
}
-
Modified: haiku/trunk/src/libs/linprog/Variable.cpp
===================================================================
--- haiku/trunk/src/libs/linprog/Variable.cpp 2010-09-20 05:40:49 UTC (rev
38739)
+++ haiku/trunk/src/libs/linprog/Variable.cpp 2010-09-20 05:42:31 UTC (rev
38740)
@@ -319,7 +319,6 @@
Variable::Variable(LinearSpec* ls)
:
fLS(ls),
-
fValue(NAN),
fMin(0),
fMax(DBL_MAX),
Other related posts:
- » [haiku-commits] r38740 - in haiku/trunk: headers/libs/linprog src/libs/linprog - clemens . zeidler
