From c174bf947c6d6a58efad42a33ee63f95bff94dcb Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Fri, 5 Mar 2021 14:10:27 +0100 Subject: [PATCH] #7116 Janitor: Use CAF_ASSERT, not cassert. --- .../Application/Tools/RiaInterpolationTools.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ApplicationLibCode/Application/Tools/RiaInterpolationTools.cpp b/ApplicationLibCode/Application/Tools/RiaInterpolationTools.cpp index 0125f51685..6647bf5d92 100644 --- a/ApplicationLibCode/Application/Tools/RiaInterpolationTools.cpp +++ b/ApplicationLibCode/Application/Tools/RiaInterpolationTools.cpp @@ -18,7 +18,8 @@ #include "RiaInterpolationTools.h" -#include +#include "cafAssert.h" + #include #include #include @@ -45,7 +46,7 @@ double RiaInterpolationTools::linear( const std::vector& x, double value, ExtrapolationMode extrapolationMode ) { - assert( x.size() == y.size() ); + CAF_ASSERT( x.size() == y.size() ); // Handle cases with only one data point. if ( x.size() <= 1 ) @@ -83,7 +84,7 @@ double RiaInterpolationTools::linear( const std::vector& x, return extrapolate( x, y, value ); } - assert( extrapolationMode == ExtrapolationMode::NONE ); + CAF_ASSERT( extrapolationMode == ExtrapolationMode::NONE ); return std::numeric_limits::infinity(); } @@ -137,7 +138,7 @@ int RiaInterpolationTools::findNextDataPoint( const std::vector& values, //-------------------------------------------------------------------------------------------------- int RiaInterpolationTools::findPreviousDataPoint( const std::vector& values, int index ) { - assert( index >= 0 ); + CAF_ASSERT( index >= 0 ); for ( int i = index; i >= 0; i-- ) { @@ -177,7 +178,7 @@ int RiaInterpolationTools::interpolateRange( int start, const std::vector& x, std::vector& y ) { - assert( start <= end ); + CAF_ASSERT( start <= end ); std::vector xs = { x[firstPoint], x[lastPoint] }; std::vector ys = { y[firstPoint], y[lastPoint] }; @@ -194,7 +195,7 @@ int RiaInterpolationTools::interpolateRange( int start, //-------------------------------------------------------------------------------------------------- void RiaInterpolationTools::interpolateMissingValues( const std::vector& x, std::vector& y ) { - assert( x.size() == y.size() ); + CAF_ASSERT( x.size() == y.size() ); int index = 0;