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

(#541) Renamed some methods and variables

Browse Source
This commit is contained in:
Pål Hagen 2015-10-15 12:01:47 +02:00
parent a173694542
commit d74b4333f2
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/ReservoirDataModel/RigWellLogCurveData.cpp
View File

@ -45,7 +45,7 @@ void RigWellLogCurveData::setPoints(const std::vector<double>& xValues, const st
m_xValues = xValues;
m_yValues = yValues;
calculateValidPointIntervals();
calculateValidXValuesIntervals();
}
//--------------------------------------------------------------------------------------------------
@ -67,9 +67,9 @@ const std::vector<double>& RigWellLogCurveData::yValues() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector< std::pair<size_t, size_t> >& RigWellLogCurveData::intervals() const
const std::vector< std::pair<size_t, size_t> >& RigWellLogCurveData::filteredIntervals() const
{
return m_validPointIntervals;
return m_validXValuesIntervals;
}
//--------------------------------------------------------------------------------------------------
@ -78,7 +78,7 @@ const std::vector< std::pair<size_t, size_t> >& RigWellLogCurveData::intervals()
std::vector<double> RigWellLogCurveData::validXValues() const
{
std::vector<double> filteredValues;
addValuesFromIntervals(m_xValues, m_validPointIntervals, &filteredValues);
pickValuesFromIntervals(m_xValues, m_validXValuesIntervals, &filteredValues);
return filteredValues;
}
@ -89,7 +89,7 @@ std::vector<double> RigWellLogCurveData::validXValues() const
std::vector<double> RigWellLogCurveData::validYValues() const
{
std::vector<double> filteredValues;
addValuesFromIntervals(m_yValues, m_validPointIntervals, &filteredValues);
pickValuesFromIntervals(m_yValues, m_validXValuesIntervals, &filteredValues);
return filteredValues;
}
@ -100,7 +100,7 @@ std::vector<double> RigWellLogCurveData::validYValues() const
std::vector< std::pair<size_t, size_t> > RigWellLogCurveData::validPointsIntervals() const
{
std::vector< std::pair<size_t, size_t> > intervals;
filteredIntervals(m_validPointIntervals, &intervals);
computeFilteredIntervals(m_validXValuesIntervals, &intervals);
return intervals;
}
@ -109,9 +109,9 @@ std::vector< std::pair<size_t, size_t> > RigWellLogCurveData::validPointsInterva
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigWellLogCurveData::calculateValidPointIntervals()
void RigWellLogCurveData::calculateValidXValuesIntervals()
{
calculateIntervalsOfValidValues(m_xValues, &m_validPointIntervals);
calculateIntervalsOfValidValues(m_xValues, &m_validXValuesIntervals);
}
//--------------------------------------------------------------------------------------------------
@ -154,7 +154,7 @@ void RigWellLogCurveData::calculateIntervalsOfValidValues(const std::vector<doub
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigWellLogCurveData::addValuesFromIntervals(const std::vector<double>& values, const std::vector< std::pair<size_t, size_t> >& intervals, std::vector<double>* filteredValues)
void RigWellLogCurveData::pickValuesFromIntervals(const std::vector<double>& values, const std::vector< std::pair<size_t, size_t> >& intervals, std::vector<double>* filteredValues)
{
CVF_ASSERT(filteredValues);
@ -170,7 +170,7 @@ void RigWellLogCurveData::addValuesFromIntervals(const std::vector<double>& valu
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigWellLogCurveData::filteredIntervals(const std::vector< std::pair<size_t, size_t> >& intervals, std::vector< std::pair<size_t, size_t> >* fltrIntervals)
void RigWellLogCurveData::computeFilteredIntervals(const std::vector< std::pair<size_t, size_t> >& intervals, std::vector< std::pair<size_t, size_t> >* fltrIntervals)
{
CVF_ASSERT(fltrIntervals);

10
ApplicationCode/ReservoirDataModel/RigWellLogCurveData.h
View File

@ -37,21 +37,21 @@ public:
const std::vector<double>& xValues() const;
const std::vector<double>& yValues() const;
const std::vector< std::pair<size_t, size_t> >& intervals() const;
const std::vector< std::pair<size_t, size_t> >& filteredIntervals() const;
std::vector<double> validXValues() const;
std::vector<double> validYValues() const;
std::vector< std::pair<size_t, size_t> > validPointsIntervals() const;
private:
void calculateValidPointIntervals();
void calculateValidXValuesIntervals();
static void calculateIntervalsOfValidValues(const std::vector<double>& values, std::vector< std::pair<size_t, size_t> >* intervals);
static void addValuesFromIntervals(const std::vector<double>& values, const std::vector< std::pair<size_t, size_t> >& intervals, std::vector<double>* filteredValues);
static void filteredIntervals(const std::vector< std::pair<size_t, size_t> >& intervals, std::vector< std::pair<size_t, size_t> >* fltrIntervals);
static void pickValuesFromIntervals(const std::vector<double>& values, const std::vector< std::pair<size_t, size_t> >& intervals, std::vector<double>* filteredValues);
static void computeFilteredIntervals(const std::vector< std::pair<size_t, size_t> >& intervals, std::vector< std::pair<size_t, size_t> >* filteredIntervals);
private:
std::vector<double> m_xValues;
std::vector<double> m_yValues;
std::vector< std::pair<size_t, size_t> > m_validPointIntervals;
std::vector< std::pair<size_t, size_t> > m_validXValuesIntervals;
};