[poincare] Remove flag MATRICES_ARE_DEFINED

2026-01-19 00:37:25 +01:00 · 2019-06-28 17:46:30 +02:00
parent ba05d040dd
commit d11b8a9614
12 changed files with 0 additions and 44 deletions
--- a/apps/math_toolbox.cpp
+++ b/apps/math_toolbox.cpp
@@ -37,7 +37,6 @@ const ToolboxMessageTree arithmeticChildren[] = {
  ToolboxMessageTree::Leaf(I18n::Message::QuoCommandWithArg, I18n::Message::Quotient)
 };

-#if MATRICES_ARE_DEFINED
 const ToolboxMessageTree matricesChildren[] = {
  ToolboxMessageTree::Leaf(I18n::Message::MatrixCommandWithArg, I18n::Message::NewMatrix, false, I18n::Message::MatrixCommand),
  ToolboxMessageTree::Leaf(I18n::Message::IndentityCommandWithArg, I18n::Message::Identity),
@@ -47,7 +46,6 @@ const ToolboxMessageTree matricesChildren[] = {
  ToolboxMessageTree::Leaf(I18n::Message::TraceCommandWithArg, I18n::Message::Trace),
  ToolboxMessageTree::Leaf(I18n::Message::DimensionCommandWithArg, I18n::Message::Dimension)
 };
-#endif

 #if LIST_ARE_DEFINED
 const ToolboxMessageTree listsChildren[] = {
@@ -88,9 +86,7 @@ const ToolboxMessageTree menu[] = {
  ToolboxMessageTree::Node(I18n::Message::ComplexNumber, complexChildren),
  ToolboxMessageTree::Node(I18n::Message::Probability, probabilityChildren),
  ToolboxMessageTree::Node(I18n::Message::Arithmetic, arithmeticChildren),
-#if MATRICES_ARE_DEFINED
  ToolboxMessageTree::Node(I18n::Message::Matrices, matricesChildren),
-#endif
 #if LIST_ARE_DEFINED
  ToolboxMessageTree::Node(I18n::Message::Lists,listsChildren),
 #endif
--- a/apps/math_toolbox.h
+++ b/apps/math_toolbox.h
@@ -1,7 +1,6 @@
 #ifndef APPS_MATH_TOOLBOX_H
 #define APPS_MATH_TOOLBOX_H

-#define MATRICES_ARE_DEFINED 1
 #include <escher.h>
 #include <apps/i18n.h>

--- a/poincare/include/poincare_layouts.h
+++ b/poincare/include/poincare_layouts.h
@@ -1,8 +1,6 @@
 #ifndef POINCARE_LAYOUTS_H
 #define POINCARE_LAYOUTS_H

-#define MATRICES_ARE_DEFINED 1
-
 #include <poincare/absolute_value_layout.h>
 #include <poincare/binomial_coefficient_layout.h>
 #include <poincare/bracket_pair_layout.h>
--- a/poincare/include/poincare_nodes.h
+++ b/poincare/include/poincare_nodes.h
@@ -1,8 +1,6 @@
 #ifndef POINCARE_NODES_H
 #define POINCARE_NODES_H

-#define MATRICES_ARE_DEFINED 1
-
 #include <poincare/absolute_value.h>
 #include <poincare/addition.h>
 #include <poincare/arc_cosine.h>
--- a/poincare/test/addition.cpp
+++ b/poincare/test/addition.cpp
@@ -50,14 +50,12 @@ QUIZ_CASE(poincare_addition_evaluate) {
  assert_parsed_expression_evaluates_to<float>("𝐢", "𝐢");
  assert_parsed_expression_evaluates_to<float>("𝐢+𝐢", "2×𝐢");
  assert_parsed_expression_evaluates_to<double>("2+𝐢+4+𝐢", "6+2×𝐢");
-#if MATRICES_ARE_DEFINED
  assert_parsed_expression_evaluates_to<float>("[[1,2][3,4][5,6]]+3", "[[4,5][6,7][8,9]]");
  assert_parsed_expression_evaluates_to<double>("[[1,2+𝐢][3,4][5,6]]+3+𝐢", "[[4+𝐢,5+2×𝐢][6+𝐢,7+𝐢][8+𝐢,9+𝐢]]");
  assert_parsed_expression_evaluates_to<float>("3+[[1,2][3,4][5,6]]", "[[4,5][6,7][8,9]]");
  assert_parsed_expression_evaluates_to<double>("3+𝐢+[[1,2+𝐢][3,4][5,6]]", "[[4+𝐢,5+2×𝐢][6+𝐢,7+𝐢][8+𝐢,9+𝐢]]");
  assert_parsed_expression_evaluates_to<float>("[[1,2][3,4][5,6]]+[[1,2][3,4][5,6]]", "[[2,4][6,8][10,12]]");
  assert_parsed_expression_evaluates_to<double>("[[1,2+𝐢][3,4][5,6]]+[[1,2+𝐢][3,4][5,6]]", "[[2,4+2×𝐢][6,8][10,12]]");
-#endif
 }

 QUIZ_CASE(poincare_addition_simplify) {
--- a/poincare/test/division.cpp
+++ b/poincare/test/division.cpp
@@ -9,15 +9,12 @@ using namespace Poincare;
 QUIZ_CASE(poincare_division_evaluate) {
  assert_parsed_expression_evaluates_to<float>("1/2", "0.5");
  assert_parsed_expression_evaluates_to<double>("(3+𝐢)/(4+𝐢)", "7.6470588235294ᴇ-1+5.8823529411765ᴇ-2×𝐢");
-
-#if MATRICES_ARE_DEFINED
  assert_parsed_expression_evaluates_to<float>("[[1,2][3,4][5,6]]/2", "[[0.5,1][1.5,2][2.5,3]]");
  assert_parsed_expression_evaluates_to<double>("[[1,2+𝐢][3,4][5,6]]/(1+𝐢)", "[[0.5-0.5×𝐢,1.5-0.5×𝐢][1.5-1.5×𝐢,2-2×𝐢][2.5-2.5×𝐢,3-3×𝐢]]");
  assert_parsed_expression_evaluates_to<float>("[[1,2][3,4][5,6]]/2", "[[0.5,1][1.5,2][2.5,3]]");
  assert_parsed_expression_evaluates_to<double>("[[1,2][3,4]]/[[3,4][6,9]]", "[[-1,6.6666666666667ᴇ-1][1,0]]");
  assert_parsed_expression_evaluates_to<double>("3/[[3,4][5,6]]", "[[-9,6][7.5,-4.5]]");
  assert_parsed_expression_evaluates_to<double>("(3+4𝐢)/[[1,𝐢][3,4]]", "[[4×𝐢,1][-3×𝐢,𝐢]]");
-#endif
  assert_parsed_expression_evaluates_to<float>("1ᴇ20/(1ᴇ20+1ᴇ20𝐢)", "0.5-0.5×𝐢");
  assert_parsed_expression_evaluates_to<double>("1ᴇ155/(1ᴇ155+1ᴇ155𝐢)", "0.5-0.5×𝐢");
 }
--- a/poincare/test/function.cpp
+++ b/poincare/test/function.cpp
@@ -23,9 +23,7 @@ QUIZ_CASE(poincare_parse_function) {
  assert_parsed_expression_type("arg(2+𝐢)", ExpressionNode::Type::ComplexArgument);
  assert_parsed_expression_type("det([[1,2,3][4,5,6][7,8,9]])", ExpressionNode::Type::Determinant);
  assert_parsed_expression_type("diff(2×x, x, 2)", ExpressionNode::Type::Derivative);
-#if MATRICES_ARE_DEFINED
  assert_parsed_expression_type("dim([[2]])", ExpressionNode::Type::MatrixDimension);
-#endif
  assert_parsed_expression_type("confidence(0.1, 100)", ExpressionNode::Type::ConfidenceInterval);
  assert_parsed_expression_type("conj(2)", ExpressionNode::Type::Conjugate);
  assert_parsed_expression_type("factor(23/42)", ExpressionNode::Type::Factor);
@@ -35,9 +33,7 @@ QUIZ_CASE(poincare_parse_function) {
  assert_parsed_expression_type("im(2+𝐢)", ExpressionNode::Type::ImaginaryPart);
  assert_parsed_expression_type("lcm(2,3)", ExpressionNode::Type::LeastCommonMultiple);
  assert_parsed_expression_type("int(x, x, 2, 3)", ExpressionNode::Type::Integral);
-#if MATRICES_ARE_DEFINED
  assert_parsed_expression_type("inverse([[1,2,3][4,5,6][7,8,9]])", ExpressionNode::Type::MatrixInverse);
-#endif
  assert_parsed_expression_type("ln(2)", ExpressionNode::Type::NaperianLogarithm);
  assert_parsed_expression_type("log(2)", ExpressionNode::Type::Logarithm);
  assert_parsed_expression_type("permute(10, 4)", ExpressionNode::Type::PermuteCoefficient);
@@ -56,10 +52,8 @@ QUIZ_CASE(poincare_parse_function) {
  assert_parsed_expression_type("round(2,3)", ExpressionNode::Type::Round);
  assert_parsed_expression_type("sign(3)", ExpressionNode::Type::SignFunction);
  assert_parsed_expression_type("sum(n,n, 4, 10)", ExpressionNode::Type::Sum);
-#if MATRICES_ARE_DEFINED
  assert_parsed_expression_type("trace([[1,2,3][4,5,6][7,8,9]])", ExpressionNode::Type::MatrixTrace);
  assert_parsed_expression_type("transpose([[1,2,3][4,5,6][7,8,9]])", ExpressionNode::Type::MatrixTranspose);
-#endif
  assert_parsed_expression_type("6!", ExpressionNode::Type::Factorial);
 }

@@ -83,13 +77,11 @@ QUIZ_CASE(poincare_function_evaluate) {
  assert_parsed_expression_evaluates_to<float>("ceil(0.2)", "1");
  assert_parsed_expression_evaluates_to<double>("ceil(0.2)", "1");

-#if MATRICES_ARE_DEFINED
  assert_parsed_expression_evaluates_to<float>("det([[1,23,3][4,5,6][7,8,9]])", "126", System, Degree, Cartesian, 6); // FIXME: the determinant computation is not precised enough to be displayed with 7 significant digits
  assert_parsed_expression_evaluates_to<double>("det([[1,23,3][4,5,6][7,8,9]])", "126");

  assert_parsed_expression_evaluates_to<float>("det([[𝐢,23-2𝐢,3×𝐢][4+𝐢,5×𝐢,6][7,8×𝐢+2,9]])", "126-231×𝐢", System, Degree, Cartesian, 6); // FIXME: the determinant computation is not precised enough to be displayed with 7 significant digits
  assert_parsed_expression_evaluates_to<double>("det([[𝐢,23-2𝐢,3×𝐢][4+𝐢,5×𝐢,6][7,8×𝐢+2,9]])", "126-231×𝐢");
-#endif

  assert_parsed_expression_evaluates_to<float>("diff(2×x, x, 2)", "2");
  assert_parsed_expression_evaluates_to<double>("diff(2×x, x, 2)", "2");
@@ -147,18 +139,14 @@ QUIZ_CASE(poincare_function_evaluate) {
  assert_parsed_expression_evaluates_to<float>("sum(r,r, 4, 10)", "49");
  assert_parsed_expression_evaluates_to<double>("sum(k,k, 4, 10)", "49");

-#if MATRICES_ARE_DEFINED
  assert_parsed_expression_evaluates_to<float>("trace([[1,2,3][4,5,6][7,8,9]])", "15");
  assert_parsed_expression_evaluates_to<double>("trace([[1,2,3][4,5,6][7,8,9]])", "15");
-#endif

  assert_parsed_expression_evaluates_to<float>("confidence(0.1, 100)", "[[0,0.2]]");
  assert_parsed_expression_evaluates_to<double>("confidence(0.1, 100)", "[[0,0.2]]");

-#if MATRICES_ARE_DEFINED
  assert_parsed_expression_evaluates_to<float>("dim([[1,2,3][4,5,-6]])", "[[2,3]]");
  assert_parsed_expression_evaluates_to<double>("dim([[1,2,3][4,5,-6]])", "[[2,3]]");
-#endif

  assert_parsed_expression_evaluates_to<float>("conj(3+2×𝐢)", "3-2×𝐢");
  assert_parsed_expression_evaluates_to<double>("conj(3+2×𝐢)", "3-2×𝐢");
@@ -166,12 +154,10 @@ QUIZ_CASE(poincare_function_evaluate) {
  assert_parsed_expression_evaluates_to<float>("factor(-23/4)", "-5.75");
  assert_parsed_expression_evaluates_to<double>("factor(-123/24)", "-5.125");

-#if MATRICES_ARE_DEFINED
  assert_parsed_expression_evaluates_to<float>("inverse([[1,2,3][4,5,-6][7,8,9]])", "[[-1.2917,-0.083333,0.375][1.0833,0.16667,-0.25][0.041667,-0.083333,0.041667]]", System, Degree, Cartesian, 5); // inverse is not precise enough to display 7 significative digits
  assert_parsed_expression_evaluates_to<double>("inverse([[1,2,3][4,5,-6][7,8,9]])", "[[-1.2916666666667,-8.3333333333333ᴇ-2,0.375][1.0833333333333,1.6666666666667ᴇ-1,-0.25][4.1666666666667ᴇ-2,-8.3333333333333ᴇ-2,4.1666666666667ᴇ-2]]");
  assert_parsed_expression_evaluates_to<float>("inverse([[𝐢,23-2𝐢,3×𝐢][4+𝐢,5×𝐢,6][7,8×𝐢+2,9]])", "[[-0.0118-0.0455×𝐢,-0.5-0.727×𝐢,0.318+0.489×𝐢][0.0409+0.00364×𝐢,0.04-0.0218×𝐢,-0.0255+0.00091×𝐢][0.00334-0.00182×𝐢,0.361+0.535×𝐢,-0.13-0.358×𝐢]]", System, Degree, Cartesian, 3); // inverse is not precise enough to display 7 significative digits
  assert_parsed_expression_evaluates_to<double>("inverse([[𝐢,23-2𝐢,3×𝐢][4+𝐢,5×𝐢,6][7,8×𝐢+2,9]])", "[[-0.0118289353958-0.0454959053685×𝐢,-0.500454959054-0.727024567789×𝐢,0.31847133758+0.488626023658×𝐢][0.0409463148317+3.63967242948ᴇ-3×𝐢,0.0400363967243-0.0218380345769×𝐢,-0.0254777070064+9.0991810737ᴇ-4×𝐢][3.33636639369ᴇ-3-1.81983621474ᴇ-3×𝐢,0.36093418259+0.534728541098×𝐢,-0.130118289354-0.357597816197×𝐢]]", System, Degree, Cartesian, 12); // FIXME: inverse is not precise enough to display 14 significative digits
-#endif

  assert_parsed_expression_evaluates_to<float>("prediction(0.1, 100)", "[[0,0.2]]");
  assert_parsed_expression_evaluates_to<double>("prediction(0.1, 100)", "[[0,0.2]]");
@@ -206,14 +192,12 @@ QUIZ_CASE(poincare_function_evaluate) {
  assert_parsed_expression_evaluates_to<double>("sum(2+n×𝐢,n,1,5)", "10+15×𝐢");
  assert_parsed_expression_evaluates_to<double>("sum(2+n×𝐢,n,1,5)", "10+15×𝐢");

-#if MATRICES_ARE_DEFINED
  assert_parsed_expression_evaluates_to<float>("transpose([[1,2,3][4,5,-6][7,8,9]])", "[[1,4,7][2,5,8][3,-6,9]]");
  assert_parsed_expression_evaluates_to<float>("transpose([[1,7,5][4,2,8]])", "[[1,4][7,2][5,8]]");
  assert_parsed_expression_evaluates_to<float>("transpose([[1,2][4,5][7,8]])", "[[1,4,7][2,5,8]]");
  assert_parsed_expression_evaluates_to<double>("transpose([[1,2,3][4,5,-6][7,8,9]])", "[[1,4,7][2,5,8][3,-6,9]]");
  assert_parsed_expression_evaluates_to<double>("transpose([[1,7,5][4,2,8]])", "[[1,4][7,2][5,8]]");
  assert_parsed_expression_evaluates_to<double>("transpose([[1,2][4,5][7,8]])", "[[1,4,7][2,5,8]]");
-#endif

  assert_parsed_expression_evaluates_to<float>("round(2.3246,3)", "2.325");
  assert_parsed_expression_evaluates_to<double>("round(2.3245,3)", "2.325");
--- a/poincare/test/matrix.cpp
+++ b/poincare/test/matrix.cpp
@@ -5,14 +5,11 @@
 using namespace Poincare;

 QUIZ_CASE(poincare_matrix_evaluate) {
-#if MATRICES_ARE_DEFINED
  assert_parsed_expression_evaluates_to<float>("[[1,2,3][4,5,6]]", "[[1,2,3][4,5,6]]");
  assert_parsed_expression_evaluates_to<double>("[[1,2,3][4,5,6]]", "[[1,2,3][4,5,6]]");
-#endif
 }

 QUIZ_CASE(poincare_matrix_simplify) {
-#if MATRICES_ARE_DEFINED
 #if MATRIX_EXACT_REDUCING
  // Addition Matrix
  assert_parsed_expression_simplify_to("1+[[1,2,3][4,5,6]]", "[[2,3,4][5,6,7]]");
@@ -104,5 +101,4 @@ QUIZ_CASE(poincare_matrix_simplify) {
 #else
  assert_parsed_expression_simplify_to("R([[4,2][P/7,1]])", "R([[4,2][P/7,1]])");
 #endif
-#endif
 }
--- a/poincare/test/multiplication.cpp
+++ b/poincare/test/multiplication.cpp
@@ -8,15 +8,12 @@ using namespace Poincare;
 QUIZ_CASE(poincare_multiplication_evaluate) {
  assert_parsed_expression_evaluates_to<float>("1×2", "2");
  assert_parsed_expression_evaluates_to<double>("(3+𝐢)×(4+𝐢)", "11+7×𝐢");
-
-#if MATRICES_ARE_DEFINED
  assert_parsed_expression_evaluates_to<float>("[[1,2][3,4][5,6]]×2", "[[2,4][6,8][10,12]]");
  assert_parsed_expression_evaluates_to<double>("[[1,2+𝐢][3,4][5,6]]×(3+𝐢)", "[[3+𝐢,5+5×𝐢][9+3×𝐢,12+4×𝐢][15+5×𝐢,18+6×𝐢]]");
  assert_parsed_expression_evaluates_to<float>("2×[[1,2][3,4][5,6]]", "[[2,4][6,8][10,12]]");
  assert_parsed_expression_evaluates_to<double>("(3+𝐢)×[[1,2+𝐢][3,4][5,6]]", "[[3+𝐢,5+5×𝐢][9+3×𝐢,12+4×𝐢][15+5×𝐢,18+6×𝐢]]");
  assert_parsed_expression_evaluates_to<float>("[[1,2][3,4][5,6]]×[[1,2,3,4][5,6,7,8]]", "[[11,14,17,20][23,30,37,44][35,46,57,68]]");
  assert_parsed_expression_evaluates_to<double>("[[1,2+𝐢][3,4][5,6]]×[[1,2+𝐢,3,4][5,6+𝐢,7,8]]", "[[11+5×𝐢,13+9×𝐢,17+7×𝐢,20+8×𝐢][23,30+7×𝐢,37,44][35,46+11×𝐢,57,68]]");
-#endif
 }

 QUIZ_CASE(poincare_multiplication_simplify) {
--- a/poincare/test/power.cpp
+++ b/poincare/test/power.cpp
@@ -19,10 +19,8 @@ QUIZ_CASE(poincare_power_evaluate) {
  assert_parsed_expression_evaluates_to<double>("(-2)^4.2", "14.8690638497+10.8030072384×𝐢", System, Radian, Cartesian, 12);
  assert_parsed_expression_evaluates_to<double>("(-0.1)^4", "0.0001", System, Radian, Cartesian, 12);

-#if MATRICES_ARE_DEFINED
  assert_parsed_expression_evaluates_to<float>("[[1,2][3,4]]^(-3)", "[[-14.75,6.75][10.125,-4.625]]", System, Degree, Cartesian, 6);
  assert_parsed_expression_evaluates_to<double>("[[1,2][3,4]]^3", "[[37,54][81,118]]");
-#endif
  assert_parsed_expression_evaluates_to<float>("0^2", "0");
  assert_parsed_expression_evaluates_to<double>("𝐢^𝐢", "2.0787957635076ᴇ-1");
  assert_parsed_expression_evaluates_to<float>("1.0066666666667^60", "1.48985", System, Radian, Cartesian, 6);
--- a/poincare/test/subtraction.cpp
+++ b/poincare/test/subtraction.cpp
@@ -8,13 +8,10 @@ using namespace Poincare;
 QUIZ_CASE(poincare_subtraction_evaluate) {
  assert_parsed_expression_evaluates_to<float>("1-2", "-1");
  assert_parsed_expression_evaluates_to<double>("3+𝐢-(4+𝐢)", "-1");
-
-#if MATRICES_ARE_DEFINED
  assert_parsed_expression_evaluates_to<float>("[[1,2][3,4][5,6]]-3", "[[-2,-1][0,1][2,3]]");
  assert_parsed_expression_evaluates_to<double>("[[1,2+𝐢][3,4][5,6]]-(4+𝐢)", "[[-3-𝐢,-2][-1-𝐢,-𝐢][1-𝐢,2-𝐢]]");
  assert_parsed_expression_evaluates_to<float>("3-[[1,2][3,4][5,6]]", "[[2,1][0,-1][-2,-3]]");
  assert_parsed_expression_evaluates_to<double>("3+𝐢-[[1,2+𝐢][3,4][5,6]]", "[[2+𝐢,1][𝐢,-1+𝐢][-2+𝐢,-3+𝐢]]");
  assert_parsed_expression_evaluates_to<float>("[[1,2][3,4][5,6]]-[[6,5][4,3][2,1]]", "[[-5,-3][-1,1][3,5]]");
  assert_parsed_expression_evaluates_to<double>("[[1,2+𝐢][3,4][5,6]]-[[1,2+𝐢][3,4][5,6]]", "[[0,0][0,0][0,0]]");
-#endif
 }
--- a/scripts/config.mak
+++ b/scripts/config.mak
@@ -10,7 +10,6 @@ EPSILON_BOOT_PROMPT ?= none
 EPSILON_APPS ?= calculation graph code statistics probability solver sequence regression settings
 EPSILON_I18N ?= en fr es de pt
 EPSILON_GETOPT ?= 0
-MATRICES_ARE_DEFINED ?=1
 ESCHER_LOG_EVENTS_BINARY ?= 0

 include scripts/defaults.mak
@@ -36,5 +35,4 @@ endif
 ifeq (update,$(EPSILON_BOOT_PROMPT))
 SFLAGS += -DEPSILON_BOOT_PROMPT=$(EPSILON_UPDATE_PROMPT)
 endif
-SFLAGS += -DMATRICES_ARE_DEFINED=$(MATRICES_ARE_DEFINED)
 SFLAGS += -DESCHER_LOG_EVENTS_BINARY=$(ESCHER_LOG_EVENTS_BINARY)