* Simplified and optimized a lot the "ToString()" debugging facilities.

* *::Index() is now const, thanks to the BList improvements.


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

headers/libs/alm/Area.h

@@ -83,8 +83,8 @@ public:
 	bool				AutoPreferredContentSize() const;
 	void				SetAutoPreferredContentSize(bool value);
 
-	BString*			ToBString();
+						operator BString() const;
-	const char*			ToString();
+	void				GetString(BString& string) const;
 
 	Constraint*			HasSameWidthAs(Area* area);
 	Constraint*			HasSameHeightAs(Area* area);

headers/libs/linprog/Constraint.h

@@ -29,7 +29,7 @@ class LinearSpec;
 class Constraint {
 
 public:
-	int32				Index();
+	int32				Index() const;
 
 	BList*				LeftSide();
 	void				SetLeftSide(BList* summands);
@@ -68,8 +68,8 @@ public:
 	bool				IsValid();
 	void				Invalidate();
 
-	BString*			ToBString();
+						operator BString() const;
-	const char*			ToString();
+	void				GetString(BString& string) const;
 
 						~Constraint();
 

headers/libs/linprog/LinearSpec.h

@@ -90,7 +90,7 @@ public:
 	ResultType			Presolve();
 	void				RemovePresolved();
 	ResultType			Solve();
-	void				Save(char* fname);
+	void				Save(const char* fileName);
 
 	int32				CountColumns() const;
 	OptimizationType	Optimization() const;
@@ -101,8 +101,8 @@ public:
 	double				ObjectiveValue() const;
 	double				SolvingTime() const;
 
-	BString*			ToBString();
+						operator BString() const;
-	const char*			ToString();
+	void				GetString(BString& string) const;
 
 protected:
 	int32 				fCountColumns;

headers/libs/linprog/Variable.h

@@ -24,7 +24,7 @@ class Summand;
 class Variable {
 
 public:
-	int32				Index();
+	int32				Index() const;
 	LinearSpec*			LS() const;
 	double				Value() const;
 	void				SetValue(double value);
@@ -37,8 +37,8 @@ public:
 	const char*			Label();
 	void				SetLabel(const char* label);
 
-	BString*			ToBString();
+						operator BString() const;
-	const char*			ToString();
+	void				GetString(BString& string) const;
 
 	Constraint*			IsEqual(Variable* var);
 	Constraint*			IsSmallerOrEqual(Variable* var);

src/libs/alm/Area.cpp

@@ -649,34 +649,26 @@ Area::SetDefaultBehavior()
 }
 
 
-BString*
+Area::operator BString() const
-Area::ToBString()
 {
-	BString* str = new BString();
+	BString string;
-	BString* leftStr = fLeft->ToBString();
+	GetString(string);
-	BString* topStr = fTop->ToBString();
+	return string;
-	BString* rightStr = fRight->ToBString();
-	BString* bottomStr = fBottom->ToBString();
-	*str << "Area(" << *leftStr << ", "
-		<< *topStr << ", "
-		<< *rightStr << ", "
-		<< *bottomStr << ")";
-	delete leftStr;
-	delete topStr;
-	delete rightStr;
-	delete bottomStr;
-	return str;
 }
 
 
-const char*
+void
-Area::ToString()
+Area::GetString(BString& string) const
 {
-	BString* str = new BString();
+	string << "Area(";
-	char* result = (char*) malloc(str->Length() + 1);
+	fLeft->GetString(string);
-	str->CopyInto(result, 0, str->Length());
+	string << ", ";
-	delete str;
+	fTop->GetString(string);
-	return result;
+	string << ", ";
+	fRight->GetString(string);
+	string << ", ";
+	fBottom->GetString(string);
+	string << ")";
 }
 
 

src/libs/alm/BALMLayout.cpp

@@ -62,22 +62,27 @@ BALMLayout::SolveLayout()
 			currentArea->SetDefaultBehavior();
 	}
 
