Skip to content
Snippets Groups Projects
Commit 2d4d18e9 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

rename file -> ParseUtil

parent df8e558f
No related branches found
No related tags found
1 merge request!1629IO further cleanup
Pipeline #99179 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
Showing
with 29 additions and 30 deletions
Device/IO/IOFactory.cpp
+ 3
− 3
View file @ 2d4d18e9
......@@ -19,7 +19,7 @@
#include "Device/Data/Datafield.h"
#include "Device/Histo/DiffUtil.h"
#include "Device/Histo/SimulationResult.h"
#include "Device/IO/DataFormatUtil.h"
#include "Device/IO/ParseUtil.h"
#include "Device/IO/ReadReflectometry.h"
#include "Device/IO/ReadWriteINT.h"
#include "Device/IO/ReadWriteNicos.h"
......@@ -77,7 +77,7 @@ std::stringstream file2stream(const std::string& file_name)
if (!Util::Path::IsFileExists(file_name))
throw std::runtime_error("File does not exist: " + file_name);
using namespace DataUtil::Format;
using namespace Util::Parse;
std::ifstream input_stream;
std::ios_base::openmode openmode = std::ios::in;
if (is_binary(file_name))
......@@ -109,7 +109,7 @@ std::stringstream file2stream(const std::string& file_name)
void stream2file(const std::string& file_name, std::stringstream& s)
{
using namespace DataUtil::Format;
using namespace Util::Parse;
std::ofstream fout;
std::ios_base::openmode openmode = std::ios::out;
......
Device/IO/DataFormatUtil.cpp → Device/IO/ParseUtil.cpp
+ 6
− 6
View file @ 2d4d18e9
......@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file Device/IO/DataFormatUtil.cpp
//! @file Device/IO/ParseUtil.cpp
//! @brief Implements class DataFormatUtils.
//!
//! @homepage http://www.bornagainproject.org
......@@ -12,7 +12,7 @@
//
// ************************************************************************************************
#include "Device/IO/DataFormatUtil.h"
#include "Device/IO/ParseUtil.h"
#include "Base/Axis/MakeScale.h"
#include "Base/Util/PathUtil.h"
#include "Base/Util/StringUtil.h"
......@@ -43,7 +43,7 @@ void readLineOfDoubles(std::vector<double>& buffer, std::istringstream& iss)
} // namespace
//! Creates axis of certain type from input stream
Scale* DataUtil::Format::parseScale(std::istream& input_stream)
Scale* Util::Parse::parseScale(std::istream& input_stream)
{
auto iss = ::getAxisStringRepresentation(input_stream);
std::string type;
......@@ -82,7 +82,7 @@ Scale* DataUtil::Format::parseScale(std::istream& input_stream)
}
//! Fills output data raw buffer from input stream
void DataUtil::Format::fillDatafield(Datafield* data, std::istream& input_stream)
void Util::Parse::fillDatafield(Datafield* data, std::istream& input_stream)
{
std::string line;
size_t iout = 0;
......@@ -121,7 +121,7 @@ void DataUtil::Format::fillDatafield(Datafield* data, std::istream& input_stream
//! Parse double values from string to vector of double
std::vector<double> DataUtil::Format::parse_doubles(const std::string& str)
std::vector<double> Util::Parse::parse_doubles(const std::string& str)
{
std::vector<double> result;
std::istringstream iss(str);
......@@ -137,7 +137,7 @@ std::vector<double> DataUtil::Format::parse_doubles(const std::string& str)
return result;
}
double DataUtil::Format::ignoreDenormalized(double value)
double Util::Parse::ignoreDenormalized(double value)
{
return (std::fpclassify(value) == FP_SUBNORMAL) ? 0.0 : value;
}
Device/IO/DataFormatUtil.h → Device/IO/ParseUtil.h
+ 6
− 6
View file @ 2d4d18e9
......@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file Device/IO/DataFormatUtil.h
//! @file Device/IO/ParseUtil.h
//! @brief Defines class DatafieldIOFactory.
//!
//! @homepage http://www.bornagainproject.org
......@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
#ifndef BORNAGAIN_DEVICE_IO_DATAFORMATUTIL_H
#define BORNAGAIN_DEVICE_IO_DATAFORMATUTIL_H
#ifndef BORNAGAIN_DEVICE_IO_PARSEUTIL_H
#define BORNAGAIN_DEVICE_IO_PARSEUTIL_H
#include <string>
#include <vector>
......@@ -26,7 +26,7 @@ class Datafield;
//! Utility functions for data input and output.
namespace DataUtil::Format {
namespace Util::Parse {
Scale* parseScale(std::istream& input_stream);
......@@ -36,6 +36,6 @@ std::vector<double> parse_doubles(const std::string& str);
double ignoreDenormalized(double value);
} // namespace DataUtil::Format
} // namespace Util::Parse
#endif // BORNAGAIN_DEVICE_IO_DATAFORMATUTIL_H
#endif // BORNAGAIN_DEVICE_IO_PARSEUTIL_H
Device/IO/ReadReflectometry.cpp
+ 2
− 2
View file @ 2d4d18e9
......@@ -17,7 +17,7 @@
#include "Base/Util/Assert.h"
#include "Base/Util/StringUtil.h"
#include "Device/Data/Datafield.h"
#include "Device/IO/DataFormatUtil.h"
#include "Device/IO/ParseUtil.h"
#include <map>
Datafield* Util::RW::readReflectometryTable(std::istream& inStream)
......@@ -31,7 +31,7 @@ Datafield* Util::RW::readReflectometryTable(std::istream& inStream)
// Read numbers from file:
while (std::getline(inStream, line)) {
line = BaseUtil::String::trim(line);
std::vector<double> rowVec = DataUtil::Format::parse_doubles(line); // may throw
std::vector<double> rowVec = Util::Parse::parse_doubles(line); // may throw
vecVec.push_back(rowVec);
}
......
Device/IO/ReadWriteINT.cpp
+ 4
− 4
View file @ 2d4d18e9
......@@ -17,7 +17,7 @@
#include "Base/Util/StringUtil.h"
#include "Device/Data/ArrayUtil.h"
#include "Device/Data/Datafield.h"
#include "Device/IO/DataFormatUtil.h"
#include "Device/IO/ParseUtil.h"
void writeDatafieldDoubles(const std::vector<double>& dataValues, std::ostream& output_stream,
size_t n_columns)
......@@ -27,7 +27,7 @@ void writeDatafieldDoubles(const std::vector<double>& dataValues, std::ostream&
size_t ncol = 0;
for (size_t i = 0; i < dataValues.size(); ++i) {
ncol++;
output_stream << DataUtil::Format::ignoreDenormalized(dataValues[i]) << " ";
output_stream << Util::Parse::ignoreDenormalized(dataValues[i]) << " ";
if (ncol == n_columns) {
output_stream << std::endl;
ncol = 0;
......@@ -44,14 +44,14 @@ Datafield* Util::RW::readBAInt(std::istream& input_stream)
line = BaseUtil::String::trim(line);
if (line.find("axis") != std::string::npos)
axes.emplace_back(DataUtil::Format::parseScale(input_stream));
axes.emplace_back(Util::Parse::parseScale(input_stream));
if (line.find("data") != std::string::npos)
break;
}
// std::cout << "Read " << axes.size() << " axes" << std::endl;
auto* result = new Datafield(std::move(axes));
DataUtil::Format::fillDatafield(result, input_stream);
Util::Parse::fillDatafield(result, input_stream);
return result;
}
......
Device/IO/ReadWriteNumpyTXT.cpp
+ 4
− 4
View file @ 2d4d18e9
......@@ -18,7 +18,7 @@
#include "Base/Util/StringUtil.h"
#include "Device/Data/ArrayUtil.h"
#include "Device/Data/Datafield.h"
#include "Device/IO/DataFormatUtil.h"
#include "Device/IO/ParseUtil.h"
#include <string>
#include <vector>
......@@ -39,7 +39,7 @@ void write1DRepresentation(const Datafield& data, std::ostream& output_stream)
// printing coordinate and associated intensity
for (size_t i = 0, nrows = axis_values.size(); i < nrows; ++i)
output_stream << axis_values[i] << " " << DataUtil::Format::ignoreDenormalized(data[i])
output_stream << axis_values[i] << " " << Util::Parse::ignoreDenormalized(data[i])
<< std::endl;
}
......@@ -57,7 +57,7 @@ void write2DRepresentation(const Datafield& data, std::ostream& output_stream)
for (size_t i = 0; i < nrows; i++) {
for (size_t j = 0; j < ncols; j++) {
double z_value = dataArray[i][j];
output_stream << DataUtil::Format::ignoreDenormalized(z_value) << " ";
output_stream << Util::Parse::ignoreDenormalized(z_value) << " ";
}
output_stream << std::endl;
}
......@@ -75,7 +75,7 @@ Datafield* Util::RW::readNumpyTxt(std::istream& input_stream)
line = BaseUtil::String::trim(line);
if (line.empty() || !isDoubleStartChar(line[0]))
continue;
std::vector<double> dataInRow = DataUtil::Format::parse_doubles(line);
std::vector<double> dataInRow = Util::Parse::parse_doubles(line);
data.push_back(dataInRow);
}
......
GUI/View/Import/ImportDataUtil.cpp
+ 0
− 1
View file @ 2d4d18e9
......@@ -14,7 +14,6 @@
#include "GUI/View/Import/ImportDataUtil.h"
#include "Device/Data/Datafield.h"
#include "Device/IO/DataFormatUtil.h"
#include "GUI/Model/Device/RealItem.h"
#include "GUI/Support/IO/ImportDataInfo.h"
#include "GUI/View/Loaders/QREDataLoader.h"
......
Tests/Unit/Device/FixedBinAxisTest.cpp
+ 2
− 2
View file @ 2d4d18e9
#include "Base/Axis/MakeScale.h"
#include "Base/Axis/Scale.h"
#include "Device/IO/DataFormatUtil.h"
#include "Device/IO/ParseUtil.h"
#include "Tests/GTestWrapper/google_test.h"
#include <iostream>
......@@ -118,7 +118,7 @@ TEST(EquiDivisionTest, IOStream)
oss << axis;
std::istringstream iss(oss.str());
std::unique_ptr<Scale> result(DataUtil::Format::parseScale(iss));
std::unique_ptr<Scale> result(Util::Parse::parseScale(iss));
EXPECT_TRUE(axis == *result);
}
......
Tests/Unit/Device/PointwiseAxisTest.cpp
+ 2
− 2
View file @ 2d4d18e9
#include "Base/Axis/MakeScale.h"
#include "Base/Axis/Scale.h"
#include "Device/IO/DataFormatUtil.h"
#include "Device/IO/ParseUtil.h"
#include "Tests/GTestWrapper/google_test.h"
#include <iostream>
......@@ -87,7 +87,7 @@ TEST(PointwiseAxisTest, IOStream)
oss << axis;
std::istringstream iss(oss.str());
std::unique_ptr<Scale> result(DataUtil::Format::parseScale(iss));
std::unique_ptr<Scale> result(Util::Parse::parseScale(iss));
EXPECT_TRUE(axis == *result);
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment