Kaydet (Commit) 5ada7c73 authored tarafından Georg Brandl's avatar Georg Brandl

Update Vec class constructor, remove indirection via function, use operator module.

üst dc00a2a2
# A simple vector class # A simple vector class
import operator
def vec(*v):
return Vec(*v)
class Vec: class Vec:
...@@ -10,14 +8,16 @@ class Vec: ...@@ -10,14 +8,16 @@ class Vec:
def __init__(self, *v): def __init__(self, *v):
self.v = list(v) self.v = list(v)
def fromlist(self, v): @classmethod
def fromlist(cls, v):
if not isinstance(v, list): if not isinstance(v, list):
raise TypeError raise TypeError
self.v = v[:] inst = cls()
return self inst.v = v
return inst
def __repr__(self): def __repr__(self):
return 'vec(' + repr(self.v)[1:-1] + ')' return 'Vec(' + repr(self.v)[1:-1] + ')'
def __len__(self): def __len__(self):
return len(self.v) return len(self.v)
...@@ -27,24 +27,24 @@ class Vec: ...@@ -27,24 +27,24 @@ class Vec:
def __add__(self, other): def __add__(self, other):
# Element-wise addition # Element-wise addition
v = list(map(lambda x, y: x+y, self, other)) v = list(map(operator.add, self, other))
return Vec().fromlist(v) return Vec.fromlist(v)
def __sub__(self, other): def __sub__(self, other):
# Element-wise subtraction # Element-wise subtraction
v = list(map(lambda x, y: x-y, self, other)) v = list(map(operator.sub, self, other))
return Vec().fromlist(v) return Vec.fromlist(v)
def __mul__(self, scalar): def __mul__(self, scalar):
# Multiply by scalar # Multiply by scalar
v = [x*scalar for x in self.v] v = [x*scalar for x in self.v]
return Vec().fromlist(v) return Vec.fromlist(v)
def test(): def test():
a = vec(1, 2, 3) a = Vec(1, 2, 3)
b = vec(3, 2, 1) b = Vec(3, 2, 1)
print(a) print(a)
print(b) print(b)
print(a+b) print(a+b)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment