https://svn.lrde.epita.fr/svn/oln/trunk/milena
The only tests that do not work on my laptop now are:
- milena/tests/value/graylevel.cc
- milena/tests/value/graylevel_f.cc
because of an ambiguous conversion.
I have no time to try and fix it today, but any help is welcome! :)
Index: ChangeLog
from Roland Levillain <roland(a)lrde.epita.fr>
Have most of the test suite compile again.
* mln/algebra/quat.hh: Include missing header for mln/math/abs.hh.
* mln/draw/graph.hh
(graph(Image<I>&, const p_graph<P>&, mln_value(I), mln_value(I))):
s/n1/v1/.
s/n2/v2/.
* tests/draw/graph.cc (test): s/add_node/add_vertex/.
mln/algebra/quat.hh | 1 +
mln/draw/graph.hh | 4 ++--
tests/draw/graph.cc | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
Index: mln/algebra/quat.hh
--- mln/algebra/quat.hh (revision 2060)
+++ mln/algebra/quat.hh (working copy)
@@ -42,6 +42,7 @@
# include <mln/trait/value_.hh>
# include <mln/algebra/vec.hh>
+# include <mln/math/abs.hh>
# include <mln/norm/l2.hh>
//FIXME: pow, exp etc... are def here and in value::...
Index: mln/draw/graph.hh
--- mln/draw/graph.hh (revision 2060)
+++ mln/draw/graph.hh (working copy)
@@ -99,8 +99,8 @@
line (exact(ima),
// FIXME: Too low-level. See similar remarks
// in mln/core/graph_image.hh
- pg.gr_->vertex_data(pg.gr_->edge(l).n1()),
- pg.gr_->vertex_data(pg.gr_->edge(l).n2()),
+ pg.gr_->vertex_data(pg.gr_->edge(l).v1()),
+ pg.gr_->vertex_data(pg.gr_->edge(l).v2()),
edge_v);
// Draw the points (vertices).
for (size_t p = 0; p < pg.npoints(); ++p)
Index: tests/draw/graph.cc
--- tests/draw/graph.cc (revision 2060)
+++ tests/draw/graph.cc (working copy)
@@ -64,7 +64,7 @@
util::graph<mln::point2d> g;
// Populate the graph with nodes.
for (unsigned i = 0; i < points.size(); ++i)
- g.add_node (points[i]);
+ g.add_vertex(points[i]);
// Populate the graph with edges.
for (edges_type::const_iterator i = edges.begin(); i != edges.end(); ++i)
g.add_edge (i->first, i->second);