From 3156c99cdc717bc77cd577cb8c03ac1804a5dbb5 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 11 Dec 2020 10:26:03 +0100
Subject: [PATCH] rm unused TRange
---
Sample/Particle/TRange.h | 57 ----------------
Tests/UnitTests/Core/Other/TRangeTest.cpp | 81 -----------------------
2 files changed, 138 deletions(-)
delete mode 100644 Sample/Particle/TRange.h
delete mode 100644 Tests/UnitTests/Core/Other/TRangeTest.cpp
diff --git a/Sample/Particle/TRange.h b/Sample/Particle/TRange.h
deleted file mode 100644
index 8f51fd7f5ca..00000000000
--- a/Sample/Particle/TRange.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// ************************************************************************************************
-//
-// BornAgain: simulate and fit scattering at grazing incidence
-//
-//! @file Sample/Particle/TRange.h
-//! @brief Defines and implements template classes TRange and TSampledRange.
-//!
-//! @homepage http://www.bornagainproject.org
-//! @license GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
-//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-//
-// ************************************************************************************************
-
-#ifdef SWIG
-#error no need to expose this header to Swig
-#endif
-
-#ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_PARTICLE_TRANGE_H
-#define BORNAGAIN_SAMPLE_PARTICLE_TRANGE_H
-
-#include <cstddef>
-
-//! An interval [lowerBound..upperBound[.
-//! @ingroup tools_internal
-
-template <class T> class TRange {
-public:
- TRange(T lowerBound, T upperBound) : m_lower_bound(lowerBound), m_upper_bound(upperBound) {}
- virtual ~TRange() {}
-
- T getLowerBound() const { return m_lower_bound; }
- T getUpperBound() const { return m_upper_bound; }
- T getDifference() const { return m_upper_bound - m_lower_bound; }
-
- bool inRange(T value) const { return value >= m_lower_bound && value < m_upper_bound; }
-
-private:
- T m_lower_bound, m_upper_bound;
-};
-
-//! An interval [lowerBound..upperBound[, and a number of samples.
-
-template <class T> class TSampledRange : public TRange<T> {
-public:
- TSampledRange(size_t n_samples, T lowerBound, T upperBound)
- : TRange<T>(lowerBound, upperBound), m_n_samples(n_samples) {}
-
- size_t getNSamples() const { return m_n_samples; }
-
-private:
- size_t m_n_samples;
-};
-
-#endif // BORNAGAIN_SAMPLE_PARTICLE_TRANGE_H
-#endif // USER_API
diff --git a/Tests/UnitTests/Core/Other/TRangeTest.cpp b/Tests/UnitTests/Core/Other/TRangeTest.cpp
deleted file mode 100644
index fed37dbf783..00000000000
--- a/Tests/UnitTests/Core/Other/TRangeTest.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "Sample/Particle/TRange.h"
-#include "Tests/GTestWrapper/google_test.h"
-#include <algorithm>
-
-class TRangeTest : public ::testing::Test {
-protected:
- TRangeTest();
- virtual ~TRangeTest();
-
- const TRange<int>* intRange;
- const TRange<float>* floatRange;
- const TRange<double>* doubleRange;
- const TSampledRange<int>* intSampledRange;
- const TSampledRange<float>* floatSampledRange;
- const TSampledRange<double>* doubleSampledRange;
-};
-
-TRangeTest::TRangeTest() {
- intRange = new TRange<int>(1, 100);
- floatRange = new TRange<float>(101.0f, 200.0f);
- doubleRange = new TRange<double>(201.0, 300.0);
-
- intSampledRange = new TSampledRange<int>(4000u, 1, 100);
- floatSampledRange = new TSampledRange<float>(5000u, 101.0f, 200.0f);
- doubleSampledRange = new TSampledRange<double>(6000u, 201.0, 300.0);
-}
-
-TRangeTest::~TRangeTest() {
- delete intRange;
- delete floatRange;
- delete doubleRange;
- delete intSampledRange;
- delete floatSampledRange;
- delete doubleSampledRange;
-}
-
-TEST_F(TRangeTest, TRangeTestLowerBound) {
- EXPECT_EQ(1, intRange->getLowerBound());
- EXPECT_EQ(101.0f, floatRange->getLowerBound());
- EXPECT_EQ(201.0, doubleRange->getLowerBound());
-}
-
-TEST_F(TRangeTest, TRangeTestUpperBound) {
- EXPECT_EQ(100, intRange->getUpperBound());
- EXPECT_EQ(200.0f, floatRange->getUpperBound());
- EXPECT_EQ(300.0, doubleRange->getUpperBound());
-}
-
-TEST_F(TRangeTest, TRangeTestDifference) {
- EXPECT_EQ(99, intRange->getDifference());
- EXPECT_EQ(99.0f, floatRange->getDifference());
- EXPECT_EQ(99.0, doubleRange->getDifference());
-}
-
-TEST_F(TRangeTest, TRangeTestInRange) {
- EXPECT_TRUE(intRange->inRange(1));
- EXPECT_TRUE(floatRange->inRange(101.0f));
- EXPECT_TRUE(doubleRange->inRange(201.0));
-
- EXPECT_TRUE(intRange->inRange(50));
- EXPECT_TRUE(floatRange->inRange(150.0f));
- EXPECT_TRUE(doubleRange->inRange(250.0));
-
- EXPECT_FALSE(intRange->inRange(100));
- EXPECT_FALSE(floatRange->inRange(200.0f));
- EXPECT_FALSE(doubleRange->inRange(300.0));
-
- EXPECT_FALSE(intRange->inRange(0));
- EXPECT_FALSE(floatRange->inRange(100.0f));
- EXPECT_FALSE(doubleRange->inRange(200.0));
-
- EXPECT_FALSE(intRange->inRange(101));
- EXPECT_FALSE(floatRange->inRange(201.0f));
- EXPECT_FALSE(doubleRange->inRange(301.0));
-}
-
-TEST_F(TRangeTest, TSampledRangeNSamples) {
- EXPECT_EQ(4000u, intSampledRange->getNSamples());
- EXPECT_EQ(5000u, floatSampledRange->getNSamples());
- EXPECT_EQ(6000u, doubleSampledRange->getNSamples());
-}
--
GitLab