[Boost-commit] svn:boost r54116 - in sandbox/SOC/2009/function_graph: boost/function_graph libs/test

Subject: [Boost-commit] svn:boost r54116 - in sandbox/SOC/2009/function_graph: boost/function_graph libs/test
From: mlopez7_at_[hidden]
Date: 2009-06-19 18:46:52

Author: lopezeant
Date: 2009-06-19 18:46:51 EDT (Fri, 19 Jun 2009)
New Revision: 54116
URL: http://svn.boost.org/trac/boost/changeset/54116

Log:
started in_edges(v, g)
Text files modified: 
   sandbox/SOC/2009/function_graph/boost/function_graph/function_graph.hpp |    42 +++++++++++++++++++++++++++++++++++---- 
   sandbox/SOC/2009/function_graph/libs/test/test2.cpp                     |     8 +++++-                                  
   2 files changed, 43 insertions(+), 7 deletions(-)

Modified: sandbox/SOC/2009/function_graph/boost/function_graph/function_graph.hpp
==============================================================================
--- sandbox/SOC/2009/function_graph/boost/function_graph/function_graph.hpp	(original)
+++ sandbox/SOC/2009/function_graph/boost/function_graph/function_graph.hpp	2009-06-19 18:46:51 EDT (Fri, 19 Jun 2009)
@@ -75,6 +75,15 @@
 
 
 
+/** @name function_graph_in_edge_iterator
+ * Iterates through the in edges of a vertex
+ * @note The name of this data type is 31 characters long. I need some brevity.
+ */
+
+struct function_graph_in_edge_iterator { };
+
+
+
 /**
  * Empty function graph prevents instantiations such as function_graph<int> and
  * function_graph<bool (int, int)>.
@@ -111,7 +120,8 @@
     typedef adjacency_matrix_tag traversal_category;
     typedef Range vertex_iterator_range_type;
     typedef typename range_iterator<vertex_iterator_range_type>::type
-                         vertex_iterator_type;
+                         vertex_iterator;
+    typedef function_graph_in_edge_iterator in_edge_iterator;
 
     /** Constructor: takes a functor and range */
     function_graph(function_type const& f, vertex_iterator_range_type const& r)
@@ -122,6 +132,7 @@
     Range range_;
 };
 
+// Specialization: function_graph without range
 template <typename Result, typename Vertex>
 struct function_graph<function<Result(Vertex, Vertex)>, no_domain>
     : public function_graph_base<function<Result(Vertex, Vertex)> >
@@ -154,10 +165,10 @@
 
 //@{
 template <typename Result, typename Vertex>
-function_graph<function<Result(Vertex, Vertex)> >
+function_graph<function<Result(Vertex, Vertex)>, no_domain>
     make_function_graph(function<Result(Vertex, Vertex)> const& f)
 {
-    return function_graph<function<Result(Vertex, Vertex)> >(f);
+    return function_graph<function<Result(Vertex, Vertex)>, no_domain>(f);
 }
 
 template <typename Result, typename Vertex, typename Range>
@@ -200,13 +211,34 @@
 
 
 
+/** in_edges(v, g) is part of the bidirectional graph concept. */
+
+template <typename Result, typename Vertex, typename Range>
+std::pair<typename function_graph<function<Result(Vertex, Vertex)>,
+          Range>::in_edge_iterator,
+          typename function_graph<function<Result(Vertex, Vertex)>,
+          Range>::in_edge_iterator>
+in_edges(typename function_graph<function<Result(Vertex, Vertex)>,
+         Range>::vertex_descriptor const& v,
+         function_graph<function<Result(Vertex, Vertex)>, Range> const& g)
+{
+    std::pair<typename function_graph<function<Result(Vertex, Vertex)>,
+              Range>::in_edge_iterator,
+              typename function_graph<function<Result(Vertex, Vertex)>,
+              Range>::in_edge_iterator> iter_range;
+    // Search for first and last in_edges
+    return iter_range;
+}
+
+
+
 /** vertices(g) is part of the vertex list concept. */
 
 template <typename Result, typename Vertex, typename Range>
 std::pair<typename function_graph<function<Result(Vertex, Vertex)>,
-          Range>::iterator_type,
+          Range>::vertex_iterator,
           typename function_graph<function<Result(Vertex, Vertex)>,
-          Range>::iterator_type>
+          Range>::vertex_iterator>
 vertices(function_graph<function<Result(Vertex, Vertex)>, Range> const& g) {
     return std::make_pair(begin(g.range_), end(g.range_));
 }

Modified: sandbox/SOC/2009/function_graph/libs/test/test2.cpp
==============================================================================
--- sandbox/SOC/2009/function_graph/libs/test/test2.cpp	(original)
+++ sandbox/SOC/2009/function_graph/libs/test/test2.cpp	2009-06-19 18:46:51 EDT (Fri, 19 Jun 2009)
@@ -34,11 +34,15 @@
 
     ////////
     // Create functions, graphs and edges
-    //G funcGraph = boost::make_function_graph(less_than<int>());
-    G funcGraph(less_than<int>());
+    G funcGraph(std::less<int>());
     GwithRange funcGraphWithRange(less_than<int>(),
                                   std::make_pair(vectorOfInts.begin(),
                                                  vectorOfInts.end()));
+    /*GwithRange funcGraphWithRange2 = boost::make_function_graph(less_than<int>(),
+                                  std::make_pair(vectorOfInts.begin(),
+                                                 vectorOfInts.end()));*/
+
+    
 
     return 0;
 }