Fix #189

coin-or · Nov 1, 2023 · 950a29e · 950a29e
1 parent a9284bf
commit 950a29e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cylp/py/pivots/PositiveEdgePivot.py b/cylp/py/pivots/PositiveEdgePivot.py
@@ -7,7 +7,7 @@
 import random
 import numpy as np
 from cylp.cy import CyCoinIndexedVector
-from cylp.cy.CyClpSimplex import cydot
+#from cylp.cy.CyClpSimplex import cydot
 from .PivotPythonBase import PivotPythonBase
 
 
@@ -92,7 +92,7 @@ def isCompatible(self, varInd):
         s = self.clpModel
         s.getACol(varInd, self.aColumn)
 
-        return abs(cydot(self.aColumn, self.w)) < self.EPSILON
+        return abs(cylp.cy.CyClpSimplex.cydot(self.aColumn, self.w)) < self.EPSILON
 
     def checkVar(self, i):
         return self.isCompatible(i)

diff --git a/cylp/py/pivots/PositiveEdgeWolfePivot.py b/cylp/py/pivots/PositiveEdgeWolfePivot.py
@@ -4,7 +4,7 @@
 from cylp.cy import CyCoinIndexedVector
 import random
 from math import floor
-from cylp.cy.CyClpSimplex import cydot
+#from cylp.cy.CyClpSimplex import cydot
 from cylp.py.pivots import PositiveEdgePivot
 
 

diff --git a/cylp/py/pivots/WolfePivotPE.py b/cylp/py/pivots/WolfePivotPE.py
@@ -3,7 +3,7 @@
 import random
 import numpy as np
 from cylp.cy import CyCoinIndexedVector
-from cylp.cy.CyClpSimplex import cydot
+#from cylp.cy.CyClpSimplex import cydot
 from PivotPythonBase import PivotPythonBase
 
 
@@ -82,7 +82,7 @@ def isCompatible(self, varInd):
         s = self.clpModel
         s.getACol(varInd, self.aColumn)
 
-        return abs(cydot(self.aColumn, self.w)) < self.EPSILON
+        return abs(cylp.cy.CyClpSImplex.cydot(self.aColumn, self.w)) < self.EPSILON
 
     # End of Positive-Edge-related attributes