diff --git a/source/detail/numeric_utils.hpp b/include/xlnt/utils/numeric.hpp
similarity index 97%
rename from source/detail/numeric_utils.hpp
rename to include/xlnt/utils/numeric.hpp
index 97723772..1165b2f5 100644
--- a/source/detail/numeric_utils.hpp
+++ b/include/xlnt/utils/numeric.hpp
@@ -31,6 +31,7 @@
namespace xlnt {
namespace detail {
+
///
/// Takes in any number and outputs a string form of that number which will
/// serialise and deserialise without loss of precision
@@ -84,8 +85,7 @@ constexpr typename std::common_type::type min(NumberL lval, Nu
///
template // parameter types (deduced)
-bool
-float_equals(const LNumber &lhs, const RNumber &rhs,
+bool float_equals(const LNumber &lhs, const RNumber &rhs,
int epsilon_scale = 20) // scale the "fuzzy" equality. Higher value gives a more tolerant comparison
{
// a type that lhs and rhs can agree on
@@ -111,7 +111,7 @@ float_equals(const LNumber &lhs, const RNumber &rhs,
// additionally, a scale factor is applied.
common_t scaled_fuzz = epsilon_scale * epsilon * max(max(xlnt::detail::abs(lhs),
xlnt::detail::abs(rhs)), // |max| of parameters.
- common_t{1}); // clamp
+ common_t{1}); // clamp
return ((lhs + scaled_fuzz) >= rhs) && ((rhs + scaled_fuzz) >= lhs);
}
diff --git a/include/xlnt/utils/optional.hpp b/include/xlnt/utils/optional.hpp
index 4f5b6b78..1337f040 100644
--- a/include/xlnt/utils/optional.hpp
+++ b/include/xlnt/utils/optional.hpp
@@ -25,7 +25,7 @@
#include "xlnt/xlnt_config.hpp"
#include "xlnt/utils/exceptions.hpp"
-#include "../source/detail/numeric_utils.hpp"
+#include "xlnt/utils/numeric.hpp"
#include
namespace xlnt {
diff --git a/include/xlnt/worksheet/sheet_format_properties.hpp b/include/xlnt/worksheet/sheet_format_properties.hpp
index dd63685d..b6223954 100644
--- a/include/xlnt/worksheet/sheet_format_properties.hpp
+++ b/include/xlnt/worksheet/sheet_format_properties.hpp
@@ -25,7 +25,7 @@
#include
#include
-#include "../source/detail/numeric_utils.hpp"
+#include
namespace xlnt {
diff --git a/source/detail/header_footer/header_footer_code.cpp b/source/detail/header_footer/header_footer_code.cpp
index b678ef90..7e4da211 100644
--- a/source/detail/header_footer/header_footer_code.cpp
+++ b/source/detail/header_footer/header_footer_code.cpp
@@ -22,7 +22,7 @@
// @author: see AUTHORS file
#include
-#include
+//#include
namespace xlnt {
namespace detail {
diff --git a/source/detail/implementations/cell_impl.hpp b/source/detail/implementations/cell_impl.hpp
index 1ead8557..b72e3c47 100644
--- a/source/detail/implementations/cell_impl.hpp
+++ b/source/detail/implementations/cell_impl.hpp
@@ -33,7 +33,7 @@
#include
#include
#include
-#include "../numeric_utils.hpp"
+//#include "../numeric_utils.hpp"
namespace xlnt {
namespace detail {
diff --git a/source/detail/serialization/xlsx_producer.cpp b/source/detail/serialization/xlsx_producer.cpp
index 66c4860c..31e36347 100644
--- a/source/detail/serialization/xlsx_producer.cpp
+++ b/source/detail/serialization/xlsx_producer.cpp
@@ -33,10 +33,10 @@
#include
#include
#include
-#include
#include
#include
#include
+#include
#include
#include
#include
diff --git a/source/worksheet/page_margins.cpp b/source/worksheet/page_margins.cpp
index fc1c69c2..883d3ebe 100644
--- a/source/worksheet/page_margins.cpp
+++ b/source/worksheet/page_margins.cpp
@@ -22,7 +22,7 @@
// @license: http://www.opensource.org/licenses/mit-license.php
// @author: see AUTHORS file
#include
-#include "detail/numeric_utils.hpp"
+#include
namespace xlnt {
diff --git a/source/worksheet/page_setup.cpp b/source/worksheet/page_setup.cpp
index 087d980c..2fab4113 100644
--- a/source/worksheet/page_setup.cpp
+++ b/source/worksheet/page_setup.cpp
@@ -22,7 +22,7 @@
// @license: http://www.opensource.org/licenses/mit-license.php
// @author: see AUTHORS file
#include
-#include "detail/numeric_utils.hpp"
+#include
namespace xlnt {
diff --git a/source/worksheet/worksheet.cpp b/source/worksheet/worksheet.cpp
index b0e41945..c2db52ee 100644
--- a/source/worksheet/worksheet.cpp
+++ b/source/worksheet/worksheet.cpp
@@ -46,7 +46,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/tests/detail/numeric_util_test_suite.cpp b/tests/detail/numeric_util_test_suite.cpp
index 5fb033d1..51c67b98 100644
--- a/tests/detail/numeric_util_test_suite.cpp
+++ b/tests/detail/numeric_util_test_suite.cpp
@@ -21,7 +21,7 @@
// @license: http://www.opensource.org/licenses/mit-license.php
// @author: see AUTHORS file
-#include "../../source/detail/numeric_utils.hpp"
+#include
#include
class numeric_test_suite : public test_suite