diff --git a/src/pyscipopt/reader.pxi b/src/pyscipopt/reader.pxi index c75cab137..fe02a4443 100644 --- a/src/pyscipopt/reader.pxi +++ b/src/pyscipopt/reader.pxi @@ -12,7 +12,7 @@ cdef class Reader: '''calls read method of reader''' return {} - def readerwrite(self, file, name, transformed, objsense, objscale, objoffset, binvars, intvars, + def readerwrite(self, file, name, transformed, objsense, objoffset, objscale, binvars, intvars, implvars, contvars, fixedvars, startnvars, conss, maxnconss, startnconss, genericnames): '''calls write method of reader''' return {} @@ -40,8 +40,8 @@ cdef SCIP_RETCODE PyReaderRead (SCIP* scip, SCIP_READER* reader, const char* fil cdef SCIP_RETCODE PyReaderWrite (SCIP* scip, SCIP_READER* reader, FILE* file, const char* name, SCIP_PROBDATA* probdata, SCIP_Bool transformed, - SCIP_OBJSENSE objsense, SCIP_Real objscale, SCIP_Real objoffset, - SCIP_RATIONAL* objoffsetexact, SCIP_RATIONAL* objscaleexact, + SCIP_OBJSENSE objsense, SCIP_Real objoffset, SCIP_Real objscale, + SCIP_RATIONAL* objoffsetexact, SCIP_RATIONAL* objscaleexact, SCIP_VAR** vars, int nvars, int nbinvars, int nintvars, int nimplvars, int ncontvars, SCIP_VAR** fixedvars, int nfixedvars, int startnvars, SCIP_CONS** conss, int nconss, int maxnconss, int startnconss, @@ -59,7 +59,8 @@ cdef SCIP_RETCODE PyReaderWrite (SCIP* scip, SCIP_READER* reader, FILE* file, PyFixedVars = [Variable.create(fixedvars[i]) for i in range(nfixedvars)] PyConss = [Constraint.create(conss[i]) for i in range(nconss)] PyReader = readerdata - result_dict = PyReader.readerwrite(PyFile, PyName, transformed, objsense, objscale, objoffset, + #TODO: provide rational objoffsetexact and objscaleexact + result_dict = PyReader.readerwrite(PyFile, PyName, transformed, objsense, objoffset, objscale, PyBinVars, PyIntVars, PyImplVars, PyContVars, PyFixedVars, startnvars, PyConss, maxnconss, startnconss, genericnames) result[0] = result_dict.get("result", result[0]) diff --git a/src/pyscipopt/scip.pxd b/src/pyscipopt/scip.pxd index c64768f36..df28c8c97 100644 --- a/src/pyscipopt/scip.pxd +++ b/src/pyscipopt/scip.pxd @@ -994,8 +994,8 @@ cdef extern from "scip/scip.h": SCIP_RETCODE (*readerread) (SCIP* scip, SCIP_READER* reader, const char* filename, SCIP_RESULT* result), SCIP_RETCODE (*readerwrite) (SCIP* scip, SCIP_READER* reader, FILE* file, const char* name, SCIP_PROBDATA* probdata, SCIP_Bool transformed, - SCIP_OBJSENSE objsense, SCIP_Real objscale, SCIP_Real objoffset, - SCIP_RATIONAL* objoffsetexact, SCIP_RATIONAL* objscaleexact, + SCIP_OBJSENSE objsense, SCIP_Real objoffset, SCIP_Real objscale, + SCIP_RATIONAL* objoffsetexact, SCIP_RATIONAL* objscaleexact, SCIP_VAR** vars, int nvars, int nbinvars, int nintvars, int nimplvars, int ncontvars, SCIP_VAR** fixedvars, int nfixedvars, int startnvars, SCIP_CONS** conss, int nconss, int maxnconss, int startnconss,