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

Moved remaining code from RimWellLogCurveImpl to RigWellLogCurveData

Browse Source 
Removed class RimWellLogCurveImpl.
RigWellLogCurveData::calculateValidPointsIntervals() needs to be
harmonized with new way of extracting depths from well paths.
This commit is contained in:
Pål Hagen
2015-10-15 13:29:45 +02:00
parent c2577391c2
commit 956beba118
7 changed files with 70 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/ReservoirDataModel/RigWellLogCurveData.h
View File

@@ -46,16 +46,17 @@ public:
std::vector< std::pair<size_t, size_t> > validPointsIntervals() const;
private:
void calculateValidXValuesIntervals();
void calculateValidPointsIntervals();
static void calculateIntervalsOfValidValues(const std::vector<double>& values, std::vector< std::pair<size_t, size_t> >* intervals);
static void pickValuesFromIntervals(const std::vector<double>& values, const std::vector< std::pair<size_t, size_t> >& intervals, std::vector<double>* filteredValues);
static void calculateIntervalsOfValidDepthValues(const std::vector<double>& depthValues, size_t startIdx, size_t stopIdx, std::vector< std::pair<size_t, size_t> >* intervals);
static void getValuesByIntervals(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_validXValuesIntervals;
std::vector< std::pair<size_t, size_t> > m_validPointsIntervals;
friend class RigWellLogCurveDataTestInterface;
};