From 2d4d18e9526546f31c1893743ae9eb852069abc2 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 10 May 2023 22:11:08 +0200
Subject: [PATCH] rename file -> ParseUtil
---
Device/IO/IOFactory.cpp | 6 +++---
Device/IO/{DataFormatUtil.cpp => ParseUtil.cpp} | 12 ++++++------
Device/IO/{DataFormatUtil.h => ParseUtil.h} | 12 ++++++------
Device/IO/ReadReflectometry.cpp | 4 ++--
Device/IO/ReadWriteINT.cpp | 8 ++++----
Device/IO/ReadWriteNumpyTXT.cpp | 8 ++++----
GUI/View/Import/ImportDataUtil.cpp | 1 -
Tests/Unit/Device/FixedBinAxisTest.cpp | 4 ++--
Tests/Unit/Device/PointwiseAxisTest.cpp | 4 ++--
9 files changed, 29 insertions(+), 30 deletions(-)
rename Device/IO/{DataFormatUtil.cpp => ParseUtil.cpp} (92%)
rename Device/IO/{DataFormatUtil.h => ParseUtil.h} (80%)
diff --git a/Device/IO/IOFactory.cpp b/Device/IO/IOFactory.cpp
index 1114906eb88..4d04229e6c3 100644
--- a/Device/IO/IOFactory.cpp
+++ b/Device/IO/IOFactory.cpp
@@ -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;
diff --git a/Device/IO/DataFormatUtil.cpp b/Device/IO/ParseUtil.cpp
similarity index 92%
rename from Device/IO/DataFormatUtil.cpp
rename to Device/IO/ParseUtil.cpp
index fd0278293d9..614af5a3c45 100644
--- a/Device/IO/DataFormatUtil.cpp
+++ b/Device/IO/ParseUtil.cpp
@@ -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;
}
diff --git a/Device/IO/DataFormatUtil.h b/Device/IO/ParseUtil.h
similarity index 80%
rename from Device/IO/DataFormatUtil.h
rename to Device/IO/ParseUtil.h
index 5b7375bbed1..df0c7b55ee4 100644
--- a/Device/IO/DataFormatUtil.h
+++ b/Device/IO/ParseUtil.h
@@ -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
diff --git a/Device/IO/ReadReflectometry.cpp b/Device/IO/ReadReflectometry.cpp
index 9c843bca161..4e84b1def78 100644
--- a/Device/IO/ReadReflectometry.cpp
+++ b/Device/IO/ReadReflectometry.cpp
@@ -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);
}
diff --git a/Device/IO/ReadWriteINT.cpp b/Device/IO/ReadWriteINT.cpp
index b5f33895d7e..665300fae47 100644
--- a/Device/IO/ReadWriteINT.cpp
+++ b/Device/IO/ReadWriteINT.cpp
@@ -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;
}
diff --git a/Device/IO/ReadWriteNumpyTXT.cpp b/Device/IO/ReadWriteNumpyTXT.cpp
index 2da1172ef52..ff84305d43c 100644
--- a/Device/IO/ReadWriteNumpyTXT.cpp
+++ b/Device/IO/ReadWriteNumpyTXT.cpp
@@ -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);
}
diff --git a/GUI/View/Import/ImportDataUtil.cpp b/GUI/View/Import/ImportDataUtil.cpp
index 9af1cef7d2e..c2142d2d326 100644
--- a/GUI/View/Import/ImportDataUtil.cpp
+++ b/GUI/View/Import/ImportDataUtil.cpp
@@ -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"
diff --git a/Tests/Unit/Device/FixedBinAxisTest.cpp b/Tests/Unit/Device/FixedBinAxisTest.cpp
index 0ff55b86c2a..663e8418693 100644
--- a/Tests/Unit/Device/FixedBinAxisTest.cpp
+++ b/Tests/Unit/Device/FixedBinAxisTest.cpp
@@ -1,6 +1,6 @@
#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);
}
diff --git a/Tests/Unit/Device/PointwiseAxisTest.cpp b/Tests/Unit/Device/PointwiseAxisTest.cpp
index 601dc8b2fae..d8a2bca2b1b 100644
--- a/Tests/Unit/Device/PointwiseAxisTest.cpp
+++ b/Tests/Unit/Device/PointwiseAxisTest.cpp
@@ -1,6 +1,6 @@
#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);
}
--
GitLab