[ViewVC] Diff of: group/trunk/OOPSE/libmdtools/Constraint.hpp

Comparing trunk/OOPSE/libmdtools/Constraint.hpp (file contents):
Revision 994 by tim, Tue Jan 27 19:15:20 2004 UTC vs.
Revision 995 by tim, Wed Jan 28 20:40:26 2004 UTC

#	Line 9 \| Line 9 \| using namespace std;
9
10		using namespace std;
11
12	<	enum ConsType {simpleBound = 1, linearEqu = 2, linearInequ = 4,
12	>	typedef enum ConsType {simpleBound = 1, linearEqu = 2, linearInequ = 4,
13		nonlinearEqu = 8, nonlinearInequ =16};
14
15	<	enum BoundType{upper, lower, equ};
15	>	typedef enum BoundType{upper, lower, equ};
16
17	+	/**
18	+	* Abstract class of constraint for nonlinear optimization problem
19	+	*/
20		class ConstraintBase{
21		public:
22		ConstraintBase();
#	Line 38 \| Line 41 \| class ConstraintBase{
41
42		};
43
44	+	/**
45	+	* Simple Bound Constraint for nonlinear optimization problem
46	+	* boundType is used to identify whether it is upper bound or lower bound
47	+	*/
48		class SimpleBoundCons : public ConstraintBase{
49		public:
50
#	Line 53 \| Line 60 \| class SimpleBoundCons : public ConstraintBase{
60		int index;
61		};
62
63	+	/**
64	+	* Linear Constraint for nonlinear optimization problem
65	+	* boundType is used to identify whether it is linear equation constraint or linear inequality
66	+	* constraint. If it is inear inequality constraint
67	+	*/
68	+
69		class LinearCons : public ConstraintBase{
70
71		public:
#	Line 69 \| Line 82 \| class LinearCons : public ConstraintBase{
82		vector<double> coeff;
83		};
84
85	+	/**
86	+	* Linear Constraint for nonlinear optimization problem
87	+	* boundType is used to identify whether it is linear equality constraint or linear inequality
88	+	* constraint
89	+	*/
90	+
91	+
92		class NonlinearCons : public ConstraintBase{
93
94		public:

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines