Skip to content

Commit 4ceb242

Browse files
authored
Update scip.pxi
1 parent 696f60e commit 4ceb242

File tree

1 file changed

+29
-10
lines changed

1 file changed

+29
-10
lines changed

src/pyscipopt/scip.pxi

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6835,11 +6835,20 @@ cdef class Model:
68356835
Py_INCREF(conshdlr)
68366836

68376837
def copyLargeNeighborhoodSearch(self, to_fix, fix_vals) -> Model:
6838-
""" Creates a copy of the transformed model
6838+
"""
6839+
Creates a copy of the transformed model
68396840

6840-
:param to_fix: A List[Variable] of variables to fix in the subscip
6841-
:param fix_vals A List[Real] of the values to which to fix the variables in the subscip (care their order)
6842-
:return A Model containing the created subscip
6841+
Parameters
6842+
----------
6843+
to_fix : List[Variable]
6844+
A list of variables to fix in the copy
6845+
fix_vals : List[Real]
6846+
A list of the values to which to fix the variables in the copy (care their order)
6847+
6848+
Returns
6849+
-------
6850+
model : Model
6851+
A model containing the created copy
68436852

68446853
"""
68456854
orig_vars = SCIPgetVars(self._scip)
@@ -6869,13 +6878,23 @@ cdef class Model:
68696878
SCIPhashmapFree(&varmap)
68706879
return sub_model
68716880

6872-
def translateSubSol(self, Model sub_model, Solution sol, heur):
6873-
""" Translates a solution of a subscip into a solution of the main scip
6881+
def translateSubSol(self, Model sub_model, Solution sol, heur) -> :
6882+
"""
6883+
Translates a solution of a model copy into a solution of the main model
68746884

6875-
:param sub_model The python-wrapper of the subscip
6876-
:param sol The python-wrapper of the solution of the subscip
6877-
:param heur Python-wrapper of the heuristic that found the solution
6878-
:return A python-wrapper of the corresponding solution in the main scip
6885+
Parameters
6886+
----------
6887+
sub_model : Model
6888+
The python-wrapper of the subscip
6889+
sol : Solution
6890+
The python-wrapper of the solution of the subscip
6891+
heur : Heur
6892+
The python-wrapper of the heuristic that found the solution
6893+
6894+
Returns
6895+
-------
6896+
solution : Solution
6897+
The corresponding solution in the main model
68796898

68806899
"""
68816900
cdef SCIP_SOL* real_sol

0 commit comments

Comments
 (0)