#7400 StimPlanModel: Cache calculated results.

ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModel.cpp

@@ -379,6 +379,7 @@ void RimStimPlanModel::fieldChangedByUi( const caf::PdmFieldHandle* changedField
     }
     else
     {
+        m_calculator->clearCache();
         updateViewsAndPlots();
     }
 }
@@ -1692,6 +1693,8 @@ RimStimPlanModelTemplate* RimStimPlanModel::stimPlanModelTemplate() const
 //--------------------------------------------------------------------------------------------------
 void RimStimPlanModel::stimPlanModelTemplateChanged( const caf::SignalEmitter* emitter )
 {
+    m_calculator->clearCache();
+
     if ( m_stimPlanModelTemplate() )
     {
         m_eclipseCase                = m_stimPlanModelTemplate()->dynamicEclipseCase();

ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCalculator.cpp

@@ -77,18 +77,56 @@ bool RimStimPlanModelCalculator::extractCurveData( RiaDefines::CurveProperty cur
                                                    std::vector<double>&      tvDepthValues,
                                                    double&                   rkbDiff ) const
 {
-    for ( const auto& calculator : m_resultCalculators )
+    ResultKey key  = std::make_pair( curveProperty, timeStep );
+    auto      data = m_resultCache.find( key );
+    if ( data != m_resultCache.end() )
     {
-        if ( calculator->isMatching( curveProperty ) )
+        // Cache hit: reuse previous result
+        auto [cachedValues, cachedMeasuredDepthValues, cachedTvDepthValues, cachedRkbDiff] = data->second;
+
+        values              = cachedValues;
+        measuredDepthValues = cachedMeasuredDepthValues;
+        tvDepthValues       = cachedTvDepthValues;
+        rkbDiff             = cachedRkbDiff;
+        return true;
+    }
+    else
+    {
+        // Cache miss: try to calculate the request data
+        for ( const auto& calculator : m_resultCalculators )
         {
-            return calculator
+            if ( calculator->isMatching( curveProperty ) )
-                ->calculate( curveProperty, m_stimPlanModel, timeStep, values, measuredDepthValues, tvDepthValues, rkbDiff );
+            {
+                bool isOk = calculator->calculate( curveProperty,
+                                                   m_stimPlanModel,
+                                                   timeStep,
+                                                   values,
+                                                   measuredDepthValues,
+                                                   tvDepthValues,
+                                                   rkbDiff );
+
+                if ( isOk )
+                {
+                    // Populate cache when calculation succeeds
+                    m_resultCache[key] = std::make_tuple( values, measuredDepthValues, tvDepthValues, rkbDiff );
+                }
+
+                return isOk;
+            }
         }
     }
 
     return false;
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimStimPlanModelCalculator::clearCache()
+{
+    m_resultCache.clear();
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCalculator.h

@@ -21,6 +21,7 @@
 
 #include "RimStimPlanModelPropertyCalculator.h"
 
+#include <map>
 #include <memory>
 #include <vector>
 
@@ -66,6 +67,8 @@ public:
 
     void calculateTemperature( std::vector<double>& temperatures ) const;
 
+    void clearCache();
+
 protected:
     std::vector<double> findCurveAndComputeLayeredAverage( RiaDefines::CurveProperty curveProperty ) const;
     std::vector<double> findCurveXValuesByProperty( RiaDefines::CurveProperty curveProperty ) const;
@@ -93,4 +96,8 @@ protected:
 private:
     RimStimPlanModel*                                                m_stimPlanModel;
     std::vector<std::unique_ptr<RimStimPlanModelPropertyCalculator>> m_resultCalculators;
+
+    typedef std::pair<RiaDefines::CurveProperty, int>                                         ResultKey;
+    typedef std::tuple<std::vector<double>, std::vector<double>, std::vector<double>, double> ResultData;
+    mutable std::map<ResultKey, ResultData>                                                   m_resultCache;
 };