UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[app/sequence] Add a third sequence

Browse Source
This commit is contained in:
Émilie Feral
2019-07-16 18:10:46 +02:00
parent 7db5a10da9
commit 2e7fb601c8
6 changed files with 71 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/sequence/cache_context.cpp
View File

@@ -8,17 +8,17 @@ namespace Sequence {
template<typename T>
CacheContext<T>::CacheContext(Context * parentContext) :
m_values{{NAN, NAN},
{NAN, NAN}},
m_values{{NAN, NAN},{NAN, NAN},{NAN,NAN}},
m_parentContext(parentContext)
{
}
template<typename T>
const Expression CacheContext<T>::expressionForSymbol(const SymbolAbstract & symbol, bool clone) {
// [u|v](n(+1)?)
// [u|v|w](n(+1)?)
if (symbol.type() == ExpressionNode::Type::Symbol
&& (symbol.name()[0] == SequenceStore::k_sequenceNames[0][0] || symbol.name()[0] == SequenceStore::k_sequenceNames[1][0])
&& symbol.name()[0] >= SequenceStore::k_sequenceNames[0][0]
&& symbol.name()[0] <= SequenceStore::k_sequenceNames[MaxNumberOfSequences-1][0]
&& (strcmp(symbol.name()+1, "(n)") == 0 || strcmp(symbol.name()+1, "(n+1)") == 0))
{
Symbol s = const_cast<Symbol &>(static_cast<const Symbol &>(symbol));
@@ -39,12 +39,10 @@ void CacheContext<T>::setValueForSymbol(T value, const Poincare::Symbol & symbol
template<typename T>
int CacheContext<T>::nameIndexForSymbol(const Poincare::Symbol & symbol) {
assert(strlen(symbol.name()) == 4 || strlen(symbol.name()) == 6); // [u|v](n(+1)?)
if (symbol.name()[0] == SequenceStore::k_sequenceNames[0][0]) { // u
return 0;
}
// v
return 1;
assert(strlen(symbol.name()) == 4 || strlen(symbol.name()) == 6); // [u|v|w](n(+1)?)
char name = symbol.name()[0];
assert(name >= SequenceStore::k_sequenceNames[0][0] && name <= SequenceStore::k_sequenceNames[MaxNumberOfSequences-1][0]); // u, v or w
return name - 'u';
}
template<typename T>