Simplifying SingleTableBase

njoy · Jul 24, 2024 · 233f29c · 233f29c
1 parent f9cb5ec
commit 233f29c
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 27 deletions.
diff --git a/cmake/unit_testing.cmake b/cmake/unit_testing.cmake
@@ -60,7 +60,6 @@ add_subdirectory( src/scion/interpolation/LinearLinear/test )
 add_subdirectory( src/scion/interpolation/LinearLogarithmic/test )
 add_subdirectory( src/scion/interpolation/LogarithmicLinear/test )
 add_subdirectory( src/scion/interpolation/LogarithmicLogarithmic/test )
-add_subdirectory( src/scion/interpolation/Table/test )
 
 add_subdirectory( src/scion/linearisation/ToleranceConvergence/test )
 add_subdirectory( src/scion/linearisation/MidpointSplit/test )

diff --git a/src/scion/interpolation.hpp b/src/scion/interpolation.hpp
@@ -5,4 +5,4 @@
 #include "scion/interpolation/LinearLogarithmic.hpp"
 #include "scion/interpolation/LogarithmicLinear.hpp"
 #include "scion/interpolation/LogarithmicLogarithmic.hpp"
-#include "scion/interpolation/Table.hpp"
+
diff --git a/src/scion/math/SingleTableBase.hpp b/src/scion/math/SingleTableBase.hpp
@@ -6,7 +6,6 @@
 // other includes
 #include "tools/Log.hpp"
 #include "scion/interpolation/InterpolationType.hpp"
-#include "scion/interpolation/Table.hpp"
 #include "scion/linearisation/ToleranceConvergence.hpp"
 #include "scion/linearisation/MidpointSplit.hpp"
 #include "scion/linearisation/Lineariser.hpp"
@@ -32,8 +31,6 @@ namespace math {
 
     /* type aliases */
     using Parent = FunctionBase< Derived, X, Y >;
-    using Table = interpolation::Table< Interpolator,
-                                        XContainer, YContainer >;
 
   public:
 
@@ -43,11 +40,21 @@ namespace math {
   private:
 
     /* fields */
-    Table table_;
+    Interpolator interpolator_;
+    XContainer x_;
+    YContainer y_;
 
     /* auxiliary function */
     #include "scion/math/SingleTableBase/src/verifyTable.hpp"
 
+    /**
+     *  @brief Return the panel interpolator
+     */
+    const Interpolator& interpolator() const noexcept {
+
+      return this->interpolator_;
+    }
+
   protected:
 
     /* constructor */
@@ -70,15 +77,15 @@ namespace math {
      */
     const XContainer& x() const noexcept {
 
-      return this->table_.x();
+      return this->x_;
     }
 
     /**
      *  @brief Return the y values of the table
      */
     const YContainer& y() const noexcept {
 
-      return this->table_.y();
+      return this->y_;
     }
 
     /**
@@ -89,16 +96,7 @@ namespace math {
       return this->x().size();
     }
 
-    /**
-     *  @brief Evaluate the function for a value of x
-     *
-     *  @param x   the value to be evaluated
-     */
-    Y evaluate( const X& x ) const {
-
-      return this->table_.evaluate( x );
-    }
-
+    #include "scion/math/SingleTableBase/src/evaluate.hpp"
     #include "scion/math/SingleTableBase/src/linearise.hpp"
 
     using Parent::domain;

diff --git a/src/scion/math/SingleTableBase/src/ctor.hpp b/src/scion/math/SingleTableBase/src/ctor.hpp
@@ -1,14 +1,11 @@
 private:
 
 /**
- *  @brief Private intermediate constructor
+ *  @brief Private constructor
  */
-SingleTableBase( Table&& table ) :
-  Parent( IntervalDomain( table.x().front(), table.x().back() ) ),
-  table_( std::move( table ) ) {
-
-  verifyTable( this->table_.x(), this->table_.y() );
-}
+SingleTableBase( IntervalDomain< X >&& domain, XContainer&& x, YContainer&& y ) :
+  Parent( std::move( domain ) ), interpolator_(), 
+  x_( std::move( x ) ), y_( std::move( y ) ) {}
 
 protected:
 
@@ -19,4 +16,6 @@ SingleTableBase( Table&& table ) :
  *  @param y   the y values of the tabulated data
  */
 SingleTableBase( XContainer x, YContainer y ) :
-  SingleTableBase( Table( std::move( x ), std::move( y ) ) ) {}
+  SingleTableBase( verifyTableAndRetrieveDomain( x, y ),
+                   std::move( x ), std::move( y ) ) {}
+
diff --git a/src/scion/math/SingleTableBase/src/verifyTable.hpp b/src/scion/math/SingleTableBase/src/verifyTable.hpp
@@ -1,4 +1,32 @@
-static void verifyTable( const XContainer& x, const YContainer& y ) {
+static IntervalDomain< X > 
+verifyTableAndRetrieveDomain( const XContainer& x, const YContainer& y ) {
+
+  if ( ( ! verification::isAtLeastOfSize( x, 2 ) ) ||
+       ( ! verification::isAtLeastOfSize( y, 2 ) ) ) {
+
+    Log::error( "Insufficient x or y values defined for tabulated data "
+                "with a single interpolation type (at least 2 points are "
+                "required)" );
+    Log::info( "x.size(): {}", x.size() );
+    Log::info( "y.size(): {}", y.size() );
+    throw std::exception();
+  }
+
+  if ( ! verification::isSameSize( x, y ) ) {
+
+    Log::error( "Inconsistent number of x and y values for tabulated data "
+                "with a single interpolation type" );
+    Log::info( "x.size(): {}", x.size() );
+    Log::info( "y.size(): {}", y.size() );
+    throw std::exception();
+  }
+
+  if ( ! verification::isSorted( x ) ) {
+
+    Log::error( "The x values do not appear to be in ascending order for "
+                "tabulated data with a single interpolation type" );
+    throw std::exception();
+  }
 
   if ( ! verification::isUnique( x ) ) {
 
@@ -13,4 +41,6 @@ static void verifyTable( const XContainer& x, const YContainer& y ) {
     }
     throw std::exception();
   }
+
+  return IntervalDomain( x.front(), x.back() );
 }