Merge pull request scipopt#267 from bzfmuelh/doxygen

changed names of variables SCIP_VAR, SCIP_COL, SCIP_ROW, SCIP_NODE, S…
Wenbo11 · Mar 25, 2019 · d22f144 · d22f144
2 parents 8ec067d + 322a1b8
commit d22f144
Show file tree

Hide file tree

Showing 3 changed files with 205 additions and 205 deletions.
diff --git a/src/pyscipopt/benders.pxi b/src/pyscipopt/benders.pxi
@@ -209,5 +209,5 @@ cdef SCIP_RETCODE PyBendersGetvar (SCIP* scip, SCIP_BENDERS* benders, SCIP_VAR*
     if mappedvariable is None:
         mappedvar[0] = NULL
     else:
-        mappedvar[0] = mappedvariable.var
+        mappedvar[0] = mappedvariable.scip_var
     return SCIP_OKAY
diff --git a/src/pyscipopt/conshdlr.pxi b/src/pyscipopt/conshdlr.pxi
@@ -226,7 +226,7 @@ cdef SCIP_RETCODE PyConsTrans (SCIP* scip, SCIP_CONSHDLR* conshdlr, SCIP_CONS* s
     # otherwise use the created cons
     if "targetcons" in result_dict:
         PyTargetCons = result_dict.get("targetcons")
-        targetcons[0] = PyTargetCons.cons
+        targetcons[0] = PyTargetCons.scip_cons
         Py_INCREF(PyTargetCons)
     else:
         PY_SCIP_CALL(SCIPcreateCons(scip, targetcons, str_conversion(PySourceCons.name), conshdlr, <SCIP_CONSDATA*>PySourceCons,