From 8d15d9bccd65bcef4cde62dce87c68523198a6f0 Mon Sep 17 00:00:00 2001 From: Martinez Date: Mon, 23 Nov 2015 21:54:01 +0100 Subject: [PATCH] fix compare_float revert ec98b0cde8e67392e08e5417bf3dc059c68ed52c --- core/cython_types.pyx | 5 +---- core/m.py | 4 ++++ core/python_types.py | 5 +---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/core/cython_types.pyx b/core/cython_types.pyx index a881016..c3f569a 100644 --- a/core/cython_types.pyx +++ b/core/cython_types.pyx @@ -44,10 +44,7 @@ class map: ''' if source: - if len(source[0]) == len(source[1]): - self.keys, self.vals = source - else: - raise ValueError('over.core.types.map initialized with two sequences of different lengths') + self.keys, self.vals = zip(*source) else: self.keys = [] self.vals = [] diff --git a/core/m.py b/core/m.py index 6c75076..2f36f5f 100644 --- a/core/m.py +++ b/core/m.py @@ -12,6 +12,7 @@ class compare_float: self.eq = False self.ge = True self.gt = False + self.ne = False if A < (B - epsilon): self.lt = True @@ -22,6 +23,8 @@ class compare_float: if abs(A - B) < epsilon: self.eq = True + else: + self.ne = True # convenience self.less = self.lt @@ -29,6 +32,7 @@ class compare_float: self.equal = self.eq self.greater_or_equal = self.ge self.greater = self.gt + self.not_equal = self.ne if __name__ == '__main__': x = compare_float(1, 2, 0.5) diff --git a/core/python_types.py b/core/python_types.py index 2a4cdeb..3b2c573 100644 --- a/core/python_types.py +++ b/core/python_types.py @@ -44,10 +44,7 @@ class map: ''' if source: - if len(source[0]) == len(source[1]): - self.keys, self.vals = source - else: - raise ValueError('over.core.types.map initialized with two sequences of different lengths') + self.keys, self.vals = zip(*source) else: self.keys = [] self.vals = []