Changeset 2568:046c055217f6 in lemon-0.x

Timestamp:

02/08/08 11:18:55 (16 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3449

Message:

Math constants + configure bugfix backported
from hg a315a588a20d and 761622e5ed4c

Files:

• configure.ac (modified) (1 diff)
• demo/descriptor_map_demo.cc (modified) (1 diff)
• demo/eps_demo.cc (modified) (1 diff)
• doc/maps.dox (modified) (2 diffs)
• doc/maps2.dox (modified) (2 diffs)
• lemon/Makefile.am (modified) (1 diff)
• lemon/math.h (added)
• lemon/random.h (modified) (1 diff)

configure.ac

@@ -14 +14 @@
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects nostdinc])
 AC_CONFIG_SRCDIR([lemon/list_graph.h])
 AC_CONFIG_HEADERS([config.h lemon/config.h])

demo/descriptor_map_demo.cc

@@ -62 +62 @@
 
   Value operator[](const Key& key) const {
-    double angle = descriptor[key] * 2 * M_PI 
+    double angle = descriptor[key] * 2 * PI 
       / double(descriptor.inverse().size());
     double x = std::cos(angle) * radius + center.x;

demo/eps_demo.cc

@@ -48 +48 @@
   ed.moveTo(0,1);
   
-  for(d=0;d<M_PI*2*5;d+=.1)
+  for(d=0;d<PI*2*5;d+=.1)
     {
       ed.lineTo(sin(d*3),cos(d*5));

doc/maps.dox

@@ -107 +107 @@
   typedef double Value;
   typedef Graph::Edge Key;
-  double operator[](Key e) const { return M_PI;}
+  double operator[](Key e) const { return PI;}
 };
 \endcode
@@ -116 +116 @@
 struct MyMap : public MapBase<Graph::Edge,double>
 {
-  Value operator[](Key e) const { return M_PI;}
+  Value operator[](Key e) const { return PI;}
 };
 \endcode

doc/maps2.dox

@@ -43 +43 @@
   typedef double Value;
   typedef Graph::Edge Key;
-  double operator[](const Key &e) const { return M_PI;}
+  double operator[](const Key &e) const { return PI;}
 };
 \endcode
@@ -52 +52 @@
 struct MyMap : public MapBase<Graph::Edge,double>
 {
-  Value operator[](const Key& e) const { return M_PI;}
+  Value operator[](const Key& e) const { return PI;}
 };
 \endcode

lemon/Makefile.am

@@ -93 +93 @@
         lemon/map_iterator.h \
         lemon/maps.h \
+        lemon/math.h \
         lemon/matrix_maps.h \
         lemon/max_matching.h \

lemon/random.h

@@ -767 +767 @@
       double xi,nu;
       const double delta = k-std::floor(k);
-      const double v0=M_E/(M_E-delta);
+      const double v0=E/(E-delta);
       do {
         double V0=1.0-real<double>();