Rename RimWellLogDiffCurve to RimWellLogCalculatedCurve and additional improvements

* Rename from DiffCurve to CalculatedCurve and add operators selection * Add option to select depth source for resampling in CalculatedCurve - Select source for depth values for resampling - Depths from first curve, second curve or union of these - Added unit tests for function creating union depth values and calculate value with selected operator. * Guard divide by zero * Adjust algorithm for union of depths - Prevent duplicated depth values (no need for enter/exist of k-layer when resampling) - Add threshold for depth distance - Update unit tests
2025-02-25 18:55:39 -06:00 · 2023-05-27 10:30:03 +02:00
parent a3efc16615
commit 5975fe6765
13 changed files with 635 additions and 333 deletions
--- a/ApplicationLibCode/UnitTests/RimWellLogCalculatedCurve-Test.cpp
+++ b/ApplicationLibCode/UnitTests/RimWellLogCalculatedCurve-Test.cpp
@@ -0,0 +1,95 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2023- Equinor ASA
+//
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+//
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
+//  for more details.
+//
+
+#include "gtest/gtest.h"
+
+#include "RimWellLogCalculatedCurve.h"
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+TEST( RimWellLogCalculatedCurve, unionDepthValuesFromVectors_singleValuesInDepthVectors )
+{
+    // Depth vectors without duplicates
+    const std::vector<double> depthValues1 = { 1.0, 2.0, 3.0, 4.0 };
+    const std::vector<double> depthValues2 = { 2.0, 3.0, 4.0, 5.0 };
+    const double              threshold    = 0.1;
+
+    // Expected duplicate occurrence of common depth values
+    const std::vector<double> expectedUnionDepthValues = { 1.0, 2.0, 3.0, 4.0, 5.0 };
+
+    // Call the function under test
+    const std::vector<double> unionDepthValues =
+        RimWellLogCalculatedCurve::unionDepthValuesFromVectors( depthValues1, depthValues2, threshold );
+
+    ASSERT_EQ( unionDepthValues, expectedUnionDepthValues );
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+TEST( RimWellLogCalculatedCurve, unionDepthValuesFromVectors_duplicateValuesInDepthVectors )
+{
+    // Depth vectors with duplicates
+    const std::vector<double> depthValues1 = { 0.0, 0.5, 0.5, 1.0, 1.0, 1.5, 1.5 };
+    const std::vector<double> depthValues2 = { 1.5, 1.5, 2.0, 2.0, 2.5, 2.5, 3.0 };
+    const double              threshold    = 0.1;
+
+    // Expected no duplicate occurrences of depth values
+    const std::vector<double> expectedUnionDepthValues = { 0.0, 0.5, 1.0, 1.5, 2.0, 2.5, 3.0 };
+
+    // Call the function under test
+    const std::vector<double> unionDepthValues =
+        RimWellLogCalculatedCurve::unionDepthValuesFromVectors( depthValues1, depthValues2, threshold );
+
+    ASSERT_EQ( unionDepthValues, expectedUnionDepthValues );
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+TEST( RimWellLogCalculatedCurve, unionDepthValuesFromVectors_thresholdVerification )
+{
+    // Depth vectors with duplicates
+    const std::vector<double> depthValues1 = { 0.0, 0.5, 1.0, 1.5 };
+    const std::vector<double> depthValues2 = { 2.0, 2.5, 3.0, 4.0 };
+    const double              threshold    = 0.6;
+
+    // Expected every second value to be skipped due to threshold
+    const std::vector<double> expectedUnionDepthValues = { 0.0, 1.0, 2.0, 3.0, 4.0 };
+
+    // Call the function under test
+    const std::vector<double> unionDepthValues =
+        RimWellLogCalculatedCurve::unionDepthValuesFromVectors( depthValues1, depthValues2, threshold );
+
+    ASSERT_EQ( unionDepthValues, expectedUnionDepthValues );
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+TEST( RimWellLogCalculatedCurve, calculateValue )
+{
+    ASSERT_DOUBLE_EQ( 7.0, RimWellLogCalculatedCurve::calculateValue( 5.0, 2.0, RimWellLogCalculatedCurve::Operators::ADD ) );
+    ASSERT_DOUBLE_EQ( 3.0, RimWellLogCalculatedCurve::calculateValue( 5.0, 2.0, RimWellLogCalculatedCurve::Operators::SUBTRACT ) );
+    ASSERT_DOUBLE_EQ( 2.5, RimWellLogCalculatedCurve::calculateValue( 5.0, 2.0, RimWellLogCalculatedCurve::Operators::DIVIDE ) );
+    ASSERT_DOUBLE_EQ( 10.0, RimWellLogCalculatedCurve::calculateValue( 5.0, 2.0, RimWellLogCalculatedCurve::Operators::MULTIPLY ) );
+
+    // Divide by zero
+    ASSERT_DOUBLE_EQ( std::numeric_limits<double>::infinity(),
+                      RimWellLogCalculatedCurve::calculateValue( 5.0, 0.0, RimWellLogCalculatedCurve::Operators::DIVIDE ) );
+}