* headers.mk: update distributed file list. * mln/accu/inf.hh, * mln/accu/sup.hh: add a missing typename. * mln/canvas/browsing/depth_first_search.hh: call id() on vertex elements. * mln/core/concept/object_id.hh: add a missing operator==. * mln/fun/math/inf.hh, * mln/fun/math/sup.hh: add a missing new line at end of file and fix copyright. * mln/trait/next/solve_proxy.hh: add a missing forward declaration. * mln/util/vertex.hh, * mln/util/internal/id2element.hh: add a missing include. * tests/core/image/line_graph_image.cc: use make::vertex_image. * tests/make/dummy_p_edges.cc, * tests/make/dummy_p_vertices.cc, * tests/util/line_graph.cc: call index() instead of id(). * tests/unit_test/unit-tests.mk: update list of unit tests. --- milena/ChangeLog | 31 ++++++++ milena/headers.mk | 30 ++++++++ milena/mln/accu/inf.hh | 4 +- milena/mln/accu/sup.hh | 4 +- milena/mln/canvas/browsing/depth_first_search.hh | 9 ++- milena/mln/core/concept/object_id.hh | 84 ++++------------------ milena/mln/fun/math/inf.hh | 5 +- milena/mln/fun/math/sup.hh | 5 +- milena/mln/trait/next/solve_proxy.hh | 13 +++- milena/mln/util/internal/id2element.hh | 1 + milena/mln/util/vertex.hh | 1 + milena/tests/core/image/line_graph_image.cc | 3 +- milena/tests/make/dummy_p_edges.cc | 5 +- milena/tests/make/dummy_p_vertices.cc | 2 +- milena/tests/unit_test/unit-tests.mk | 60 +++++++++++++++ milena/tests/util/line_graph.cc | 4 +- 16 files changed, 172 insertions(+), 89 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1a416bd..efc8740 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,34 @@ +2009-04-28 Guillaume Lazzara <lazzara@lrde.epita.fr> + + Small fixes (again). + + * headers.mk: update distributed file list. + + * mln/accu/inf.hh, + * mln/accu/sup.hh: add a missing typename. + + * mln/canvas/browsing/depth_first_search.hh: call id() on vertex + elements. + + * mln/core/concept/object_id.hh: add a missing operator==. + + * mln/fun/math/inf.hh, + * mln/fun/math/sup.hh: add a missing new line at end of file and fix + copyright. + + * mln/trait/next/solve_proxy.hh: add a missing forward declaration. + + * mln/util/vertex.hh, + * mln/util/internal/id2element.hh: add a missing include. + + * tests/core/image/line_graph_image.cc: use make::vertex_image. + + * tests/make/dummy_p_edges.cc, + * tests/make/dummy_p_vertices.cc, + * tests/util/line_graph.cc: call index() instead of id(). + + * tests/unit_test/unit-tests.mk: update list of unit tests. + 2009-04-27 Guillaume Lazzara <lazzara@lrde.epita.fr> Small fixes. diff --git a/milena/headers.mk b/milena/headers.mk index 5eaf7f7..733a334 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -145,6 +145,7 @@ mln/make/cell.hh \ mln/make/image.hh \ mln/make/influence_zone_adjacency_graph.hh \ mln/make/vec.hh \ +mln/make/edge_image.hh \ mln/make/all.hh \ mln/make/dual_neighb.hh \ mln/make/attachment.hh \ @@ -204,9 +205,11 @@ mln/fun/p2b/essential.hh \ mln/fun/p2p/all.hh \ mln/fun/p2p/translation.hh \ mln/fun/p2p/mirror.hh \ +mln/fun/accu_result.hh \ mln/fun/x2p/closest_point.hh \ mln/fun/x2p/all.hh \ mln/fun/x2p/essential.hh \ +mln/fun/binary.hh \ mln/fun/ops.hh \ mln/fun/c.hh \ mln/fun/vv2v/max.hh \ @@ -224,6 +227,8 @@ mln/fun/internal/x2x_linear_impl.hh \ mln/fun/internal/ch_function_value_impl.hh \ mln/fun/internal/resolve.hh \ mln/fun/internal/selector.hh \ +mln/fun/spe/binary.hh \ +mln/fun/spe/unary.hh \ mln/fun/v2w_w2v/norm.hh \ mln/fun/p2v/ternary.hh \ mln/fun/p2v/iota.hh \ @@ -231,6 +236,12 @@ mln/fun/p2v/elifs.hh \ mln/fun/p2v/all.hh \ mln/fun/p2v/essential.hh \ mln/fun/all.hh \ +mln/fun/param.hh \ +mln/fun/math/norm.hh \ +mln/fun/math/abs.hh \ +mln/fun/math/sup.hh \ +mln/fun/math/cos.hh \ +mln/fun/math/inf.hh \ mln/fun/v2b/lnot.hh \ mln/fun/v2b/all.hh \ mln/fun/v2b/threshold.hh \ @@ -252,6 +263,7 @@ mln/fun/v2v/projection.hh \ mln/fun/v2v/convert.hh \ mln/fun/v2v/essential.hh \ mln/fun/v2w2v/cos.hh \ +mln/fun/unary.hh \ mln/fun/vv2b/implies.hh \ mln/fun/vv2b/le.hh \ mln/fun/vv2b/gt.hh \ @@ -259,6 +271,7 @@ mln/fun/vv2b/ge.hh \ mln/fun/vv2b/lt.hh \ mln/fun/vv2b/eq.hh \ mln/fun/cast.hh \ +mln/fun/composition.hh \ mln/fun/i2v/all.hh \ mln/fun/i2v/array.hh \ mln/fun/i2v/all_to.hh \ @@ -271,6 +284,12 @@ mln/fun/x2x/all.hh \ mln/fun/x2x/translation.hh \ mln/fun/x2x/rotation.hh \ mln/fun/x2x/essential.hh \ +mln/fun/component/red.hh \ +mln/fun/component/green.hh \ +mln/fun/component/comp.hh \ +mln/fun/component/blue.hh \ +mln/fun/component/rgb.hh \ +mln/fun/compose.hh \ mln/fun/meta/red.hh \ mln/fun/meta/hue.hh \ mln/fun/meta/lum.hh \ @@ -283,6 +302,7 @@ mln/fun/meta/sat.hh \ mln/fun/meta/first.hh \ mln/fun/meta/to_enc.hh \ mln/fun/meta/essential.hh \ +mln/fun/from_accu.hh \ mln/fun/x2v/trilinear.hh \ mln/fun/x2v/linear.hh \ mln/fun/x2v/bilinear.hh \ @@ -410,6 +430,7 @@ mln/accu/land_basic.hh \ mln/accu/p.hh \ mln/accu/transform.hh \ mln/accu/median_alt.hh \ +mln/accu/sup.hh \ mln/accu/volume.hh \ mln/accu/sum.hh \ mln/accu/label_used.hh \ @@ -417,6 +438,7 @@ mln/accu/height.hh \ mln/accu/land.hh \ mln/accu/take.hh \ mln/accu/histo.hh \ +mln/accu/inf.hh \ mln/accu/pair.hh \ mln/accu/count_labels.hh \ mln/accu/count_adjacent_vertices.hh \ @@ -517,10 +539,15 @@ mln/trait/window/props.hh \ mln/trait/window/print.hh \ mln/trait/accumulator/props.hh \ mln/trait/accumulator/print.hh \ +mln/trait/next/solve_binary.hh \ +mln/trait/next/solve.hh \ +mln/trait/next/solve_unary.hh \ +mln/trait/next/solve_proxy.hh \ mln/trait/ch_function_value.hh \ mln/trait/ch_value.hh \ mln/trait/solve.hh \ mln/trait/solve_unary.hh \ +mln/trait/fun.hh \ mln/trait/op/postdec.hh \ mln/trait/op/mod.hh \ mln/trait/op/lor.hh \ @@ -948,6 +975,7 @@ mln/core/concept/doc/point_iterator.hh \ mln/core/concept/pseudo_site.hh \ mln/core/concept/image.hh \ mln/core/concept/value_set.hh \ +mln/core/concept/meta_function.hh \ mln/core/concept/proxy.hh \ mln/core/concept/site.hh \ mln/core/concept/weighted_window.hh \ @@ -1005,8 +1033,10 @@ mln/core/image/cast_image.hh \ mln/core/image/rle_encode.hh \ mln/core/image/complex_window_piter.hh \ mln/core/image/tr_image.hh \ +mln/core/image/thrubin_morpher.hh \ mln/core/image/sub_image.hh \ mln/core/image/rle_image.hh \ +mln/core/image/thru_morpher.hh \ mln/core/image/mono_rle_encode.hh \ mln/core/image/bgraph_psite.hh \ mln/core/image/sparse_image.hh \ diff --git a/milena/mln/accu/inf.hh b/milena/mln/accu/inf.hh index a17ee29..d44b1b5 100644 --- a/milena/mln/accu/inf.hh +++ b/milena/mln/accu/inf.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2009 EPITA Research and Development Laboratory // (LRDE) // // This file is part of the Olena Library. This library is free @@ -75,7 +75,7 @@ namespace mln protected: T t_; - mln::fun::inf::with<T, T>::ret fun_; + typename mln::fun::inf::with<T, T>::ret fun_; }; diff --git a/milena/mln/accu/sup.hh b/milena/mln/accu/sup.hh index f7759d2..a07c3e7 100644 --- a/milena/mln/accu/sup.hh +++ b/milena/mln/accu/sup.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2009 EPITA Research and Development Laboratory // (LRDE) // // This file is part of the Olena Library. This library is free @@ -75,7 +75,7 @@ namespace mln protected: T t_; - mln::fun::sup::with<T, T>::ret fun_; + typename mln::fun::sup::with<T, T>::ret fun_; }; diff --git a/milena/mln/canvas/browsing/depth_first_search.hh b/milena/mln/canvas/browsing/depth_first_search.hh index 818e44b..48a8554 100644 --- a/milena/mln/canvas/browsing/depth_first_search.hh +++ b/milena/mln/canvas/browsing/depth_first_search.hh @@ -81,18 +81,25 @@ namespace mln namespace browsing { + /// Depth-limited search algorithm for graph. + /// Browse over all vertices for each component. struct depth_first_search_t : public Browsing< depth_first_search_t > { template <typename G, typename F> void operator()(const Graph<G>&, F& f) const; }; + extern const depth_first_search_t depth_first_search; + + # ifndef MLN_INCLUDE_ONLY const depth_first_search_t depth_first_search; + + template <typename G, typename F> inline void @@ -115,7 +122,7 @@ namespace mln while (!queue.empty()) { util::vertex<G> current_v = g.vertex(queue.front()); - f.process_vertex(current_v); // <--- process_vertex + f.process_vertex(current_v.id()); // <--- process_vertex queue.pop(); for (unsigned nv = 0; nv < current_v.nmax_nbh_vertices(); ++nv) if (f.to_be_queued(current_v.ith_nbh_vertex(nv))) // <--- to_be_queued diff --git a/milena/mln/core/concept/object_id.hh b/milena/mln/core/concept/object_id.hh index 5bf5547..770098e 100644 --- a/milena/mln/core/concept/object_id.hh +++ b/milena/mln/core/concept/object_id.hh @@ -98,19 +98,10 @@ namespace mln template <typename Tag, typename V> bool operator==(const object_id<Tag,V>& lhs, const object_id<Tag,V>& rhs); -// -// template <typename Tag, typename V> -// bool -// operator<(const object_id<Tag,V>& lhs, const object_id<Tag,V>& rhs); -// -// template <typename Tag, typename V> -// bool -// operator<(const object_id<Tag,V>& lhs, -// const typename object_id<Tag,V>::V& rhs); -// -// template <typename Tag, typename V> -// std::ostream& -// operator<<(std::ostream& ostr, const object_id<Tag,V>& id); + + template <typename Tag, typename V, typename V2> + bool + operator==(const object_id<Tag,V>& lhs, const Value<V2>& rhs); # ifndef MLN_INCLUDE_ONLY @@ -202,15 +193,8 @@ namespace mln } -// template <typename Tag, typename V> -// inline -// std::ostream& -// operator<<(std::ostream& ostr, const object_id<Tag,V>& id) -// { -// return ostr << id.value(); -// } -// -// + + template <typename Tag, typename V> inline bool @@ -218,56 +202,14 @@ namespace mln { return lhs.value() == rhs.value(); } -// -// template <typename Tag, typename V> -// inline -// bool -// operator<(const object_id<Tag,V>& lhs, const object_id<Tag,V>& rhs) -// { -// return lhs.value() < rhs.value(); -// } -// -// template <typename Tag, typename V> -// inline -// bool -// operator<(const object_id<Tag,V>& lhs, const V& rhs) -// { -// return lhs.value() < rhs; -// } -// -// template <typename Tag, typename V> -// inline -// bool -// operator<=(const object_id<Tag,V>& lhs, const object_id<Tag,V>& rhs) -// { -// return lhs.value() <= rhs.value(); -// } -// -// template <typename Tag, typename V> -// inline -// bool -// operator<=(const object_id<Tag,V>& lhs, const V& rhs) -// { -// return lhs.value() <= rhs; -// } - -// template <typename Tag, typename V> -// inline -// object_id<Tag,V> -// operator+(const object_id<Tag,V>& lhs, const V& rhs) -// { -// return lhs.value() + rhs; -// } -// -// template <typename Tag, typename V> -// inline -// object_id<Tag,V> -// operator+(const object_id<Tag,V>& lhs, const size_t& rhs) -// { -// return lhs.value() + rhs; -// } - + template <typename Tag, typename V, typename V2> + inline + bool + operator==(const object_id<Tag,V>& lhs, const Value<V2>& rhs) + { + return lhs.value() == exact(rhs).to_equiv(); + } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/fun/math/inf.hh b/milena/mln/fun/math/inf.hh index 56a4a12..2c80d84 100644 --- a/milena/mln/fun/math/inf.hh +++ b/milena/mln/fun/math/inf.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -66,4 +66,5 @@ namespace mln } -#endif /* ! MLN_FUN_MATH_INF_HH */ \ No newline at end of file +#endif /* ! MLN_FUN_MATH_INF_HH */ + diff --git a/milena/mln/fun/math/sup.hh b/milena/mln/fun/math/sup.hh index ed00aa8..cd94dc1 100644 --- a/milena/mln/fun/math/sup.hh +++ b/milena/mln/fun/math/sup.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -66,4 +66,5 @@ namespace mln } -#endif /* ! MLN_FUN_MATH_SUP_HH */ \ No newline at end of file +#endif /* ! MLN_FUN_MATH_SUP_HH */ + diff --git a/milena/mln/trait/next/solve_proxy.hh b/milena/mln/trait/next/solve_proxy.hh index 168d305..a46cf1b 100644 --- a/milena/mln/trait/next/solve_proxy.hh +++ b/milena/mln/trait/next/solve_proxy.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -51,6 +51,13 @@ namespace mln namespace next { + // Forward declaration + // Needed by mln_trait_nbinary. + template < typename Name, typename L_, typename R_ > + struct solve_binary; + + + // Unary ops. template < typename Op, typename P > @@ -67,8 +74,8 @@ namespace mln { typedef mln::internal::helper_unprox_binop<L, R> helper; typedef mln_trait_nbinary(Op, - typename helper::L_ret, - typename helper::R_ret) ret; + typename helper::L_ret, + typename helper::R_ret) ret; }; template < typename Op, typename P, typename O > diff --git a/milena/mln/util/internal/id2element.hh b/milena/mln/util/internal/id2element.hh index d574dc3..48550da 100644 --- a/milena/mln/util/internal/id2element.hh +++ b/milena/mln/util/internal/id2element.hh @@ -34,6 +34,7 @@ /// Function constructing a element from an id. #include <mln/core/concept/graph.hh> +#include <mln/core/concept/function.hh> namespace mln { diff --git a/milena/mln/util/vertex.hh b/milena/mln/util/vertex.hh index 4b43ef3..8c931df 100644 --- a/milena/mln/util/vertex.hh +++ b/milena/mln/util/vertex.hh @@ -33,6 +33,7 @@ # include <mln/util/graph_ids.hh> # include <mln/util/internal/vertex_impl.hh> # include <mln/core/concept/proxy.hh> +# include <mln/core/concept/site.hh> /// \file mln/util/vertex.hh /// diff --git a/milena/tests/core/image/line_graph_image.cc b/milena/tests/core/image/line_graph_image.cc index 2c11e73..9a67fda 100644 --- a/milena/tests/core/image/line_graph_image.cc +++ b/milena/tests/core/image/line_graph_image.cc @@ -42,6 +42,7 @@ #include <mln/pw/all.hh> #include <mln/fun/i2v/array.hh> #include <mln/util/graph.hh> +#include <mln/make/vertex_image.hh> /* The graph and its corresponding line graph are as follows: @@ -113,7 +114,7 @@ int main() // Create line graph image. typedef vertex_image<point2d,unsigned> ima_t; - ima_t ima(g, sites, iota); + ima_t ima = make::vertex_image(g, sites, iota); /*------------. | Iterators. | diff --git a/milena/tests/make/dummy_p_edges.cc b/milena/tests/make/dummy_p_edges.cc index b04e6d4..5fb56e8 100644 --- a/milena/tests/make/dummy_p_edges.cc +++ b/milena/tests/make/dummy_p_edges.cc @@ -52,13 +52,14 @@ int main() g.add_edge(4,2); { - typedef p_edges<G, pw::cst_<int> > pe_t; + typedef p_edges<G> pe_t; pe_t pe = make::dummy_p_edges(g); + unsigned i = 0; mln_assertion(pe.nsites() == 4); mln_piter_(pe_t) p(pe); for_all(p) - mln_assertion(p == 0); + mln_assertion(p.id() == i++); } { diff --git a/milena/tests/make/dummy_p_vertices.cc b/milena/tests/make/dummy_p_vertices.cc index 344d72c..c97e805 100644 --- a/milena/tests/make/dummy_p_vertices.cc +++ b/milena/tests/make/dummy_p_vertices.cc @@ -52,7 +52,7 @@ int main() g.add_edge(4,2); { - typedef p_vertices<G, pw::cst_<int> > pe_t; + typedef p_vertices<G> pe_t; pe_t pe = make::dummy_p_vertices(g); mln_assertion(pe.nsites() == 5); diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 46fbff2..844b37f 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -140,6 +140,7 @@ mln_make_cell \ mln_make_image \ mln_make_influence_zone_adjacency_graph \ mln_make_vec \ +mln_make_edge_image \ mln_make_all \ mln_make_dual_neighb \ mln_make_attachment \ @@ -199,9 +200,11 @@ mln_fun_p2b_essential \ mln_fun_p2p_all \ mln_fun_p2p_translation \ mln_fun_p2p_mirror \ +mln_fun_accu_result \ mln_fun_x2p_closest_point \ mln_fun_x2p_all \ mln_fun_x2p_essential \ +mln_fun_binary \ mln_fun_ops \ mln_fun_c \ mln_fun_vv2v_max \ @@ -219,6 +222,8 @@ mln_fun_internal_x2x_linear_impl \ mln_fun_internal_ch_function_value_impl \ mln_fun_internal_resolve \ mln_fun_internal_selector \ +mln_fun_spe_binary \ +mln_fun_spe_unary \ mln_fun_v2w_w2v_norm \ mln_fun_p2v_ternary \ mln_fun_p2v_iota \ @@ -226,6 +231,12 @@ mln_fun_p2v_elifs \ mln_fun_p2v_all \ mln_fun_p2v_essential \ mln_fun_all \ +mln_fun_param \ +mln_fun_math_norm \ +mln_fun_math_abs \ +mln_fun_math_sup \ +mln_fun_math_cos \ +mln_fun_math_inf \ mln_fun_v2b_lnot \ mln_fun_v2b_all \ mln_fun_v2b_threshold \ @@ -247,6 +258,7 @@ mln_fun_v2v_projection \ mln_fun_v2v_convert \ mln_fun_v2v_essential \ mln_fun_v2w2v_cos \ +mln_fun_unary \ mln_fun_vv2b_implies \ mln_fun_vv2b_le \ mln_fun_vv2b_gt \ @@ -254,6 +266,7 @@ mln_fun_vv2b_ge \ mln_fun_vv2b_lt \ mln_fun_vv2b_eq \ mln_fun_cast \ +mln_fun_composition \ mln_fun_i2v_all \ mln_fun_i2v_array \ mln_fun_i2v_all_to \ @@ -266,6 +279,12 @@ mln_fun_x2x_all \ mln_fun_x2x_translation \ mln_fun_x2x_rotation \ mln_fun_x2x_essential \ +mln_fun_component_red \ +mln_fun_component_green \ +mln_fun_component_comp \ +mln_fun_component_blue \ +mln_fun_component_rgb \ +mln_fun_compose \ mln_fun_meta_red \ mln_fun_meta_hue \ mln_fun_meta_lum \ @@ -278,6 +297,7 @@ mln_fun_meta_sat \ mln_fun_meta_first \ mln_fun_meta_to_enc \ mln_fun_meta_essential \ +mln_fun_from_accu \ mln_fun_x2v_trilinear \ mln_fun_x2v_linear \ mln_fun_x2v_bilinear \ @@ -405,6 +425,7 @@ mln_accu_land_basic \ mln_accu_p \ mln_accu_transform \ mln_accu_median_alt \ +mln_accu_sup \ mln_accu_volume \ mln_accu_sum \ mln_accu_label_used \ @@ -412,6 +433,7 @@ mln_accu_height \ mln_accu_land \ mln_accu_take \ mln_accu_histo \ +mln_accu_inf \ mln_accu_pair \ mln_accu_count_labels \ mln_accu_count_adjacent_vertices \ @@ -510,10 +532,15 @@ mln_trait_window_props \ mln_trait_window_print \ mln_trait_accumulator_props \ mln_trait_accumulator_print \ +mln_trait_next_solve_binary \ +mln_trait_next_solve \ +mln_trait_next_solve_unary \ +mln_trait_next_solve_proxy \ mln_trait_ch_function_value \ mln_trait_ch_value \ mln_trait_solve \ mln_trait_solve_unary \ +mln_trait_fun \ mln_trait_op_postdec \ mln_trait_op_mod \ mln_trait_op_lor \ @@ -923,6 +950,7 @@ mln_core_concept_iterator \ mln_core_concept_pseudo_site \ mln_core_concept_image \ mln_core_concept_value_set \ +mln_core_concept_meta_function \ mln_core_concept_proxy \ mln_core_concept_site \ mln_core_concept_weighted_window \ @@ -980,8 +1008,10 @@ mln_core_image_cast_image \ mln_core_image_rle_encode \ mln_core_image_complex_window_piter \ mln_core_image_tr_image \ +mln_core_image_thrubin_morpher \ mln_core_image_sub_image \ mln_core_image_rle_image \ +mln_core_image_thru_morpher \ mln_core_image_mono_rle_encode \ mln_core_image_bgraph_psite \ mln_core_image_sparse_image \ @@ -1295,6 +1325,7 @@ mln_make_cell_SOURCES = mln_make_cell.cc mln_make_image_SOURCES = mln_make_image.cc mln_make_influence_zone_adjacency_graph_SOURCES = mln_make_influence_zone_adjacency_graph.cc mln_make_vec_SOURCES = mln_make_vec.cc +mln_make_edge_image_SOURCES = mln_make_edge_image.cc mln_make_all_SOURCES = mln_make_all.cc mln_make_dual_neighb_SOURCES = mln_make_dual_neighb.cc mln_make_attachment_SOURCES = mln_make_attachment.cc @@ -1354,9 +1385,11 @@ mln_fun_p2b_essential_SOURCES = mln_fun_p2b_essential.cc mln_fun_p2p_all_SOURCES = mln_fun_p2p_all.cc mln_fun_p2p_translation_SOURCES = mln_fun_p2p_translation.cc mln_fun_p2p_mirror_SOURCES = mln_fun_p2p_mirror.cc +mln_fun_accu_result_SOURCES = mln_fun_accu_result.cc mln_fun_x2p_closest_point_SOURCES = mln_fun_x2p_closest_point.cc mln_fun_x2p_all_SOURCES = mln_fun_x2p_all.cc mln_fun_x2p_essential_SOURCES = mln_fun_x2p_essential.cc +mln_fun_binary_SOURCES = mln_fun_binary.cc mln_fun_ops_SOURCES = mln_fun_ops.cc mln_fun_c_SOURCES = mln_fun_c.cc mln_fun_vv2v_max_SOURCES = mln_fun_vv2v_max.cc @@ -1374,6 +1407,8 @@ mln_fun_internal_x2x_linear_impl_SOURCES = mln_fun_internal_x2x_linear_impl.cc mln_fun_internal_ch_function_value_impl_SOURCES = mln_fun_internal_ch_function_value_impl.cc mln_fun_internal_resolve_SOURCES = mln_fun_internal_resolve.cc mln_fun_internal_selector_SOURCES = mln_fun_internal_selector.cc +mln_fun_spe_binary_SOURCES = mln_fun_spe_binary.cc +mln_fun_spe_unary_SOURCES = mln_fun_spe_unary.cc mln_fun_v2w_w2v_norm_SOURCES = mln_fun_v2w_w2v_norm.cc mln_fun_p2v_ternary_SOURCES = mln_fun_p2v_ternary.cc mln_fun_p2v_iota_SOURCES = mln_fun_p2v_iota.cc @@ -1381,6 +1416,12 @@ mln_fun_p2v_elifs_SOURCES = mln_fun_p2v_elifs.cc mln_fun_p2v_all_SOURCES = mln_fun_p2v_all.cc mln_fun_p2v_essential_SOURCES = mln_fun_p2v_essential.cc mln_fun_all_SOURCES = mln_fun_all.cc +mln_fun_param_SOURCES = mln_fun_param.cc +mln_fun_math_norm_SOURCES = mln_fun_math_norm.cc +mln_fun_math_abs_SOURCES = mln_fun_math_abs.cc +mln_fun_math_sup_SOURCES = mln_fun_math_sup.cc +mln_fun_math_cos_SOURCES = mln_fun_math_cos.cc +mln_fun_math_inf_SOURCES = mln_fun_math_inf.cc mln_fun_v2b_lnot_SOURCES = mln_fun_v2b_lnot.cc mln_fun_v2b_all_SOURCES = mln_fun_v2b_all.cc mln_fun_v2b_threshold_SOURCES = mln_fun_v2b_threshold.cc @@ -1402,6 +1443,7 @@ mln_fun_v2v_projection_SOURCES = mln_fun_v2v_projection.cc mln_fun_v2v_convert_SOURCES = mln_fun_v2v_convert.cc mln_fun_v2v_essential_SOURCES = mln_fun_v2v_essential.cc mln_fun_v2w2v_cos_SOURCES = mln_fun_v2w2v_cos.cc +mln_fun_unary_SOURCES = mln_fun_unary.cc mln_fun_vv2b_implies_SOURCES = mln_fun_vv2b_implies.cc mln_fun_vv2b_le_SOURCES = mln_fun_vv2b_le.cc mln_fun_vv2b_gt_SOURCES = mln_fun_vv2b_gt.cc @@ -1409,6 +1451,7 @@ mln_fun_vv2b_ge_SOURCES = mln_fun_vv2b_ge.cc mln_fun_vv2b_lt_SOURCES = mln_fun_vv2b_lt.cc mln_fun_vv2b_eq_SOURCES = mln_fun_vv2b_eq.cc mln_fun_cast_SOURCES = mln_fun_cast.cc +mln_fun_composition_SOURCES = mln_fun_composition.cc mln_fun_i2v_all_SOURCES = mln_fun_i2v_all.cc mln_fun_i2v_array_SOURCES = mln_fun_i2v_array.cc mln_fun_i2v_all_to_SOURCES = mln_fun_i2v_all_to.cc @@ -1421,6 +1464,12 @@ mln_fun_x2x_all_SOURCES = mln_fun_x2x_all.cc mln_fun_x2x_translation_SOURCES = mln_fun_x2x_translation.cc mln_fun_x2x_rotation_SOURCES = mln_fun_x2x_rotation.cc mln_fun_x2x_essential_SOURCES = mln_fun_x2x_essential.cc +mln_fun_component_red_SOURCES = mln_fun_component_red.cc +mln_fun_component_green_SOURCES = mln_fun_component_green.cc +mln_fun_component_comp_SOURCES = mln_fun_component_comp.cc +mln_fun_component_blue_SOURCES = mln_fun_component_blue.cc +mln_fun_component_rgb_SOURCES = mln_fun_component_rgb.cc +mln_fun_compose_SOURCES = mln_fun_compose.cc mln_fun_meta_red_SOURCES = mln_fun_meta_red.cc mln_fun_meta_hue_SOURCES = mln_fun_meta_hue.cc mln_fun_meta_lum_SOURCES = mln_fun_meta_lum.cc @@ -1433,6 +1482,7 @@ mln_fun_meta_sat_SOURCES = mln_fun_meta_sat.cc mln_fun_meta_first_SOURCES = mln_fun_meta_first.cc mln_fun_meta_to_enc_SOURCES = mln_fun_meta_to_enc.cc mln_fun_meta_essential_SOURCES = mln_fun_meta_essential.cc +mln_fun_from_accu_SOURCES = mln_fun_from_accu.cc mln_fun_x2v_trilinear_SOURCES = mln_fun_x2v_trilinear.cc mln_fun_x2v_linear_SOURCES = mln_fun_x2v_linear.cc mln_fun_x2v_bilinear_SOURCES = mln_fun_x2v_bilinear.cc @@ -1560,6 +1610,7 @@ mln_accu_land_basic_SOURCES = mln_accu_land_basic.cc mln_accu_p_SOURCES = mln_accu_p.cc mln_accu_transform_SOURCES = mln_accu_transform.cc mln_accu_median_alt_SOURCES = mln_accu_median_alt.cc +mln_accu_sup_SOURCES = mln_accu_sup.cc mln_accu_volume_SOURCES = mln_accu_volume.cc mln_accu_sum_SOURCES = mln_accu_sum.cc mln_accu_label_used_SOURCES = mln_accu_label_used.cc @@ -1567,6 +1618,7 @@ mln_accu_height_SOURCES = mln_accu_height.cc mln_accu_land_SOURCES = mln_accu_land.cc mln_accu_take_SOURCES = mln_accu_take.cc mln_accu_histo_SOURCES = mln_accu_histo.cc +mln_accu_inf_SOURCES = mln_accu_inf.cc mln_accu_pair_SOURCES = mln_accu_pair.cc mln_accu_count_labels_SOURCES = mln_accu_count_labels.cc mln_accu_count_adjacent_vertices_SOURCES = mln_accu_count_adjacent_vertices.cc @@ -1665,10 +1717,15 @@ mln_trait_window_props_SOURCES = mln_trait_window_props.cc mln_trait_window_print_SOURCES = mln_trait_window_print.cc mln_trait_accumulator_props_SOURCES = mln_trait_accumulator_props.cc mln_trait_accumulator_print_SOURCES = mln_trait_accumulator_print.cc +mln_trait_next_solve_binary_SOURCES = mln_trait_next_solve_binary.cc +mln_trait_next_solve_SOURCES = mln_trait_next_solve.cc +mln_trait_next_solve_unary_SOURCES = mln_trait_next_solve_unary.cc +mln_trait_next_solve_proxy_SOURCES = mln_trait_next_solve_proxy.cc mln_trait_ch_function_value_SOURCES = mln_trait_ch_function_value.cc mln_trait_ch_value_SOURCES = mln_trait_ch_value.cc mln_trait_solve_SOURCES = mln_trait_solve.cc mln_trait_solve_unary_SOURCES = mln_trait_solve_unary.cc +mln_trait_fun_SOURCES = mln_trait_fun.cc mln_trait_op_postdec_SOURCES = mln_trait_op_postdec.cc mln_trait_op_mod_SOURCES = mln_trait_op_mod.cc mln_trait_op_lor_SOURCES = mln_trait_op_lor.cc @@ -2078,6 +2135,7 @@ mln_core_concept_iterator_SOURCES = mln_core_concept_iterator.cc mln_core_concept_pseudo_site_SOURCES = mln_core_concept_pseudo_site.cc mln_core_concept_image_SOURCES = mln_core_concept_image.cc mln_core_concept_value_set_SOURCES = mln_core_concept_value_set.cc +mln_core_concept_meta_function_SOURCES = mln_core_concept_meta_function.cc mln_core_concept_proxy_SOURCES = mln_core_concept_proxy.cc mln_core_concept_site_SOURCES = mln_core_concept_site.cc mln_core_concept_weighted_window_SOURCES = mln_core_concept_weighted_window.cc @@ -2135,8 +2193,10 @@ mln_core_image_cast_image_SOURCES = mln_core_image_cast_image.cc mln_core_image_rle_encode_SOURCES = mln_core_image_rle_encode.cc mln_core_image_complex_window_piter_SOURCES = mln_core_image_complex_window_piter.cc mln_core_image_tr_image_SOURCES = mln_core_image_tr_image.cc +mln_core_image_thrubin_morpher_SOURCES = mln_core_image_thrubin_morpher.cc mln_core_image_sub_image_SOURCES = mln_core_image_sub_image.cc mln_core_image_rle_image_SOURCES = mln_core_image_rle_image.cc +mln_core_image_thru_morpher_SOURCES = mln_core_image_thru_morpher.cc mln_core_image_mono_rle_encode_SOURCES = mln_core_image_mono_rle_encode.cc mln_core_image_bgraph_psite_SOURCES = mln_core_image_bgraph_psite.cc mln_core_image_sparse_image_SOURCES = mln_core_image_sparse_image.cc diff --git a/milena/tests/util/line_graph.cc b/milena/tests/util/line_graph.cc index 811a695..3370a5c 100644 --- a/milena/tests/util/line_graph.cc +++ b/milena/tests/util/line_graph.cc @@ -94,7 +94,7 @@ int main() { unsigned i = 0; for_all(n) - mln_assertion(i++ == n.id()); + mln_assertion(i++ == n.index()); mln_assertion(i != 0); } } @@ -107,7 +107,7 @@ int main() { unsigned i = v.nmax_nbh_edges(); for_all(e) - mln_assertion(--i == e.id()); + mln_assertion(--i == e.index()); mln_assertion((v.nmax_nbh_edges() == 0 && i == 0) || i != v.nmax_nbh_edges()); } } -- 1.5.6.5