Skip to content

Commit

Permalink
Fix python2 compatibility #92
Browse files Browse the repository at this point in the history
  • Loading branch information
Onur R. Bingol committed Aug 2, 2020
1 parent 5c664c5 commit 8322df5
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions geomdl/abstract.py
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,8 @@ def sample_size(self):
:setter: Sets sample size
:type: int
"""
return math.floor((1.0 / self.delta) + 0.5)
ss = math.floor((1.0 / self.delta) + 0.5)
return int(ss)

@sample_size.setter
def sample_size(self, value):
Expand Down Expand Up @@ -1491,7 +1492,8 @@ def sample_size_u(self):
:setter: Sets sample size for the u-direction
:type: int
"""
return math.floor((1.0 / self.delta_u) + 0.5)
ss = math.floor((1.0 / self.delta_u) + 0.5)
return int(ss)

@sample_size_u.setter
def sample_size_u(self, value):
Expand Down Expand Up @@ -1522,7 +1524,8 @@ def sample_size_v(self):
:setter: Sets sample size for the v-direction
:type: int
"""
return math.floor((1.0 / self.delta_v) + 0.5)
ss = math.floor((1.0 / self.delta_v) + 0.5)
return int(ss)

@sample_size_v.setter
def sample_size_v(self, value):
Expand Down Expand Up @@ -1561,7 +1564,7 @@ def sample_size(self):
"""
sample_size_u = math.floor((1.0 / self.delta_u) + 0.5)
sample_size_v = math.floor((1.0 / self.delta_v) + 0.5)
return sample_size_u, sample_size_v
return int(sample_size_u), int(sample_size_v)

@sample_size.setter
def sample_size(self, value):
Expand Down Expand Up @@ -2539,7 +2542,8 @@ def sample_size_u(self):
:setter: Sets sample size for the u-direction
:type: int
"""
return math.floor((1.0 / self.delta_u) + 0.5)
ss = math.floor((1.0 / self.delta_u) + 0.5)
return int(ss)

@sample_size_u.setter
def sample_size_u(self, value):
Expand Down Expand Up @@ -2570,7 +2574,8 @@ def sample_size_v(self):
:setter: Sets sample size for the v-direction
:type: int
"""
return math.floor((1.0 / self.delta_v) + 0.5)
ss = math.floor((1.0 / self.delta_v) + 0.5)
return int(ss)

@sample_size_v.setter
def sample_size_v(self, value):
Expand Down Expand Up @@ -2601,7 +2606,8 @@ def sample_size_w(self):
:setter: Sets sample size for the w-direction
:type: int
"""
return math.floor((1.0 / self.delta_w) + 0.5)
ss = math.floor((1.0 / self.delta_w) + 0.5)
return int(ss)

@sample_size_w.setter
def sample_size_w(self, value):
Expand Down Expand Up @@ -2641,7 +2647,7 @@ def sample_size(self):
sample_size_u = math.floor((1.0 / self.delta_u) + 0.5)
sample_size_v = math.floor((1.0 / self.delta_v) + 0.5)
sample_size_w = math.floor((1.0 / self.delta_w) + 0.5)
return sample_size_u, sample_size_v, sample_size_w
return int(sample_size_u), int(sample_size_v), int(sample_size_w)

@sample_size.setter
def sample_size(self, value):
Expand Down

0 comments on commit 8322df5

Please sign in to comment.