Merge all linear programming types in one file an rename them.

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

headers/libs/linprog/Constraint.h

@@ -13,7 +13,7 @@
 #include <String.h>
 #include <SupportDefs.h>
 
-#include "OperatorType.h"
+#include "LinearProgrammingTypes.h"
 #include "Summand.h"
 #include "Variable.h"
 

headers/libs/linprog/LinearProgrammingTypes.h

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2007-2008, Christof Lutteroth, [email protected]
+ * Copyright 2007-2008, James Kim, [email protected]
+ * Copyright 2010, Clemens Zeidler <[email protected]>
+ * Distributed under the terms of the MIT License.
+ */
+
+#ifndef	LINEAR_PROGRAMMING_TYPES_H
+#define	LINEAR_PROGRAMMING_TYPES_H
+
+
+namespace LinearProgramming {
+
+
+/**
+ * The possible results of a solving attempt.
+ */
+enum ResultType {
+	kNoMemory = -2,
+	kError = -1,
+	kOptimal = 0,
+	kSuboptimal = 1,
+	kInfeasible = 2,
+	kUnbounded = 3,
+	kDegenerate = 4,
+	kNumFailure = 5
+};
+
+
+/**
+ * Possible operators for linear constraints.
+ */
+enum OperatorType {
+	kEQ,
+	kLE,
+	kGE
+};
+
+
+
+/**
+ * The two possibilities for optimizing the objective function.
+ */
+enum OptimizationType {
+	kMinimize,
+	kMaximize
+};
+
+}	// namespace LinearProgramming
+
+
+using LinearProgramming::ResultType;
+using LinearProgramming::OperatorType;
+using LinearProgramming::OptimizationType;
+
+
+#endif // LINEAR_PROGRAMMING_TYPES_H

headers/libs/linprog/LinearSpec.h

@@ -15,10 +15,8 @@
 #include <SupportDefs.h>
 
 #include "Constraint.h"
-#include "OperatorType.h"
-#include "OptimizationType.h"
+#include "LinearProgrammingTypes.h"
 #include "PenaltyFunction.h"
-#include "ResultType.h"
 #include "Summand.h"
 #include "Variable.h"
 

headers/libs/linprog/OperatorType.h

@@ -1,26 +0,0 @@
-/*
- * Copyright 2007-2008, Christof Lutteroth, [email protected]
- * Copyright 2007-2008, James Kim, [email protected]
- * Distributed under the terms of the MIT License.
- */
-
-#ifndef	OPERATOR_TYPE_H
-#define	OPERATOR_TYPE_H
-
-
-namespace LinearProgramming {
-
-/**
- * Possible operators for linear constraints.
- */
-enum OperatorType {
-	kEQ,
-	kLE,
-	kGE
-};
-
-}	// namespace LinearProgramming
-
-using LinearProgramming::OperatorType;
-
-#endif

headers/libs/linprog/OptimizationType.h

@@ -1,24 +0,0 @@
-/*
- * Copyright 2007-2008, Christof Lutteroth, [email protected]
- * Copyright 2007-2008, James Kim, [email protected]
- * Distributed under the terms of the MIT License.
- */
-
-#ifndef	OPTIMIZATION_TYPE_H
-#define	OPTIMIZATION_TYPE_H
-
-
-namespace LinearProgramming {
-
-/**
- * The two possibilities for optimizing the objective function.
- */
-enum OptimizationType {
-	MINIMIZE, MAXIMIZE
-};
-
-}	// namespace LinearProgramming
-
-using LinearProgramming::OptimizationType;
-
-#endif

headers/libs/linprog/ResultType.h

@@ -1,38 +0,0 @@
-/*
- * Copyright 2007-2008, Christof Lutteroth, [email protected]
- * Copyright 2007-2008, James Kim, [email protected]
- * Distributed under the terms of the MIT License.
- */
-
-#ifndef	RESULT_TYPE_H
-#define	RESULT_TYPE_H
-
-
-namespace LinearProgramming {
-	
-/**
- * The possible results of a solving attempt.
- */
-enum ResultType {
-	NOMEMORY = -2,
-	ERROR = -1,
-	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
-
-using LinearProgramming::ResultType;
-
-#endif