Some more simplifications

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

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/python/src/definitions.hpp b/python/src/definitions.hpp
@@ -73,7 +73,7 @@ template < typename Component, typename X, typename Y, typename PythonClass >
 void addStandardFunctionDefinitions( PythonClass& component ) {
 
   using ToleranceConvergence = njoy::scion::linearisation::ToleranceConvergence< X, Y >;
-  using DomainVariant = typename njoy::scion::math::FunctionBase< X, Y >::DomainVariant;
+  using DomainVariant = typename Component::DomainVariant;
 
   // note: for is_same_domain to bind properly, all possible variant members
   //       must have a default constructor

diff --git a/src/scion/math/FunctionBase.hpp b/src/scion/math/FunctionBase.hpp
@@ -14,12 +14,12 @@ namespace math {
 
   /**
    *  @class
-   *  @brief Base class for function objects
+   *  @brief Base class for function objects modelling y = f(x)
    *
    *  This base class provides the common interface for all function objects.
    *  This includes domain testing and function evaluation.
    */
-  template < typename Derived, typename X, typename Y = X >
+  template < typename Derived, typename X, typename Y >
   class FunctionBase {
 
   public:
@@ -37,7 +37,14 @@ namespace math {
   protected:
 
     /* constructor */
-    #include "scion/math/FunctionBase/src/ctor.hpp"
+
+    /**
+     *  @brief Constructor
+     *
+     *  @param domain   the domain of the function
+     */
+    FunctionBase( DomainVariant domain ) :
+      domain_( std::move( domain ) ) {}
 
   public:
 

diff --git a/src/scion/math/FunctionBase/src/ctor.hpp b/src/scion/math/FunctionBase/src/ctor.hpp