diff --git a/jngen.h b/jngen.h index 21fb0b6..b043856 100644 --- a/jngen.h +++ b/jngen.h @@ -2884,70 +2884,6 @@ inline int GenericGraph::compareTo(const GenericGraph& other) const { -#include - -namespace jngen { - -class VertexDescriptor { -public: - int v() const { return vertex_; } - int vertex() const { return vertex_; } - - Weight w() const { return weight_; } - Weight weight() const { return weight_; } - - operator int() const { return v(); } - -private: - VertexDescriptor() = delete; - - const int vertex_; - const Weight weight_; -}; - -JNGEN_DECLARE_SIMPLE_PRINTER(VertexDescriptor, 3) { - JNGEN_PRINT(t.vertex()); - - if (!t.weight().empty()) { - out << " "; - JNGEN_PRINT_NO_MOD(t.weight()); - } -} - -class EdgeDescriptor { -public: - int u() const { return from_; } - int from() const { return from_; } - - int v() const { return to_; } - int to() const { return to_; } - - Weight w() const { return weight_; } - Weight weight() const { return weight_; } - - operator int() const { return to_; } - operator std::pair() const { return {from_, to_}; } - -private: - EdgeDescriptor() = delete; - - const int from_; - const int to_; - const Weight weight_; -}; - -JNGEN_DECLARE_SIMPLE_PRINTER(EdgeDescriptor, 3) { - JNGEN_PRINT(t.to()); - - if (!t.weight().empty()) { - out << " "; - JNGEN_PRINT_NO_MOD(t.weight()); - } -} - -} // namespace jngen - - #include #include