Updating interpolation for 2d version, update tests

src/scion/math/HistogramTable.hpp

@@ -16,13 +16,13 @@ namespace math {
 
   /**
    *  @class
-   *  @brief Tabulated data with histogram interpolation (y is constant in x)
+   *  @brief Tabulated x,y data with histogram interpolation (y is constant in x)
    *
    *  The HistogramTable is templatised on the container type used for the
    *  x and y values in addition to the actual x and y types. This allows us to
    *  use something like utility::IteratorView instead of std::vector.
    */
-  template < typename X, typename Y = X,
+  template < typename X, typename Y,
              typename XContainer = std::vector< X >,
              typename YContainer = std::vector< Y > >
   class HistogramTable :

src/scion/math/LinearLinearTable.hpp

@@ -16,13 +16,13 @@ namespace math {
 
   /**
    *  @class
-   *  @brief Tabulated data with linear-linear interpolation (y is linear in x)
+   *  @brief Tabulated x,y data with linear-linear interpolation (y is linear in x)
    *
    *  The LinearLinearTable is templatised on the container type used for the
    *  x and y values in addition to the actual x and y types. This allows us to
    *  use something like utility::IteratorView instead of std::vector.
    */
-  template < typename X, typename Y = X,
+  template < typename X, typename Y,
              typename XContainer = std::vector< X >,
              typename YContainer = std::vector< Y > >
   class LinearLinearTable :

src/scion/math/LinearLogTable.hpp

@@ -15,13 +15,13 @@ namespace math {
 
   /**
    *  @class
-   *  @brief Tabulated data with linear-log interpolation (y is linear in ln(x))
+   *  @brief Tabulated x,y data with linear-log interpolation (y is linear in ln(x))
    *
    *  The LinearLogTable is templatised on the container type used for the
    *  x and y values in addition to the actual x and y types. This allows us to
    *  use something like utility::IteratorView instead of std::vector.
    */
-  template < typename X, typename Y = X,
+  template < typename X, typename Y,
              typename XContainer = std::vector< X >,
              typename YContainer = std::vector< Y > >
   class LinearLogTable :

src/scion/math/LogLinearTable.hpp

@@ -15,13 +15,13 @@ namespace math {
 
   /**
    *  @class
-   *  @brief Tabulated data with log-linear interpolation (ln(y) is linear in x)
+   *  @brief Tabulated x,y data with log-linear interpolation (ln(y) is linear in x)
    *
    *  The LogLinearTable is templatised on the container type used for the
    *  x and y values in addition to the actual x and y types. This allows us to
    *  use something like utility::IteratorView instead of std::vector.
    */
-  template < typename X, typename Y = X,
+  template < typename X, typename Y,
              typename XContainer = std::vector< X >,
              typename YContainer = std::vector< Y > >
   class LogLinearTable :

src/scion/math/LogLogTable.hpp

@@ -15,13 +15,13 @@ namespace math {
 
   /**
    *  @class
-   *  @brief Tabulated data with log-log interpolation (ln(y) is linear in ln(x))
+   *  @brief Tabulated x,y data with log-log interpolation (ln(y) is linear in ln(x))
    *
    *  The LogLogTable is templatised on the container type used for the
    *  x and y values in addition to the actual x and y types. This allows us to
    *  use something like utility::IteratorView instead of std::vector.
    */
-  template < typename X, typename Y = X,
+  template < typename X, typename Y,
              typename XContainer = std::vector< X >,
              typename YContainer = std::vector< Y > >
   class LogLogTable :

src/scion/math/SingleTableBase.hpp

@@ -18,13 +18,13 @@ namespace math {
 
   /**
    *  @class
-   *  @brief Base class for tabulated data using a single interpolation region
+   *  @brief Base class for x,y tabulated data using a single interpolation region
    *
    *  This base class provides the common interface for single region
    *  interpolation data such as the LinearLinearTable, LogLogTable, etc.
    */
   template < typename Derived, typename Interpolator,
-             typename X, typename Y = X,
+             typename X, typename Y,
              typename XContainer = std::vector< X >,
              typename YContainer = std::vector< Y > >
   class SingleTableBase : public OneDimensionalFunctionBase< Derived, X, Y > {

src/scion/math/SingleTableBase/src/verifyTable.hpp

@@ -1,10 +1,10 @@
-static IntervalDomain< X > 
+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 "
+    Log::error( "Insufficient x or y values defined for x,y tabulated data "
                 "with a single interpolation type (at least 2 points are "
                 "required)" );
     Log::info( "x.size(): {}", x.size() );
@@ -14,7 +14,7 @@ verifyTableAndRetrieveDomain( const XContainer& x, const YContainer& y ) {
 
   if ( ! verification::isSameSize( x, y ) ) {
 
-    Log::error( "Inconsistent number of x and y values for tabulated data "
+    Log::error( "Inconsistent number of x and y values for x,y tabulated data "
                 "with a single interpolation type" );
     Log::info( "x.size(): {}", x.size() );
     Log::info( "y.size(): {}", y.size() );
@@ -24,13 +24,13 @@ verifyTableAndRetrieveDomain( const XContainer& x, const YContainer& y ) {
   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" );
+                "x,y tabulated data with a single interpolation type" );
     throw std::exception();
   }
 
   if ( ! verification::isUnique( x ) ) {
 
-    Log::error( "The x values do not appear to be unique for tabulated values "
+    Log::error( "The x values do not appear to be unique for x,y tabulated values "
                 "with a single interpolation type" );
 
     auto iter = std::adjacent_find( x.begin(), x.end() );