diff --git a/src/cpp/multisolver_interface/environment.cc b/src/cpp/multisolver_interface/environment.cc index e97b24e2d..c70426598 100644 --- a/src/cpp/multisolver_interface/environment.cc +++ b/src/cpp/multisolver_interface/environment.cc @@ -79,95 +79,100 @@ std::function XPRSgetcoltype = nullptr; std::function XPRSgetlb = nullptr; -/*----*/ - -std::function XPRSgetlicerrmsg = nullptr; -std::function XPRSlicense = nullptr; -std::function XPRSgetbanner = nullptr; -std::function XPRSgetversion = nullptr; -std::function XPRSsetdefaultcontrol = nullptr; -std::function XPRSsetintcontrol = - nullptr; -std::function - XPRSsetintcontrol64 = nullptr; -std::function XPRSsetdblcontrol = - nullptr; -std::function - XPRSsetstrcontrol = nullptr; -std::function - XPRSgetintcontrol64 = nullptr; -std::function - XPRSgetdblcontrol = nullptr; -std::function - XPRSgetstringcontrol = nullptr; -std::function XPRSgetintattrib = - nullptr; -std::function - XPRSgetdblattrib = nullptr; -std::function - XPRSloadlp64 = nullptr; std::function XPRSgetub = nullptr; -std::function - XPRSgetcoef = nullptr; +std::function XPRSdelrows = + nullptr; std::function XPRSaddrows = nullptr; -std::function XPRSdelrows = - nullptr; std::function XPRSaddcols = nullptr; -std::function XPRSdelcols = - nullptr; + std::function - XPRSchgcoltype = nullptr; -std::function - XPRSloadbasis = nullptr; -std::function XPRSpostsolve = nullptr; + const double objcoef[])> + XPRSchgobj = nullptr; std::function XPRSchgobjsense = nullptr; -std::function XPRSgetlasterror = nullptr; -std::function XPRSgetbasis = - nullptr; std::function XPRSchgbounds = nullptr; +std::function + XPRSchgcoltype = nullptr; +std::function + XPRSchgrhs = nullptr; + +std::function XPRSchgcoef = + nullptr; +std::function XPRSgetbasis = + nullptr; +std::function + XPRSgetdblattrib = nullptr; std::function XPRSgetlpsol = nullptr; std::function XPRSgetmipsol = nullptr; -std::function - XPRSchgobj = nullptr; -std::function XPRSchgcoef = - nullptr; -std::function - XPRSchgmcoef = nullptr; -std::function - XPRSchgrhs = nullptr; -std::function - XPRSchgrhsrange = nullptr; -std::function - XPRSchgrowtype = nullptr; std::function XPRSsetcbmessage = nullptr; +std::function XPRSsetintcontrol = + nullptr; +std::function XPRSsetdblcontrol = + nullptr; +std::function XPRSgetbanner = nullptr; + +std::function XPRSgetlicerrmsg = nullptr; +std::function XPRSlicense = nullptr; +std::function XPRSgetversion = nullptr; +std::function XPRSgetintattrib = + nullptr; +/*----*/ + +// std::function XPRSsetdefaultcontrol = +// nullptr; std::function +// XPRSsetintcontrol64 = nullptr; +// std::function +// XPRSsetstrcontrol = nullptr; +// std::function +// XPRSgetintcontrol64 = nullptr; +// std::function +// XPRSgetdblcontrol = nullptr; +// std::function +// XPRSgetstringcontrol = nullptr; +// std::function +// XPRSloadlp64 = nullptr; +// std::function +// XPRSgetcoef = nullptr; +// std::function XPRSdelcols +// = +// nullptr; +// std::function +// XPRSloadbasis = nullptr; +// std::function XPRSpostsolve = nullptr; +// std::function XPRSgetlasterror = nullptr; +// std::function +// XPRSchgmcoef = nullptr; +// std::function +// XPRSchgrhsrange = nullptr; +// std::function +// XPRSchgrowtype = nullptr; bool LoadXpressFunctions(DynamicLibrary* xpress_dynamic_library) { // This was generated with the parse_header_xpress.py script. @@ -198,48 +203,50 @@ bool LoadXpressFunctions(DynamicLibrary* xpress_dynamic_library) { xpress_dynamic_library->GetFunction(&XPRSgetrhs, "XPRSgetrhs"); xpress_dynamic_library->GetFunction(&XPRSgetcoltype, "XPRSgetcoltype"); xpress_dynamic_library->GetFunction(&XPRSgetlb, "XPRSgetlb"); - - /**/ - xpress_dynamic_library->GetFunction(&XPRSgetlicerrmsg, "XPRSgetlicerrmsg"); - xpress_dynamic_library->GetFunction(&XPRSlicense, "XPRSlicense"); - xpress_dynamic_library->GetFunction(&XPRSgetbanner, "XPRSgetbanner"); - xpress_dynamic_library->GetFunction(&XPRSgetversion, "XPRSgetversion"); - xpress_dynamic_library->GetFunction(&XPRSsetdefaultcontrol, - "XPRSsetdefaultcontrol"); - xpress_dynamic_library->GetFunction(&XPRSsetintcontrol, "XPRSsetintcontrol"); - xpress_dynamic_library->GetFunction(&XPRSsetintcontrol64, - "XPRSsetintcontrol64"); - xpress_dynamic_library->GetFunction(&XPRSsetdblcontrol, "XPRSsetdblcontrol"); - xpress_dynamic_library->GetFunction(&XPRSsetstrcontrol, "XPRSsetstrcontrol"); - xpress_dynamic_library->GetFunction(&XPRSgetintcontrol64, - "XPRSgetintcontrol64"); - xpress_dynamic_library->GetFunction(&XPRSgetdblcontrol, "XPRSgetdblcontrol"); - xpress_dynamic_library->GetFunction(&XPRSgetstringcontrol, - "XPRSgetstringcontrol"); - xpress_dynamic_library->GetFunction(&XPRSgetdblattrib, "XPRSgetdblattrib"); - xpress_dynamic_library->GetFunction(&XPRSloadlp64, "XPRSloadlp64"); xpress_dynamic_library->GetFunction(&XPRSgetub, "XPRSgetub"); - xpress_dynamic_library->GetFunction(&XPRSgetcoef, "XPRSgetcoef"); - xpress_dynamic_library->GetFunction(&XPRSaddrows, "XPRSaddrows"); xpress_dynamic_library->GetFunction(&XPRSdelrows, "XPRSdelrows"); + xpress_dynamic_library->GetFunction(&XPRSaddrows, "XPRSaddrows"); + xpress_dynamic_library->GetFunction(&XPRSchgobj, "XPRSchgobj"); xpress_dynamic_library->GetFunction(&XPRSaddcols, "XPRSaddcols"); - xpress_dynamic_library->GetFunction(&XPRSdelcols, "XPRSdelcols"); - xpress_dynamic_library->GetFunction(&XPRSchgcoltype, "XPRSchgcoltype"); - xpress_dynamic_library->GetFunction(&XPRSloadbasis, "XPRSloadbasis"); - xpress_dynamic_library->GetFunction(&XPRSpostsolve, "XPRSpostsolve"); xpress_dynamic_library->GetFunction(&XPRSchgobjsense, "XPRSchgobjsense"); - xpress_dynamic_library->GetFunction(&XPRSgetlasterror, "XPRSgetlasterror"); - xpress_dynamic_library->GetFunction(&XPRSgetbasis, "XPRSgetbasis"); xpress_dynamic_library->GetFunction(&XPRSchgbounds, "XPRSchgbounds"); + xpress_dynamic_library->GetFunction(&XPRSchgcoltype, "XPRSchgcoltype"); + xpress_dynamic_library->GetFunction(&XPRSchgrhs, "XPRSchgrhs"); + xpress_dynamic_library->GetFunction(&XPRSchgcoef, "XPRSchgcoef"); + xpress_dynamic_library->GetFunction(&XPRSgetbasis, "XPRSgetbasis"); xpress_dynamic_library->GetFunction(&XPRSgetlpsol, "XPRSgetlpsol"); + xpress_dynamic_library->GetFunction(&XPRSgetdblattrib, "XPRSgetdblattrib"); xpress_dynamic_library->GetFunction(&XPRSgetmipsol, "XPRSgetmipsol"); - xpress_dynamic_library->GetFunction(&XPRSchgobj, "XPRSchgobj"); - xpress_dynamic_library->GetFunction(&XPRSchgcoef, "XPRSchgcoef"); - xpress_dynamic_library->GetFunction(&XPRSchgmcoef, "XPRSchgmcoef"); - xpress_dynamic_library->GetFunction(&XPRSchgrhs, "XPRSchgrhs"); - xpress_dynamic_library->GetFunction(&XPRSchgrhsrange, "XPRSchgrhsrange"); - xpress_dynamic_library->GetFunction(&XPRSchgrowtype, "XPRSchgrowtype"); xpress_dynamic_library->GetFunction(&XPRSsetcbmessage, "XPRSsetcbmessage"); + xpress_dynamic_library->GetFunction(&XPRSsetintcontrol, "XPRSsetintcontrol"); + xpress_dynamic_library->GetFunction(&XPRSsetdblcontrol, "XPRSsetdblcontrol"); + xpress_dynamic_library->GetFunction(&XPRSgetbanner, "XPRSgetbanner"); + xpress_dynamic_library->GetFunction(&XPRSgetlicerrmsg, "XPRSgetlicerrmsg"); + xpress_dynamic_library->GetFunction(&XPRSlicense, "XPRSlicense"); + xpress_dynamic_library->GetFunction(&XPRSgetversion, "XPRSgetversion"); + + /**/ + // xpress_dynamic_library->GetFunction(&XPRSsetdefaultcontrol, + // "XPRSsetdefaultcontrol"); + // xpress_dynamic_library->GetFunction(&XPRSsetintcontrol64, + // "XPRSsetintcontrol64"); + // xpress_dynamic_library->GetFunction(&XPRSsetstrcontrol, + // "XPRSsetstrcontrol"); + // xpress_dynamic_library->GetFunction(&XPRSgetintcontrol64, + // "XPRSgetintcontrol64"); + // xpress_dynamic_library->GetFunction(&XPRSgetdblcontrol, + // "XPRSgetdblcontrol"); + // xpress_dynamic_library->GetFunction(&XPRSgetstringcontrol, + // "XPRSgetstringcontrol"); + // xpress_dynamic_library->GetFunction(&XPRSloadlp64, "XPRSloadlp64"); + // xpress_dynamic_library->GetFunction(&XPRSgetcoef, "XPRSgetcoef"); + // xpress_dynamic_library->GetFunction(&XPRSdelcols, "XPRSdelcols"); + // xpress_dynamic_library->GetFunction(&XPRSloadbasis, "XPRSloadbasis"); + // xpress_dynamic_library->GetFunction(&XPRSpostsolve, "XPRSpostsolve"); + // xpress_dynamic_library->GetFunction(&XPRSgetlasterror, "XPRSgetlasterror"); + // xpress_dynamic_library->GetFunction(&XPRSchgmcoef, "XPRSchgmcoef"); + // xpress_dynamic_library->GetFunction(&XPRSchgrhsrange, "XPRSchgrhsrange"); + // xpress_dynamic_library->GetFunction(&XPRSchgrowtype, "XPRSchgrowtype"); auto notFound = xpress_dynamic_library->FunctionsNotFound(); if (!notFound.empty()) { diff --git a/src/cpp/multisolver_interface/environment.h b/src/cpp/multisolver_interface/environment.h index d576e10e4..86bc23a53 100644 --- a/src/cpp/multisolver_interface/environment.h +++ b/src/cpp/multisolver_interface/environment.h @@ -427,45 +427,45 @@ extern std::function XPRS extern std::function XPRSgetrhsrange; extern std::function XPRSgetcoltype; extern std::function XPRSgetlb; - - -/***/ -extern std::function XPRSgetlicerrmsg; -extern std::function XPRSlicense; -extern std::function XPRSgetbanner; -extern std::function XPRSgetversion; -extern std::function XPRSsetdefaultcontrol; -extern std::function XPRSsetintcontrol; -extern std::function XPRSsetintcontrol64; -extern std::function XPRSsetdblcontrol; -extern std::function XPRSsetstrcontrol; -extern std::function XPRSgetintcontrol64; -extern std::function XPRSgetdblcontrol; -extern std::function XPRSgetstringcontrol; -extern std::function XPRSgetdblattrib; -extern std::function XPRSloadlp64; extern std::function XPRSgetub; -extern std::function XPRSgetcoef; -extern std::function XPRSaddrows; extern std::function XPRSdelrows; +extern std::function XPRSaddrows; extern std::function XPRSaddcols; -extern std::function XPRSdelcols; -extern std::function XPRSchgcoltype; -extern std::function XPRSloadbasis; -extern std::function XPRSpostsolve; +extern std::function XPRSchgobj; extern std::function XPRSchgobjsense; -extern std::function XPRSgetlasterror; -extern std::function XPRSgetbasis; extern std::function XPRSchgbounds; +extern std::function XPRSchgcoltype; +extern std::function XPRSchgrhs; +extern std::function XPRSchgcoef; +extern std::function XPRSgetbasis; +extern std::function XPRSgetdblattrib; extern std::function XPRSgetlpsol; extern std::function XPRSgetmipsol; -extern std::function XPRSchgobj; -extern std::function XPRSchgcoef; -extern std::function XPRSchgmcoef; -extern std::function XPRSchgrhs; -extern std::function XPRSchgrhsrange; -extern std::function XPRSchgrowtype; extern std::function XPRSsetcbmessage; +extern std::function XPRSsetintcontrol; +extern std::function XPRSsetdblcontrol; +extern std::function XPRSgetbanner; + +extern std::function XPRSgetlicerrmsg; +extern std::function XPRSlicense; +extern std::function XPRSgetversion; + +/***/ +// extern std::function XPRSsetdefaultcontrol; +// extern std::function XPRSsetintcontrol64; +// extern std::function XPRSsetstrcontrol; +// extern std::function XPRSgetintcontrol64; +// extern std::function XPRSgetdblcontrol; +// extern std::function XPRSgetstringcontrol; +// extern std::function XPRSloadlp64; +// extern std::function XPRSgetcoef; +// extern std::function XPRSdelcols; +// extern std::function XPRSloadbasis; +// extern std::function XPRSpostsolve; +// extern std::function XPRSgetlasterror; +// extern std::function XPRSchgmcoef; +// extern std::function XPRSchgrhsrange; +// extern std::function XPRSchgrowtype; } // namespace operations_research_Xpansion