Commit 17734ea5 authored by Roland Levillain's avatar Roland Levillain
Browse files

Fix make::edge_image.

	* mln/make/edge_image.hh: Fix Doxygen comments.
	(make::edge_image(const Graph<G>&, const fun::i2v::array<V>&))
	(make::edge_image(const Graph<G>&, const Function_v2v<FP>&,
	const Function_v2v<FV>&))):
	Properly build the required p_edges site sets.
	(make::edge_image(const vertex_image<P,V,G>&, const Function_v2b<F>&)):
	Actually use the predicate passed as second argument.
	Remove debug code.
parent 4c42b800
2010-05-11 Roland Levillain <roland@lrde.epita.fr>
Fix make::edge_image.
* mln/make/edge_image.hh: Fix Doxygen comments.
(make::edge_image(const Graph<G>&, const fun::i2v::array<V>&))
(make::edge_image(const Graph<G>&, const Function_v2v<FP>&,
const Function_v2v<FV>&))):
Properly build the required p_edges site sets.
(make::edge_image(const vertex_image<P,V,G>&, const Function_v2b<F>&)):
Actually use the predicate passed as second argument.
Remove debug code.
2010-04-27 Roland Levillain <roland@lrde.epita.fr> 2010-04-27 Roland Levillain <roland@lrde.epita.fr>
   
Help g++ 3.3 compile Milena code. Help g++ 3.3 compile Milena code.
...@@ -46,7 +46,7 @@ namespace mln ...@@ -46,7 +46,7 @@ namespace mln
/// Construct an edge image. /// Construct an edge image.
/// ///
/// \param[in] g A graph /// \param[in] g A graph.
/// \param[in] fv A function mapping edge ids to values. /// \param[in] fv A function mapping edge ids to values.
/// ///
/// \return an edge image. /// \return an edge image.
...@@ -57,7 +57,7 @@ namespace mln ...@@ -57,7 +57,7 @@ namespace mln
/// Construct an edge image. /// Construct an edge image.
/// ///
/// \param[in] g A graph /// \param[in] g A graph.
/// \param[in] fv A function mapping edge ids to values. /// \param[in] fv A function mapping edge ids to values.
/// ///
/// \return an edge image. /// \return an edge image.
...@@ -69,7 +69,7 @@ namespace mln ...@@ -69,7 +69,7 @@ namespace mln
/// Construct an edge image. /// Construct an edge image.
/// ///
/// \param[in] g_ A graph /// \param[in] g_ A graph.
/// \param[in] fp A function mapping edge ids to sites. /// \param[in] fp A function mapping edge ids to sites.
/// \param[in] fv A function mapping edge ids to values. /// \param[in] fv A function mapping edge ids to values.
/// ///
...@@ -86,7 +86,7 @@ namespace mln ...@@ -86,7 +86,7 @@ namespace mln
/// Construct an edge image. /// Construct an edge image.
/// ///
/// \param[in] v_ima_ A vertex image. /// \param[in] v_ima_ A vertex image.
/// \param[in] pe A p_edges mapping graph element to sites . /// \param[in] pe A p_edges mapping graph elements to sites.
/// \param[in] fv_ A function mapping two vertex ids to a value. /// \param[in] fv_ A function mapping two vertex ids to a value.
/// The result is associated to the corresponding edge. /// The result is associated to the corresponding edge.
/// ///
...@@ -103,7 +103,7 @@ namespace mln ...@@ -103,7 +103,7 @@ namespace mln
/// Construct an edge image. /// Construct an edge image.
/// ///
/// \param[in] v_ima_ A vertex image. /// \param[in] v_ima_ A vertex image.
/// \param[in] fv_ A function mapping two vertices ids to a value. /// \param[in] fv_ A function mapping two vertices' values to a value.
/// The result is associated to the corresponding edge. /// The result is associated to the corresponding edge.
/// ///
/// \return an edge image without localization information mapped to /// \return an edge image without localization information mapped to
...@@ -118,8 +118,9 @@ namespace mln ...@@ -118,8 +118,9 @@ namespace mln
/// Construct an edge image. /// Construct an edge image.
/// ///
/// \param[in] v_ima_ A vertex image. /// \param[in] v_ima_ A vertex image.
/// \param[in] fv_ A function mapping a vertex ids to a value. /// \param[in] fv_ A predicate on a vertex's value.
/// The result is associated to the corresponding edge. /// The (Boolean) result is associated to the
/// edges adjacent to the vertex.
/// ///
/// \return an edge image without localization information mapped to /// \return an edge image without localization information mapped to
/// graph elements. /// graph elements.
...@@ -142,8 +143,8 @@ namespace mln ...@@ -142,8 +143,8 @@ namespace mln
trace::entering("make::edge_image"); trace::entering("make::edge_image");
mln_precondition(exact(g).is_valid()); mln_precondition(exact(g).is_valid());
p_vertices<G> pv(g); p_edges<G> pe(g);
mln::edge_image<void,V,G> ima(pv, fv); mln::edge_image<void,V,G> ima(pe, fv);
trace::exiting("make::edge_image"); trace::exiting("make::edge_image");
return ima; return ima;
...@@ -183,8 +184,8 @@ namespace mln ...@@ -183,8 +184,8 @@ namespace mln
const G& g = exact(g_); const G& g = exact(g_);
mln_precondition(g.is_valid()); mln_precondition(g.is_valid());
p_vertices<G,FP> pv(g,fp); p_edges<G,FP> pe(g,fp);
mln::edge_image<mln_result(FP),mln_result(FV),G> ima(pv, fv); mln::edge_image<mln_result(FP),mln_result(FV),G> ima(pe, fv);
trace::exiting("make::edge_image"); trace::exiting("make::edge_image");
return ima; return ima;
...@@ -256,7 +257,6 @@ namespace mln ...@@ -256,7 +257,6 @@ namespace mln
const v_ima_t& v_ima = exact(v_ima_); const v_ima_t& v_ima = exact(v_ima_);
mln_precondition(v_ima.is_valid()); mln_precondition(v_ima.is_valid());
p_edges<G> pe(v_ima.domain().graph()); p_edges<G> pe(v_ima.domain().graph());
typedef mln::edge_image<void,bool,G> edge_ima_t; typedef mln::edge_image<void,bool,G> edge_ima_t;
edge_ima_t ima_e(pe); edge_ima_t ima_e(pe);
...@@ -269,8 +269,7 @@ namespace mln ...@@ -269,8 +269,7 @@ namespace mln
typename v_ima_t::edge_win_t win; typename v_ima_t::edge_win_t win;
mln_qiter(v_ima_t::edge_win_t) q(win, p); mln_qiter(v_ima_t::edge_win_t) q(win, p);
for_all(q) for_all(q)
std::cout << q << std::endl; ima_e(q) = false;
// ima_e(q) = false;
} }
trace::exiting("make::edge_image"); trace::exiting("make::edge_image");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment