HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/SciQLOPCore Commit - r6:d9ddd9092db4

Added DateTimeRange unit Tests...

jeandet -

r6:d9ddd9092db4

parent child

Context file:

r6:d9ddd9092db4

tests/Data/TestDateTimeRange.cpp created 644 +106 0

@@ -0,0 +1,106
	1	#include <QObject>
	2	#include <QtTest>
	3	#include <QUuid>
	4	#include <limits>
	5
	6
	7	#include <Data/DateTimeRange.h>
	8	#include <Common/Numeric.h>
	9
	10	Q_DECLARE_METATYPE(Seconds<double>);
	11
	12	DateTimeRange computeZoom(QDateTime start, QDateTime stop, double zoom)
	13	{
	14	double start_epoch = start.toMSecsSinceEpoch();
	15	double stop_epoch = stop.toMSecsSinceEpoch();
	16	auto delta = stop_epoch - start_epoch;
	17	auto dt_ms = (zoom-1.)*(double(delta))/2.;
	18	return DateTimeRange{(start_epoch - dt_ms)/1000., (stop_epoch + dt_ms)/1000.};
	19	}
	20
	21	class TestDateTimeRange: public QObject {
	22	Q_OBJECT
	23
	24	private slots:
	25	void testRangeDelta_data()
	26	{
	27	QTest::addColumn<QDateTime>("tstart");
	28	QTest::addColumn<QDateTime>("tend");
	29	QTest::addColumn<double>("expected");
	30	auto now = QDateTime::currentDateTime();
	31	auto yesterday = QDateTime::currentDateTime().addDays(-1);
	32	QTest::newRow("No delta") << now << now << 0.;
	33	QTest::newRow("One day delta") << yesterday << now << 60.60.24.;
	34	QTest::newRow("Minus one day delta") << now << yesterday << -60.60.24.;
	35	}
	36
	37	void testRangeDelta()
	38	{
	39	QFETCH(QDateTime,tstart);
	40	QFETCH(QDateTime,tend);
	41	QFETCH(double,expected);
	42	auto range = DateTimeRange::fromDateTime(tstart, tend);
	43	double delta = range.delta();
	44	// Since it is built from QDateTime don't expect better resolution
	45	QVERIFY((delta-expected) <= 0.002);
	46	}
	47
	48	void testRangeShift_data()
	49	{
	50	QTest::addColumn<DateTimeRange>("initial");
	51	QTest::addColumn<Seconds<double>>("shift");
	52	QTest::addColumn<DateTimeRange>("expected");
	53	auto now = QDateTime::currentDateTime();
	54	auto yestd = QDateTime::currentDateTime().addDays(-1);
	55	auto range = DateTimeRange::fromDateTime(yestd, now);
	56	QTest::newRow("No shift") << range << Seconds<double>{0.} << range;
	57
	58	QTest::newRow("One milisecond left") << range << Seconds<double>{-.001} <<
	59	DateTimeRange::fromDateTime(yestd.addMSecs(-1.), now.addMSecs(-1.));
	60	QTest::newRow("One milisecond right") << range << Seconds<double>{.001} <<
	61	DateTimeRange::fromDateTime(yestd.addMSecs(1.), now.addMSecs(1.));
	62	QTest::newRow("One second left") << range << Seconds<double>{-1.} <<
	63	DateTimeRange::fromDateTime(yestd.addSecs(-1.), now.addSecs(-1.));
	64	QTest::newRow("One second right") << range << Seconds<double>{1.} <<
	65	DateTimeRange::fromDateTime(yestd.addSecs(1.), now.addSecs(1.));
	66	QTest::newRow("One year left") << range << Seconds<double>{-365.24.60.*60.} <<
	67	DateTimeRange::fromDateTime(yestd.addYears(-1.), now.addYears(-1.));
	68	QTest::newRow("One year right") << range << Seconds<double>{365.24.60.*60.} <<
	69	DateTimeRange::fromDateTime(yestd.addYears(1.), now.addYears(1.));
	70	}
	71	void testRangeShift()
	72	{
	73	QFETCH(DateTimeRange,initial);
	74	QFETCH(Seconds<double>,shift);
	75	QFETCH(DateTimeRange,expected);
	76	QCOMPARE(initial+shift, expected);
	77	}
	78
	79	void testRangeZoom_data()
	80	{
	81	QTest::addColumn<DateTimeRange>("initial");
	82	QTest::addColumn<double>("zoom");
	83	QTest::addColumn<DateTimeRange>("expected");
	84	auto now = QDateTime::currentDateTime();
	85	auto yestd = QDateTime::currentDateTime().addDays(-1);
	86	auto range = DateTimeRange::fromDateTime(yestd, now);
	87	QTest::newRow("No zoom") << range << 1. << range;
	88
	89	QTest::newRow("Zoom IN 0.001") << range << 1.001 <<
	90	computeZoom(yestd, now, 1.001);
	91	QTest::newRow("Zoom OUT 0.001") << range << 0.999 <<
	92	computeZoom(yestd, now, 0.999);
	93	}
	94	void testRangeZoom()
	95	{
	96	QFETCH(DateTimeRange,initial);
	97	QFETCH(double,zoom);
	98	QFETCH(DateTimeRange,expected);
	99	QCOMPARE(initial*zoom, expected);
	100	}
	101
	102	};
	103	QTEST_MAIN(TestDateTimeRange)
	104
	105
	106	#include "TestDateTimeRange.moc"

