add forgotten events. tests pass

Author: Joao-Dionisio

src/pyscipopt/scip.pxi

@@ -208,60 +208,62 @@ cdef class PY_SCIP_HEURTIMING:
 
 EventNames = {}
 cdef class PY_SCIP_EVENTTYPE:
-    DISABLED        = SCIP_EVENTTYPE_DISABLED
-    VARADDED        = SCIP_EVENTTYPE_VARADDED
-    VARDELETED      = SCIP_EVENTTYPE_VARDELETED
-    VARFIXED        = SCIP_EVENTTYPE_VARFIXED
-    VARUNLOCKED     = SCIP_EVENTTYPE_VARUNLOCKED
-    OBJCHANGED      = SCIP_EVENTTYPE_OBJCHANGED
-    GLBCHANGED      = SCIP_EVENTTYPE_GLBCHANGED
-    GUBCHANGED      = SCIP_EVENTTYPE_GUBCHANGED
-    LBTIGHTENED     = SCIP_EVENTTYPE_LBTIGHTENED
-    LBRELAXED       = SCIP_EVENTTYPE_LBRELAXED
-    UBTIGHTENED     = SCIP_EVENTTYPE_UBTIGHTENED
-    UBRELAXED       = SCIP_EVENTTYPE_UBRELAXED
-    GHOLEADDED      = SCIP_EVENTTYPE_GHOLEADDED
-    GHOLEREMOVED    = SCIP_EVENTTYPE_GHOLEREMOVED
-    LHOLEADDED      = SCIP_EVENTTYPE_LHOLEADDED
-    LHOLEREMOVED    = SCIP_EVENTTYPE_LHOLEREMOVED
-    IMPLADDED       = SCIP_EVENTTYPE_IMPLADDED
-    PRESOLVEROUND   = SCIP_EVENTTYPE_PRESOLVEROUND
-    NODEFOCUSED     = SCIP_EVENTTYPE_NODEFOCUSED
-    NODEFEASIBLE    = SCIP_EVENTTYPE_NODEFEASIBLE
-    NODEINFEASIBLE  = SCIP_EVENTTYPE_NODEINFEASIBLE
-    NODEBRANCHED    = SCIP_EVENTTYPE_NODEBRANCHED
-    NODEDELETE      = SCIP_EVENTTYPE_NODEDELETE
-    FIRSTLPSOLVED   = SCIP_EVENTTYPE_FIRSTLPSOLVED
-    LPSOLVED        = SCIP_EVENTTYPE_LPSOLVED
-    LPEVENT         = SCIP_EVENTTYPE_LPEVENT
-    POORSOLFOUND    = SCIP_EVENTTYPE_POORSOLFOUND
-    BESTSOLFOUND    = SCIP_EVENTTYPE_BESTSOLFOUND
-    ROWADDEDSEPA    = SCIP_EVENTTYPE_ROWADDEDSEPA
-    ROWDELETEDSEPA  = SCIP_EVENTTYPE_ROWDELETEDSEPA
-    ROWADDEDLP      = SCIP_EVENTTYPE_ROWADDEDLP
-    ROWDELETEDLP    = SCIP_EVENTTYPE_ROWDELETEDLP
-    ROWCOEFCHANGED  = SCIP_EVENTTYPE_ROWCOEFCHANGED
-    ROWCONSTCHANGED = SCIP_EVENTTYPE_ROWCONSTCHANGED
-    ROWSIDECHANGED  = SCIP_EVENTTYPE_ROWSIDECHANGED
-    SYNC            = SCIP_EVENTTYPE_SYNC
-    GBDCHANGED      = SCIP_EVENTTYPE_GBDCHANGED
-    LBCHANGED       = SCIP_EVENTTYPE_LBCHANGED
-    UBCHANGED       = SCIP_EVENTTYPE_UBCHANGED
-    BOUNDTIGHTENED  = SCIP_EVENTTYPE_BOUNDTIGHTENED
-    BOUNDRELAXED    = SCIP_EVENTTYPE_BOUNDRELAXED
-    BOUNDCHANGED    = SCIP_EVENTTYPE_BOUNDCHANGED
-    GHOLECHANGED    = SCIP_EVENTTYPE_GHOLECHANGED
-    LHOLECHANGED    = SCIP_EVENTTYPE_LHOLECHANGED
-    HOLECHANGED     = SCIP_EVENTTYPE_HOLECHANGED
-    DOMCHANGED      = SCIP_EVENTTYPE_DOMCHANGED
-    VARCHANGED      = SCIP_EVENTTYPE_VARCHANGED
-    VAREVENT        = SCIP_EVENTTYPE_VAREVENT
-    NODESOLVED      = SCIP_EVENTTYPE_NODESOLVED
-    NODEEVENT       = SCIP_EVENTTYPE_NODEEVENT
-    SOLFOUND        = SCIP_EVENTTYPE_SOLFOUND
-    SOLEVENT        = SCIP_EVENTTYPE_SOLEVENT
-    ROWCHANGED      = SCIP_EVENTTYPE_ROWCHANGED
-    ROWEVENT        = SCIP_EVENTTYPE_ROWEVENT
+    DISABLED          = SCIP_EVENTTYPE_DISABLED
+    VARADDED          = SCIP_EVENTTYPE_VARADDED
+    VARDELETED        = SCIP_EVENTTYPE_VARDELETED
+    VARFIXED          = SCIP_EVENTTYPE_VARFIXED
+    VARUNLOCKED       = SCIP_EVENTTYPE_VARUNLOCKED
+    OBJCHANGED        = SCIP_EVENTTYPE_OBJCHANGED
+    GLBCHANGED        = SCIP_EVENTTYPE_GLBCHANGED
+    GUBCHANGED        = SCIP_EVENTTYPE_GUBCHANGED
+    LBTIGHTENED       = SCIP_EVENTTYPE_LBTIGHTENED
+    LBRELAXED         = SCIP_EVENTTYPE_LBRELAXED
+    UBTIGHTENED       = SCIP_EVENTTYPE_UBTIGHTENED
+    UBRELAXED         = SCIP_EVENTTYPE_UBRELAXED
+    GHOLEADDED        = SCIP_EVENTTYPE_GHOLEADDED
+    GHOLEREMOVED      = SCIP_EVENTTYPE_GHOLEREMOVED
+    LHOLEADDED        = SCIP_EVENTTYPE_LHOLEADDED
+    LHOLEREMOVED      = SCIP_EVENTTYPE_LHOLEREMOVED
+    IMPLADDED         = SCIP_EVENTTYPE_IMPLADDED
+    PRESOLVEROUND     = SCIP_EVENTTYPE_PRESOLVEROUND
+    NODEFOCUSED       = SCIP_EVENTTYPE_NODEFOCUSED
+    NODEFEASIBLE      = SCIP_EVENTTYPE_NODEFEASIBLE
+    NODEINFEASIBLE    = SCIP_EVENTTYPE_NODEINFEASIBLE
+    NODEBRANCHED      = SCIP_EVENTTYPE_NODEBRANCHED
+    NODEDELETE        = SCIP_EVENTTYPE_NODEDELETE
+    DUALBOUNDIMPROVED = SCIP_EVENTTYPE_DUALBOUNDIMPROVED
+    FIRSTLPSOLVED     = SCIP_EVENTTYPE_FIRSTLPSOLVED
+    LPSOLVED          = SCIP_EVENTTYPE_LPSOLVED
+    LPEVENT           = SCIP_EVENTTYPE_LPEVENT
+    POORSOLFOUND      = SCIP_EVENTTYPE_POORSOLFOUND
+    BESTSOLFOUND      = SCIP_EVENTTYPE_BESTSOLFOUND
+    ROWADDEDSEPA      = SCIP_EVENTTYPE_ROWADDEDSEPA
+    ROWDELETEDSEPA    = SCIP_EVENTTYPE_ROWDELETEDSEPA
+    ROWADDEDLP        = SCIP_EVENTTYPE_ROWADDEDLP
+    ROWDELETEDLP      = SCIP_EVENTTYPE_ROWDELETEDLP
+    ROWCOEFCHANGED    = SCIP_EVENTTYPE_ROWCOEFCHANGED
+    ROWCONSTCHANGED   = SCIP_EVENTTYPE_ROWCONSTCHANGED
+    ROWSIDECHANGED    = SCIP_EVENTTYPE_ROWSIDECHANGED
+    SYNC              = SCIP_EVENTTYPE_SYNC
+    GBDCHANGED        = SCIP_EVENTTYPE_GBDCHANGED
+    LBCHANGED         = SCIP_EVENTTYPE_LBCHANGED
+    UBCHANGED         = SCIP_EVENTTYPE_UBCHANGED
+    BOUNDTIGHTENED    = SCIP_EVENTTYPE_BOUNDTIGHTENED
+    BOUNDRELAXED      = SCIP_EVENTTYPE_BOUNDRELAXED
+    BOUNDCHANGED      = SCIP_EVENTTYPE_BOUNDCHANGED
+    GHOLECHANGED      = SCIP_EVENTTYPE_GHOLECHANGED
+    LHOLECHANGED      = SCIP_EVENTTYPE_LHOLECHANGED
+    HOLECHANGED       = SCIP_EVENTTYPE_HOLECHANGED
+    DOMCHANGED        = SCIP_EVENTTYPE_DOMCHANGED
+    VARCHANGED        = SCIP_EVENTTYPE_VARCHANGED
+    VAREVENT          = SCIP_EVENTTYPE_VAREVENT
+    NODESOLVED        = SCIP_EVENTTYPE_NODESOLVED
+    NODEEVENT         = SCIP_EVENTTYPE_NODEEVENT
+    SOLFOUND          = SCIP_EVENTTYPE_SOLFOUND
+    SOLEVENT          = SCIP_EVENTTYPE_SOLEVENT
+    GAPUPDATED        = SCIP_EVENTTYPE_GAPUPDATED
+    ROWCHANGED        = SCIP_EVENTTYPE_ROWCHANGED
+    ROWEVENT          = SCIP_EVENTTYPE_ROWEVENT
 
 cdef class PY_SCIP_LOCKTYPE:
     MODEL    = SCIP_LOCKTYPE_MODEL