-	// try to solve the layout until the result is OPTIMAL or INFEASIBLE, maximally 
+	// Try to solve the layout until the result is OPTIMAL or INFEASIBLE,
-	// 15 tries sometimes the solving algorithm encounters numerical problems 
+	// maximally 15 tries sometimes the solving algorithm encounters numerical
-	// (NUMFAILURE), and repeating the solving often helps to overcome them
+	// problems (NUMFAILURE), and repeating the solving often helps to overcome
-	BFile* file = new BFile(fPerformancePath, 
+	// them.
-				B_READ_WRITE | B_CREATE_FILE | B_OPEN_AT_END);
+	BFile* file = NULL;
+	if (fPerformancePath != NULL) {
+		file = new BFile(fPerformancePath,
+			B_READ_WRITE | B_CREATE_FILE | B_OPEN_AT_END);
+	}
 
 	ResultType result;
 	for (int32 tries = 0; tries < 15; tries++) {
 		result = Solve();
 		if (fPerformancePath != NULL) {
 			char buffer [100];
-			file->Write(buffer, sprintf(buffer, "%d\t%fms\t#vars=%ld\t#constraints=%ld\n", 
+			file->Write(buffer, sprintf(buffer, "%d\t%fms\t#vars=%ld\t"
-					result, SolvingTime(), Variables()->CountItems(), 
+				"#constraints=%ld\n", result, SolvingTime(),
-					Constraints()->CountItems()));
+				Variables()->CountItems(), Constraints()->CountItems()));
 		}
-		if (result == OPTIMAL || result == INFEASIBLE) break;
+		if (result == OPTIMAL || result == INFEASIBLE)
+			break;
 	}
 	delete file;
 }
@@ -130,8 +135,10 @@ Row*
 BALMLayout::AddRow(YTab* top, YTab* bottom)
 {
 	Row* row = new Row(this);
-	if (top != NULL) row->Constraints()->AddItem(row->Top()->IsEqual(top));
+	if (top != NULL)
-	if (bottom != NULL) row->Constraints()->AddItem(row->Bottom()->IsEqual(bottom));
+		row->Constraints()->AddItem(row->Top()->IsEqual(top));
+	if (bottom != NULL)
+		row->Constraints()->AddItem(row->Bottom()->IsEqual(bottom));
 	return row;
 }
 

src/libs/linprog/Constraint.cpp

@@ -27,7 +27,7 @@
  * @return the index of the constraint
  */
 int32
-Constraint::Index()
+Constraint::Index() const
 {
 	int32 i = fLS->Constraints()->IndexOf(this);
 	if (i == -1) {
@@ -349,16 +349,15 @@ Constraint::WriteXML(BFile* file)
 			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()->ToBString();
+			BString varStr = *(summand->Var());
 			file->Write(buffer, sprintf(buffer, "\t\t\t\t<var>%s</var>\n",
-				varStr->String()));
+				varStr.String()));
-			delete varStr;
 			file->Write(buffer, sprintf(buffer, "\t\t\t</summand>\n"));
 		}
 
 		file->Write(buffer, sprintf(buffer, "\t\t</leftside>\n"));
 
-		char* op;
+		const char* op = "??";
 		if (fOp == OperatorType(EQ))
 			op = "EQ";
 		else if (fOp == OperatorType(LE))
@@ -457,44 +456,38 @@ Constraint::Invalidate()
 }
 
 
-BString*
+Constraint::operator BString() const
-Constraint::ToBString()
 {
-	BString* str = new BString();
+	BString string;
-	*str << "Constraint ";
+	GetString(string);
+	return string;
+}
+
+
+void
+Constraint::GetString(BString& string) const
+{
+	string << "Constraint ";
 	if (fLabel)
-		*str << fLabel;
+		string << fLabel;
-	*str << "(" << (int32)this << "): ";
+	string << "(" << (int32)this << "): ";
 
 	if (fIsValid) {
 		for (int i = 0; i < fLeftSide->CountItems(); i++) {
 			Summand* s = static_cast<Summand*>(fLeftSide->ItemAt(i));
-			*str << (float)s->Coeff() << "*";
+			string << (float)s->Coeff() << "*";
-			BString* varString = s->Var()->ToBString();
+			s->Var()->GetString(string);
-			*str << *varString << " ";
+			string << " ";
-			delete varString;
 		}
-		*str << ((fOp == OperatorType(EQ)) ? "== "
+		string << ((fOp == OperatorType(EQ)) ? "== "
 			: (fOp == OperatorType(GE)) ? ">= "
 			: (fOp == OperatorType(LE)) ? "<= "
 			: "?? ");
-		*str << (float)fRightSide;
+		string << (float)fRightSide;
-		*str << " PenaltyPos=" << (float)PenaltyPos();
+		string << " PenaltyPos=" << (float)PenaltyPos();
-		*str << " PenaltyNeg=" << (float)PenaltyNeg();
+		string << " PenaltyNeg=" << (float)PenaltyNeg();
 	} else
-		*str << "invalid";
+		string << "invalid";
-	return str;
-}
-
-
-const char*
-Constraint::ToString()
-{
-	BString* str = ToBString();
-	char* result = (char*) malloc(str->Length() + 1);
-	str->CopyInto(result, 0, str->Length());
-	delete str;
-	return result;
 }
 
 

src/libs/linprog/LinearSpec.cpp

@@ -486,9 +486,10 @@ LinearSpec::Solve()
  * @param fname	the file name
  */
 void
-LinearSpec::Save(char* fname)
+LinearSpec::Save(const char* fileName)
 {
-	write_lp(fLP, fname);
+	// TODO: Constness should be fixed in liblpsolve API.
+	write_lp(fLP, const_cast<char*>(fileName));
 }
 
 
@@ -594,54 +595,47 @@ LinearSpec::SolvingTime() const
 }
 
 
