Changeset 2691 for ThirdParty/SCIP


Ignore:
Timestamp:
Dec 14, 2012 3:46:43 PM (7 years ago)
Author:
stefan
Message:

add names array for lp solvers

Location:
ThirdParty/SCIP/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/SCIP/trunk/lpiswitch.c

    r2690 r2691  
    714714static LPISW_DECL_LPIWRITELP((*lpiWriteLP)) = NULL;
    715715
    716 static SCIP_LPISW_LPSOLVER currentsolver = -1;
     716static SCIP_LPISW_LPSOLVER currentsolver = SCIP_LPISW_NSOLVERS;
    717717
    718718/** macro to set static function pointers to LPI functions of a particular solver
     
    906906#endif
    907907      }
     908      default: ;
    908909   }
    909910   SCIPerrorMessage("Unknown LP solver id %d\n", lpsolver);
  • ThirdParty/SCIP/trunk/lpiswitch.h

    r2690 r2691  
    1717enum SCIP_LPISW_LPSolver
    1818{
    19    SCIP_LPISW_CLP,
    20    SCIP_LPISW_CPLEX,
    21    SCIP_LPISW_GUROBI,
    22    SCIP_LPISW_MOSEK,
    23    SCIP_LPISW_NONE,
    24    SCIP_LPISW_QSOPT,
    25    SCIP_LPISW_SOPLEX,
    26    SCIP_LPISW_XPRESS
     19   SCIP_LPISW_CLP = 0,
     20   SCIP_LPISW_CPLEX = 1,
     21   SCIP_LPISW_GUROBI = 2,
     22   SCIP_LPISW_MOSEK = 3,
     23   SCIP_LPISW_NONE = 4,
     24   SCIP_LPISW_QSOPT = 5,
     25   SCIP_LPISW_SOPLEX = 6,
     26   SCIP_LPISW_XPRESS = 7,
     27   SCIP_LPISW_NSOLVERS = 8
    2728};
    2829typedef enum SCIP_LPISW_LPSolver SCIP_LPISW_LPSOLVER;
     30
     31const char* const SCIP_LPISW_SOLVERNAMES[SCIP_LPISW_NSOLVERS] =
     32{ "clp", "cplex", "gurobi", "mosek", "none", "qsopt", "soplex", "xpress" };
    2933
    3034/** gets enum of currently used LP solver */
Note: See TracChangeset for help on using the changeset viewer.