i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some clean up (not complete).

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38736 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler
2010-09-20 04:23:27 +00:00
parent 416aca7ac9
commit 4403274117
2 changed files with 104 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/libs/linprog/LinearSpec.h
+89 -85
View File
@@ -1,28 +1,29 @@
/* /*
* Copyright 2007-2008, Christof Lutteroth, [email protected] * Copyright 2007-2008, Christof Lutteroth, [email protected]
* Copyright 2007-2008, James Kim, [email protected] * Copyright 2007-2008, James Kim, [email protected]
* Copyright 2010, Clemens Zeidler, [email protected]
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef LINEAR_SPEC_H #ifndef LINEAR_SPEC_H
#define LINEAR_SPEC_H #define LINEAR_SPEC_H
#include "Variable.h"
#include "Constraint.h"
#include "Summand.h"
#include "PenaltyFunction.h"
#include "OperatorType.h"
#include "ResultType.h"
#include "OptimizationType.h"
#include "lp_lib.h"
#include <List.h>
#include <String.h>
#include <OS.h>
#include <SupportDefs.h>
#include <math.h> #include <math.h>
#include <List.h>
#include <OS.h>
#include <String.h>
#include <SupportDefs.h>
#include "Constraint.h"
#include "OperatorType.h"
#include "OptimizationType.h"
#include "PenaltyFunction.h"
#include "ResultType.h"
#include "Summand.h"
#include "Variable.h"
#include "lp_lib.h"
namespace LinearProgramming { namespace LinearProgramming {
@@ -31,92 +32,95 @@ class ObjFunctionSummand;
class PenaltyFunction; class PenaltyFunction;
class Variable; class Variable;
/**
/*!
* Specification of a linear programming problem. * Specification of a linear programming problem.
*/ */
class LinearSpec { class LinearSpec {
public: public:
LinearSpec(); LinearSpec();
virtual ~LinearSpec(); virtual ~LinearSpec();
Variable* AddVariable(); Variable* AddVariable();
Constraint* AddConstraint(BList* summands, Constraint* AddConstraint(BList* summands,
OperatorType op, double rightSide); OperatorType op, double rightSide);
Constraint* AddConstraint(double coeff1, Variable* var1, Constraint* AddConstraint(double coeff1, Variable* var1,
OperatorType op, double rightSide); OperatorType op, double rightSide);
Constraint* AddConstraint(double coeff1, Variable* var1, Constraint* AddConstraint(double coeff1, Variable* var1,
double coeff2, Variable* var2, double coeff2, Variable* var2,
OperatorType op, double rightSide); OperatorType op, double rightSide);
Constraint* AddConstraint(double coeff1, Variable* var1, Constraint* AddConstraint(double coeff1, Variable* var1,
double coeff2, Variable* var2, double coeff2, Variable* var2,
double coeff3, Variable* var3, double coeff3, Variable* var3,
OperatorType op, double rightSide); OperatorType op, double rightSide);
Constraint* AddConstraint(double coeff1, Variable* var1, Constraint* AddConstraint(double coeff1, Variable* var1,
double coeff2, Variable* var2, double coeff2, Variable* var2,
double coeff3, Variable* var3, double coeff3, Variable* var3,
double coeff4, Variable* var4, double coeff4, Variable* var4,
OperatorType op, double rightSide); OperatorType op, double rightSide);
Constraint* AddConstraint(BList* summands, Constraint* AddConstraint(BList* summands,
OperatorType op, double rightSide, OperatorType op, double rightSide,
double penaltyNeg, double penaltyPos); double penaltyNeg, double penaltyPos);
Constraint* AddConstraint(double coeff1, Variable* var1, Constraint* AddConstraint(double coeff1, Variable* var1,
OperatorType op, double rightSide, OperatorType op, double rightSide,
double penaltyNeg, double penaltyPos); double penaltyNeg, double penaltyPos);
Constraint* AddConstraint(double coeff1, Variable* var1, Constraint* AddConstraint(double coeff1, Variable* var1,
double coeff2, Variable* var2, double coeff2, Variable* var2,
OperatorType op, double rightSide, OperatorType op, double rightSide,
double penaltyNeg, double penaltyPos); double penaltyNeg, double penaltyPos);
Constraint* AddConstraint(double coeff1, Variable* var1, Constraint* AddConstraint(double coeff1, Variable* var1,
double coeff2, Variable* var2, double coeff2, Variable* var2,
double coeff3, Variable* var3, double coeff3, Variable* var3,
OperatorType op, double rightSide, OperatorType op, double rightSide,
double penaltyNeg, double penaltyPos); double penaltyNeg, double penaltyPos);
Constraint* AddConstraint(double coeff1, Variable* var1, Constraint* AddConstraint(double coeff1, Variable* var1,
double coeff2, Variable* var2, double coeff2, Variable* var2,
double coeff3, Variable* var3, double coeff3, Variable* var3,
double coeff4, Variable* var4, double coeff4, Variable* var4,
OperatorType op, double rightSide, OperatorType op, double rightSide,
double penaltyNeg, double penaltyPos); double penaltyNeg, double penaltyPos);
PenaltyFunction* AddPenaltyFunction(Variable* var, BList* xs, BList* gs); PenaltyFunction* AddPenaltyFunction(Variable* var, BList* xs,
BList* gs);
BList* ObjFunction(); BList* ObjFunction();
void SetObjFunction(BList* summands); void SetObjFunction(BList* summands);
void UpdateObjFunction(); void UpdateObjFunction();
ResultType Presolve(); ResultType Presolve();
void RemovePresolved(); void RemovePresolved();
ResultType Solve(); ResultType Solve();
void Save(const char* fileName); void Save(const char* fileName);
int32 CountColumns() const; int32 CountColumns() const;
OptimizationType Optimization() const; OptimizationType Optimization() const;
void SetOptimization(OptimizationType value); void SetOptimization(OptimizationType value);
BList* Variables() const;
BList* Constraints() const;
ResultType Result() const;
double ObjectiveValue() const;
double SolvingTime() const;
operator BString() const; ResultType Result() const;
void GetString(BString& string) const; double ObjectiveValue() const;
double SolvingTime() const;
operator BString() const;
void GetString(BString& string) const;
protected: protected:
int32 fCountColumns; BList* Variables() const;
BList* Constraints() const;
int32 fCountColumns;
private: private:
lprec* fLpPresolved; lprec* fLpPresolved;
OptimizationType fOptimization; OptimizationType fOptimization;
lprec* fLP; lprec* fLP;
BList* fObjFunction; BList* fObjFunction;
BList fVariables; BList fVariables;
BList fConstraints; BList fConstraints;
ResultType fResult; ResultType fResult;
double fObjectiveValue; double fObjectiveValue;
double fSolvingTime; double fSolvingTime;
public: public:
friend class Constraint; friend class Constraint;
headers/libs/linprog/ResultType.h
+15 -3
View File
@@ -14,9 +14,21 @@ namespace LinearProgramming {
* The possible results of a solving attempt. * The possible results of a solving attempt.
*/ */
enum ResultType { enum ResultType {
NOMEMORY = -2, ERROR = -1, OPTIMAL = 0, SUBOPTIMAL = 1, INFEASIBLE = 2, UNBOUNDED = 3, NOMEMORY = -2,
DEGENERATE = 4, NUMFAILURE = 5, USERABORT = 6, TIMEOUT = 7, PRESOLVED = 9, PROCFAIL = 10, ERROR = -1,
PROCBREAK = 11, FEASFOUND = 12, NOFEASFOUND = 13 OPTIMAL = 0,
SUBOPTIMAL = 1,
INFEASIBLE = 2,
UNBOUNDED = 3,
DEGENERATE = 4,
NUMFAILURE = 5,
USERABORT = 6,
TIMEOUT = 7,
PRESOLVED = 9,
PROCFAIL = 10,
PROCBREAK = 11,
FEASFOUND = 12,
NOFEASFOUND = 13
}; };
} // namespace LinearProgramming } // namespace LinearProgramming