Proxy header + renamed constant to avoid any copyright issues (#3)

* Proxy header
* Renamed constant to avoid any copyright issues
* Removed XPRS_CC
* Improved _get_entity_name impl
* Added back _get_entity_name checks
* I've also fixed a typo and added some urls in one of the readme that was missing them.

Author: XPRSc4v4

include/pyoptinterface/xpress_model.hpp

@@ -4,7 +4,8 @@
 #include <memory>
 #include <variant>
 
-#include <xprs.h>
+// #include <xprs.h>
+#include "../thirdparty/solvers/xpress/xpress_forward_decls.h"
 
 #include "pyoptinterface/core.hpp"
 #include "pyoptinterface/container.hpp"
@@ -17,7 +18,7 @@
 #define XPRS_VER_MINOR 1
 #define XPRS_VER_BUILD 1
 
-#if XPVERSION_MAJOR < XPRS_VER_MAJOR
+#if POI_XPVERSION_MAJOR < XPRS_VER_MAJOR
 #warning "System Xpress library major version is older than the officially supported version. " \
     "Some features may not work correctly."
 #endif
@@ -243,91 +244,91 @@ struct Env
 // Types associated with Xpress attribute and controls
 enum class CATypes : int
 {
-	NOTDEFINED = XPRS_TYPE_NOTDEFINED,
-	INT = XPRS_TYPE_INT,
-	INT64 = XPRS_TYPE_INT64,
-	DOUBLE = XPRS_TYPE_DOUBLE,
-	STRING = XPRS_TYPE_STRING,
+	NOTDEFINED = POI_XPRS_TYPE_NOTDEFINED,
+	INT = POI_XPRS_TYPE_INT,
+	INT64 = POI_XPRS_TYPE_INT64,
+	DOUBLE = POI_XPRS_TYPE_DOUBLE,
+	STRING = POI_XPRS_TYPE_STRING,
 };
 
 enum class SOLSTATUS : int
 {
-	NOTFOUND = XPRS_SOLSTATUS_NOTFOUND,
-	OPTIMAL = XPRS_SOLSTATUS_OPTIMAL,
-	FEASIBLE = XPRS_SOLSTATUS_FEASIBLE,
-	INFEASIBLE = XPRS_SOLSTATUS_INFEASIBLE,
-	UNBOUNDED = XPRS_SOLSTATUS_UNBOUNDED
+	NOTFOUND = POI_XPRS_SOLSTATUS_NOTFOUND,
+	OPTIMAL = POI_XPRS_SOLSTATUS_OPTIMAL,
+	FEASIBLE = POI_XPRS_SOLSTATUS_FEASIBLE,
+	INFEASIBLE = POI_XPRS_SOLSTATUS_INFEASIBLE,
+	UNBOUNDED = POI_XPRS_SOLSTATUS_UNBOUNDED
 };
 
 enum class SOLVESTATUS : int
 {
-	UNSTARTED = XPRS_SOLVESTATUS_UNSTARTED,
-	STOPPED = XPRS_SOLVESTATUS_STOPPED,
-	FAILED = XPRS_SOLVESTATUS_FAILED,
-	COMPLETED = XPRS_SOLVESTATUS_COMPLETED
+	UNSTARTED = POI_XPRS_SOLVESTATUS_UNSTARTED,
+	STOPPED = POI_XPRS_SOLVESTATUS_STOPPED,
+	FAILED = POI_XPRS_SOLVESTATUS_FAILED,
+	COMPLETED = POI_XPRS_SOLVESTATUS_COMPLETED
 };
 
 enum class LPSTATUS : int
 {
-	UNSTARTED = XPRS_LP_UNSTARTED,
-	OPTIMAL = XPRS_LP_OPTIMAL,
-	INFEAS = XPRS_LP_INFEAS,
-	CUTOFF = XPRS_LP_CUTOFF,
-	UNFINISHED = XPRS_LP_UNFINISHED,
-	UNBOUNDED = XPRS_LP_UNBOUNDED,
-	CUTOFF_IN_DUAL = XPRS_LP_CUTOFF_IN_DUAL,
-	UNSOLVED = XPRS_LP_UNSOLVED,
-	NONCONVEX = XPRS_LP_NONCONVEX
+	UNSTARTED = POI_XPRS_LP_UNSTARTED,
+	OPTIMAL = POI_XPRS_LP_OPTIMAL,
+	INFEAS = POI_XPRS_LP_INFEAS,
+	CUTOFF = POI_XPRS_LP_CUTOFF,
+	UNFINISHED = POI_XPRS_LP_UNFINISHED,
+	UNBOUNDED = POI_XPRS_LP_UNBOUNDED,
+	CUTOFF_IN_DUAL = POI_XPRS_LP_CUTOFF_IN_DUAL,
+	UNSOLVED = POI_XPRS_LP_UNSOLVED,
+	NONCONVEX = POI_XPRS_LP_NONCONVEX
 };
 
 enum class MIPSTATUS : int
 {
-	NOT_LOADED = XPRS_MIP_NOT_LOADED,
-	LP_NOT_OPTIMAL = XPRS_MIP_LP_NOT_OPTIMAL,
-	LP_OPTIMAL = XPRS_MIP_LP_OPTIMAL,
-	NO_SOL_FOUND = XPRS_MIP_NO_SOL_FOUND,
-	SOLUTION = XPRS_MIP_SOLUTION,
-	INFEAS = XPRS_MIP_INFEAS,
-	OPTIMAL = XPRS_MIP_OPTIMAL,
-	UNBOUNDED = XPRS_MIP_UNBOUNDED
+	NOT_LOADED = POI_XPRS_MIP_NOT_LOADED,
+	LP_NOT_OPTIMAL = POI_XPRS_MIP_LP_NOT_OPTIMAL,
+	LP_OPTIMAL = POI_XPRS_MIP_LP_OPTIMAL,
+	NO_SOL_FOUND = POI_XPRS_MIP_NO_SOL_FOUND,
+	SOLUTION = POI_XPRS_MIP_SOLUTION,
+	INFEAS = POI_XPRS_MIP_INFEAS,
+	OPTIMAL = POI_XPRS_MIP_OPTIMAL,
+	UNBOUNDED = POI_XPRS_MIP_UNBOUNDED
 };
 
 enum class NLPSTATUS : int
 {
-	UNSTARTED = XPRS_NLPSTATUS_UNSTARTED,
-	SOLUTION = XPRS_NLPSTATUS_SOLUTION,
-	LOCALLY_OPTIMAL = XPRS_NLPSTATUS_LOCALLY_OPTIMAL,
-	OPTIMAL = XPRS_NLPSTATUS_OPTIMAL,
-	NOSOLUTION = XPRS_NLPSTATUS_NOSOLUTION,
-	LOCALLY_INFEASIBLE = XPRS_NLPSTATUS_LOCALLY_INFEASIBLE,
-	INFEASIBLE = XPRS_NLPSTATUS_INFEASIBLE,
-	UNBOUNDED = XPRS_NLPSTATUS_UNBOUNDED,
-	UNFINISHED = XPRS_NLPSTATUS_UNFINISHED,
-	UNSOLVED = XPRS_NLPSTATUS_UNSOLVED,
+	UNSTARTED = POI_XPRS_NLPSTATUS_UNSTARTED,
+	SOLUTION = POI_XPRS_NLPSTATUS_SOLUTION,
+	LOCALLY_OPTIMAL = POI_XPRS_NLPSTATUS_LOCALLY_OPTIMAL,
+	OPTIMAL = POI_XPRS_NLPSTATUS_OPTIMAL,
+	NOSOLUTION = POI_XPRS_NLPSTATUS_NOSOLUTION,
+	LOCALLY_INFEASIBLE = POI_XPRS_NLPSTATUS_LOCALLY_INFEASIBLE,
+	INFEASIBLE = POI_XPRS_NLPSTATUS_INFEASIBLE,
+	UNBOUNDED = POI_XPRS_NLPSTATUS_UNBOUNDED,
+	UNFINISHED = POI_XPRS_NLPSTATUS_UNFINISHED,
+	UNSOLVED = POI_XPRS_NLPSTATUS_UNSOLVED,
 };
 
 enum class IISSOLSTATUS : int
 {
-	UNSTARTED = XPRS_IIS_UNSTARTED,
-	FEASIBLE = XPRS_IIS_FEASIBLE,
-	COMPLETED = XPRS_IIS_COMPLETED,
-	UNFINISHED = XPRS_IIS_UNFINISHED
+	UNSTARTED = POI_XPRS_IIS_UNSTARTED,
+	FEASIBLE = POI_XPRS_IIS_FEASIBLE,
+	COMPLETED = POI_XPRS_IIS_COMPLETED,
+	UNFINISHED = POI_XPRS_IIS_UNFINISHED
 };
 
 enum class SOLAVAILABLE : int
 {
-	NOTFOUND = XPRS_SOLAVAILABLE_NOTFOUND,
-	OPTIMAL = XPRS_SOLAVAILABLE_OPTIMAL,
-	FEASIBLE = XPRS_SOLAVAILABLE_FEASIBLE
+	NOTFOUND = POI_XPRS_SOLAVAILABLE_NOTFOUND,
+	OPTIMAL = POI_XPRS_SOLAVAILABLE_OPTIMAL,
+	FEASIBLE = POI_XPRS_SOLAVAILABLE_FEASIBLE
 };
 
 enum class OPTIMIZETYPE : int
 {
-	NONE = XPRS_OPTIMIZETYPE_NONE,
-	LP = XPRS_OPTIMIZETYPE_LP,
-	MIP = XPRS_OPTIMIZETYPE_MIP,
-	LOCAL = XPRS_OPTIMIZETYPE_LOCAL,
-	GLOBAL = XPRS_OPTIMIZETYPE_GLOBAL
+	NONE = POI_XPRS_OPTIMIZETYPE_NONE,
+	LP = POI_XPRS_OPTIMIZETYPE_LP,
+	MIP = POI_XPRS_OPTIMIZETYPE_MIP,
+	LOCAL = POI_XPRS_OPTIMIZETYPE_LOCAL,
+	GLOBAL = POI_XPRS_OPTIMIZETYPE_GLOBAL
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -512,8 +513,8 @@ class Model : public OnesideLinearConstraintMixin<Model>,
 
 	// Variables
 	VariableIndex add_variable(VariableDomain domain = VariableDomain::Continuous,
-	                           double lb = XPRS_MINUSINFINITY, double ub = XPRS_PLUSINFINITY,
-	                           const char *name = nullptr);
+	                           double lb = POI_XPRS_MINUSINFINITY,
+	                           double ub = POI_XPRS_PLUSINFINITY, const char *name = nullptr);
 	void delete_variable(VariableIndex variable);
 	void delete_variables(const Vector<VariableIndex> &variables);
 	void set_objective_coefficient(VariableIndex variable, double value);
@@ -638,7 +639,7 @@ class Model : public OnesideLinearConstraintMixin<Model>,
 
 	void cb_exit();
 
-	// NOTE: Xpress only provive ways to add local cuts, so, all these functions map to the same
+	// NOTE: Xpress only provide ways to add local cuts, so, all these functions map to the same
 	// XPRSaddcuts operation
 	void cb_add_lazy_constraint(const ScalarAffineFunction &function, ConstraintSense sense,
 	                            CoeffT rhs);