include/Common/Numeric.h +8 0

+            #ifndef NUMERIC_H
+            #define NUMERIC_H
             #include <cmath>
             #include <limits>
             #include <type_traits>
             #include <algorithm>
+            namespace SciQLop::numeric {
             /*
              taken from here https://en.cppreference.com/w/cpp/types/numeric_limits/epsilon
             */
                 // unless the result is subnormal
                        || std::abs(x-y) < std::numeric_limits<T>::min();
             }
+            }
+            #endif

include/Data/DateTimeRange.h +13 -8

             #ifndef SCIQLOP_SQPRANGE_H
             #define SCIQLOP_SQPRANGE_H
+            #include <cmath>
             #include <QObject>
             #include <QDebug>
+            #include <opaque/numeric_typedef.hpp>
             #include <Common/DateUtils.h>
             #include <Common/MetaTypes.h>
-            #include <opaque/numeric_typedef.hpp>
+            #include <Common/Numeric.h>
-            #include <cmath>
             template <typename T>
             {
               using base  = opaque::numeric_typedef<T, Seconds<T>>;
               using base::base;
+              operator T () const {return this->value;}
             };
             /**
                             DateUtils::secondsSinceEpoch(QDateTime{endDate, endTime, Qt::UTC})};
                 }
+                static DateTimeRange fromDateTime(const QDateTime &start,  const QDateTime &end)
+                {
+                    return {DateUtils::secondsSinceEpoch(start),
+                            DateUtils::secondsSinceEpoch(end)};
+                }
                 /// Start time (UTC)
                 double m_TStart;
                 /// End time (UTC)
                 bool operator==(const DateTimeRange &other) const
                 {
-                    auto equals = [](const auto &v1, const auto &v2) {
+                    return SciQLop::numeric::almost_equal(m_TStart, other.m_TStart, 1.) &&
-                        return (std::isnan(v1) && std::isnan(v2)) || v1 == v2;
+                            SciQLop::numeric::almost_equal(m_TEnd, other.m_TEnd, 1.);
-                    };
-                    return equals(m_TStart, other.m_TStart) && equals(m_TEnd, other.m_TEnd);
                 }
                 bool operator!=(const DateTimeRange &other) const { return !(*this == other); }
                 void grow(double factor)

src/Variable/VariableController.cpp +1 -1

             AcquisitionZoomType VariableController::getZoomType(const DateTimeRange &range, const DateTimeRange &oldRange)
             {
-                if (almost_equal(static_cast<double>(range.delta()), static_cast<double>(oldRange.delta()), 1)) // same delta -> must be a pan or nothing
+                if (SciQLop::numeric::almost_equal<double>(range.delta(), oldRange.delta(), 1)) // same delta -> must be a pan or nothing
                 {
                     if(range.m_TStart > oldRange.m_TStart)
                         return AcquisitionZoomType::PanRight;

src/Variable/VariableController2.cpp +3 0

             #include "Variable/VariableController2.h"
+            #include "Variable/VariableSynchronizationGroup2.h"
             #include <Common/containers.h>
             #include <Common/debug.h>
             #include <Data/DataProviderParameters.h>
             {
                 std::set<std::shared_ptr<Variable>> _variables;
                 QMap<QUuid,std::shared_ptr<IDataProvider>> _providers;
+                QMap<QUuid,std::shared_ptr<VariableSynchronizationGroup2>> _synchronizationGroups;
             public:
                 VariableController2Private(QObject* parent=Q_NULLPTR)
                 {
                     auto newVar = std::make_shared<Variable>(name,metadata);
                     this->_variables.insert(newVar);
                     this->_providers[newVar->ID()] = provider;
+                    this->_synchronizationGroups[newVar->ID()] = std::make_shared<VariableSynchronizationGroup2>(newVar->ID());
                     return newVar;
                 }

src/pybind11_wrappers/CoreWrappers.cpp +1 -1

                 py::class_<DateTimeRange>(m,"SqpRange")
-                        .def("fromDateTime", &DateTimeRange::fromDateTime, py::return_value_policy::move)
+                        //.def("fromDateTime", &DateTimeRange::fromDateTime, py::return_value_policy::move)
                         .def(py::init([](double start, double stop){return DateTimeRange{start, stop};}))
                         .def(py::init([](system_clock::time_point start, system_clock::time_point stop)
                 {

tests/CMakeLists.txt +2 0

             declare_test(TestContainers TestContainers Common/TestContainers.cpp "sciqlopcore;Qt5::Test")
             declare_test(TestSyncGroup TestSyncGroup Variable/TestSyncGroup.cpp "sciqlopcore;Qt5::Test")
+            declare_test(TestDateTimeRange TestDateTimeRange Data/TestDateTimeRange.cpp "sciqlopcore;Qt5::Test")
             declare_test(TestDataSeriesUtils TestDataSeriesUtils Data/TestDataSeriesUtils.cpp "sciqlopcore;Qt5::Test")
             declare_test(TestOptionalAxis TestOptionalAxis Data/TestOptionalAxis.cpp "sciqlopcore;Qt5::Test")

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages