From ff61de73fe8f89c56ebaa053b4d51716d39c55b0 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 24 Aug 2021 15:13:46 +0200
Subject: [PATCH] mv ParameterSample.h to Param/Distrib
---
Device/Resolution/ScanResolution.h | 2 +-
Param/Distrib/Distributions.cpp | 2 +-
Param/Distrib/ParameterDistribution.h | 2 +-
Param/{Varia => Distrib}/ParameterSample.h | 8 ++++----
Param/Distrib/RangedDistributions.cpp | 2 +-
.../SoftParticle/FormFactorSphereLogNormalRadius.cpp | 2 +-
Tests/Unit/Param/DistributionsTest.cpp | 2 +-
Tests/Unit/Param/RangedDistributionTest.cpp | 2 +-
Wrap/Swig/libBornAgainParam.i | 2 +-
auto/Wrap/doxygenParam.i | 11 ++++-------
10 files changed, 16 insertions(+), 19 deletions(-)
rename Param/{Varia => Distrib}/ParameterSample.h (80%)
diff --git a/Device/Resolution/ScanResolution.h b/Device/Resolution/ScanResolution.h
index fddfecd4dd2..d12f1a4b448 100644
--- a/Device/Resolution/ScanResolution.h
+++ b/Device/Resolution/ScanResolution.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_DEVICE_RESOLUTION_SCANRESOLUTION_H
#include "Base/Types/ICloneable.h"
-#include "Param/Varia/ParameterSample.h"
+#include "Param/Distrib/ParameterSample.h"
#include <memory>
#include <string>
#include <vector>
diff --git a/Param/Distrib/Distributions.cpp b/Param/Distrib/Distributions.cpp
index 4a94a89c64f..b9ade8eb733 100644
--- a/Param/Distrib/Distributions.cpp
+++ b/Param/Distrib/Distributions.cpp
@@ -15,7 +15,7 @@
#include "Param/Distrib/Distributions.h"
#include "Base/Math/Constants.h"
#include "Base/Py/PyFmt.h"
-#include "Param/Varia/ParameterSample.h"
+#include "Param/Distrib/ParameterSample.h"
#include <algorithm>
#include <cmath>
#include <limits>
diff --git a/Param/Distrib/ParameterDistribution.h b/Param/Distrib/ParameterDistribution.h
index d5b66a05005..777fb928e6e 100644
--- a/Param/Distrib/ParameterDistribution.h
+++ b/Param/Distrib/ParameterDistribution.h
@@ -17,7 +17,7 @@
#include "Fit/Param/RealLimits.h"
#include "Param/Base/IParametric.h"
-#include "Param/Varia/ParameterSample.h"
+#include "Param/Distrib/ParameterSample.h"
#include <memory>
#include <vector>
diff --git a/Param/Varia/ParameterSample.h b/Param/Distrib/ParameterSample.h
similarity index 80%
rename from Param/Varia/ParameterSample.h
rename to Param/Distrib/ParameterSample.h
index 0989ad31af4..ca0513467ae 100644
--- a/Param/Varia/ParameterSample.h
+++ b/Param/Distrib/ParameterSample.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Param/Varia/ParameterSample.h
+//! @file Param/Distrib/ParameterSample.h
//! @brief Defines class ParameterSample.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_PARAM_VARIA_PARAMETERSAMPLE_H
-#define BORNAGAIN_PARAM_VARIA_PARAMETERSAMPLE_H
+#ifndef BORNAGAIN_PARAM_DISTRIB_PARAMETERSAMPLE_H
+#define BORNAGAIN_PARAM_DISTRIB_PARAMETERSAMPLE_H
//! A parameter value with a weight, as obtained when sampling from a distribution.
@@ -24,4 +24,4 @@ public:
double weight;
};
-#endif // BORNAGAIN_PARAM_VARIA_PARAMETERSAMPLE_H
+#endif // BORNAGAIN_PARAM_DISTRIB_PARAMETERSAMPLE_H
diff --git a/Param/Distrib/RangedDistributions.cpp b/Param/Distrib/RangedDistributions.cpp
index 4db2d7f2267..58dafb62438 100644
--- a/Param/Distrib/RangedDistributions.cpp
+++ b/Param/Distrib/RangedDistributions.cpp
@@ -14,7 +14,7 @@
#include "Param/Distrib/RangedDistributions.h"
#include "Param/Distrib/Distributions.h"
-#include "Param/Varia/ParameterSample.h"
+#include "Param/Distrib/ParameterSample.h"
#include <cmath>
#include <limits>
diff --git a/Sample/SoftParticle/FormFactorSphereLogNormalRadius.cpp b/Sample/SoftParticle/FormFactorSphereLogNormalRadius.cpp
index 8cb0ed93d84..9ba64f6ddef 100644
--- a/Sample/SoftParticle/FormFactorSphereLogNormalRadius.cpp
+++ b/Sample/SoftParticle/FormFactorSphereLogNormalRadius.cpp
@@ -15,7 +15,7 @@
#include "Sample/SoftParticle/FormFactorSphereLogNormalRadius.h"
#include "Base/Py/PyFmt.h"
#include "Param/Distrib/Distributions.h"
-#include "Param/Varia/ParameterSample.h"
+#include "Param/Distrib/ParameterSample.h"
#include "Sample/LibFF/SomeFormFactors.h"
#include "Sample/Shapes/TruncatedEllipsoid.h"
diff --git a/Tests/Unit/Param/DistributionsTest.cpp b/Tests/Unit/Param/DistributionsTest.cpp
index f23838472d0..79a4db53d15 100644
--- a/Tests/Unit/Param/DistributionsTest.cpp
+++ b/Tests/Unit/Param/DistributionsTest.cpp
@@ -1,6 +1,6 @@
#include "Param/Distrib/Distributions.h"
#include "Base/Math/Constants.h"
-#include "Param/Varia/ParameterSample.h"
+#include "Param/Distrib/ParameterSample.h"
#include "Tests/GTestWrapper/google_test.h"
#include <cmath>
#include <memory>
diff --git a/Tests/Unit/Param/RangedDistributionTest.cpp b/Tests/Unit/Param/RangedDistributionTest.cpp
index 2ffcb40a885..87a687c9941 100644
--- a/Tests/Unit/Param/RangedDistributionTest.cpp
+++ b/Tests/Unit/Param/RangedDistributionTest.cpp
@@ -1,6 +1,6 @@
#include "Param/Distrib/Distributions.h"
#include "Param/Distrib/RangedDistributions.h"
-#include "Param/Varia/ParameterSample.h"
+#include "Param/Distrib/ParameterSample.h"
#include "Tests/GTestWrapper/google_test.h"
class RangedDistributionTest : public ::testing::Test {
diff --git a/Wrap/Swig/libBornAgainParam.i b/Wrap/Swig/libBornAgainParam.i
index 469e2781a31..1b5e80d5582 100644
--- a/Wrap/Swig/libBornAgainParam.i
+++ b/Wrap/Swig/libBornAgainParam.i
@@ -47,5 +47,5 @@
%include "Param/Distrib/ParameterDistribution.h"
%include "Param/Distrib/RangedDistributions.h"
-%include "Param/Varia/ParameterSample.h"
+%include "Param/Distrib/ParameterSample.h"
%template(ParameterSampleVector) std::vector<ParameterSample>;
diff --git a/auto/Wrap/doxygenParam.i b/auto/Wrap/doxygenParam.i
index f275695762d..d56c52002c6 100644
--- a/auto/Wrap/doxygenParam.i
+++ b/auto/Wrap/doxygenParam.i
@@ -1202,7 +1202,7 @@ Returns distribution name for python-formatted text.
// File: namespace_0d4.xml
-// File: namespace_0d8.xml
+// File: namespace_0d9.xml
// File: namespaceNodeUtils.xml
@@ -1236,6 +1236,9 @@ Returns a vector of triples (descendant, depth, parent)
// File: ParameterDistribution_8h.xml
+// File: ParameterSample_8h.xml
+
+
// File: RangedDistributions_8cpp.xml
@@ -1261,9 +1264,6 @@ Returns a vector of triples (descendant, depth, parent)
// File: NodeUtils_8h.xml
-// File: ParameterSample_8h.xml
-
-
// File: dir_a1f38e94e849d0203a55ad5a19f2f15a.xml
@@ -1275,6 +1275,3 @@ Returns a vector of triples (descendant, depth, parent)
// File: dir_d452a16c8784395bb8c21da516e88a7f.xml
-
-// File: dir_dda74d2e7a2b62d18fb900593a370493.xml
-
--
GitLab