-BString*
+LinearSpec::operator BString() const
-LinearSpec::ToBString()
 {
-	BString* str = new BString();
+	BString string;
-	*str << "LinearSpec " << (int32)this << ":\n";
+	GetString(string);
+	return string;
+}
+
+
+void
+LinearSpec::GetString(BString& string) const
+{
+	string << "LinearSpec " << (int32)this << ":\n";
 	for (int i = 0; i < fVariables->CountItems(); i++) {
 		Variable* variable = static_cast<Variable*>(fVariables->ItemAt(i));
-		BString* vStr = variable->ToBString();
+		variable->GetString(string);
-		*str << *vStr << "=" << (float)variable->Value() << " ";
+		string << "=" << (float)variable->Value() << " ";
-		delete vStr;
 	}
-	*str << "\n";
+	string << "\n";
 	for (int i = 0; i < fConstraints->CountItems(); i++) {
 		Constraint* c = static_cast<Constraint*>(fConstraints->ItemAt(i));
-		BString* cStr = c->ToBString();
+		string << i << ": ";
-		*str << i << ": " << *cStr;
+		c->GetString(string);
-		delete cStr;
+		string << "\n";
-		*str << "\n";
 	}
-	*str << "Result=";
+	string << "Result=";
 	if (fResult==-1)
-		*str << "ERROR";
+		string << "ERROR";
 	else if (fResult==0)
-		*str << "OPTIMAL";
+		string << "OPTIMAL";
 	else if (fResult==1)
-		*str << "SUBOPTIMAL";
+		string << "SUBOPTIMAL";
 	else if (fResult==2)
-		*str << "INFEASIBLE";
+		string << "INFEASIBLE";
 	else if (fResult==3)
-		*str << "UNBOUNDED";
+		string << "UNBOUNDED";
 	else if (fResult==4)
-		*str << "DEGENERATE";
+		string << "DEGENERATE";
 	else if (fResult==5)
-		*str << "NUMFAILURE";
+		string << "NUMFAILURE";
 	else
-		*str << fResult;
+		string << fResult;
-	*str << " SolvingTime=" << (float)fSolvingTime << "ms";
+	string << " SolvingTime=" << (float)fSolvingTime << "ms";
-	return str;
-}
-
-
-const char*
-LinearSpec::ToString()
-{
-	BString* str = ToBString();
-	char* result = (char*) malloc(str->Length() + 1);
-	str->CopyInto(result, 0, str->Length());
-	delete str;
-	return result;
 }
 

src/libs/linprog/Variable.cpp

@@ -30,7 +30,7 @@
  * @return the index of the variable
  */
 int32
-Variable::Index()
+Variable::Index() const
 {
 	int32 i = fLS->Variables()->IndexOf(this);
 	if (i == -1) {
@@ -166,39 +166,34 @@ Variable::SetLabel(const char* label)
 }
 
 
+Variable::operator BString() const
+{
+	BString string;
+	GetString(string);
+	return string;
+}
+
+
 /**
  * Returns index of the variable as String.
  * E.g. "Var2"
  *
  * @return the <code>String</code> index of the variable
  */
-BString*
+void
-Variable::ToBString()
+Variable::GetString(BString& string) const
 {
-	BString* str = new BString();
 	if (fLabel) {
-		*str << fLabel;
+		string << fLabel;
 		if (!fIsValid)
-			*str << "(invalid)";
+			string << "(invalid)";
 	} else {
-		*str << "Var";
+		string << "Var";
 		if (!fIsValid)
-			*str << "(invalid," << (int32)this << ")";
+			string << "(invalid," << (int32)this << ")";
 		else
-			*str << Index();
+			string << Index();
 	}
-	return str;
-}
-
-
-const char*
-Variable::ToString()
-{
-	BString* str = ToBString();
-	char* result = (char*) malloc(str->Length() + 1);
-	str->CopyInto(result, 0, str->Length());
-	delete str;
-	return result;
 }