GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r771:fa4cc23d1d91

Updates cache strategy

Alexandre Leroux -

r771:fa4cc23d1d91

parent child

Context file:

r771:fa4cc23d1d91

Collapse all files

core/include/Variable/VariableCacheStrategyFactory.h created 644 +44 0

@@ -0,0 +1,44
	1	#ifndef SCIQLOP_VARIABLECACHESTRATEGYFACTORY_H
	2	#define SCIQLOP_VARIABLECACHESTRATEGYFACTORY_H
	3
	4
	5	#include <memory>
	6	#include <stdexcept>
	7
	8	#include "VariableCacheStrategy.h"
	9	#include "VariableSingleThresholdCacheStrategy.h"
	10
	11	#include <QLoggingCategory>
	12	#include <QString>
	13
	14	Q_LOGGING_CATEGORY(LOG_VariableCacheStrategyFactory, "VariableCacheStrategyFactory")
	15
	16	enum class CacheStrategy { SingleThreshold, TwoThreashold };
	17
	18	class VariableCacheStrategyFactory {
	19
	20	using cacheStratPtr = std::unique_ptr<VariableCacheStrategy>;
	21
	22	public:
	23	static cacheStratPtr createCacheStrategy(CacheStrategy specificStrategy)
	24	{
	25	switch (specificStrategy) {
	26	case CacheStrategy::SingleThreshold: {
	27	return std::unique_ptr<VariableCacheStrategy>{
	28	new VariableSingleThresholdCacheStrategy{}};
	29	break;
	30	}
	31	case CacheStrategy::TwoThreashold: {
	32	qCCritical(LOG_VariableCacheStrategyFactory())
	33	<< QObject::tr("cache strategy not implemented yet");
	34	break;
	35	}
	36	default:
	37	qCCritical(LOG_VariableCacheStrategyFactory())
	38	<< QObject::tr("Unknown cache strategy");
	39	}
	40	}
	41	};
	42
	43
	44	#endif // VARIABLECACHESTRATEGYFACTORY_H

core/include/Variable/VariableSingleThresholdCacheStrategy.h created 644 +32 0

@@ -0,0 +1,32
	1	#ifndef SCIQLOP_VARIABLESINGLETHRESHOLDCACHESTRATEGY_H
	2	#define SCIQLOP_VARIABLESINGLETHRESHOLDCACHESTRATEGY_H
	3
	4	#include "Settings/SqpSettingsDefs.h"
	5	#include "VariableCacheStrategy.h"
	6
	7
	8	/// This class aims to hande the cache strategy.
	9	class SCIQLOP_CORE_EXPORT VariableSingleThresholdCacheStrategy : public VariableCacheStrategy {
	10	public:
	11	VariableSingleThresholdCacheStrategy() = default;
	12
	13	std::pair<SqpRange, SqpRange> computeRange(const SqpRange &vRange,
	14	const SqpRange &rangeRequested) override
	15	{
	16
	17	auto varRanges = std::pair<SqpRange, SqpRange>{};
	18
	19	auto toleranceFactor = SqpSettings::toleranceValue(
	20	GENERAL_TOLERANCE_AT_UPDATE_KEY, GENERAL_TOLERANCE_AT_UPDATE_DEFAULT_VALUE);
	21	auto tolerance = toleranceFactor * (rangeRequested.m_TEnd - rangeRequested.m_TStart);
	22
	23	varRanges.first = rangeRequested;
	24	varRanges.second
	25	= SqpRange{rangeRequested.m_TStart - tolerance, rangeRequested.m_TEnd + tolerance};
	26
	27	return varRanges;
	28	}
	29	};
	30
	31
	32	#endif // SCIQLOP_VARIABLESINGLETHRESHOLDCACHESTRATEGY_H

core/include/Variable/VariableCacheStrategy.h +6 -15

@@ -18,23 +18,14 Q_DECLARE_LOGGING_CATEGORY(LOG_VariableCacheStrategy)
18		18
19	class Variable;	19	class Variable;
20		20
21	/**
22	* Possible types of zoom operation
23	*/
24	enum class CacheStrategy { FixedTolerance, TwoThreashold };
25
26	/// This class aims to hande the cache strategy.	21	/// This class aims to hande the cache strategy.
27	class SCIQLOP_CORE_EXPORT VariableCacheStrategy : ~~public~~ ~~QObject~~ {	22	class SCIQLOP_CORE_EXPORT VariableCacheStrategy {
28	Q_OBJECT
29	public:
30	explicit VariableCacheStrategy(QObject *parent = 0);
31
32	std::pair<SqpRange, SqpRange> computeStrategyRanges(const SqpRange &vRange,
33	const SqpRange &rangeRequested);
34		23
35	private:	24	public:
36	class VariableCacheStrategyPrivate;	25	virtual std::pair<SqpRange, SqpRange> computeRange(const SqpRange &vRange,
37	spimpl::unique_impl_ptr<VariableCacheStrategyPrivate> impl;	26	const SqpRange &rangeRequested)
		27	= 0;
38	};	28	};
39		29
		30
40	#endif // SCIQLOP_VARIABLECACHESTRATEGY_H	31	#endif // SCIQLOP_VARIABLECACHESTRATEGY_H

core/src/Data/VectorSeries.cpp +1 -1

                     result.push_back(xValues[i]);
                     result.push_back(yValues[i]);
                     result.push_back(zValues[i]);
+                }
                 return result;
             }

core/src/Variable/VariableController.cpp +5 -2

             #include <Variable/Variable.h>
             #include <Variable/VariableAcquisitionWorker.h>
             #include <Variable/VariableCacheStrategy.h>
+            #include <Variable/VariableCacheStrategyFactory.h>
             #include <Variable/VariableController.h>
             #include <Variable/VariableModel.h>
             #include <Variable/VariableSynchronizationGroup.h>
                         : m_WorkingMutex{},
                           m_VariableModel{new VariableModel{parent}},
                           m_VariableSelectionModel{new QItemSelectionModel{m_VariableModel, parent}},
-                          m_VariableCacheStrategy{std::make_unique<VariableCacheStrategy>()},
+                          // m_VariableCacheStrategy{std::make_unique<VariableCacheStrategy>()},
+                          m_VariableCacheStrategy{VariableCacheStrategyFactory::createCacheStrategy(
+                              CacheStrategy::SingleThreshold)},
                           m_VariableAcquisitionWorker{std::make_unique<VariableAcquisitionWorker>()},
                           q{parent}
                 {
                 auto varId = m_VariableToIdentifierMap.at(var);
                 auto varStrategyRangesRequested
-                    = m_VariableCacheStrategy->computeStrategyRanges(var->range(), rangeRequested);
+                    = m_VariableCacheStrategy->computeRange(var->range(), rangeRequested);
                 auto notInCacheRangeList = QVector<SqpRange>{varStrategyRangesRequested.second};
                 auto inCacheRangeList = QVector<SqpRange>{};

gui/meson.build +1 -1

               'ui/SidePane/SqpSidePane.ui',
               'ui/TimeWidget/TimeWidget.ui',
               'ui/Variable/VariableInspectorWidget.ui',
-              'ui/Variable/VariableMenuHeaderWidget.ui',
               'ui/Variable/RenameVariableDialog.ui',
+              'ui/Variable/VariableMenuHeaderWidget.ui',
               'ui/Visualization/VisualizationGraphWidget.ui',
               'ui/Visualization/VisualizationTabWidget.ui',
               'ui/Visualization/VisualizationWidget.ui',

core/src/Variable/VariableCacheStrategy.cpp removed 0 -52

NO CONTENT: file was removed

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