roland/xo-tokenizer2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-ratio: + .to_str() method using xo-flatstring

Browse source
This commit is contained in:
Roland Conybeare 2024-04-18 17:06:29 -04:00
commit c0b2e83211
3 changed files with 39 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -51,6 +51,7 @@ xo_export_cmake_config(${PROJECT_NAME} ${PROJECT_VERSION} ${PROJECT_NAME}Targets
# ----------------------------------------------------------------
# dependencies
xo_headeronly_dependency(${SELF_LIB} xo_flatstring)
#xo_headeronly_dependency(${SELF_LIB} randomgen)
# etc..

2
cmake/xo_ratioConfig.cmake.in
View file

@ -6,7 +6,7 @@ include(CMakeFindDependencyMacro)
# must coordinate with xo_dependency() calls
# in xo-reactor/src/reactor/CMakeLists.txt
#
#find_dependency(reflect)
find_dependency(xo_flatstring)
#find_dependency(subsys)
#find_dependency(Eigen3)
#find_dependency(webutil)

38
include/xo/ratio/ratio.hpp
View file

@ -6,6 +6,7 @@
#pragma once
#include "ratio_concept.hpp"
#include "xo/flatstring/flatstring.hpp"
#include <numeric>
#include <compare>
//#include <type_traits>
@ -196,7 +197,42 @@ namespace xo {
* For example: to int or double
**/
template <typename Repr>
constexpr Repr to() const { return num_ / static_cast<Repr>(den_); }
constexpr Repr to() const noexcept { return num_ / static_cast<Repr>(den_); }
/** @brief convert to short human-friendly flatstring representation
*
* Example:
* @code
* ratio(7,1).to_str<5>(); // "7"
* ratio(1,7).to_str<5>(); // "(1/7)"
* ratio(-1,7).to_str<10>(); // "(-1/7)"
* ratio(-1,7).to_str<5>(); // "(-1/"
* @endcode
**/
template <std::size_t N>
constexpr flatstring<N> to_str() const noexcept {
if (this->is_integer()) {
return flatstring<N>::from_int(num_);
} else {
auto num_str = flatstring<N>::from_int(num_);
auto den_str = flatstring<N>::from_int(den_);
/* tmp capacity will be about 2N+3 */
auto tmp = flatstring_concat(flatstring("("),
num_str,
flatstring("/"),
den_str,
flatstring(")"));
flatstring<N> retval;
retval.assign(tmp);
return retval;
}
}
/** @brief negate operator **/
constexpr ratio operator-() const { return ratio(-num_, den_); }
/** @brief convert to representation using different integer types **/
template <typename Ratio2>