From 66e768b4529ff1a0ead8df4e15eb65ab149746be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Wed, 22 Aug 2018 10:42:53 +0200 Subject: [PATCH] [poincare] Enable more power tets --- poincare/test/power.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/poincare/test/power.cpp b/poincare/test/power.cpp index dd1713033..e1e11946a 100644 --- a/poincare/test/power.cpp +++ b/poincare/test/power.cpp @@ -41,10 +41,8 @@ QUIZ_CASE(poincare_power_simplify) { assert_parsed_expression_simplify_to("3^4", "81"); assert_parsed_expression_simplify_to("3^(-4)", "1/81"); assert_parsed_expression_simplify_to("(-3)^3", "-27"); -#if 0 assert_parsed_expression_simplify_to("1256^(1/3)*x", "2*root(157,3)*x"); assert_parsed_expression_simplify_to("1256^(-1/3)", "1/(2*root(157,3))"); -#endif assert_parsed_expression_simplify_to("32^(-1/5)", "1/2"); assert_parsed_expression_simplify_to("(2+3-4)^(x)", "1"); assert_parsed_expression_simplify_to("1^x", "1"); @@ -61,11 +59,10 @@ QUIZ_CASE(poincare_power_simplify) { assert_parsed_expression_simplify_to("(2*A)^B", "2^B*A^B"); #if 0 assert_parsed_expression_simplify_to("(12^4*x)^(0.5)", "144*R(x)"); +#endif assert_parsed_expression_simplify_to("R(32)", "4*R(2)"); assert_parsed_expression_simplify_to("R(3^2)", "3"); -#endif assert_parsed_expression_simplify_to("2^(2+P)", "4*2^P"); -#if 0 assert_parsed_expression_simplify_to("R(5513219850886344455940081)", "2348024669991"); assert_parsed_expression_simplify_to("R(154355776)", "12424"); assert_parsed_expression_simplify_to("R(P)^2", "P"); @@ -74,12 +71,14 @@ QUIZ_CASE(poincare_power_simplify) { assert_parsed_expression_simplify_to("R(x*144)", "12*R(x)"); assert_parsed_expression_simplify_to("R(x*144*P^2)", "12*R(x)*P"); assert_parsed_expression_simplify_to("R(x*144*P)", "12*R(x)*R(P)"); + assert_parsed_expression_simplify_to("(-1)*(2+(-4*R(2)))", "(-2)+4*R(2)"); assert_parsed_expression_simplify_to("R(2-4*R(2))", "R((-2)+4*R(2))*I"); assert_parsed_expression_simplify_to("x^(1/2)", "R(x)"); assert_parsed_expression_simplify_to("x^(-1/2)", "1/R(x)"); assert_parsed_expression_simplify_to("x^(1/7)", "root(x,7)"); assert_parsed_expression_simplify_to("x^(-1/7)", "1/root(x,7)"); assert_parsed_expression_simplify_to("1/(3R(2))", "R(2)/6"); +#if 0 assert_parsed_expression_simplify_to("X^ln(3)", "3"); assert_parsed_expression_simplify_to("X^ln(R(3))", "R(3)"); assert_parsed_expression_simplify_to("P^log(R(3),P)", "R(3)"); @@ -87,21 +86,19 @@ QUIZ_CASE(poincare_power_simplify) { assert_parsed_expression_simplify_to("X^ln(65)", "65"); assert_parsed_expression_simplify_to("X^ln(PX)", "P*X"); assert_parsed_expression_simplify_to("X^log(PX)", "X^(log(P)+log(X))"); - assert_parsed_expression_simplify_to("R(X^2)", "X"); #endif + assert_parsed_expression_simplify_to("R(X^2)", "X"); assert_parsed_expression_simplify_to("999^(10000/3)", "999^(10000/3)"); /* This does not reduce but should not as the integer is above * k_maxNumberOfPrimeFactors and thus it prime decomposition might overflow * 32 factors. */ -#if 0 assert_parsed_expression_simplify_to("1881676377434183981909562699940347954480361860897069^(1/3)", "root(1881676377434183981909562699940347954480361860897069,3)"); /* This does not reduce but should not as the prime decomposition involves * factors above k_maxNumberOfPrimeFactors. */ assert_parsed_expression_simplify_to("1002101470343^(1/3)", "root(1002101470343,3)"); -#endif assert_parsed_expression_simplify_to("P*P*P", "P^3"); - //assert_parsed_expression_simplify_to("(x+P)^(3)", "x^3+3*x^2*P+3*x*P^2+P^3"); #if 0 + assert_parsed_expression_simplify_to("(x+P)^(3)", "x^3+3*x^2*P+3*x*P^2+P^3"); assert_parsed_expression_simplify_to("(5+R(2))^(-8)", "(1446241-1003320*R(2))/78310985281"); assert_parsed_expression_simplify_to("(5*P+R(2))^(-5)", "1/(4*R(2)+100*P+500*R(2)*P^2+2500*P^3+3125*R(2)*P^4+3125*P^5)"); assert_parsed_expression_simplify_to("(1+R(2)+R(3))^5", "296+224*R(2)+184*R(3)+120*R(6)");