to_complex trunc zeta

jfalcou · Nov 23, 2024 · ab42f1f · ab42f1f
1 parent 7fb15d3
commit ab42f1f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/include/kyosu/functions/to_complex.hpp b/include/kyosu/functions/to_complex.hpp
@@ -24,13 +24,13 @@ namespace kyosu
     template<eve::floating_value T>
     KYOSU_FORCEINLINE constexpr complex_t<T> operator()(T r)  const noexcept
     {
-      return as_cayley_dickson_n_t<2,T>(v, R{0});
+      return as_cayley_dickson_n_t<2,T>(r, T{0});
     }
 
     template<eve::floating_value R, eve::floating_value I>
     KYOSU_FORCEINLINE constexpr as_cayley_dickson_n_t<2,R,I> operator()(R r,I i) const noexcept
     {
-      return return as_cayley_dickson_n_t<2,R,I>{r, i};
+      return as_cayley_dickson_n_t<2,R,I>{r, i};
     }
 
     KYOSU_CALLABLE_OBJECT(make_complex_t, make_complex_);

diff --git a/include/kyosu/functions/trunc.hpp b/include/kyosu/functions/trunc.hpp
@@ -16,7 +16,7 @@ namespace kyosu
   {
     template<concepts::cayley_dickson Z>
     KYOSU_FORCEINLINE constexpr Z operator()(Z const& z) const noexcept
-    { return KYOSU_CALL(z); }
+    { return Z{kumi::map([](auto const& e) { return eve::trunc(e); }, z)}; }
 
     template<concepts::real V>
     KYOSU_FORCEINLINE constexpr V operator()(V v) const noexcept
@@ -65,12 +65,3 @@ namespace kyosu
 //! @}
 //======================================================================================================================
 }
-
-namespace kyosu::_
-{
-  template<typename Z, eve::callable_options O>
-  KYOSU_FORCEINLINE constexpr auto trunc_(KYOSU_DELAY(), O const&, Z c) noexcept
-  {
-    return Z{kumi::map([](auto const& e) { return eve::trunc(e); }, c)};
-  }
-}
diff --git a/include/kyosu/functions/zeta.hpp b/include/kyosu/functions/zeta.hpp
@@ -19,7 +19,19 @@ namespace kyosu
   {
     template<concepts::cayley_dickson Z>
     KYOSU_FORCEINLINE constexpr Z operator()(Z const& z) const noexcept
-    { return KYOSU_CALL(z); }
+    {
+      if constexpr(concepts::complex<Z> )
+      {
+        auto zz=exp2(z);
+        auto k = zz/(zz-2);
+        auto g = if_else(z == Z(1), complex(eve::nan(eve::as(real(z)))), k*eta(z));
+        return if_else(real(z) == eve::inf(eve::as(real(z))), complex(eve::one(eve::as(real(z)))), g);
+      }
+      else
+      {
+        return kyosu::_::cayley_extend(*this, z);
+      }
+    }
 
     template<concepts::real V>
     KYOSU_FORCEINLINE constexpr complex_t<V> operator()(V v) const noexcept