From c1263ad7988c3acb696f86cab39d2e8e095021e0 Mon Sep 17 00:00:00 2001 From: Raffaele Sena Date: Tue, 9 Oct 2018 10:28:06 -0700 Subject: [PATCH 1/2] Added __str__ and __repr__ plus missing properties (real, imag, conjugate). Also added tests. --- py/complex.go | 27 +++++++++++++++++++++++++++ py/tests/complex.py | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 py/tests/complex.py diff --git a/py/complex.go b/py/complex.go index 8c1413ff..8f42a480 100644 --- a/py/complex.go +++ b/py/complex.go @@ -7,6 +7,7 @@ package py import ( + "fmt" "math" "math/cmplx" ) @@ -60,6 +61,14 @@ func convertToComplex(other Object) (Complex, bool) { return 0, false } +func (a Complex) M__str__() (Object, error) { + return String(fmt.Sprintf("(%g%+gj)", real(complex128(a)), imag(complex128(a)))), nil +} + +func (a Complex) M__repr__() (Object, error) { + return a.M__str__() +} + func (a Complex) M__neg__() (Object, error) { return -a, nil } @@ -286,6 +295,24 @@ func (a Complex) M__ge__(other Object) (Object, error) { return a.M__lt__(other) } +// Properties +func init() { + ComplexType.Dict["real"] = &Property{ + Fget: func(self Object) (Object, error) { + return Float(real(self.(Complex))), nil + }, + } + ComplexType.Dict["imag"] = &Property{ + Fget: func(self Object) (Object, error) { + return Float(imag(self.(Complex))), nil + }, + } + ComplexType.Dict["conjugate"] = MustNewMethod("conjugate", func(self Object) (Object, error) { + cnj := cmplx.Conj(complex128(self.(Complex))) + return Complex(cnj), nil + }, 0, "conjugate() -> Returns the complex conjugate.") +} + // Check interface is satisfied var _ floatArithmetic = Complex(complex(0, 0)) var _ richComparison = Complex(0) diff --git a/py/tests/complex.py b/py/tests/complex.py new file mode 100644 index 00000000..186ce7a2 --- /dev/null +++ b/py/tests/complex.py @@ -0,0 +1,32 @@ +# Copyright 2018 The go-python Authors. All rights reserved. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. + +from libtest import assertRaises + +doc="str" +assert str(3+4j) == "(3+4j)" + +doc="repr" +assert repr(3+4j) == "(3+4j)" + +doc="real" +assert (3+4j).real == 3.0 + +doc="imag" +assert (3+4j).imag == 4.0 + +doc="conjugate" +assert (3+4j).conjugate() == 3-4j + +doc="add" +assert (3+4j) + 2 == 5+4j +assert (3+4j) + 2j == 3+6j + +doc="sub" +assert (3+4j) - 1 == 2+4j +assert (3+4j) - 1j == 3+3j + +doc="mul" +assert (3+4j) * 2 == 6+8j +assert (3+4j) * 2j == -8+6j From 5ea88b82633b6ccb836626850bfa66e2289ef6bb Mon Sep 17 00:00:00 2001 From: Raffaele Sena Date: Tue, 9 Oct 2018 13:08:10 -0700 Subject: [PATCH 2/2] Forgot to "finish" the test. --- py/tests/complex.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/py/tests/complex.py b/py/tests/complex.py index 186ce7a2..2673f988 100644 --- a/py/tests/complex.py +++ b/py/tests/complex.py @@ -30,3 +30,5 @@ doc="mul" assert (3+4j) * 2 == 6+8j assert (3+4j) * 2j == -8+6j + +doc="finished" pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy