Rename xtd::helpers::strictly_ordered to xtd::comparable

Author: gammasoft71

examples/xtd.core.examples/generic_collections/generic_enumerable_generator/src/generic_enumerable_generator.cpp

@@ -8,10 +8,7 @@ auto odd_numbers_generator(int count = 100, int min_value = 0, int max_value = 1
 
 auto main() -> int {
   println("Odd numbers : ");
-  auto odd_numbers = odd_numbers_generator()
-    .where([](auto n) {return n % 5 == 0;})
-    .distinct();
-  for (auto number : odd_numbers)
+  for (auto number : odd_numbers_generator().where([](auto n) {return n % 5 == 0;}).distinct())
     println("{,4}", number);
   println("Done!");
 }

src/xtd.core/CMakeLists.txt

@@ -123,6 +123,8 @@ add_sources(
   "include/xtd/chrono"
   "include/xtd/cnull.hpp"
   "include/xtd/cnull"
+  "include/xtd/comparable.hpp"
+  "include/xtd/comparable"
   "include/xtd/comparison.hpp"
   "include/xtd/comparison"
   "include/xtd/compiler.hpp"
@@ -844,8 +846,6 @@ add_sources(
   "include/xtd/helpers/greater_than_comparable"
   "include/xtd/helpers/less_than_comparable.hpp"
   "include/xtd/helpers/less_than_comparable"
-  "include/xtd/helpers/strictly_ordered.hpp"
-  "include/xtd/helpers/strictly_ordered"
   "include/xtd/helpers/throw_helper.hpp"
   "include/xtd/helpers/throw_helper"
   "include/xtd/extensions/comparison_operators.hpp"

src/xtd.core/include/xtd/collections/generic/comparer.hpp

@@ -64,7 +64,7 @@ namespace xtd {
         /// | Zero              | x equals y.          |
         /// | Greater than zero | x is greater than y. |
         [[nodiscard]] auto compare(const first_argument_type& x, const second_argument_type& y) const -> result_type override {
-          if constexpr(xtd::helpers::strictly_ordered<first_argument_type> || std::derived_from<first_argument_type, xtd::icomparable<first_argument_type>>) return helpers::comparer<type_t> {}(x, y);
+          if constexpr(xtd::comparable<first_argument_type> || std::derived_from<first_argument_type, xtd::icomparable<first_argument_type>>) return helpers::comparer<type_t> {}(x, y);
           else xtd::helpers::throw_helper::throws(xtd::helpers::exception_case::invalid_operation, "Failed to compare two elements in the array.");
         }
 

src/xtd.core/include/xtd/collections/generic/helpers/comparer.hpp

@@ -3,9 +3,9 @@
 /// @copyright Copyright (c) 2026 Gammasoft. All rights reserved.
 #pragma once
 #include "../icomparer.hpp"
+#include "../../../comparable.hpp"
 #include "../../../icomparable.hpp"
 #include "../../../int32.hpp"
-#include "../../../helpers/strictly_ordered.hpp"
 
 /// @brief The xtd namespace contains all fundamental classes to access Hardware, Os, System, and more.
 namespace xtd {
@@ -68,7 +68,7 @@ namespace xtd {
             if (&x == &y) return 0;
             if (comparer_) return comparer_->compare(x, y);
             if constexpr(std::is_polymorphic_v<first_argument_type> && std::is_base_of_v<xtd::icomparable<first_argument_type>, first_argument_type>) return static_cast<const xtd::icomparable<first_argument_type>&>(x).compare_to(y);
-            else if constexpr(xtd::helpers::strictly_ordered<first_argument_type>) return x < y ? -1 : (x > y ? 1 : 0);
+            else if constexpr(xtd::comparable<first_argument_type>) return x < y ? -1 : (x > y ? 1 : 0);
             else return &x < &y ? -1 : 1;
           }
           /// @}

src/xtd.core/include/xtd/comparable

@@ -0,0 +1,2 @@
+#pragma once
+#include <xtd/comparable.hpp>

src/xtd.core/include/xtd/comparable.hpp

@@ -0,0 +1,27 @@
+/// @file
+/// @brief Contains xtd::comparable concept.
+/// @copyright Copyright (c) 2026 Gammasoft. All rights reserved.
+#pragma once
+#include "helpers/greater_than_comparable.hpp"
+#include "helpers/less_than_comparable.hpp"
+
+/// @brief The xtd namespace contains all fundamental classes to access Hardware, Os, System, and more.
+namespace xtd {
+  /// @brief Concept comparable.
+  /// @par Definition
+  /// ```cpp
+  /// template<typename value_t>
+  /// concept comparable;
+  /// ```
+  /// @par Header
+  /// ```cpp
+  /// #include <xtd/comparable>
+  /// ```
+  /// @par Namespace
+  /// xtd
+  /// @par Library
+  /// xtd.core
+  /// @ingroup xtd_core concepts
+  template<typename value_t>
+  concept comparable = xtd::helpers::less_than_comparable<value_t> && xtd::helpers::greater_than_comparable<value_t>;
+}

src/xtd.core/include/xtd/helpers/strictly_ordered

@@ -112,7 +112,6 @@
 #include "helpers/exception_case.hpp"
 #include "helpers/greater_than_comparable.hpp"
 #include "helpers/less_than_comparable.hpp"
-#include "helpers/strictly_ordered.hpp"
 #include "helpers/throw_helper.hpp"
 #include "io/binary_reader.hpp"
 #include "io/binary_writer.hpp"
@@ -339,6 +338,8 @@
 #include "char8_object.hpp"
 #include "char_object.hpp"
 #include "cnull.hpp"
+#include "comparable.hpp"
+#include "comparison.hpp"
 #include "compiler.hpp"
 #include "compiler_id.hpp"
 #include "console.hpp"

src/xtd.core/include/xtd/helpers/strictly_ordered.hpp

@@ -40,7 +40,6 @@ add_sources(
   "src/xtd/globalization/tests/translator_tests.cpp"
   "src/xtd/helpers/tests/exception_case_tests.cpp"
   "src/xtd/helpers/tests/greater_than_comparable_tests.cpp"
-  "src/xtd/helpers/tests/strictly_ordered_tests.cpp"
   "src/xtd/helpers/tests/less_than_comparable_tests.cpp"
   "src/xtd/io/tests/binary_reader_tests.cpp"
   "src/xtd/io/tests/directory_tests.cpp"
@@ -137,6 +136,7 @@ add_sources(
   "src/xtd/tests/build_type.hpp"
   "src/xtd/tests/build_type_tests.cpp"
   "src/xtd/tests/bytes_assert.hpp"
+  "src/xtd/tests/comparable_tests.cpp"
   "src/xtd/tests/compiler_name.hpp"
   "src/xtd/tests/compiler_tests.cpp"
   "src/xtd/tests/compiler_id_tests.cpp"