From 302fcce649bc5f41fa04db936dbfc18e7cf0f952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Wed, 31 Jul 2019 11:51:57 +0200 Subject: [PATCH] [poincare] Discard POINCARE_TESTS_PRINT_EXPRESSIONS flag (has been replaced by POINCARE_TREE_LOG) --- poincare/Makefile | 8 - poincare/src/expression_debug.cpp | 265 ------------------------------ poincare/src/expression_debug.h | 14 -- poincare/test/infinity.cpp | 5 - poincare/test/simplify.cpp | 5 - 5 files changed, 297 deletions(-) delete mode 100644 poincare/src/expression_debug.cpp delete mode 100644 poincare/src/expression_debug.h diff --git a/poincare/Makefile b/poincare/Makefile index 71fb80111..cd8660e92 100644 --- a/poincare/Makefile +++ b/poincare/Makefile @@ -182,14 +182,6 @@ tests_src += $(addprefix poincare/test/,\ vertical_offset_layout.cpp\ ) -# simplify_utils.cpp\ - -ifdef POINCARE_TESTS_PRINT_EXPRESSIONS -tests_src += poincare/src/expression_debug.o -poincare_src += poincare/src/expression_debug.cpp -SFLAGS += -DPOINCARE_TESTS_PRINT_EXPRESSIONS=1 -endif - ifdef POINCARE_TREE_LOG SFLAGS += -DPOINCARE_TREE_LOG=1 endif diff --git a/poincare/src/expression_debug.cpp b/poincare/src/expression_debug.cpp deleted file mode 100644 index 55b92e4f0..000000000 --- a/poincare/src/expression_debug.cpp +++ /dev/null @@ -1,265 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include - -namespace Poincare { - -void print_expression(const Expression e, int indentationLevel) { - if (indentationLevel>0) { - for (int i=0; i(context, Preferences::AngleUnit::Radian); - std::cout << ")"; - break; - case ExpressionNode::Type::Derivative: - std::cout << "Derivative"; - break; - case ExpressionNode::Type::Determinant: - std::cout << "Determinant"; - break; - case ExpressionNode::Type::Division: - std::cout << "Division"; - break; - case ExpressionNode::Type::DivisionQuotient: - std::cout << "DivisionQuotient"; - break; - case ExpressionNode::Type::DivisionRemainder: - std::cout << "DivisionRemainder"; - break; - case ExpressionNode::Type::EmptyExpression: - std::cout << "EmptyExpression"; - break; - case ExpressionNode::Type::Equal: - std::cout << "Equal"; - break; - case ExpressionNode::Type::Factor: - std::cout << "Factor"; - break; - case ExpressionNode::Type::Factorial: - std::cout << "Factorial"; - break; - case ExpressionNode::Type::Float: - std::cout << "Float("; - std::cout << e.approximateToScalar(context, Preferences::AngleUnit::Radian); - std::cout << ")"; - break; - case ExpressionNode::Type::Floor: - std::cout << "Floor"; - break; - case ExpressionNode::Type::FracPart: - std::cout << "FracPart"; - break; - case ExpressionNode::Type::GreatCommonDivisor: - std::cout << "GreatCommonDivisor"; - break; - case ExpressionNode::Type::HyperbolicArcCosine: - std::cout << "HyperbolicArcCosine"; - break; - case ExpressionNode::Type::HyperbolicArcSine: - std::cout << "HyperbolicArcSine"; - break; - case ExpressionNode::Type::HyperbolicArcTangent: - std::cout << "HyperbolicArcTangent"; - break; - case ExpressionNode::Type::HyperbolicCosine: - std::cout << "HyperbolicCosine"; - break; - case ExpressionNode::Type::HyperbolicSine: - std::cout << "HyperbolicSine"; - break; - case ExpressionNode::Type::HyperbolicTangent: - std::cout << "HyperbolicTangent"; - break; - case ExpressionNode::Type::ImaginaryPart: - std::cout << "ImaginaryPart"; - break; - case ExpressionNode::Type::Infinity: - std::cout << "Infinity("; - std::cout << (e.sign() == ExpressionNode::Sign::Negative ? "Negative" : "Positive"); - std::cout << ")"; - break; - case ExpressionNode::Type::Integral: - std::cout << "Integral"; - break; - case ExpressionNode::Type::LeastCommonMultiple: - std::cout << "LeastCommonMultiple"; - break; - case ExpressionNode::Type::Logarithm: - std::cout << "Logarithm"; - break; - case ExpressionNode::Type::Matrix: - std::cout << "Matrix(Rows: "; - std::cout << static_cast(e).numberOfRows(); - std::cout << ", Columns: "; - std::cout << static_cast(e).numberOfColumns(); - std::cout << ")"; - break; - case ExpressionNode::Type::MatrixDimension: - std::cout << "MatrixDimension"; - break; - case ExpressionNode::Type::MatrixInverse: - std::cout << "MatrixInverse"; - break; - case ExpressionNode::Type::MatrixTrace: - std::cout << "MatrixTrace"; - break; - case ExpressionNode::Type::MatrixTranspose: - std::cout << "MatrixTranspose"; - break; - case ExpressionNode::Type::MultiplicationExplicite: - std::cout << "Multiplication Explicite"; - break; - case ExpressionNode::Type::MultiplicationImplicite: - std::cout << "Multiplication Implicite"; - break; - case ExpressionNode::Type::NaperianLogarithm: - std::cout << "NaperianLogarithm"; - break; - case ExpressionNode::Type::NthRoot: - std::cout << "NthRoot"; - break; - case ExpressionNode::Type::Opposite: - std::cout << "Opposite"; - break; - case ExpressionNode::Type::Parenthesis: - std::cout << "Parenthesis"; - break; - case ExpressionNode::Type::PermuteCoefficient: - std::cout << "PermuteCoefficient"; - break; - case ExpressionNode::Type::PredictionInterval: - std::cout << "PredictionInterval"; - break; - case ExpressionNode::Type::Power: - std::cout << "Power"; - break; - case ExpressionNode::Type::Product: - std::cout << "Product"; - break; - case ExpressionNode::Type::Random: - std::cout << "Random"; - break; - case ExpressionNode::Type::Randint: - std::cout << "Randint"; - break; - case ExpressionNode::Type::Rational: - std::cout << "Rational("; - std::cout << static_cast(e).signedIntegerNumerator().approximate(); - std::cout << ", "; - std::cout << static_cast(e).integerDenominator().approximate(); - std::cout << ")"; - break; - case ExpressionNode::Type::RealPart: - std::cout << "RealPart"; - break; - case ExpressionNode::Type::Round: - std::cout << "Round"; - break; - case ExpressionNode::Type::Sine: - std::cout << "Sine"; - break; - case ExpressionNode::Type::SquareRoot: - std::cout << "SquareRoot"; - break; - case ExpressionNode::Type::Store: - std::cout << "Store"; - break; - case ExpressionNode::Type::Subtraction: - std::cout << "Subtraction"; - break; - case ExpressionNode::Type::Sum: - std::cout << "Sum"; - break; - case ExpressionNode::Type::Symbol: - std::cout << "Symbol("; - UTF8Decoder decoder(static_cast(e).name()); - CodePoint firstCodePoint = decoder.nextCodePoint(); - switch (firstCodePoint) { - case UCodePointGreekSmallLetterPi: - std::cout << "PI"; - break; - case UCodePointMathematicalBoldSmallI: - std::cout << "i"; - break; - case UCodePointScriptSmallE: - std::cout << "e"; - break; - default: - std::cout << static_cast(e).name(); - } - std::cout << ")"; - break; - case ExpressionNode::Type::Tangent: - std::cout << "Tangent"; - break; - case ExpressionNode::Type::Undefined: - std::cout << "Undefined"; - break; - case ExpressionNode::Type::Uninitialized: - std::cout << "Uninitialized"; - break; - } - std::cout << " (identifier: " << e.identifier() << ")" << std::endl; - for (int i=0; i(); - std::cout << "^"; - std::cout << outputCoefficients[index].approximate(); - std::cout << "*"; - } - std::cout <<" "<< std::endl; -} - -} diff --git a/poincare/src/expression_debug.h b/poincare/src/expression_debug.h deleted file mode 100644 index 930d1795f..000000000 --- a/poincare/src/expression_debug.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef POICARE_EXPRESSION_DEBUG_H -#define POICARE_EXPRESSION_DEBUG_H - -#include -#include - -namespace Poincare { - -void print_expression(const Expression e, int indentationLevel = 0); -void print_prime_factorization(Integer * outputFactors, Integer * outputCoefficients, int outputLength); - -} - -#endif // POICARE_EXPRESSION_DEBUG_H diff --git a/poincare/test/infinity.cpp b/poincare/test/infinity.cpp index bd11f2500..91f21dc29 100644 --- a/poincare/test/infinity.cpp +++ b/poincare/test/infinity.cpp @@ -2,11 +2,6 @@ #include #include #include "helper.h" -#if POINCARE_TESTS_PRINT_EXPRESSIONS -#include "../src/expression_debug.h" -#include -using namespace std; -#endif using namespace Poincare; diff --git a/poincare/test/simplify.cpp b/poincare/test/simplify.cpp index 00d4bd57e..101f85e8c 100644 --- a/poincare/test/simplify.cpp +++ b/poincare/test/simplify.cpp @@ -2,11 +2,6 @@ #include #include #include "helper.h" -#if POINCARE_TESTS_PRINT_EXPRESSIONS -#include "../src/expression_debug.h" -#include -using namespace std; -#endif using namespace Poincare; QUIZ_CASE(poincare_reduction_target) {