From f8251a74bcecbdf096b008610ef52f5603cb7db2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Thu, 6 Dec 2018 17:20:01 +0100 Subject: [PATCH] [poincare] SquareRoot: use realPart and imaginaryPart to compute the complexArgument --- poincare/include/poincare/square_root.h | 2 +- poincare/src/square_root.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/poincare/include/poincare/square_root.h b/poincare/include/poincare/square_root.h index a0e09931f..a31f1baeb 100644 --- a/poincare/include/poincare/square_root.h +++ b/poincare/include/poincare/square_root.h @@ -25,7 +25,7 @@ public: Expression realPart(Context & context, Preferences::AngleUnit angleUnit) const override { return complexPart(context, angleUnit, true); } Expression imaginaryPart(Context & context, Preferences::AngleUnit angleUnit) const override { return complexPart(context, angleUnit, false); } Expression complexNorm(Context & context, Preferences::AngleUnit angleUnit) const override; - Expression complexArgument(Context & context, Preferences::AngleUnit angleUnit) const override; + //Expression complexArgument(Context & context, Preferences::AngleUnit angleUnit) const override; private: // Complex Expression complexPart(Context & context, Preferences::AngleUnit angleUnit, bool isReal) const; diff --git a/poincare/src/square_root.cpp b/poincare/src/square_root.cpp index 6b92dd875..5d763c27b 100644 --- a/poincare/src/square_root.cpp +++ b/poincare/src/square_root.cpp @@ -27,14 +27,14 @@ Expression SquareRootNode::complexNorm(Context & context, Preferences::AngleUnit return SquareRoot::Builder(r).shallowReduce(context, angleUnit, ReductionTarget::BottomUpComputation); } -Expression SquareRootNode::complexArgument(Context & context, Preferences::AngleUnit angleUnit) const { +/*Expression SquareRootNode::complexArgument(Context & context, Preferences::AngleUnit angleUnit) const { Expression th = childAtIndex(0)->complexArgument(context, angleUnit); if (th.isUninitialized()) { return Expression(); } // TH = th/2 return Division(th, Rational(2)).shallowReduce(context, angleUnit, ReductionTarget::BottomUpComputation); -} +}*/ Expression SquareRootNode::complexPart(Context & context, Preferences::AngleUnit angleUnit, bool real) const { // real: (1/2)*sqrt(2*(sqrt(x^2+y^2)+x))