# HG changeset patch # User Nathann Cohen # Date 1332513466 -3600 # Node ID c34205f8ecef0e8369bfddfc6a6495e7dfd82075 # Parent 44f753a1f5faad8e7267ae362b65d9ae8d436fac Remove cached information in sage.numerical.backends.coin_backend diff --git a/sage/numerical/backends/coin_backend.pxd b/sage/numerical/backends/coin_backend.pxd --- a/sage/numerical/backends/coin_backend.pxd +++ b/sage/numerical/backends/coin_backend.pxd @@ -58,6 +58,7 @@ cdef extern from "../../local/include/coin/CoinMessageHandler.hpp": cdef cppclass CoinMessageHandler: void setLogLevel (int) + int LogLevel () CoinMessageHandler *new_CoinMessageHandler "new CoinMessageHandler" () void del_CoinMessageHandler "delete" (CoinMessageHandler *) @@ -143,6 +144,7 @@ CbcModel(CbcModel & rhs, int cloneHandler = ?) # shut up void setLogLevel(int value) + int logLevel() # assign strategy void setStrategy(CbcStrategy & strategy) # threads @@ -176,7 +178,7 @@ cdef class CoinBackend(GenericBackend): cdef OsiSolverInterface * si - cdef double * solution + cdef CbcModel * model cdef int log_level cdef double obj_value diff --git a/sage/numerical/backends/coin_backend.pyx b/sage/numerical/backends/coin_backend.pyx --- a/sage/numerical/backends/coin_backend.pyx +++ b/sage/numerical/backends/coin_backend.pyx @@ -4,6 +4,9 @@ AUTHORS: - Nathann Cohen (2010-10): initial implementation + +- John Perry (2012-03): major modifications to the interface in order to update + the Coin package to version 2.7.5 """ ############################################################################## @@ -32,9 +35,7 @@ # Coin devs seem to favor OsiClpSolverInterface self.si = new OsiClpSolverInterface() - self.solution = NULL - self.log_level = 0 - self.obj_value = 0.0 + self.model = new CbcModel(self.si[0]) self.prob_name = None self.row_names = [] self.col_names = [] @@ -49,8 +50,6 @@ Destructor function """ del self.si - if self.solution != NULL: - sage_free(self.solution) cpdef int add_variable(self, lower_bound=0.0, upper_bound=None, binary=False, continuous=False, integer=False, obj=0.0, name=None) except -1: r""" @@ -77,10 +76,6 @@ OUTPUT: The index of the newly created variable - .. NOTE:: - - The names are ignored by Coin at the moment !!! - EXAMPLE:: sage: from sage.numerical.backends.generic_backend import get_solver @@ -107,11 +102,6 @@ 1.0 """ - # the solution is no longer valid if we add a new column - if self.solution != NULL: - sage_free(self.solution) - self.solution = NULL - # for some reason, Cython is not accepting the line below, which appeare #cdef int vtype = int(bool(binary)) + int(bool(continuous)) + int(bool(integer)) cdef int vtype = int(binary) + int(continuous) + int(integer) @@ -172,10 +162,6 @@ OUTPUT: The index of the variable created last. - .. NOTE:: - - The names are ignored by Coin at the moment !!! - EXAMPLE:: sage: from sage.numerical.backends.generic_backend import get_solver @@ -188,6 +174,8 @@ 5 sage: p.add_variables(2, lower_bound=-2.0, integer=True, names=['a','b']) # optional - Coin 6 + sage: p.col_name(5) # optional - Coin + 'a' """ #cdef int vtype = int(bool(binary)) + int(bool(continuous)) + int(bool(integer)) cdef int vtype = int(binary) + int(continuous) + int(integer) @@ -218,11 +206,11 @@ if obj: self.si.setObjCoeff(n + i, obj) - # THE NAMES ARE IGNORED BY COIN AT THE MOMENT - # not in this patch if names != None: for name in names: self.col_names.append(name) + else: + self.col_names.extend(['' for i in range(number)]) return n + number -1 @@ -283,9 +271,6 @@ sage: p.is_maximization() # optional - Coin False """ - if self.solution != NULL: - sage_free(self.solution) - self.solution = NULL self.si.setObjSense(-sense) cpdef objective_coefficient(self, int variable, coeff=None): @@ -313,9 +298,6 @@ """ if coeff is not None: self.si.setObjCoeff(variable, coeff) - if self.solution != NULL: - sage_free(self.solution) - self.solution = NULL else: return self.si.getObjCoefficients()[variable] @@ -340,9 +322,7 @@ """ cdef int i - if self.solution != NULL: - sage_free(self.solution) - self.solution = NULL + for i,v in enumerate(coeff): self.si.setObjCoeff(i, v) @@ -362,7 +342,8 @@ """ - self.log_level = level + self.model.setLogLevel(level) + cpdef add_linear_constraints(self, int number, lower_bound, upper_bound, names = None): """ @@ -378,10 +359,6 @@ - ``names`` - an optional list of names (default: ``None``) - .. NOTE:: - - The names are ignored by Coin at the moment !!! - EXAMPLE:: sage: from sage.numerical.backends.generic_backend import get_solver @@ -394,11 +371,14 @@ sage: p.row_bounds(4) # optional - Coin (None, 2.0) sage: p.add_linear_constraints(2, None, 2, names=['foo','bar']) # optional - Coin + sage: p.row_name(6) # optional - Coin + 'bar' """ cdef int i for 0<= isage_malloc(sizeof(double) * self.si.getNumCols()) - cdef double * temp_sol = model.solver().getColSolution() - cdef int i - for i in xrange(self.si.getNumCols()): self.solution[i] = temp_sol[i] - del model - + del self.model + self.model = model cpdef double get_objective_value(self): r""" @@ -723,12 +685,7 @@ sage: p.get_variable_value(1) # optional - Coin 1.5 """ - - #return self.si.getObjValue() - if self.solution != NULL: - return self.obj_value - else: - raise MIPSolverException("If you change a linear program, you must solve it before requesting solutions.") + return self.model.solver().getObjValue() cpdef double get_variable_value(self, int variable): r""" @@ -756,12 +713,9 @@ 1.5 """ - #cdef double * solution - #solution = self.model.solver().getColSolution() - if self.solution != NULL: - return self.solution[variable] - else: - raise MIPSolverException("If you change a linear program, you must solve it before requesting solutions.") + cdef double * solution + solution = self.model.solver().getColSolution() + return solution[variable] cpdef int ncols(self): r""" @@ -922,9 +876,6 @@ return ub[index] if ub[index] != + self.si.getInfinity() else None else: self.si.setColUpper(index, value if value is not None else +self.si.getInfinity()) - if self.solution != NULL: - sage_free(self.solution) - self.solution = NULL cpdef variable_lower_bound(self, int index, value = False): r""" @@ -957,9 +908,6 @@ return lb[index] if lb[index] != - self.si.getInfinity() else None else: self.si.setColLower(index, value if value is not None else -self.si.getInfinity()) - if self.solution != NULL: - sage_free(self.solution) - self.solution = NULL cpdef write_mps(self, char * filename, int modern): r""" @@ -1045,7 +993,7 @@ sage: p = get_solver(solver = "Coin") # optional - Coin sage: p.add_linear_constraints(1, 2, None, names=['Empty constraint 1']) # optional - Coin sage: print p.row_name(0) # optional - Coin - + Empty constraint 1 """ if self.row_names != None: return self.row_names[index] @@ -1100,4 +1048,3 @@ p.prob_name = self.prob_name return p - diff --git a/sage/numerical/backends/generic_backend.pyx b/sage/numerical/backends/generic_backend.pyx --- a/sage/numerical/backends/generic_backend.pyx +++ b/sage/numerical/backends/generic_backend.pyx @@ -808,7 +808,7 @@ INPUT: - ``solver`` -- defines the solver to use: - + - GLPK (``solver="GLPK"``). See the `GLPK `_ web site. @@ -895,7 +895,7 @@ INPUT: - ``solver`` -- 4 solvers should be available through this class: - + - GLPK (``solver="GLPK"``). See the `GLPK `_ web site. @@ -931,7 +931,7 @@ if solver is None: solver = default_mip_solver() - + # We do not want to use Coin for constraint_generation. It just does not # work if solver == "Coin" and constraint_generation: