Ticket #250: 250-new-ac89b1685fbc.patch

lemon/path.h

@@ -164 +164 @@
       return ArcIt(*this, n);
     }
 
+    /// \brief The n-th arc.
+    ///
+    /// Gives back the n-th arc. This operator is just an alias for \ref nth(),
+    /// it runs in O(1) time.
+    /// \pre \c n is in the range <tt>[0..length() - 1]</tt>.
+    const Arc& operator[](int n) const {
+      return nth(n);
+    }
+
     /// \brief The first arc of the path
     const Arc& front() const {
       return head.empty() ? tail.front() : head.back();
@@ -367 +376 @@
       return ArcIt(*this, n);
     }
 
+    /// \brief The n-th arc.
+    ///
+    /// Gives back the n-th arc. This operator is just an alias for \ref nth(),
+    /// it runs in O(1) time.
+    /// \pre \c n is in the range <tt>[0..length() - 1]</tt>.
+    const Arc& operator[](int n) const {
+      return data[n];
+    }
+
     /// \brief The first arc of the path.
     const Arc& front() const {
       return data.front();
@@ -566 +584 @@
       return ArcIt(*this, node);
     }
 
+    /// \brief The n-th arc.
+    ///
+    /// Looks for the n-th arc in O(n) time. This operator is just an alias
+    /// for \ref nth().
+    /// \pre \c n is in the range <tt>[0..length() - 1]</tt>.
+    const Arc& operator[](int n) const {
+      return nth(n);
+    }
+
     /// \brief Length of the path.
     int length() const {
       int len = 0;
@@ -897 +924 @@
       return ArcIt(*this, n);
     }
 
+    /// \brief The n-th arc.
+    ///
+    /// Gives back the n-th arc. This operator is just an alias for \ref nth(),
+    /// it runs in O(1) time.
+    /// \pre \c n is in the range <tt>[0..length() - 1]</tt>.
+    const Arc& operator[](int n) const {
+      return arcs[n];
+    }
+
     /// \brief The length of the path.
     int length() const { return len; }
 

test/path_test.cc

@@ -108 +108 @@
     checkBackAndFrontInsertablePath<ListPath<GR> >();
     checkBackInsertablePath<SimplePath<GR> >();
 
+    checkSubscriptOperator<Path<GR> >();
+    checkSubscriptOperator<SimplePath<GR> >();
+    checkSubscriptOperator<StaticPath<GR> >();
+    checkSubscriptOperator<ListPath<GR> >();
+
     checkListPathSplitAndSplice();
   }
 
@@ -273 +278 @@
     check(checkPath(cgr, cp), "Wrong checkPath()");
   }
 
+  template <typename P>
+  void checkSubscriptOperator() {
+    SimplePath<GR> p0;
+    p0.addBack(a1);
+    p0.addBack(a3);
+    p0.addBack(a2);
+    P p = p0;
+    check(!p.empty(), "Wrong empty()");
+    check(p.length() == 3, "Wrong length");
+    check(p.front() == a1, "Wrong front()");
+    check(p.back() == a2, "Wrong back()");
+    check(p.nth(0) == a1, "Wrong nth()");
+    check(p.nth(1) == a3, "Wrong nth()");
+    check(p.nth(2) == a2, "Wrong nth()");
+    check(p[0] == a1, "Wrong operator[]");
+    check(p[1] == a3, "Wrong operator[]");
+    check(p[2] == a2, "Wrong operator[]");
+  }
+
   void checkListPathSplitAndSplice() {
 
     // Build a path with spliceFront() and spliceBack()