##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SciQLop-fork
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Merge pull request 233 from SCIQLOP-Initialisation develop...
leroux -
r619:3ec53f32541f merge
parent child
Show More
Show file before | Show file after | Hide comments
@@ -2,6 +2,7
2 #define SCIQLOP_SORTUTILS_H
2 #define SCIQLOP_SORTUTILS_H
3
3
4 #include <algorithm>
4 #include <algorithm>
5 #include <cmath>
5 #include <numeric>
6 #include <numeric>
6 #include <vector>
7 #include <vector>
7
8
Show file before | Show file after | Hide comments
@@ -2,6 +2,8
2 #include "Data/ScalarSeries.h"
2 #include "Data/ScalarSeries.h"
3 #include "Data/VectorSeries.h"
3 #include "Data/VectorSeries.h"
4
4
5 #include <cmath>
6
5 #include <QObject>
7 #include <QObject>
6 #include <QtTest>
8 #include <QtTest>
7
9
@@ -465,8 +467,8 void TestDataSeries::testValuesBoundsScalar_data()
465 QTest::newRow("scalarBounds4")
467 QTest::newRow("scalarBounds4")
466 << createScalarSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.}) << 5.1 << 6.
468 << createScalarSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.}) << 5.1 << 6.
467 << false << nan << nan;
469 << false << nan << nan;
468 QTest::newRow("scalarBounds5")
470 QTest::newRow("scalarBounds5") << createScalarSeries({1.}, {100.}) << 0. << 2. << true << 100.
469 << createScalarSeries({1.}, {100.}) << 0. << 2. << true << 100. << 100.;
471 << 100.;
470 QTest::newRow("scalarBounds6") << createScalarSeries({}, {}) << 0. << 2. << false << nan << nan;
472 QTest::newRow("scalarBounds6") << createScalarSeries({}, {}) << 0. << 2. << false << nan << nan;
471
473
472 // Tests with NaN values: NaN values are not included in min/max search
474 // Tests with NaN values: NaN values are not included in min/max search
Show file before | Show file after | Hide comments
@@ -9,6 +9,7
9 #include <Variable/Variable.h>
9 #include <Variable/Variable.h>
10 #include <Variable/VariableController.h>
10 #include <Variable/VariableController.h>
11
11
12 #include <cmath>
12 #include <QUuid>
13 #include <QUuid>
13 #include <SqpApplication.h>
14 #include <SqpApplication.h>
14
15
General Comments 0
You need to be logged in to leave comments. Login now