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

[tests] Fix tests (use new methods)

Browse Source
This commit is contained in:
Léa Saviot
2019-09-03 10:09:36 +02:00
parent b712338a18
commit bc2eba1726
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ void check_sequences_defined_by(double result[MaxNumberOfSequences][10], Sequenc
for (int j = 0; j < 10; j++) {
for (int i = 0; i < MaxNumberOfSequences; i++) {
if (seqs[i]->isDefined()) {
double un = seqs[i]->evaluateAtAbscissa((double)j, &sequenceContext);
double un = seqs[i]->evaluateXYAtParameter((double)j, &sequenceContext).x2();
quiz_assert((std::isnan(un) && std::isnan(result[i][j])) || (un == result[i][j]));
}
}

12
poincare/test/function_solver.cpp
View File

@@ -45,10 +45,10 @@ void assert_next_extrema_are(
} else if (extremumType == ExtremumType::Root) {
nextExtrema = Coordinate2D<double>(e.nextRoot(symbol, currentStart, step, max, context, complexFormat, angleUnit), 0.0 );
}
currentStart = nextExtrema.x() + step;
currentStart = nextExtrema.x1() + step;
quiz_assert_log_if_failure(
(doubles_are_approximately_equal(extrema[i].x(), nextExtrema.x()))
&& (doubles_are_approximately_equal(extrema[i].y(), nextExtrema.y())),
(doubles_are_approximately_equal(extrema[i].x1(), nextExtrema.x1()))
&& (doubles_are_approximately_equal(extrema[i].x2(), nextExtrema.x2())),
e);
}
}
@@ -195,10 +195,10 @@ void assert_next_intersections_are(
for (int i = 0; i < numberOfIntersections; i++) {
quiz_assert_log_if_failure(!std::isnan(currentStart), e);
Coordinate2D<double> nextIntersection = e.nextIntersection(symbol, currentStart, step, max, context, complexFormat, angleUnit, otherExpression);
currentStart = nextIntersection.x() + step;
currentStart = nextIntersection.x1() + step;
quiz_assert_log_if_failure(
(doubles_are_approximately_equal(intersections[i].x(), nextIntersection.x()))
&& (doubles_are_approximately_equal(intersections[i].y(), nextIntersection.y())),
(doubles_are_approximately_equal(intersections[i].x1(), nextIntersection.x1()))
&& (doubles_are_approximately_equal(intersections[i].x2(), nextIntersection.x2())),
e);
}
}