diff --git a/cylp/py/pivots/PositiveEdgePivot.py b/cylp/py/pivots/PositiveEdgePivot.py index 8fbea707..5d58f376 100644 --- a/cylp/py/pivots/PositiveEdgePivot.py +++ b/cylp/py/pivots/PositiveEdgePivot.py @@ -7,7 +7,6 @@ import random import numpy as np from cylp.cy import CyCoinIndexedVector -from cylp.cy.CyClpSimplex import cydot from .PivotPythonBase import PivotPythonBase @@ -92,7 +91,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 index 64908f99..90bd84f2 100644 --- a/cylp/py/pivots/PositiveEdgeWolfePivot.py +++ b/cylp/py/pivots/PositiveEdgeWolfePivot.py @@ -4,7 +4,6 @@ from cylp.cy import CyCoinIndexedVector import random from math import floor -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 index a7b18e4f..28d4a88f 100644 --- a/cylp/py/pivots/WolfePivotPE.py +++ b/cylp/py/pivots/WolfePivotPE.py @@ -3,7 +3,6 @@ import random import numpy as np from cylp.cy import CyCoinIndexedVector -from cylp.cy.CyClpSimplex import cydot from PivotPythonBase import PivotPythonBase @@ -82,7 +81,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