Commit d6dd7b35 authored by Ugo Jardonnet's avatar Ugo Jardonnet
Browse files

Update INIM.

	* jardonnet/virtual/access.cc: Update.
	* inim/classif/src/iccvg04.cc: Fix signature.
	* inim/classif/src/proj.hh: Fix include.
	* inim/classif/src/v2.cc: Fix include.
	* inim/classif/Makefile: Make all.


git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3177 4aad255d-cdde-0310-9447-f3009e2ae8c0
parent 3f6e5dbc
2009-01-21 Ugo Jardonnet <ugo.jardonnet@lrde.epita.fr>
Update INIM.
* jardonnet/virtual/access.cc: Update.
* inim/classif/src/iccvg04.cc: Fix signature.
* inim/classif/src/proj.hh: Fix include.
* inim/classif/src/v2.cc: Fix include.
* inim/classif/Makefile: Make all.
2009-01-21 Thierry Geraud <thierry.geraud@lrde.epita.fr>
Add children computation to Laurent's code.
......
......@@ -19,6 +19,7 @@ V2_DBG=v2_dbg
LOG=> stdout.log 2> stderr.log
all: $(ICCVG) $(V2)
$(ICCVG): $(ICCVG_SRC)
g++ $(ICCVG_INCLUDES) -O1 -DNDEBUG $(ICCVG_SRC) -o $(ICCVG)
......
......@@ -2,7 +2,6 @@
#include <mln/core/image/image2d.hh>
#include <mln/core/image/image3d.hh>
#include <mln/histo/data.hh>
#include <mln/value/all.hh>
#include <mln/data/fill.hh>
......@@ -158,8 +157,8 @@ int main(int argc, char **argv)
image3d<unsigned> histo = fill_histo(ima,div_factor);
//compute opening_volume of histo
image3d<unsigned> histo_filtered(histo.domain());
morpho::opening_volume(histo, c6(), lambda, histo_filtered);
image3d<unsigned> histo_filtered;
histo_filtered = morpho::opening_volume(histo, c6(), lambda);
//watershed over histo_closure
unsigned nbasins = 0;
......
......@@ -35,7 +35,7 @@
#include <mln/accu/maj_h.hh>
#include <mln/literal/white.hh>
#include <mln/literal/colors.hh>
#include <mln/make/vec.hh
#include <mln/make/vec.hh>
#include <mln/opt/at.hh>
namespace mln
......
#include <mln/core/image/image2d.hh>
#include <mln/core/image/image3d.hh>
#include <mln/histo/data.hh>
#include <mln/value/all.hh>
......@@ -65,7 +64,7 @@ process_max_tree(const I& ima, const J& histo, const N& nbh,
// FIXME: write a compute() method with functor argument
image3d<unsigned> nb_represent = run.compute_nb_represent();
image3d<unsigned> volume = run.compute_volume();
image3d<unsigned> volume = run.compute_volume(); // surface (area)
image3d< algebra::vec<3, double> > mean_color = run.compute_mean_color();
image3d<double> density = compute_density(nb_represent, volume);
......
......@@ -84,13 +84,9 @@ int main()
mln_VAR(rt, compose(r,t));
mln_VAR(tr_ima, transposed_image(interp.domain(), interp, rt));
// data::fill(output, tr_ima);
//border::adjust(interp, 20);
//test1<interpolation::bilinear>(input, output, compose(r,t));
test2(interp, output, compose(r,t));
//test3(tr_ima, output);
mln::io::ppm::save(output,"./out.ppm");
}
......@@ -72,13 +72,13 @@ namespace mln
struct my_less_
{
const I& ima_;
inline
my_less_(const I& ima)
: ima_(ima)
{
}
inline
bool operator()(const mln_site(I)& lhs,
const mln_site(I)& rhs) const
......@@ -272,11 +272,11 @@ namespace mln
if (echo)
std::cout << "n_regmins(g_ref) = " << n_regmins_g_ref << std::endl
<< std::endl;
if (g != g_ref)
std::cerr << "OOPS: g DIFFERS FROM ref!" << std::endl
<< std::endl;
bool consistency = (n_regmins_g_ref + less == n_objects);
if (consistency == false)
std::cerr << "OOPS: INCONSISTENCY (BUG...)!" << std::endl
......@@ -330,7 +330,7 @@ int main(int argc, char* argv[])
S s = level::sort_psites_decreasing(f);
// Children go towards lower levels so leafs are regional minima.
// We get a min-tree so that we can perform morphological closings.
// We get a min-tree so that we can perform morphological closings.
typedef morpho::tree::data<I,S> tree_t;
tree_t t(f, s, nbh);
......
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