summaryrefslogtreecommitdiff
path: root/wasserstein/include/basic_defs_ws.h
diff options
context:
space:
mode:
Diffstat (limited to 'wasserstein/include/basic_defs_ws.h')
-rw-r--r--wasserstein/include/basic_defs_ws.h18
1 files changed, 1 insertions, 17 deletions
diff --git a/wasserstein/include/basic_defs_ws.h b/wasserstein/include/basic_defs_ws.h
index 1712ccf..bdcfd75 100644
--- a/wasserstein/include/basic_defs_ws.h
+++ b/wasserstein/include/basic_defs_ws.h
@@ -45,12 +45,6 @@ derivative works thereof, in binary and source code form.
#include <ciso646>
#endif
-#ifndef FOR_R_TDA
-#include "spdlog/spdlog.h"
-#include "spdlog/fmt/fmt.h"
-#include "spdlog/fmt/ostr.h"
-#endif
-
#include "hera_infinity.h"
#include "dnn/geometry/euclidean-dynamic.h"
#include "def_debug_ws.h"
@@ -107,7 +101,7 @@ namespace ws
template<class R>
inline std::ostream& operator<<(std::ostream& output, const IdxValPair<R> p)
{
- output << fmt::format("({0}, {1})", p.first, p.second);
+ output << "(" << p.first << ", " << p.second << ")";
return output;
}
@@ -214,16 +208,6 @@ namespace ws
inline std::ostream& operator<<(std::ostream& output, const DiagramPoint<Real> p);
#endif
- template<class Real>
- inline void format_arg(fmt::BasicFormatter<char> &f, const char *&format_str, const DiagramPoint<Real>&p) {
- if (p.is_diagonal()) {
- f.writer().write("({0},{1}, DIAG)", p.x, p.y);
- } else {
- f.writer().write("({0},{1}, NORM)", p.x, p.y);
- }
- }
-
-
template<class Real, class Pt>
struct DistImpl
{