Apply suggestions from code review

Co-authored-by: DominikKamp <130753997+DominikKamp@users.noreply.github.com>

Author: Joao-Dionisio

src/pyscipopt/scip.pxi

@@ -1702,7 +1702,7 @@ cdef class Variable(Expr):
 
         Parameters
         ----------
-        locktype: PY_SCIP_LOCKTYPE
+        locktype : SCIP_LOCKTYPE
             type of variable locks
 
         Returns
@@ -1718,7 +1718,7 @@ cdef class Variable(Expr):
 
         Parameters
         ----------
-        locktype: PY_SCIP_LOCKTYPE
+        locktype : SCIP_LOCKTYPE
             type of variable locks
 
         Returns
@@ -3937,7 +3937,7 @@ cdef class Model:
         ----------
         var : Variable
             variable to adjust the locks for
-        locktype : PY_SCIP_LOCKTYPE
+        locktype : SCIP_LOCKTYPE
             type of variable locks
         nlocksdown : int
             modification in number of down locks

tests/helpers/utils.py

@@ -260,4 +260,3 @@ def gastrans_lp():
     model.relax()
 
     return model
- 

tests/test_conshdlr.py

@@ -73,20 +73,20 @@ def conslock(self, constraint, locktype, nlockspos, nlocksneg):
         except ReferenceError:
             return
 
-        n_locks_up = var.getNLocksUp()
         n_locks_down = var.getNLocksDown()
-        n_locks_up_model = var.getNLocksUpType(SCIP_LOCKTYPE.MODEL)
-        n_locks_up_conflict = var.getNLocksUpType(SCIP_LOCKTYPE.CONFLICT)
+        n_locks_up = var.getNLocksUp()
         n_locks_down_model = var.getNLocksDownType(SCIP_LOCKTYPE.MODEL)
         n_locks_down_conflict = var.getNLocksDownType(SCIP_LOCKTYPE.CONFLICT)
+        n_locks_up_model = var.getNLocksUpType(SCIP_LOCKTYPE.MODEL)
+        n_locks_up_conflict = var.getNLocksUpType(SCIP_LOCKTYPE.CONFLICT)
 
         self.model.addVarLocksType(var, locktype, nlockspos, nlocksneg)
-        if locktype == SCIP_LOCKTYPE.CONFLICT:
-            assert var.getNLocksUpType(SCIP_LOCKTYPE.CONFLICT) != n_locks_up_conflict or var.getNLocksDownType(SCIP_LOCKTYPE.CONFLICT) != n_locks_down_conflict            
-            assert var.getNLocksUpType(SCIP_LOCKTYPE.MODEL) == n_locks_up_model and var.getNLocksDownType(SCIP_LOCKTYPE.MODEL) == n_locks_down_model
-        elif locktype == SCIP_LOCKTYPE.MODEL:
-            assert var.getNLocksUpType(SCIP_LOCKTYPE.CONFLICT) == n_locks_up_conflict and var.getNLocksDownType(SCIP_LOCKTYPE.CONFLICT) == n_locks_down_conflict            
-            assert var.getNLocksUpType(SCIP_LOCKTYPE.MODEL) != n_locks_up_model or var.getNLocksDownType(SCIP_LOCKTYPE.MODEL) != n_locks_down_model
+        if locktype == SCIP_LOCKTYPE.MODEL:
+            assert var.getNLocksDownType(SCIP_LOCKTYPE.MODEL) != n_locks_down_model or var.getNLocksUpType(SCIP_LOCKTYPE.MODEL) != n_locks_up_model
+            assert var.getNLocksDownType(SCIP_LOCKTYPE.CONFLICT) == n_locks_down_conflict and var.getNLocksUpType(SCIP_LOCKTYPE.CONFLICT) == n_locks_up_conflict
+        elif locktype == SCIP_LOCKTYPE.CONFLICT:
+            assert var.getNLocksDownType(SCIP_LOCKTYPE.MODEL) == n_locks_down_model and var.getNLocksUpType(SCIP_LOCKTYPE.MODEL) == n_locks_up_model
+            assert var.getNLocksDownType(SCIP_LOCKTYPE.CONFLICT) != n_locks_down_conflict or var.getNLocksUpType(SCIP_LOCKTYPE.CONFLICT) != n_locks_up_conflict
         else:
             raise ValueError("Unknown locktype")
 

tests/test_numerics.py

@@ -18,4 +18,5 @@ def test_numerical_checks():
 
     assert not m.isFeasGT(1, 0.99999)
     assert m.isGT(1, 0.99999)
- 
+
+test_numerical_checks()