Overhaul polynomial type

CMakeLists.txt

@@ -179,6 +179,8 @@ find_package(PCGRandom REQUIRED)
 find_package(GMP REQUIRED)
 find_package(MPFR REQUIRED)
 find_package(range-v3 CONFIG REQUIRED)
+find_package(ctre CONFIG REQUIRED)
+find_package(fmt CONFIG REQUIRED)
 
 message(STATUS "Target architecture ${RPY_ARCH}")
 

platform/include/roughpy/generics/type.h

@@ -30,18 +30,19 @@ namespace rpy::generics {
  * includes methods and attributes which can be leveraged to manage and
  * manipulate these properties efficiently and effectively.
  */
-struct BasicProperties {
-    bool standard_layout : 1;
-    bool trivially_copyable : 1;
-    bool trivially_constructible : 1;
-    bool trivially_default_constructible : 1;
-    bool trivially_copy_constructible : 1;
-    bool trivially_copy_assignable : 1;
-    bool trivially_destructible : 1;
-    bool polymorphic : 1;
-    bool is_signed : 1;
-    bool is_floating_point : 1;
-    bool is_integral : 1;
+struct BasicProperties
+{
+    bool standard_layout: 1;
+    bool trivially_copyable: 1;
+    bool trivially_constructible: 1;
+    bool trivially_default_constructible: 1;
+    bool trivially_copy_constructible: 1;
+    bool trivially_copy_assignable: 1;
+    bool trivially_destructible: 1;
+    bool polymorphic: 1;
+    bool is_signed: 1;
+    bool is_floating_point: 1;
+    bool is_integral: 1;
 };
 
 template <typename T>
@@ -60,6 +61,7 @@ constexpr BasicProperties basic_properties_of() noexcept;
 
 template <typename T>
 TypePtr get_type() noexcept;
+
 //{
 //    static_assert(false, "There is no Type associated with T");
 //    RPY_UNREACHABLE_RETURN(nullptr);
@@ -78,7 +80,6 @@ class ROUGHPY_PLATFORM_EXPORT Type : public mem::PolymorphicRefCounted
     friend class Value;
 
 public:
-
     /**
      * @brief Returns the type information of the current instance.
      *
@@ -164,7 +165,6 @@ class ROUGHPY_PLATFORM_EXPORT Type : public mem::PolymorphicRefCounted
     virtual void free_object(void* ptr) const = 0;
 
 public:
-
     virtual bool parse_from_string(void* data, string_view str) const noexcept;
 
     /**
@@ -183,7 +183,7 @@ class ROUGHPY_PLATFORM_EXPORT Type : public mem::PolymorphicRefCounted
      */
     virtual void
     copy_or_move(void* dst, const void* src, size_t count, bool move) const
-            = 0;
+    = 0;
 
     virtual void
     destroy_range(void* data, size_t count) const = 0;
@@ -273,10 +273,7 @@ class ROUGHPY_PLATFORM_EXPORT Type : public mem::PolymorphicRefCounted
      *
      * @return A TypePtr representing the specific type.
      */
-    static TypePtr of() noexcept
-    {
-        return get_type<decay_t<T>>();
-    }
+    static TypePtr of() noexcept { return get_type<decay_t<T> >(); }
 
 };
 
@@ -314,8 +311,8 @@ const BuiltinTypes& get_builtin_types() noexcept;
 class ROUGHPY_PLATFORM_EXPORT MultiPrecisionTypes
 {
     MultiPrecisionTypes();
-public:
 
+public:
     TypePtr integer_type;
     TypePtr rational_type;
 
@@ -326,6 +323,9 @@ class ROUGHPY_PLATFORM_EXPORT MultiPrecisionTypes
     static const MultiPrecisionTypes& get() noexcept;
 };
 
+RPY_NO_DISCARD
+ROUGHPY_PLATFORM_EXPORT
+TypePtr get_polynomial_type() noexcept;
 
 
 template <typename T>
@@ -338,18 +338,18 @@ constexpr BasicProperties basic_properties_of() noexcept
 {
     using base_t = remove_cvref_t<T>;
     return {
-        is_standard_layout_v<base_t>,
-        is_trivially_copyable_v<base_t>,
-        is_trivially_constructible_v<base_t>,
-        is_trivially_default_constructible_v<base_t>,
-        is_trivially_copy_constructible_v<base_t>,
-        is_trivially_copy_assignable_v<base_t>,
-        is_trivially_destructible_v<base_t>,
-        is_polymorphic_v<base_t>,
-        is_signed_v<base_t>,
-        is_floating_point_v<base_t>,
-        is_integral_v<base_t>,
-};
+            is_standard_layout_v<base_t>,
+            is_trivially_copyable_v<base_t>,
+            is_trivially_constructible_v<base_t>,
+            is_trivially_default_constructible_v<base_t>,
+            is_trivially_copy_constructible_v<base_t>,
+            is_trivially_copy_assignable_v<base_t>,
+            is_trivially_destructible_v<base_t>,
+            is_polymorphic_v<base_t>,
+            is_signed_v<base_t>,
+            is_floating_point_v<base_t>,
+            is_integral_v<base_t>,
+    };
 }
 
 /**
@@ -366,7 +366,9 @@ constexpr BasicProperties basic_properties_of() noexcept
  * @return The promoted type based on the provided `lhs` and `rhs` types.
  * If neither type can be promoted to the other, `nullptr` is returned.
  */
