diff --git a/fastlib2/contrib/nvasil/all_centroid_knn/all_centroid_knn.h b/fastlib2/contrib/nvasil/all_centroid_knn/all_centroid_knn.h index d0258738ac..735dd79424 100644 --- a/fastlib2/contrib/nvasil/all_centroid_knn/all_centroid_knn.h +++ b/fastlib2/contrib/nvasil/all_centroid_knn/all_centroid_knn.h @@ -266,7 +266,7 @@ class AllCentroidkNN { tree_max_depth_=0; tree_min_depth_=RAND_MAX; ComputeDepth_(tree_for_centroids_, 0); - NOTIFY("Tree max depth:%i min depth:%i \n", tree_max_depth_, tree_min_depth_); + NOTIFY("Tree max_depth:%i min_depth:%i \n", tree_max_depth_, tree_min_depth_); } /* diff --git a/fastlib2/contrib/nvasil/multiscale_mvu/multiscale_mvu.h b/fastlib2/contrib/nvasil/multiscale_mvu/multiscale_mvu.h index aebfd37135..963ffef358 100644 --- a/fastlib2/contrib/nvasil/multiscale_mvu/multiscale_mvu.h +++ b/fastlib2/contrib/nvasil/multiscale_mvu/multiscale_mvu.h @@ -39,7 +39,9 @@ class MultiscaleMVU { dimension_=points.n_rows(); num_of_points_=points.n_cols(); } - void Destruct(); + void Destruct() { + + } void ComputeOptimum() { datanode *l_bfgs_node=fx_submodule(module_, "/l_bfgs", "opt"); datanode *optfun_node=fx_submodule(module_, "/optfun", "optfun"); @@ -70,7 +72,7 @@ class MultiscaleMVU { } OptimizedFunction optfun; optfun.Init(optfun_node, interim_data); - l_bfgs_.Init(l_bfgs_node, optfun); + l_bfgs_.Init(&optfun, l_bfgs_node); l_bfgs_.set_coordinates(init_data); l_bfgs_.ComputeLocalOptimumBFGS(); // Now put the results back to interim data diff --git a/fastlib2/contrib/nvasil/multiscale_mvu/multiscale_mvu_test.cc b/fastlib2/contrib/nvasil/multiscale_mvu/multiscale_mvu_test.cc index 92a58dbafd..d163afbc4a 100644 --- a/fastlib2/contrib/nvasil/multiscale_mvu/multiscale_mvu_test.cc +++ b/fastlib2/contrib/nvasil/multiscale_mvu/multiscale_mvu_test.cc @@ -32,6 +32,7 @@ class MultiscaleMVUTest { data::Load("/net/hg200/nvasil/dataset/swiss_roll/swiss_roll_10000.csv" , &points); datanode *module=fx_submodule(NULL, "/", "temp"); engine_->Init(points, module); + engine_->ComputeOptimum(); Destruct(); } void TestAll() {