More cleanup and BList -> BObjectList.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38742 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -99,6 +99,7 @@ typedef BObjectList<Constraint> ConstraintList;
|
||||
} // namespace LinearProgramming
|
||||
|
||||
using LinearProgramming::Constraint;
|
||||
using LinearProgramming::ConstraintList;
|
||||
|
||||
#endif // CONSTRAINT_H
|
||||
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
#include <SupportDefs.h>
|
||||
|
||||
#include "Constraint.h"
|
||||
|
||||
#include "OperatorType.h"
|
||||
#include "OptimizationType.h"
|
||||
#include "PenaltyFunction.h"
|
||||
@@ -25,14 +24,9 @@
|
||||
|
||||
#include "lp_lib.h"
|
||||
|
||||
|
||||
namespace LinearProgramming {
|
||||
|
||||
class Constraint;
|
||||
class ObjFunctionSummand;
|
||||
class PenaltyFunction;
|
||||
class Variable;
|
||||
|
||||
|
||||
/*!
|
||||
* Specification of a linear programming problem.
|
||||
*/
|
||||
@@ -106,8 +100,8 @@ public:
|
||||
void GetString(BString& string) const;
|
||||
|
||||
protected:
|
||||
BList* Variables() const;
|
||||
BList* Constraints() const;
|
||||
VariableList* Variables() const;
|
||||
ConstraintList* Constraints() const;
|
||||
|
||||
int32 fCountColumns;
|
||||
|
||||
@@ -116,8 +110,8 @@ private:
|
||||
OptimizationType fOptimization;
|
||||
lprec* fLP;
|
||||
SummandList* fObjFunction;
|
||||
BList fVariables;
|
||||
BList fConstraints;
|
||||
VariableList fVariables;
|
||||
ConstraintList fConstraints;
|
||||
ResultType fResult;
|
||||
double fObjectiveValue;
|
||||
double fSolvingTime;
|
||||
|
||||
@@ -76,8 +76,13 @@ public:
|
||||
|
||||
};
|
||||
|
||||
|
||||
typedef BObjectList<Variable> VariableList;
|
||||
|
||||
|
||||
} // namespace LinearProgramming
|
||||
|
||||
using LinearProgramming::Variable;
|
||||
using LinearProgramming::VariableList;
|
||||
|
||||
#endif // VARIABLE_H
|
||||
|
||||
Reference in New Issue
Block a user