Skip to content

Commit abc77fb

Browse files
committed
remove addOrigVarsConssObjectiveFrom
1 parent a6aada0 commit abc77fb

File tree

3 files changed

+1
-43
lines changed

3 files changed

+1
-43
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
- Added additional tests to test_nodesel, test_heur, and test_strong_branching
2424
- Migrated documentation to Readthedocs
2525
- `attachEventHandlerCallback` method to Model for a more ergonomic way to attach event handlers
26-
- Added Model method: optimizeNogil, addOrigVarsConssObjectiveFrom
26+
- Added Model method: optimizeNogil
2727
- Added Solution method: getSolOrigin, retransform, translate
2828
- Added SCIP.pxd: SCIP_SOLORIGIN, SCIPcopyOrigVars, SCIPcopyOrigConss, SCIPsolve nogil, SCIPretransformSol, SCIPtranslateSubSol, SCIPsolGetOrigin, SCIPhashmapCreate, SCIPhashmapFree
2929
- Added additional tests to test_multi_threads, test_solution, and test_copy

src/pyscipopt/scip.pxi

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2094,29 +2094,6 @@ cdef class Model:
20942094
n = str_conversion(problemName)
20952095
PY_SCIP_CALL(SCIPcreateProbBasic(self._scip, n))
20962096

2097-
def addOrigVarsConssObjectiveFrom(self, Model source):
2098-
"""
2099-
add original variables and constraints from source model.
2100-
2101-
Parameters
2102-
----------
2103-
source : Model
2104-
source model copy original variables and constraints to target(self) model
2105-
"""
2106-
cdef SCIP_Bool valid
2107-
cdef SCIP_HASHMAP* localvarmap
2108-
cdef SCIP_HASHMAP* localconsmap
2109-
2110-
PY_SCIP_CALL( SCIPhashmapCreate(&localvarmap, SCIPblkmem(self._scip), SCIPgetNVars(source._scip)) )
2111-
PY_SCIP_CALL( SCIPhashmapCreate(&localconsmap, SCIPblkmem(self._scip), SCIPgetNConss(source._scip)) )
2112-
2113-
PY_SCIP_CALL(SCIPcopyOrigVars(source._scip, self._scip, localvarmap, localconsmap, NULL, NULL, 0))
2114-
PY_SCIP_CALL(SCIPcopyOrigConss(source._scip, self._scip, localvarmap, localconsmap, False, &valid))
2115-
PY_SCIP_CALL(SCIPsetObjsense(self._scip, SCIPgetObjsense(source._scip)))
2116-
2117-
SCIPhashmapFree(&localvarmap)
2118-
SCIPhashmapFree(&localconsmap)
2119-
21202097
def freeProb(self):
21212098
"""Frees problem and solution process data."""
21222099
PY_SCIP_CALL(SCIPfreeProb(self._scip))

tests/test_copy.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,3 @@ def test_copy():
2020

2121
assert s.getObjVal() == s2.getObjVal()
2222

23-
24-
def test_addOrigVarsConssObjectiveFrom():
25-
m = Model()
26-
x = m.addVar("x", vtype = 'B')
27-
y = m.addVar("y", vtype = 'B')
28-
m.addCons(x + y >= 1)
29-
m.addCons(x + y <= 2)
30-
m.setObjective(x + y, 'maximize')
31-
32-
m1 = Model()
33-
m1.addOrigVarsConssObjectiveFrom(m)
34-
35-
m.optimize()
36-
m1.optimize()
37-
38-
assert m.getNVars(transformed=False) == m1.getNVars(transformed=False)
39-
assert m.getNConss(transformed=False) == m1.getNConss(transformed=False)
40-
assert m.getObjVal() == m1.getObjVal() == 2
41-

0 commit comments

Comments
 (0)