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

#2003 Observed Data : Merge tables if DATE is present and size is equal

Browse Source
This commit is contained in:
Magne Sjaastad
2017-11-03 17:42:07 +01:00
parent 7d3a547ad6
commit 296bacf7f6
4 changed files with 51 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/FileInterface/RifColumnBasedUserDataParser.cpp
View File

@@ -72,6 +72,8 @@ void RifColumnBasedUserDataParser::parseTableData(const QString& data)
std::stringstream streamData;
streamData.str(stdData);
std::vector<TableData> rawTables;
do
{
std::vector<std::string> errorStrings;
@@ -125,7 +127,9 @@ void RifColumnBasedUserDataParser::parseTableData(const QString& data)
}
} while (std::getline(streamData, line));
m_tableDatas.push_back(table);
rawTables.push_back(table);
} while (streamData.good());
m_tableDatas = RifEclipseUserDataParserTools::mergeEqualTimeSteps(rawTables);
}

73
ApplicationCode/FileInterface/RifEclipseUserDataParserTools.cpp
View File

@@ -754,60 +754,54 @@ std::vector<size_t> RifEclipseUserDataParserTools::columnIndexForWords(const std
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<std::vector<ColumnInfo>> RifEclipseUserDataParserTools::mergeEqualTimeSteps(const std::vector<std::vector<ColumnInfo>>& tables)
std::vector<TableData> RifEclipseUserDataParserTools::mergeEqualTimeSteps(const std::vector<TableData>& tables)
{
return tables;
/*
if (tables.size() < 2)
{
return tables;
}
const ColumnInfo* timeCi = nullptr;
for (const ColumnInfo& ci : tables[0])
if (tables[0].columnInfos().size() == 0) return tables;
ColumnInfo* dateColumn = nullptr;
for (auto c : tables[0].columnInfos())
{
if (!ci.isAVector)
if (c.summaryAddress.quantityName() == "DATE")
{
timeCi = &ci;
break;
dateColumn = &c;
}
}
if (!timeCi)
// Support only merge of tables with the DATE column present
if (!dateColumn) return tables;
std::vector<TableData> largeTables;
largeTables.push_back(tables[0]);
TableData& firstTable = largeTables[0];
size_t itemsInFirstTable = tables[0].columnInfos()[0].itemCount();
for (size_t i = 1; i < tables.size(); i++)
{
return tables;
}
std::vector<std::vector<ColumnInfo>> largeTables;
{
std::vector<ColumnInfo> largeTable;
largeTable.push_back(*timeCi);
for (const auto& t : tables)
if (tables[i].columnInfos().size() > 0 &&
tables[i].columnInfos()[0].itemCount() == itemsInFirstTable)
{
if (t.size() > 0 && t[0].itemCount() != timeCi->itemCount())
for (auto& c : tables[i].columnInfos())
{
largeTables.push_back(t);
continue;
}
for (const auto& c : t)
{
if (c.isAVector &&
c.values.size() == timeCi->observationDateTimes.size())
if (c.summaryAddress.quantityName() != "DATE")
{
largeTable.push_back(c);
firstTable.columnInfos().push_back(c);
}
}
}
largeTables.push_back(largeTable);
else
{
largeTables.push_back(tables[i]);
}
}
return largeTables;
*/
}
//--------------------------------------------------------------------------------------------------
@@ -838,6 +832,19 @@ bool RifEclipseUserDataParserTools::isUnitText(const std::string& word)
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
size_t ColumnInfo::itemCount() const
{
if (isStringData)
{
return stringValues.size();
}
else
return values.size();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/FileInterface/RifEclipseUserDataParserTools.h
View File

@@ -48,6 +48,8 @@ public:
{
}
size_t itemCount() const;
public:
static ColumnInfo createColumnInfo(const std::string& quantity, const std::string& unit, const RifEclipseSummaryAddress& adr);
@@ -146,7 +148,7 @@ public:
static std::vector<ColumnInfo> columnInfoFromColumnHeaders(const std::vector<std::vector<std::string>>& columnData);
static std::vector<size_t> columnIndexForWords(const std::string& line);
static std::vector<std::vector<ColumnInfo>> mergeEqualTimeSteps(const std::vector<std::vector<ColumnInfo>>& columns);
static std::vector<TableData> mergeEqualTimeSteps(const std::vector<TableData>& tables);
static bool isUnitText(const std::string& word);

6
ApplicationCode/UnitTests/FixedWidthDataParser-Test.cpp
View File

@@ -151,9 +151,9 @@ TEST(FixedWidthDataParser, DetectFixedWidth)
RifColumnBasedUserDataParser parser(data);
auto tables = parser.tableData();
EXPECT_EQ(size_t(3), tables.size());
EXPECT_EQ(size_t(1), tables.size());
EXPECT_EQ(size_t(10), tables[0].columnInfos().size());
EXPECT_EQ(size_t(28), tables[0].columnInfos().size());
EXPECT_EQ(size_t(13), tables[0].columnInfos()[0].stringValues.size());
}
@@ -209,6 +209,6 @@ TEST(FixedWidthDataParser, VaryingTimeStepCount)
RifColumnBasedUserDataParser parser(data);
auto tables = parser.tableData();
EXPECT_EQ(2, tables.size());
EXPECT_EQ(size_t(2), tables.size());
}