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

[apps] Sequence: fix confusion between sequence index in store and

Browse Source 
sequence name
This commit is contained in:
Émilie Feral
2018-02-08 10:29:51 +01:00
committed by EmilieNumworks
parent 2f5f94ade0
commit ca1daeb527
2 changed files with 46 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/sequence/sequence_context.cpp
View File

@@ -53,8 +53,15 @@ void TemplatedSequenceContext<T>::step(SequenceStore * sequenceStore, SequenceCo
u = u && u->isDefined() ? u : nullptr;
Sequence * v = sequenceStore->numberOfFunctions() > 1 ? sequenceStore->functionAtIndex(1) : nullptr;
v = v && v->isDefined() ? v : nullptr;
/* Switch u & v if the name of u is v */
if (u != nullptr && u->name()[0] == SequenceStore::k_sequenceNames[1][0]) {
Sequence * temp = u;
u = v;
v = temp;
}
/* TODO: explain */
/* Approximate u & v at the new rank. We evaluate u twice in case its
* expression depends on v. */
m_values[0][0] = u ? u->approximateToNextRank<T>(m_rank, sqctx) : NAN;
m_values[1][0] = v ? v->approximateToNextRank<T>(m_rank, sqctx) : NAN;
m_values[0][0] = u ? u->approximateToNextRank<T>(m_rank, sqctx) : NAN;