OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Renamed method

Browse Source
This commit is contained in:
Pål Hagen 2015-10-12 15:00:40 +02:00
parent 507c30b93f
commit ba879f0c34
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/ProjectDataModel_UnitTests/RimWellLogExtractionCurveImpl-Test.cpp
View File

@ -19,7 +19,7 @@ TEST(RimWellLogExtractionCurveImplTest, StripOffInvalidValAtEndsOfVector)
values.push_back(HUGE_VAL);
std::vector< std::pair<size_t, size_t> > valuesIntervals;
RimWellLogExtractionCurveImpl::validValuesIntervals(values, valuesIntervals);
RimWellLogExtractionCurveImpl::calculateIntervalsOfValidValues(values, valuesIntervals);
EXPECT_EQ(1, valuesIntervals.size());
EXPECT_EQ(2, valuesIntervals[0].first);
@ -43,7 +43,7 @@ TEST(RimWellLogExtractionCurveImplTest, StripOffHugeValAtEndsAndInteriorOfVector
values.push_back(HUGE_VAL);
std::vector< std::pair<size_t, size_t> > valuesIntervals;
RimWellLogExtractionCurveImpl::validValuesIntervals(values, valuesIntervals);
RimWellLogExtractionCurveImpl::calculateIntervalsOfValidValues(values, valuesIntervals);
EXPECT_EQ(2, valuesIntervals.size());
EXPECT_EQ(2, valuesIntervals[0].first);

4
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveImpl.cpp
View File

@ -31,7 +31,7 @@
void RimWellLogExtractionCurveImpl::validCurvePointIntervals(const std::vector<double>& depthValues, const std::vector<double>& values, std::vector< std::pair<size_t, size_t> >& intervals)
{
std::vector< std::pair<size_t, size_t> > valuesIntervals;
validValuesIntervals(values, valuesIntervals);
calculateIntervalsOfValidValues(values, valuesIntervals);
intervals = valuesIntervals;
@ -58,7 +58,7 @@ void RimWellLogExtractionCurveImpl::validCurvePointIntervals(const std::vector<d
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellLogExtractionCurveImpl::validValuesIntervals(const std::vector<double>& values, std::vector< std::pair<size_t, size_t> >& intervals)
void RimWellLogExtractionCurveImpl::calculateIntervalsOfValidValues(const std::vector<double>& values, std::vector< std::pair<size_t, size_t> >& intervals)
{
int startIdx = -1;
size_t vIdx = 0;

2
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveImpl.h
View File

@ -30,7 +30,7 @@
class RimWellLogExtractionCurveImpl
{
public:
static void validValuesIntervals(const std::vector<double>& values, std::vector< std::pair<size_t, size_t> >& intervals);
static void calculateIntervalsOfValidValues(const std::vector<double>& values, std::vector< std::pair<size_t, size_t> >& intervals);
static void validDepthValuesIntervals(const std::vector<double>& depthValues, size_t startIdx, size_t stopIdx, std::vector< std::pair<size_t, size_t> >& intervals);
static void validCurvePointIntervals(const std::vector<double>& depthValues, const std::vector<double>& values, std::vector< std::pair<size_t, size_t> >& intervals);
static void addValuesFromIntervals(const std::vector<double>& values, std::vector< std::pair<size_t, size_t> >& intervals, std::vector<double>* filteredValues);

2
ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp
View File

@ -86,7 +86,7 @@ void RimWellLogFileCurve::updatePlotData()
if (values.size() > 0 && depthValues.size() > 0)
{
std::vector< std::pair<size_t, size_t> > valuesIntervals;
RimWellLogExtractionCurveImpl::validValuesIntervals(values, valuesIntervals);
RimWellLogExtractionCurveImpl::calculateIntervalsOfValidValues(values, valuesIntervals);
std::vector<double> filteredValues;
std::vector<double> filteredDepths;