Changeset 937de98 in mainline for uspace/lib/cpp/include/impl/complex.hpp

Timestamp:

2018-07-05T21:41:24Z (6 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a4b8b28

Parents:

25709c3

git-author:

Dzejrou <dzejrou@…> (2018-05-15 15:44:18)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:24)

Message:

cpp: fixed bug found by complex tests

File:

• uspace/lib/cpp/include/impl/complex.hpp (modified) (13 diffs)

uspace/lib/cpp/include/impl/complex.hpp

@@ -31 +31 @@
 
 #include <iosfwd>
+#include <sstream>
 
 namespace std
@@ -51 +52 @@
             template<class U>
             constexpr complex(const complex<U>& other)
-                : real_(other.real_), imag_(other.imag_)
+                : real_(other.real()), imag_(other.imag())
             { /* DUMMY BODY */ }
 
@@ -150 +151 @@
             complex& operator*=(const complex<U>& rhs)
             {
+                auto old_real = real_;
                 real_ = real_ * rhs.real_ - imag_ * rhs.imag_;
-                imag_ = real_ * rhs.imag_ - imag_ * rhs.real_;
+                imag_ = old_real * rhs.imag_ + imag_ * rhs.real_;
 
                 return *this;
@@ -159 +161 @@
             complex& operator/=(const complex<U>& rhs)
             {
+                auto old_real = real_;
                 real_ = (real_ * rhs.real_ + imag_ * rhs.imag_)
                       / (rhs.real_ * rhs.real_ + rhs.imag_ * rhs.imag_);
-                imag_ = (imag_ * rhs.real_ - real_ * rhs.imag_)
+                imag_ = (imag_ * rhs.real_ - old_real * rhs.imag_)
                       / (rhs.real_ * rhs.real_ + rhs.imag_ * rhs.imag_);
 
@@ -189 +192 @@
             template<class U>
             constexpr complex(const complex<U>& other)
-                : real_(other.real_), imag_(other.imag_)
+                : real_(other.real()), imag_(other.imag())
             { /* DUMMY BODY */ }
 
@@ -288 +291 @@
             complex& operator*=(const complex<U>& rhs)
             {
+                auto old_real = real_;
                 real_ = real_ * rhs.real_ - imag_ * rhs.imag_;
-                imag_ = real_ * rhs.imag_ - imag_ * rhs.real_;
+                imag_ = old_real * rhs.imag_ + imag_ * rhs.real_;
 
                 return *this;
@@ -297 +301 @@
             complex& operator/=(const complex<U>& rhs)
             {
+                auto old_real = real_;
                 real_ = (real_ * rhs.real_ + imag_ * rhs.imag_)
                       / (rhs.real_ * rhs.real_ + rhs.imag_ * rhs.imag_);
-                imag_ = (imag_ * rhs.real_ - real_ * rhs.imag_)
+                imag_ = (imag_ * rhs.real_ - old_real * rhs.imag_)
                       / (rhs.real_ * rhs.real_ + rhs.imag_ * rhs.imag_);
 
@@ -327 +332 @@
             template<class U>
             constexpr complex(const complex<U>& other)
-                : real_(other.real_), imag_(other.imag_)
+                : real_(other.real()), imag_(other.imag())
             { /* DUMMY BODY */ }
 
@@ -426 +431 @@
             complex& operator*=(const complex<U>& rhs)
             {
+                auto old_real = real_;
                 real_ = real_ * rhs.real_ - imag_ * rhs.imag_;
-                imag_ = real_ * rhs.imag_ - imag_ * rhs.real_;
+                imag_ = old_real * rhs.imag_ + imag_ * rhs.real_;
 
                 return *this;
@@ -435 +441 @@
             complex& operator/=(const complex<U>& rhs)
             {
+                auto old_real = real_;
                 real_ = (real_ * rhs.real_ + imag_ * rhs.imag_)
                       / (rhs.real_ * rhs.real_ + rhs.imag_ * rhs.imag_);
-                imag_ = (imag_ * rhs.real_ - real_ * rhs.imag_)
+                imag_ = (imag_ * rhs.real_ - old_real * rhs.imag_)
                       / (rhs.real_ * rhs.real_ + rhs.imag_ * rhs.imag_);
 
@@ -465 +472 @@
             template<class U>
             constexpr complex(const complex<U>& other)
-                : real_(other.real_), imag_(other.imag_)
+                : real_(other.real()), imag_(other.imag())
             { /* DUMMY BODY */ }
 
@@ -564 +571 @@
             complex& operator*=(const complex<U>& rhs)
             {
+                auto old_real = real_;
                 real_ = real_ * rhs.real_ - imag_ * rhs.imag_;
-                imag_ = real_ * rhs.imag_ - imag_ * rhs.real_;
+                imag_ = old_real * rhs.imag_ + imag_ * rhs.real_;
 
                 return *this;
@@ -573 +581 @@
             complex& operator/=(const complex<U>& rhs)
             {
+                auto old_real = real_;
                 real_ = (real_ * rhs.real_ + imag_ * rhs.imag_)
                       / (rhs.real_ * rhs.real_ + rhs.imag_ * rhs.imag_);
-                imag_ = (imag_ * rhs.real_ - real_ * rhs.imag_)
+                imag_ = (imag_ * rhs.real_ - old_real* rhs.imag_)
                       / (rhs.real_ * rhs.real_ + rhs.imag_ * rhs.imag_);