From 945d6df444cc7dd7d0b794c48ec3ec365dbd9d81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Mon, 18 Dec 2017 15:57:05 +0100 Subject: [PATCH] [apps] Fix typo: Explicite->Explicit --- apps/sequence/base.de.i18n | 2 +- apps/sequence/base.en.i18n | 2 +- apps/sequence/base.es.i18n | 2 +- apps/sequence/base.fr.i18n | 2 +- apps/sequence/base.pt.i18n | 2 +- apps/sequence/list/list_controller.cpp | 2 +- .../list/list_parameter_controller.cpp | 2 +- .../list/type_parameter_controller.cpp | 2 +- apps/sequence/sequence.cpp | 14 ++++++------ apps/sequence/sequence.h | 2 +- apps/sequence/test/sequence.cpp | 22 +++++++++---------- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/apps/sequence/base.de.i18n b/apps/sequence/base.de.i18n index 17437c81a..9d704ea73 100644 --- a/apps/sequence/base.de.i18n +++ b/apps/sequence/base.de.i18n @@ -4,7 +4,7 @@ SequenceTab = "Folgen" AddSequence = "Folge hinzuzufugen" ChooseSequenceType = "Das Bildungsgesetz der Folge auswahlen" SequenceType = "Bildungsgesetz der Folge" -Explicite = "Explizit" +Explicit = "Explizit" SingleRecurrence = "Rekursiv, Ordnung 1" DoubleRecurrence = "Rekursiv, Ordnung 2" SequenceOptions = "Optionen Folge" diff --git a/apps/sequence/base.en.i18n b/apps/sequence/base.en.i18n index 4d543691b..e9917698c 100644 --- a/apps/sequence/base.en.i18n +++ b/apps/sequence/base.en.i18n @@ -4,7 +4,7 @@ SequenceTab = "Sequences" AddSequence = "Add sequence" ChooseSequenceType = "Choose sequence type" SequenceType = "Sequence type" -Explicite = "Explicit expression" +Explicit = "Explicit expression" SingleRecurrence = "Recursive first order" DoubleRecurrence = "Recursive second order" SequenceOptions = "Sequence options" diff --git a/apps/sequence/base.es.i18n b/apps/sequence/base.es.i18n index d28c0d38b..5808cbf9b 100644 --- a/apps/sequence/base.es.i18n +++ b/apps/sequence/base.es.i18n @@ -4,7 +4,7 @@ SequenceTab = "Sucesiones" AddSequence = "Agregar una sucesion" ChooseSequenceType = "Seleccionar el tipo de sucesion" SequenceType = "Tipo de sucesion" -Explicite = "Formula explicita" +Explicit = "Formula explicita" SingleRecurrence = "Recurrencia de orden uno" DoubleRecurrence = "Recurrencia de orden dos" SequenceOptions = "Opciones de la sucesion" diff --git a/apps/sequence/base.fr.i18n b/apps/sequence/base.fr.i18n index 2de84234b..15c3d6c32 100644 --- a/apps/sequence/base.fr.i18n +++ b/apps/sequence/base.fr.i18n @@ -4,7 +4,7 @@ SequenceTab = "Suites" AddSequence = "Ajouter une suite" ChooseSequenceType = "Choisir le type de suite" SequenceType = "Type de suite" -Explicite = "Explicite" +Explicit = "Explicite" SingleRecurrence = "Recurrente d'ordre 1" DoubleRecurrence = "Recurrente d'ordre 2" SequenceOptions = "Options de la suite" diff --git a/apps/sequence/base.pt.i18n b/apps/sequence/base.pt.i18n index 9f30fd757..528fcdf4e 100644 --- a/apps/sequence/base.pt.i18n +++ b/apps/sequence/base.pt.i18n @@ -4,7 +4,7 @@ SequenceTab = "Sequencias" AddSequence = "Adicionar uma sequencia" ChooseSequenceType = "Escolha o tipo de sequencia" SequenceType = "Tipo de sequencia" -Explicite = "Explicita" +Explicit = "Explicita" SingleRecurrence = "Recorrencia de Primeira Ordem" DoubleRecurrence = "Recorrencia de Segunda Ordem" SequenceOptions = "Opcoes de sequencia" diff --git a/apps/sequence/list/list_controller.cpp b/apps/sequence/list/list_controller.cpp index 2fe503aa9..29eefaf32 100644 --- a/apps/sequence/list/list_controller.cpp +++ b/apps/sequence/list/list_controller.cpp @@ -55,7 +55,7 @@ KDCoordinate ListController::rowHeight(int j) { return Metric::StoreRowHeight; } Sequence * sequence = m_sequenceStore->functionAtIndex(functionIndexForRow(j)); - KDCoordinate defaultHeight = sequence->type() == Sequence::Type::Explicite ? Metric::StoreRowHeight : k_emptySubRowHeight; + KDCoordinate defaultHeight = sequence->type() == Sequence::Type::Explicit ? Metric::StoreRowHeight : k_emptySubRowHeight; ExpressionLayout * layout = sequence->layout(); if (sequenceDefinitionForRow(j) == 1) { layout = sequence->firstInitialConditionLayout(); diff --git a/apps/sequence/list/list_parameter_controller.cpp b/apps/sequence/list/list_parameter_controller.cpp index a4ae9a3a2..075d96581 100644 --- a/apps/sequence/list/list_parameter_controller.cpp +++ b/apps/sequence/list/list_parameter_controller.cpp @@ -171,7 +171,7 @@ TextFieldDelegateApp * ListParameterController::textFieldDelegateApp() { } bool ListParameterController::hasInitialRankRow() { - return m_sequence && m_sequence->type() != Sequence::Type::Explicite; + return m_sequence && m_sequence->type() != Sequence::Type::Explicit; } } diff --git a/apps/sequence/list/type_parameter_controller.cpp b/apps/sequence/list/type_parameter_controller.cpp index 8103fab97..29e3ec3d6 100644 --- a/apps/sequence/list/type_parameter_controller.cpp +++ b/apps/sequence/list/type_parameter_controller.cpp @@ -12,7 +12,7 @@ namespace Sequence { TypeParameterController::TypeParameterController(Responder * parentResponder, SequenceStore * sequenceStore, ListController * list, TableCell::Layout cellLayout, KDCoordinate topMargin, KDCoordinate rightMargin, KDCoordinate bottomMargin, KDCoordinate leftMargin) : ViewController(parentResponder), - m_expliciteCell(I18n::Message::Explicite, cellLayout), + m_expliciteCell(I18n::Message::Explicit, cellLayout), m_singleRecurrenceCell(I18n::Message::SingleRecurrence, cellLayout), m_doubleRecurenceCell(I18n::Message::DoubleRecurrence, cellLayout), m_expressionLayouts{}, diff --git a/apps/sequence/sequence.cpp b/apps/sequence/sequence.cpp index 51a929391..fe4d482ea 100644 --- a/apps/sequence/sequence.cpp +++ b/apps/sequence/sequence.cpp @@ -13,7 +13,7 @@ namespace Sequence { Sequence::Sequence(const char * text, KDColor color) : Function(text, color), - m_type(Type::Explicite), + m_type(Type::Explicit), m_firstInitialConditionText(), m_secondInitialConditionText(), m_firstInitialConditionExpression(nullptr), @@ -105,14 +105,14 @@ Sequence::Type Sequence::type() { } void Sequence::setType(Type type) { - if (m_type == Type::Explicite) { + if (m_type == Type::Explicit) { setInitialRank(0); } m_type = type; tidy(); /* Reset all contents */ switch (m_type) { - case Type::Explicite: + case Type::Explicit: setContent(""); break; case Type::SingleRecurrence: @@ -234,7 +234,7 @@ Poincare::ExpressionLayout * Sequence::nameLayout() { Poincare::ExpressionLayout * Sequence::definitionName() { if (m_definitionName == nullptr) { - if (m_type == Type::Explicite) { + if (m_type == Type::Explicit) { m_definitionName = new BaselineRelativeLayout(new StringLayout(name(), 1), new StringLayout("n ", 2, KDText::FontSize::Small), BaselineRelativeLayout::Type::Subscript); } if (m_type == Type::SingleRecurrence) { @@ -275,7 +275,7 @@ Poincare::ExpressionLayout * Sequence::secondInitialConditionName() { bool Sequence::isDefined() { switch (m_type) { - case Type::Explicite: + case Type::Explicit: return strlen(text()) != 0; case Type::SingleRecurrence: return strlen(text()) != 0 && strlen(firstInitialConditionText()) != 0; @@ -286,7 +286,7 @@ bool Sequence::isDefined() { bool Sequence::isEmpty() { switch (m_type) { - case Type::Explicite: + case Type::Explicit: return Function::isEmpty(); case Type::SingleRecurrence: return Function::isEmpty() && strlen(m_firstInitialConditionText) == 0; @@ -323,7 +323,7 @@ T Sequence::approximateToNextRank(int n, SequenceContext * sqctx) const { Poincare::Symbol unSymbol(Symbol::SpecialSymbols::un); Poincare::Symbol un1Symbol(Symbol::SpecialSymbols::un1); switch (m_type) { - case Type::Explicite: + case Type::Explicit: { ctx.setValueForSymbol(un, &unSymbol); ctx.setValueForSymbol(vn, &vnSymbol); diff --git a/apps/sequence/sequence.h b/apps/sequence/sequence.h index c72e96efe..6ae589aec 100644 --- a/apps/sequence/sequence.h +++ b/apps/sequence/sequence.h @@ -10,7 +10,7 @@ namespace Sequence { class Sequence : public Shared::Function { public: enum class Type { - Explicite = 0, + Explicit = 0, SingleRecurrence = 1, DoubleRecurrence = 2 }; diff --git a/apps/sequence/test/sequence.cpp b/apps/sequence/test/sequence.cpp index aa4fbf235..d02a5f887 100644 --- a/apps/sequence/test/sequence.cpp +++ b/apps/sequence/test/sequence.cpp @@ -9,7 +9,7 @@ using namespace Poincare; namespace Sequence { -void check_sequences_defined_by(double result[2][10], Sequence::Type typeU, const char * definitionU, const char * conditionU1 = nullptr, const char * conditionU2 = nullptr, Sequence::Type typeV = Sequence::Type::Explicite, const char * definitionV = nullptr, const char * conditionV1 = nullptr, const char * conditionV2 = nullptr) { +void check_sequences_defined_by(double result[2][10], Sequence::Type typeU, const char * definitionU, const char * conditionU1 = nullptr, const char * conditionU2 = nullptr, Sequence::Type typeV = Sequence::Type::Explicit, const char * definitionV = nullptr, const char * conditionV1 = nullptr, const char * conditionV2 = nullptr) { GlobalContext globalContext; SequenceStore store; SequenceContext sequenceContext(&globalContext, &store); @@ -51,7 +51,7 @@ void check_sequences_defined_by(double result[2][10], Sequence::Type typeU, cons QUIZ_CASE(sequence_evaluation) { // u(n) = n double result0[2][10] = {{0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0}, {}}; - check_sequences_defined_by(result0, Sequence::Type::Explicite, "n"); + check_sequences_defined_by(result0, Sequence::Type::Explicit, "n"); // u(n+1) = u(n)+n, u(0) = 0 double result1[2][10] = {{0.0, 0.0, 1.0, 3.0, 6.0, 10.0, 15.0, 21.0, 28.0, 36.0}, {}}; @@ -65,22 +65,22 @@ QUIZ_CASE(sequence_evaluation) { // u(n) = n; v(n) = u(n)+n double result3[2][10] = {{0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0}, {0.0, 2.0, 4.0, 6.0, 8.0, 10.0, 12.0, 14.0, 16.0, 18.0}}; - check_sequences_defined_by(result3, Sequence::Type::Explicite, "n", nullptr, nullptr, Sequence::Type::Explicite, "u(n)+n"); + check_sequences_defined_by(result3, Sequence::Type::Explicit, "n", nullptr, nullptr, Sequence::Type::Explicit, "u(n)+n"); // u(n+1) = u(n)+n, u(0) = 0; v(n) = u(n)+n double result4[2][10] = {{0.0, 0.0, 1.0, 3.0, 6.0, 10.0, 15.0, 21.0, 28.0, 36.0}, {0.0, 1.0, 3.0, 6.0, 10.0, 15.0, 21.0, 28.0, 36.0, 45.0}}; - check_sequences_defined_by(result4, Sequence::Type::SingleRecurrence, "n+u(n)", "0", nullptr, Sequence::Type::Explicite, "u(n)+n"); + check_sequences_defined_by(result4, Sequence::Type::SingleRecurrence, "n+u(n)", "0", nullptr, Sequence::Type::Explicit, "u(n)+n"); // u(n+2) = u(n+1)+u(n)+n, u(0) = 0, u(1) = 0; v(n) = u(n)+n double result5[2][10] = {{0.0, 0.0, 0.0, 1.0, 3.0, 7.0, 14.0, 26.0, 46.0, 79.0}, {0.0, 1.0, 2.0, 4.0, 7.0, 12.0, 20.0, 33.0, 54.0, 88.0}}; - check_sequences_defined_by(result5, Sequence::Type::DoubleRecurrence, "n+u(n)+u(n+1)", "0", "0", Sequence::Type::Explicite, "u(n)+n"); + check_sequences_defined_by(result5, Sequence::Type::DoubleRecurrence, "n+u(n)+u(n+1)", "0", "0", Sequence::Type::Explicit, "u(n)+n"); // u(n) = n; v(n+1) = u(n)+u(n+1)+n, v(0) = 0 double result6[2][10] = {{0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0}, {0.0, 1.0, 4.0, 7.0, 10.0, 13.0, 16.0, 19.0, 22.0, 25.0}}; - check_sequences_defined_by(result6, Sequence::Type::Explicite, "n", nullptr, nullptr, Sequence::Type::SingleRecurrence, "u(n)+u(n+1)+n", "0"); + check_sequences_defined_by(result6, Sequence::Type::Explicit, "n", nullptr, nullptr, Sequence::Type::SingleRecurrence, "u(n)+u(n+1)+n", "0"); // u(n+1) = u(n)+n, u(0) = 0; v(n+1) = u(n)+u(n+1)+n, v(0) = 0 double result7[2][10] = {{0.0, 0.0, 1.0, 3.0, 6.0, 10.0, 15.0, 21.0, 28.0, 36.0}, @@ -95,7 +95,7 @@ QUIZ_CASE(sequence_evaluation) { // u(n) = n; v(n+2) = u(n)+u(n+1)+n, v(0) = 0, v(1)=0 double result9[2][10] = {{0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0}, {0.0, 0.0, 1.0, 4.0, 7.0, 10.0, 13.0, 16.0, 19.0, 22.0}}; - check_sequences_defined_by(result9, Sequence::Type::Explicite, "n", nullptr, nullptr, Sequence::Type::DoubleRecurrence, "u(n)+u(n+1)+n", "0", "0"); + check_sequences_defined_by(result9, Sequence::Type::Explicit, "n", nullptr, nullptr, Sequence::Type::DoubleRecurrence, "u(n)+u(n+1)+n", "0", "0"); // u(n+1) = u(n)+n, u(0) = 0; v(n+2) = u(n)+u(n+1)+n, v(0) = 0, v(1)=0 double result10[2][10] = {{0.0, 0.0, 1.0, 3.0, 6.0, 10.0, 15.0, 21.0, 28.0, 36.0}, @@ -112,20 +112,20 @@ QUIZ_CASE(sequence_evaluation) { // u(n) = v(n); v(n) = u(n) double result12[2][10] = {{NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN}, {NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN}}; - check_sequences_defined_by(result12, Sequence::Type::Explicite, "v(n)", nullptr, nullptr, Sequence::Type::Explicite, "u(n)"); + check_sequences_defined_by(result12, Sequence::Type::Explicit, "v(n)", nullptr, nullptr, Sequence::Type::Explicit, "u(n)"); // u(n+1) = v(n)+n, u(0)=0; v(n) = u(n)+n double result13[2][10] = {{0.0, 0.0, 2.0, 6.0, 12.0, 20.0, 30.0, 42.0, 56.0, 72.0}, {0.0, 1.0, 4.0, 9.0, 16.0, 25.0, 36.0, 49.0, 64.0, 81}}; - check_sequences_defined_by(result13, Sequence::Type::SingleRecurrence, "v(n)+n", "0", nullptr, Sequence::Type::Explicite, "u(n)+n"); + check_sequences_defined_by(result13, Sequence::Type::SingleRecurrence, "v(n)+n", "0", nullptr, Sequence::Type::Explicit, "u(n)+n"); // u(n+2) = v(n+1)+u(n+1)+v(n)+u(n)+n, u(1) = 0; u(0)=0; v(n) = u(n)+n double result14[2][10] = {{0.0, 0.0, 1.0, 6.0, 21.0, 64.0, 183.0, 510.0, 1405.0, 3852.0}, {0.0, 1.0, 3.0, 9.0, 25.0, 69.0, 189.0, 517.0, 1413.0, 3861.0}}; - check_sequences_defined_by(result14, Sequence::Type::DoubleRecurrence, "v(n+1)+v(n)+u(n+1)+u(n)+n", "0", "0", Sequence::Type::Explicite, "u(n)+n"); + check_sequences_defined_by(result14, Sequence::Type::DoubleRecurrence, "v(n+1)+v(n)+u(n+1)+u(n)+n", "0", "0", Sequence::Type::Explicit, "u(n)+n"); // u(n) = v(n)+n; v(n+1) = u(n)+n, v(0)=0 double result15[2][10] = {{0.0, 1.0, 4.0, 9.0, 16.0, 25.0, 36.0, 49.0, 64.0, 81}, {0.0, 0.0, 2.0, 6.0, 12.0, 20.0, 30.0, 42.0, 56.0, 72.0}}; - check_sequences_defined_by(result15, Sequence::Type::Explicite, "v(n)+n", nullptr, nullptr, Sequence::Type::SingleRecurrence, "u(n)+n", "0"); + check_sequences_defined_by(result15, Sequence::Type::Explicit, "v(n)+n", nullptr, nullptr, Sequence::Type::SingleRecurrence, "u(n)+n", "0"); // u(n+1) = v(n)+n, u(0)=0; v(n+1) = u(n)+n, v(0)=0 double result16[2][10] = {{0.0, 0.0, 1.0, 3.0, 6.0, 10.0, 15.0, 21.0, 28.0, 36.0}, {0.0, 0.0, 1.0, 3.0, 6.0, 10.0, 15.0, 21.0, 28.0, 36.0}};