-RPY_NO_DISCARD TypePtr ROUGHPY_PLATFORM_EXPORT compute_promotion(const Type* lhs, const Type* rhs) noexcept;
+RPY_NO_DISCARD TypePtr ROUGHPY_PLATFORM_EXPORT compute_promotion(
+    const Type* lhs,
+    const Type* rhs) noexcept;
 
 /**
  * @brief Computes the hash value of a given Type object.
@@ -386,16 +388,10 @@ inline hash_t hash_value(const Type& value) noexcept
 }
 
 RPY_NO_DISCARD constexpr bool
-operator==(const Type& lhs, const Type& rhs) noexcept
-{
-    return &lhs == &rhs;
-}
+operator==(const Type& lhs, const Type& rhs) noexcept { return &lhs == &rhs; }
 
 RPY_NO_DISCARD constexpr bool
-operator!=(const Type& lhs, const Type& rhs) noexcept
-{
-    return !(lhs == rhs);
-}
+operator!=(const Type& lhs, const Type& rhs) noexcept { return !(lhs == rhs); }
 
 /**
  * @brief Retrieves the size of an object of the specified type.
@@ -411,7 +407,6 @@ inline size_t size_of(const Type& type) noexcept { return type.object_size(); }
 namespace concepts {
 
 
-
 /**
  * @brief Check if the given type has standard layout
  * @param type A reference to the Type object
@@ -550,7 +545,6 @@ inline bool is_arithmetic(Type const& type)
 }// namespace concepts
 
 
-
 template <>
 inline TypePtr get_type<float>() noexcept
 {
@@ -614,4 +608,4 @@ inline TypePtr get_type<uint64_t>() noexcept
 
 }// namespace rpy::generics
 
-#endif// ROUGHPY_GENERICS_TYPE_H
+#endif// ROUGHPY_GENERICS_TYPE_H

platform/src/generics/CMakeLists.txt

@@ -17,6 +17,7 @@ target_sources(RoughPy_Platform PRIVATE
         conversion_trait.cpp
         multiprecision_types.cpp
         number_trait.cpp
+        polynomial_types.cpp
         type.cpp
         type_builtin.cpp
         type_promotion.cpp
@@ -29,6 +30,7 @@ target_sources(RoughPy_Platform PRIVATE
 
 add_subdirectory(builtin_types)
 add_subdirectory(multiprecision_types)
+add_subdirectory(polynomial_type)
 
 
 

platform/src/generics/multiprecision_types/mpq_string_rep.h

@@ -0,0 +1,32 @@
+//
+// Created by sam on 26/11/24.
+//
+
+#ifndef ROUGHPY_GENERICS_INTERNAL_MPQ_STRING_REP_H
+#define ROUGHPY_GENERICS_INTERNAL_MPQ_STRING_REP_H
+
+
+#include <gmp.h>
+
+#include "roughpy/core/types.h"
+
+
+namespace rpy::generics {
+
+inline void mpq_display_rep(string& buffer, mpq_srcptr value) noexcept
+{
+    // The GMP docs describe the size of a mpq string representation in the
+    // documentation https://gmplib.org/manual/Rational-Conversions
+    auto num_size = mpz_sizeinbase(mpq_numref(value), 10);
+    auto denom_size = mpz_sizeinbase(mpq_denref(value), 10);
+    buffer.resize(num_size + denom_size + 3);
+
+    mpq_get_str(buffer.data(), 10, value);
+
+    // The buffer has at least one null byte at the end, cut these off
+    while (buffer.back() == '\0') { buffer.pop_back(); }
+}
+
+}
+
+#endif //ROUGHPY_GENERICS_INTERNAL_MPQ_STRING_REP_H

platform/src/generics/multiprecision_types/mpz_hash.h

@@ -24,6 +24,15 @@ inline hash_t mpz_hash(mpz_srcptr integer) noexcept
     return result;
 }
 
+inline hash_t mpq_hash(mpq_srcptr integer) noexcept
+{
+    auto num_hash = mpz_hash(mpq_numref(integer));
+    const auto denom_hash = mpz_hash(mpq_denref(integer));
+
+    hash_combine(num_hash, denom_hash);
+    return num_hash;
+}
+
 
 }
 

platform/src/generics/multiprecision_types/rational_type.cpp

@@ -11,6 +11,7 @@
 #include <roughpy/platform/alloc.h>
 
 #include "mpz_hash.h"
+#include "mpq_string_rep.h"
 
 using namespace rpy;
 using namespace rpy::generics;
@@ -145,18 +146,9 @@ RationalType::display(std::ostream& os, const void* value) const
 
     const auto* rat = static_cast<mpq_srcptr>(value);
 
-    // The GMP docs describe the size of a mpq string representation in the
-    // documentation https://gmplib.org/manual/Rational-Conversions
-    auto num_size = mpz_sizeinbase(mpq_numref(rat), 10);
-    auto denom_size = mpz_sizeinbase(mpq_denref(rat), 10);
-
     string buffer;
-    buffer.resize(num_size + denom_size + 3);
-
-    mpq_get_str(buffer.data(), 10, rat);
+    mpq_display_rep(buffer, rat);
 
-    // The buffer has at least one null byte at the end, cut these off
-    while (buffer.back() == '\0') { buffer.pop_back(); }
     return os << buffer;
 }
 
@@ -165,11 +157,7 @@ hash_t RationalType::hash_of(const void* value) const noexcept
     if (value == nullptr) { return 0; }
 
     auto* rat = static_cast<mpq_srcptr>(value);
-    auto num_hash = mpz_hash(mpq_numref(rat));
-    const auto denom_hash = mpz_hash(mpq_denref(rat));
-
-    hash_combine(num_hash, denom_hash);
-    return num_hash;
+    return mpq_hash(rat);
 }
 
 TypePtr RationalType::get() noexcept

platform/src/generics/polynomial_type/CMakeLists.txt

@@ -0,0 +1,60 @@
+
+
+
+
+target_sources(RoughPy_Platform PRIVATE
+        indeterminate.h
+        indeterminate.cpp
+        monomial.cpp
+        monomial.h
+        polynomial.cpp
+        polynomial.h
+        polynomial_arithmetic.cpp
+        polynomial_arithmetic.h
+        polynomial_comparison.cpp
+        polynomial_comparison.h
+        polynomial_number.cpp
+        polynomial_number.h
+        polynomial_type.cpp
+        polynomial_type.h
+)
+
+target_link_libraries(RoughPy_Platform PRIVATE
+    ctre::ctre)
+
+if (ROUGHPY_BUILD_TESTS)
+
+    add_executable(test_polynomial
+            test_indeterminate.cpp
+            test_monomial.cpp
+            test_polynomial.cpp
+            indeterminate.cpp
+            indeterminate.h
+            monomial.cpp
+            monomial.h
+            polynomial.cpp
+            polynomial.h
+    )
+
+    target_include_directories(test_polynomial PRIVATE
+            ${ROUGHPY_PLATFORM_SOURCE}
+    )
+
+    target_link_libraries(test_polynomial PRIVATE
+            RoughPy::Core
+            Boost::headers
+            GMP::GMP
+            GTest::gtest
+    )
+
+    setup_roughpy_cpp_tests(test_polynomial)
+
+    add_executable(test_polynomial_type
+            test_polynomial_type.cpp
+    )
+
+    target_link_libraries(test_polynomial_type PRIVATE RoughPy::Platform GTest::gtest)
+
+    setup_roughpy_cpp_tests(test_polynomial_type)
+
+endif ()

platform/src/generics/polynomial_type/indeterminate.cpp

@@ -0,0 +1,15 @@
+//
+// Created by sam on 26/11/24.
+//
+
+#include "indeterminate.h"
+
+#include <ostream>
+
+using namespace rpy;
+using namespace rpy::generics;
+
+
+std::ostream& generics::operator<<(std::ostream& os, const Indeterminate& value) {
+    return os << value.prefix() << value.index();
+}