Skip to content

Commit 050a6dc

Browse files
committed
Fix reader write
1 parent be3022e commit 050a6dc

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/pyscipopt/reader.pxi

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cdef class Reader:
1212
'''calls read method of reader'''
1313
return {}
1414

15-
def readerwrite(self, file, name, transformed, objsense, objscale, objoffset, binvars, intvars,
15+
def readerwrite(self, file, name, transformed, objsense, objoffset, objscale, binvars, intvars,
1616
implvars, contvars, fixedvars, startnvars, conss, maxnconss, startnconss, genericnames):
1717
'''calls write method of reader'''
1818
return {}
@@ -40,8 +40,8 @@ cdef SCIP_RETCODE PyReaderRead (SCIP* scip, SCIP_READER* reader, const char* fil
4040

4141
cdef SCIP_RETCODE PyReaderWrite (SCIP* scip, SCIP_READER* reader, FILE* file,
4242
const char* name, SCIP_PROBDATA* probdata, SCIP_Bool transformed,
43-
SCIP_OBJSENSE objsense, SCIP_Real objscale, SCIP_Real objoffset,
44-
SCIP_RATIONAL* objoffsetexact, SCIP_RATIONAL* objscaleexact,
43+
SCIP_OBJSENSE objsense, SCIP_Real objoffset, SCIP_Real objscale,
44+
SCIP_RATIONAL* objoffsetexact, SCIP_RATIONAL* objscaleexact,
4545
SCIP_VAR** vars, int nvars, int nbinvars, int nintvars, int nimplvars,
4646
int ncontvars, SCIP_VAR** fixedvars, int nfixedvars, int startnvars,
4747
SCIP_CONS** conss, int nconss, int maxnconss, int startnconss,
@@ -59,7 +59,8 @@ cdef SCIP_RETCODE PyReaderWrite (SCIP* scip, SCIP_READER* reader, FILE* file,
5959
PyFixedVars = [Variable.create(fixedvars[i]) for i in range(nfixedvars)]
6060
PyConss = [Constraint.create(conss[i]) for i in range(nconss)]
6161
PyReader = <Reader>readerdata
62-
result_dict = PyReader.readerwrite(PyFile, PyName, transformed, objsense, objscale, objoffset,
62+
#TODO: provide rational objoffsetexact and objscaleexact
63+
result_dict = PyReader.readerwrite(PyFile, PyName, transformed, objsense, objoffset, objscale,
6364
PyBinVars, PyIntVars, PyImplVars, PyContVars, PyFixedVars, startnvars,
6465
PyConss, maxnconss, startnconss, genericnames)
6566
result[0] = result_dict.get("result", <SCIP_RESULT>result[0])

src/pyscipopt/scip.pxd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -994,8 +994,8 @@ cdef extern from "scip/scip.h":
994994
SCIP_RETCODE (*readerread) (SCIP* scip, SCIP_READER* reader, const char* filename, SCIP_RESULT* result),
995995
SCIP_RETCODE (*readerwrite) (SCIP* scip, SCIP_READER* reader, FILE* file,
996996
const char* name, SCIP_PROBDATA* probdata, SCIP_Bool transformed,
997-
SCIP_OBJSENSE objsense, SCIP_Real objscale, SCIP_Real objoffset,
998-
SCIP_RATIONAL* objoffsetexact, SCIP_RATIONAL* objscaleexact,
997+
SCIP_OBJSENSE objsense, SCIP_Real objoffset, SCIP_Real objscale,
998+
SCIP_RATIONAL* objoffsetexact, SCIP_RATIONAL* objscaleexact,
999999
SCIP_VAR** vars, int nvars, int nbinvars, int nintvars, int nimplvars,
10001000
int ncontvars, SCIP_VAR** fixedvars, int nfixedvars, int startnvars,
10011001
SCIP_CONS** conss, int nconss, int maxnconss, int startnconss,

0 commit comments

Comments
 (0)