From 4274b558b6e0d9aee19f0c8eac298ea92edbd7a7 Mon Sep 17 00:00:00 2001 From: Arthur Camouseigt Date: Fri, 18 Sep 2020 17:41:12 +0200 Subject: [PATCH] [Sequences] Changing the name of CacheContext to SequenceCacheContext Change-Id: If2d542748f6f7b2363d6c1443f88c058475945eb --- apps/shared/Makefile | 4 ++-- apps/shared/sequence.cpp | 4 ++-- ...he_context.cpp => sequence_cache_context.cpp} | 16 ++++++++-------- ...{cache_context.h => sequence_cache_context.h} | 8 ++++---- apps/shared/sequence_context.cpp | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) rename apps/shared/{cache_context.cpp => sequence_cache_context.cpp} (79%) rename apps/shared/{cache_context.h => sequence_cache_context.h} (77%) diff --git a/apps/shared/Makefile b/apps/shared/Makefile index e12384f37..0c6ead3e7 100644 --- a/apps/shared/Makefile +++ b/apps/shared/Makefile @@ -29,7 +29,6 @@ app_shared_src = $(addprefix apps/shared/,\ buffer_function_title_cell.cpp \ buffer_text_view_with_text_field.cpp \ button_with_separator.cpp \ - cache_context.cpp \ cursor_view.cpp \ editable_cell_table_view_controller.cpp \ expression_field_delegate_app.cpp \ @@ -67,6 +66,7 @@ app_shared_src = $(addprefix apps/shared/,\ scrollable_multiple_expressions_view.cpp \ scrollable_two_expressions_cell.cpp \ sequence.cpp\ + sequence_cache_context.cpp \ sequence_context.cpp\ sequence_store.cpp\ sequence_title_cell.cpp \ @@ -103,8 +103,8 @@ app_shared_test_src += $(addprefix apps/graph/,\ ) app_shared_test_src += $(addprefix apps/shared/,\ - cache_context.cpp \ sequence.cpp \ + sequence_cache_context.cpp \ sequence_context.cpp \ sequence_store.cpp \ ) diff --git a/apps/shared/sequence.cpp b/apps/shared/sequence.cpp index df64d31a1..412587994 100644 --- a/apps/shared/sequence.cpp +++ b/apps/shared/sequence.cpp @@ -1,5 +1,5 @@ #include "sequence.h" -#include "cache_context.h" +#include "sequence_cache_context.h" #include "sequence_store.h" #include #include @@ -209,7 +209,7 @@ T Sequence::approximateToNextRank(int n, SequenceContext * sqctx, int sequenceIn char unknownN[bufferSize]; Poincare::SerializationHelper::CodePoint(unknownN, bufferSize, UCodePointUnknown); - CacheContext ctx = CacheContext(sqctx); + SequenceCacheContext ctx = SequenceCacheContext(sqctx); // Hold values u(n), u(n-1), u(n-2), v(n), v(n-1), v(n-2)... T values[MaxNumberOfSequences][MaxRecurrenceDepth+1]; diff --git a/apps/shared/cache_context.cpp b/apps/shared/sequence_cache_context.cpp similarity index 79% rename from apps/shared/cache_context.cpp rename to apps/shared/sequence_cache_context.cpp index e2cd46d48..518029f04 100644 --- a/apps/shared/cache_context.cpp +++ b/apps/shared/sequence_cache_context.cpp @@ -1,4 +1,4 @@ -#include "cache_context.h" +#include "sequence_cache_context.h" #include "sequence.h" #include "sequence_store.h" #include "poincare_helpers.h" @@ -12,7 +12,7 @@ using namespace Poincare; namespace Shared { template -CacheContext::CacheContext(SequenceContext * sequenceContext) : +SequenceCacheContext::SequenceCacheContext(SequenceContext * sequenceContext) : ContextWithParent(sequenceContext), m_values{{NAN, NAN},{NAN, NAN},{NAN,NAN}}, m_sequenceContext(sequenceContext) @@ -20,7 +20,7 @@ CacheContext::CacheContext(SequenceContext * sequenceContext) : } template -const Expression CacheContext::expressionForSymbolAbstract(const Poincare::SymbolAbstract & symbol, bool clone, float unknownSymbolValue ) { +const Expression SequenceCacheContext::expressionForSymbolAbstract(const Poincare::SymbolAbstract & symbol, bool clone, float unknownSymbolValue ) { // [u|v|w](n(+1)?) if (symbol.type() == ExpressionNode::Type::Sequence) { int index = nameIndexForSymbol(const_cast(static_cast(symbol))); @@ -52,12 +52,12 @@ const Expression CacheContext::expressionForSymbolAbstract(const Poincare::Sy } template -void CacheContext::setValueForSymbol(T value, const Poincare::Symbol & symbol) { +void SequenceCacheContext::setValueForSymbol(T value, const Poincare::Symbol & symbol) { m_values[nameIndexForSymbol(symbol)][rankIndexForSymbol(symbol)] = value; } template -int CacheContext::nameIndexForSymbol(const Poincare::Symbol & symbol) { +int SequenceCacheContext::nameIndexForSymbol(const Poincare::Symbol & symbol) { assert(symbol.name()[0] >= 'u' && symbol.name()[0] <= 'w'); // [u|v|w] char name = symbol.name()[0]; assert(name >= SequenceStore::k_sequenceNames[0][0] && name <= SequenceStore::k_sequenceNames[MaxNumberOfSequences-1][0]); // u, v or w @@ -65,7 +65,7 @@ int CacheContext::nameIndexForSymbol(const Poincare::Symbol & symbol) { } template -int CacheContext::rankIndexForSymbol(const Poincare::Symbol & symbol) { +int SequenceCacheContext::rankIndexForSymbol(const Poincare::Symbol & symbol) { assert(strcmp(symbol.name()+1, "(n)") == 0 || strcmp(symbol.name()+1, "(n+1)") == 0); // u(n) or u(n+1) if (symbol.name()[3] == ')') { // (n) return 0; @@ -74,7 +74,7 @@ int CacheContext::rankIndexForSymbol(const Poincare::Symbol & symbol) { return 1; } -template class CacheContext; -template class CacheContext; +template class SequenceCacheContext; +template class SequenceCacheContext; } diff --git a/apps/shared/cache_context.h b/apps/shared/sequence_cache_context.h similarity index 77% rename from apps/shared/cache_context.h rename to apps/shared/sequence_cache_context.h index 56f6f96b6..9fa79b22e 100644 --- a/apps/shared/cache_context.h +++ b/apps/shared/sequence_cache_context.h @@ -1,5 +1,5 @@ -#ifndef SEQUENCE_CACHE_CONTEXT_H -#define SEQUENCE_CACHE_CONTEXT_H +#ifndef SHARED_SEQUENCE_CACHE_CONTEXT_H +#define SHARED_SEQUENCE_CACHE_CONTEXT_H #include #include @@ -9,9 +9,9 @@ namespace Shared { template -class CacheContext : public Poincare::ContextWithParent { +class SequenceCacheContext : public Poincare::ContextWithParent { public: - CacheContext(SequenceContext * sequenceContext); + SequenceCacheContext(SequenceContext * sequenceContext); const Poincare::Expression expressionForSymbolAbstract(const Poincare::SymbolAbstract & symbol, bool clone, float unknownSymbolValue = NAN) override; void setValueForSymbol(T value, const Poincare::Symbol & symbol); void setNValue(int n) { m_nValue = n; } diff --git a/apps/shared/sequence_context.cpp b/apps/shared/sequence_context.cpp index 528a2c359..1accf43ad 100644 --- a/apps/shared/sequence_context.cpp +++ b/apps/shared/sequence_context.cpp @@ -1,6 +1,6 @@ #include "sequence_context.h" #include "sequence_store.h" -#include "cache_context.h" +#include "sequence_cache_context.h" #include "../shared/poincare_helpers.h" #include