diff options
author | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-30 10:29:32 +0000 |
---|---|---|
committer | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-30 10:29:32 +0000 |
commit | 3ec8a40aaf7e34116e0d4f422994d5aee109c2b3 (patch) | |
tree | 1031c4a624ab8e216ad1361168f12d1f4e580293 /src/Witness_complex/include/gudhi/Euclidean_witness_complex.h | |
parent | 0629c55fc91ab128cca77c977106d8dbb0148e10 (diff) |
The new class design compiles.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/relaxed-witness@2023 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 8243073046081f51ae6725aa3d7dc921dea450e1
Diffstat (limited to 'src/Witness_complex/include/gudhi/Euclidean_witness_complex.h')
-rw-r--r-- | src/Witness_complex/include/gudhi/Euclidean_witness_complex.h | 151 |
1 files changed, 12 insertions, 139 deletions
diff --git a/src/Witness_complex/include/gudhi/Euclidean_witness_complex.h b/src/Witness_complex/include/gudhi/Euclidean_witness_complex.h index 7045dc02..9845808e 100644 --- a/src/Witness_complex/include/gudhi/Euclidean_witness_complex.h +++ b/src/Witness_complex/include/gudhi/Euclidean_witness_complex.h @@ -23,6 +23,7 @@ #ifndef EUCLIDEAN_WITNESS_COMPLEX_H_ #define EUCLIDEAN_WITNESS_COMPLEX_H_ +#include <gudhi/Witness_complex.h> #include <gudhi/Active_witness/Active_witness.h> #include <gudhi/Kd_tree_search.h> #include <gudhi/Witness_complex/all_faces_in.h> @@ -44,34 +45,27 @@ namespace witness_complex { * * \tparam Kernel_ requires a <a target="_blank" * href="http://doc.cgal.org/latest/Kernel_d/classCGAL_1_1Epick__d.html">CGAL::Epick_d</a> class. -*/ + */ template< class Kernel_ > -class Euclidean_witness_complex { +class Euclidean_witness_complex : public Witness_complex<std::vector<typename Gudhi::spatial_searching::Kd_tree_search<Kernel_, std::vector<typename Kernel_::Point_d>>::INS_range>> { private: typedef Kernel_ K; typedef typename K::Point_d Point_d; - typedef typename K::FT FT; typedef std::vector<Point_d> Point_range; typedef Gudhi::spatial_searching::Kd_tree_search<Kernel_, Point_range> Kd_tree; typedef typename Kd_tree::INS_range Nearest_landmark_range; + typedef typename std::vector<Nearest_landmark_range> Nearest_landmark_table; - typedef FT Filtration_value; - - - typedef std::size_t Witness_id; typedef typename Nearest_landmark_range::Point_with_transformed_distance Id_distance_pair; typedef typename Id_distance_pair::first_type Landmark_id; - typedef Active_witness<Id_distance_pair, Nearest_landmark_range> ActiveWitness; - typedef std::list< ActiveWitness > ActiveWitnessList; - typedef std::vector< Landmark_id > typeVectorVertex; - typedef Landmark_id Vertex_handle; private: - Point_range witnesses_, landmarks_; + Point_range landmarks_; Kd_tree landmark_tree_; - - public: + using Witness_complex<Nearest_landmark_table>::nearest_landmark_table_; + +public: ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* @name Constructor */ @@ -88,8 +82,10 @@ private: typename WitnessRange > Euclidean_witness_complex(const LandmarkRange & landmarks, const WitnessRange & witnesses) - : witnesses_(witnesses), landmarks_(landmarks), landmark_tree_(landmarks_) - { + : landmarks_(landmarks), landmark_tree_(landmarks) + { + for (auto w: witnesses) + nearest_landmark_table_.push_back(landmark_tree_.query_incremental_nearest_neighbors(w)); } /** \brief Returns the point corresponding to the given vertex. @@ -99,131 +95,8 @@ private: { return landmarks_[vertex]; } - - /** \brief Outputs the (weak) witness complex of relaxation 'max_alpha_square' - * in a simplicial complex data structure. - * \details The function returns true if the construction is successful and false otherwise. - * @param[out] complex Simplicial complex data structure compatible which is a model of - * SimplicialComplexForWitness concept. - * @param[in] max_alpha_square Maximal squared relaxation parameter. - * @param[in] limit_dimension Represents the maximal dimension of the simplicial complex - * (default value = no limit). - */ - template < typename SimplicialComplexForWitness > - bool create_complex(SimplicialComplexForWitness& complex, - FT max_alpha_square, - Landmark_id limit_dimension = std::numeric_limits<Landmark_id>::max()) - { - if (complex.num_vertices() > 0) { - std::cerr << "Euclidean witness complex cannot create complex - complex is not empty.\n"; - return false; - } - if (max_alpha_square < 0) { - std::cerr << "Euclidean witness complex cannot create complex - squared relaxation parameter must be non-negative.\n"; - return false; - } - if (limit_dimension < 0) { - std::cerr << "Euclidean witness complex cannot create complex - limit dimension must be non-negative.\n"; - return false; - } - typeVectorVertex vv; - ActiveWitnessList active_witnesses; - Landmark_id k = 0; /* current dimension in iterative construction */ - for (auto w: witnesses_) - active_witnesses.push_back(ActiveWitness(landmark_tree_.query_incremental_nearest_neighbors(w))); - ActiveWitness aw_copy(active_witnesses.front()); - while (!active_witnesses.empty() && k <= limit_dimension ) { - typename ActiveWitnessList::iterator aw_it = active_witnesses.begin(); - std::vector<Landmark_id> simplex; - simplex.reserve(k+1); - while (aw_it != active_witnesses.end()) { - bool ok = add_all_faces_of_dimension(k, - max_alpha_square, - std::numeric_limits<double>::infinity(), - aw_it->begin(), - simplex, - complex, - aw_it->end()); - assert(simplex.empty()); - if (!ok) - active_witnesses.erase(aw_it++); //First increase the iterator and then erase the previous element - else - aw_it++; - } - k++; - } - complex.set_dimension(k-1); - return true; - } //@} - - private: - /* \brief Adds recursively all the faces of a certain dimension dim witnessed by the same witness. - * Iterator is needed to know until how far we can take landmarks to form simplexes. - * simplex is the prefix of the simplexes to insert. - * The output value indicates if the witness rests active or not. - */ - template < typename SimplicialComplexForWitness > - bool add_all_faces_of_dimension(int dim, - double alpha2, - double norelax_dist2, - typename ActiveWitness::iterator curr_l, - std::vector<Landmark_id>& simplex, - SimplicialComplexForWitness& sc, - typename ActiveWitness::iterator end) const - { - if (curr_l == end) - return false; - bool will_be_active = false; - typename ActiveWitness::iterator l_it = curr_l; - if (dim > 0) - for (; l_it->second - alpha2 <= norelax_dist2 && l_it != end; ++l_it) { - simplex.push_back(l_it->first); - if (sc.find(simplex) != sc.null_simplex()) { - typename ActiveWitness::iterator next_it = l_it; - will_be_active = add_all_faces_of_dimension(dim-1, - alpha2, - norelax_dist2, - ++next_it, - simplex, - sc, - end) || will_be_active; - } - assert(!simplex.empty()); - simplex.pop_back(); - // If norelax_dist is infinity, change to first omitted distance - if (l_it->second <= norelax_dist2) - norelax_dist2 = l_it->second; - typename ActiveWitness::iterator next_it = l_it; - will_be_active = add_all_faces_of_dimension(dim, - alpha2, - norelax_dist2, - ++next_it, - simplex, - sc, - end) || will_be_active; - } - else if (dim == 0) - for (; l_it->second - alpha2 <= norelax_dist2 && l_it != end; ++l_it) { - simplex.push_back(l_it->first); - double filtration_value = 0; - // if norelax_dist is infinite, relaxation is 0. - if (l_it->second > norelax_dist2) - filtration_value = l_it->second - norelax_dist2; - if (all_faces_in(simplex, &filtration_value, sc)) { - will_be_active = true; - sc.insert_simplex(simplex, filtration_value); - } - assert(!simplex.empty()); - simplex.pop_back(); - // If norelax_dist is infinity, change to first omitted distance - if (l_it->second < norelax_dist2) - norelax_dist2 = l_it->second; - } - return will_be_active; - } - }; } // namespace witness_complex |