tests/test_event.py

@@ -54,30 +54,19 @@ def eventexec(self, event):
             assert event.getType() in [SCIP_EVENTTYPE.ROWCOEFCHANGED, SCIP_EVENTTYPE.ROWCONSTCHANGED, SCIP_EVENTTYPE.ROWSIDECHANGED]
         elif self.event_type == SCIP_EVENTTYPE.ROWEVENT:
             assert event.getType() in [SCIP_EVENTTYPE.ROWADDEDSEPA, SCIP_EVENTTYPE.ROWDELETEDSEPA, SCIP_EVENTTYPE.ROWADDEDLP, SCIP_EVENTTYPE.ROWDELETEDLP, SCIP_EVENTTYPE.ROWCHANGED]
+        elif self.event_type == SCIP_EVENTTYPE.GAPUPDATED:
+            assert event.getType() in [SCIP_EVENTTYPE.DUALBOUNDIMPROVED, SCIP_EVENTTYPE.BESTSOLFOUND]
         else:
             assert event.getType() == self.event_type
 
 def test_event():
 
-    all_events = [
-        SCIP_EVENTTYPE.DISABLED,
-        SCIP_EVENTTYPE.PRESOLVEROUND,
-        SCIP_EVENTTYPE.NODEFOCUSED,
-        SCIP_EVENTTYPE.NODEFEASIBLE,
-        SCIP_EVENTTYPE.NODEINFEASIBLE,
-        SCIP_EVENTTYPE.NODEBRANCHED,
-        SCIP_EVENTTYPE.NODEDELETE,
-        SCIP_EVENTTYPE.FIRSTLPSOLVED,
-        SCIP_EVENTTYPE.LPSOLVED,
-        SCIP_EVENTTYPE.POORSOLFOUND,
-        SCIP_EVENTTYPE.BESTSOLFOUND,
-        SCIP_EVENTTYPE.SYNC,
-        SCIP_EVENTTYPE.NODESOLVED,
-        SCIP_EVENTTYPE.NODEEVENT,
-        SCIP_EVENTTYPE.LPEVENT,
-        SCIP_EVENTTYPE.SOLFOUND,
-        SCIP_EVENTTYPE.SOLEVENT,
-    ]
+    all_events = []
+    for attr_name in dir(SCIP_EVENTTYPE):
+        if not attr_name.startswith('_'):
+            attr = getattr(SCIP_EVENTTYPE, attr_name)
+            if isinstance(attr, int):
+                all_events.append(attr)
 
     all_event_hdlrs = []
     for event in all_events:
@@ -135,5 +124,4 @@ def eventexec(self, event):
     ev.event_type = SCIP_EVENTTYPE.VAREVENT
     m.includeEventhdlr(ev, "var_event", "event handler for var events")
 
-    with pytest.raises(Exception):
-        m.optimize()
+    m.optimize()

tests/test_relax.py

@@ -21,7 +21,7 @@ def test_relaxator():
     m.setHeuristics(SCIP_PARAMSETTING.OFF)
     m.setSeparating(SCIP_PARAMSETTING.OFF)
     m.setParam("limits/nodes", 1)
-    # m.hideOutput()
+    m.hideOutput()
 
     # include relaxator
     m.includeRelax(SoncRelax(), 'testrelaxator',
@@ -42,7 +42,7 @@ def test_relaxator():
 
     assert 'relaxexec' in calls
     assert len(calls) >= 1
-    assert m.getDualbound() >= 10e4
+    assert m.isGE(m.getDualbound(), 10e4)
 
 class EmptyRelaxator(Relax):
     pass