Changeset 300589 for src/graph

Timestamp:

01/11/09 19:37:48 (4 years ago)

Author:

Tiago de Paula Peixoto <tiago@…>

Branches:

master, python3

Children:

7e99be

Parents:

8cd708

git-author:

Tiago de Paula Peixoto <tiago@…> (01/11/09 18:43:21)

git-committer:

Tiago de Paula Peixoto <tiago@…> (01/11/09 19:37:48)

Message:

Add vertex and edge average calculation

This adds vertex_average() and edge_average() to the stats module.

Location:

src/graph/stats

Files:

• Makefile.am (modified) (3 diffs)
• graph_average.cc (added)
• graph_average.hh (added)
• graph_stats_bind.cc (modified) (2 diffs)

src/graph/stats/Makefile.am

@@ -1 +1 @@
 ## Process this file with automake to produce Makefile.in
 
-AM_CPPFLAGS =\
-    -I$(srcdir)/.. \
-    -I$(srcdir)/../../boost-workaround \
-    -DHAVE_CONFIG_H
+AM_CPPFLAGS = $(MOD_CPPFLAGS)
 
-AM_CFLAGS=$(AM_CXXFLAGS)
+AM_CXXFLAGS = $(CXXFLAGS)
 
 libgraph_tool_statsdir = $(pythondir)/graph_tool/stats
@@ -17 +14 @@
     graph_components.cc \
     graph_histograms.cc \
+    graph_average.cc \
     graph_parallel.cc \
     graph_stats_bind.cc
@@ -23 +21 @@
     graph_components.hh \
     graph_parallel.hh \
-    graph_histograms.hh
+    graph_histograms.hh \
+    graph_average.hh
 
-libgraph_tool_stats_la_LIBADD = \
-    $(PYTHON_LDFLAGS) \
-    $(BOOST_LDFLAGS) \
-    $(OPENMP_LDFLAGS) \
-    -lboost_python \
-    -lboost_iostreams \
-    -lexpat
+libgraph_tool_stats_la_LIBADD = $(MOD_LIBADD)
 
-# needed for typeinfo objects to work across DSO boundaries.
-# see http://gcc.gnu.org/faq.html#dso
-libgraph_tool_stats_la_LDFLAGS = \
-    -module \
-    -avoid-version \
-    -export-dynamic \
-    -no-undefined \
-    -Wl,-E
+libgraph_tool_stats_la_LDFLAGS = $(MOD_LDFLAGS)

src/graph/stats/graph_stats_bind.cc

@@ -21 +21 @@
 void export_parallel();
 void export_histograms();
+void export_average();
 
 BOOST_PYTHON_MODULE(libgraph_tool_stats)
@@ -27 +28 @@
     export_parallel();
     export_histograms();
+    export_average();
 }