Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r49773 - in sandbox/SOC/2008/graphs/trunk: boost/graphs/apps libs/graphs/test
From: asutton_at_[hidden]
Date: 2008-11-15 11:09:23


Author: asutton
Date: 2008-11-15 11:09:22 EST (Sat, 15 Nov 2008)
New Revision: 49773
URL: http://svn.boost.org/trac/boost/changeset/49773

Log:
Removing a bad attempt at building a directed acyclic word graph.

Removed:
   sandbox/SOC/2008/graphs/trunk/boost/graphs/apps/
Text files modified:
   sandbox/SOC/2008/graphs/trunk/libs/graphs/test/Jamfile | 27 +++++++++++++++------------
   sandbox/SOC/2008/graphs/trunk/libs/graphs/test/di.cpp | 1 +
   sandbox/SOC/2008/graphs/trunk/libs/graphs/test/out_edge_traits.hpp | 4 ++++
   sandbox/SOC/2008/graphs/trunk/libs/graphs/test/test_verts.cpp | 8 ++++++++
   sandbox/SOC/2008/graphs/trunk/libs/graphs/test/vertices_traits.hpp | 5 ++++-
   5 files changed, 32 insertions(+), 13 deletions(-)

Modified: sandbox/SOC/2008/graphs/trunk/libs/graphs/test/Jamfile
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/libs/graphs/test/Jamfile (original)
+++ sandbox/SOC/2008/graphs/trunk/libs/graphs/test/Jamfile 2008-11-15 11:09:22 EST (Sat, 15 Nov 2008)
@@ -2,12 +2,12 @@
 # Import a newer version of g++ and configure it for C++0x support.
 # This cannot affect the doc directory or it will try to recompile quickbook
 # with gcc-4.4 - which will absolutely not work at this time.
-using gcc : 4.4 : g++-4.4 : <cxxflags>--std=c++0x ;
-
+# using gcc : 4.4.0 : /home/asutton/opt/bin/g++ : <cxxflags>--std=c++0x ;
 # Build all subrojects using g++-4.4
 project graphs
     : requirements
- <toolset>gcc-4.4
+ <toolset>gcc-4.4.0
+ <cxxflags>--std=c++0x
         <include>$(boost-root)
         <include>../../..
     ;
@@ -22,22 +22,25 @@
 exe desc : desc.cpp ;
 
 exe test_verts : test_verts.cpp ;
-exe test_props : test_props.cpp ;
-exe test_incs : test_incs.cpp ;
-exe test_outs : test_outs.cpp ;
-exe test_ins : test_ins.cpp ;
-exe test_es : test_es.cpp ;
+# exe test_props : test_props.cpp ;
+# exe test_incs : test_incs.cpp ;
+# exe test_outs : test_outs.cpp ;
+# exe test_ins : test_ins.cpp ;
+# exe test_es : test_es.cpp ;
 
 exe un : un.cpp ;
 exe di : di.cpp ;
 
-exe propmaps : propmaps.cpp ;
+# exe propmaps : propmaps.cpp ;
 
 # exe bfs : bfs.cpp ;
 # exe dfs : dfs.cpp ;
 # exe search : search.cpp ;
-exe adv_search : adv_search.cpp ;
-exe vis : visitors.cpp ;
+# exe adv_search : adv_search.cpp ;
+# exe vis : visitors.cpp ;
 
 exe basic_matrix : basic_matrix.cpp ;
-exe un_matrix : un_matrix.cpp ;
\ No newline at end of file
+exe un_matrix : un_matrix.cpp ;
+
+# Various application tests
+exe dawg : dawg.cpp ;

Modified: sandbox/SOC/2008/graphs/trunk/libs/graphs/test/di.cpp
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/libs/graphs/test/di.cpp (original)
+++ sandbox/SOC/2008/graphs/trunk/libs/graphs/test/di.cpp 2008-11-15 11:09:22 EST (Sat, 15 Nov 2008)
@@ -10,6 +10,7 @@
 
 using namespace std;
 using namespace boost;
+using namespace boost::graphs::adjacency_list;
 
 typedef int City;
 typedef int Road;

Modified: sandbox/SOC/2008/graphs/trunk/libs/graphs/test/out_edge_traits.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/libs/graphs/test/out_edge_traits.hpp (original)
+++ sandbox/SOC/2008/graphs/trunk/libs/graphs/test/out_edge_traits.hpp 2008-11-15 11:09:22 EST (Sat, 15 Nov 2008)
@@ -2,6 +2,8 @@
 #ifndef OUT_EDGE_TRAITS_HPP
 #define OUT_EDGE_TRAITS_HPP
 
+namespace boost { namespace graphs { namespace adjacency_list {
+
 struct out_vector_tag : vector_tag, unstable_remove_tag { };
 struct out_list_tag : list_tag, stable_mutators_tag { };
 struct out_set_tag : set_tag, stable_mutators_tag { };
@@ -28,4 +30,6 @@
 struct out_edge_traits<out_set<Edge, Comp, Alloc>>
 { typedef out_set_tag category; };
 
+} } }
+
 #endif

Modified: sandbox/SOC/2008/graphs/trunk/libs/graphs/test/test_verts.cpp
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/libs/graphs/test/test_verts.cpp (original)
+++ sandbox/SOC/2008/graphs/trunk/libs/graphs/test/test_verts.cpp 2008-11-15 11:09:22 EST (Sat, 15 Nov 2008)
@@ -9,8 +9,16 @@
 #include "typestr.hpp"
 #include "vertices_traits.hpp"
 
+// TODO: Migrate this documentation out to some kind of design rationale document.
+// It might have been nice to implement the underlying as typedefs to vector
+// or whatever, and then specialize the add vertex/remove vertex algorithms
+// specifically for those types. Unfortunately, that won't work since there is
+// so much type information that we need to associate with those data structures.
+
+
 using namespace std;
 using namespace boost;
+using namespace boost::graphs::adjacency_list;
 
 struct unlabled_vertex_tag { };
 struct labeled_vertex_tag { };

Modified: sandbox/SOC/2008/graphs/trunk/libs/graphs/test/vertices_traits.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/libs/graphs/test/vertices_traits.hpp (original)
+++ sandbox/SOC/2008/graphs/trunk/libs/graphs/test/vertices_traits.hpp 2008-11-15 11:09:22 EST (Sat, 15 Nov 2008)
@@ -2,6 +2,8 @@
 #ifndef VERTICES_TRAITS_HPP
 #define VERTICES_TRAITS_HPP
 
+namespace boost { namespace graphs { namespace adjacency_list {
+
 struct simple_vertex_store_tag { };
 struct mapped_vertex_store_tag { };
 
@@ -19,7 +21,6 @@
 vertices_category(Verts const&)
 { return typename vertices_traits<Verts>::category(); }
 
-
 template <typename Vertex, typename Alloc>
 struct vertices_traits<vertices_vector<Vertex, Alloc>>
 { typedef vertex_vector_tag category; };
@@ -36,4 +37,6 @@
 struct vertices_traits<vertices_map<Vertex, Key, Compare, Alloc>>
 { typedef vertex_map_tag category; };
 
+} } }
+
 #endif


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk