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] Test: avoid duplicating sequence stores and ensure to

Browse Source 
tidy it (empty the Poincare Pool) between quiz_cases
This commit is contained in:
Émilie Feral
2020-11-04 12:17:32 +01:00
parent 5e83bee589
commit c5beb6fdd2
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/sequence/test/sequence.cpp
View File

@@ -30,12 +30,12 @@ Sequence * addSequence(SequenceStore * store, Sequence::Type type, const char *
void check_sequences_defined_by(double result[MaxNumberOfSequences][10], Sequence::Type types[MaxNumberOfSequences], const char * definitions[MaxNumberOfSequences], const char * conditions1[MaxNumberOfSequences], const char * conditions2[MaxNumberOfSequences]) {
Shared::GlobalContext globalContext;
SequenceStore store;
SequenceContext sequenceContext(&globalContext, &store);
SequenceStore * store = globalContext.sequenceStore();
SequenceContext sequenceContext(&globalContext, store);
Sequence * seqs[MaxNumberOfSequences];
for (int i = 0; i < MaxNumberOfSequences; i++) {
seqs[i] = addSequence(&store, types[i], definitions[i], conditions1[i], conditions2[i], &globalContext);
seqs[i] = addSequence(store, types[i], definitions[i], conditions1[i], conditions2[i], &globalContext);
}
for (int j = 0; j < 10; j++) {
@@ -46,20 +46,25 @@ void check_sequences_defined_by(double result[MaxNumberOfSequences][10], Sequenc
}
}
}
store.removeAll();
store->removeAll();
/* The store is a global variable that has been contructed through
* GlobalContext::sequenceStore singleton. It won't be destructed. However,
* we need to make sure that the pool is empty between quiz_cases. */
store->tidy();
}
void check_sum_of_sequence_between_bounds(double result, double start, double end, Sequence::Type type, const char * definition, const char * condition1, const char * condition2) {
Shared::GlobalContext globalContext;
SequenceStore store;
SequenceContext sequenceContext(&globalContext, &store);
SequenceStore * store = globalContext.sequenceStore();
SequenceContext sequenceContext(&globalContext, store);
Sequence * seq = addSequence(&store, type, definition, condition1, condition2, &globalContext);
Sequence * seq = addSequence(store, type, definition, condition1, condition2, &globalContext);
double sum = PoincareHelpers::ApproximateToScalar<double>(seq->sumBetweenBounds(start, end, &sequenceContext), &globalContext);
quiz_assert(std::fabs(sum - result) < 0.00000001);
store.removeAll();
store->removeAll();
store->tidy(); // Cf comment above
}
QUIZ_CASE(sequence_evaluation) {

2
apps/shared/global_context.cpp
View File

@@ -18,8 +18,6 @@ SequenceStore * GlobalContext::sequenceStore() {
return &sequenceStore;
}
bool GlobalContext::SymbolAbstractNameIsFree(const char * baseName) {
return SymbolAbstractRecordWithBaseName(baseName).isNull();
}