From e1eab27ee280826a5c9c44d530679626da2efb1f Mon Sep 17 00:00:00 2001 From: skachano Date: Thu, 29 Sep 2016 18:30:50 +0000 Subject: Weak Witness + Active Witness. It compiles git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/relaxed-witness@1593 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 7307e01148fc7cadfc22bd136ebdf0d55c8da937 --- .../include/gudhi/Active_witness/Active_witness.h | 70 ++++++++++++++++ .../gudhi/Active_witness/Active_witness_iterator.h | 96 ++++++++++++++++++++++ 2 files changed, 166 insertions(+) create mode 100644 src/Witness_complex/include/gudhi/Active_witness/Active_witness.h create mode 100644 src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h (limited to 'src/Witness_complex/include/gudhi/Active_witness') diff --git a/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h b/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h new file mode 100644 index 00000000..87981c25 --- /dev/null +++ b/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h @@ -0,0 +1,70 @@ +/* This file is part of the Gudhi Library. The Gudhi library + * (Geometric Understanding in Higher Dimensions) is a generic C++ + * library for computational topology. + * + * Author(s): Siargey Kachanovich + * + * Copyright (C) 2016 INRIA Sophia Antipolis-Méditerranée (France) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef ACTIVE_WITNESS_H_ +#define ACTIVE_WITNESS_H_ + +#include "Active_witness_iterator.h" +#include +#include + +namespace Gudhi { + +namespace witness_complex { + +template< typename Id_distance_pair, + typename INS_range > +class Active_witness { +public: + typedef Active_witness ActiveWitness; + typedef typename INS_range::iterator INS_iterator; + typedef Active_witness_iterator< ActiveWitness, Id_distance_pair, INS_iterator > iterator; + + std::vector nearest_landmark_table_; + INS_range search_range_; + INS_iterator iterator_last_; + INS_iterator iterator_end_; + + Active_witness(INS_range search_range) + : search_range_(search_range), iterator_end_(search_range.end()), iterator_last_(search_range.begin()) + { + nearest_landmark_table_.push_back(*iterator_last_); + } + + iterator begin() + { + return iterator(this, nearest_landmark_table_.begin()); + } + + iterator end() + { + return iterator(this); + } + + std::vector end_element_table_; + typename std::vector::iterator end_pointer = end_element_table_.end(); +}; + +} +} + +#endif diff --git a/src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h b/src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h new file mode 100644 index 00000000..cd4f4b92 --- /dev/null +++ b/src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h @@ -0,0 +1,96 @@ +/* This file is part of the Gudhi Library. The Gudhi library + * (Geometric Understanding in Higher Dimensions) is a generic C++ + * library for computational topology. + * + * Author(s): Siargey Kachanovich + * + * Copyright (C) 2016 INRIA Sophia Antipolis-Méditerranée (France) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef ACTIVE_WITNESS_ITERATOR_H_ +#define ACTIVE_WITNESS_ITERATOR_H_ + +//#include "Active_witness.h" +#include +#include + +namespace Gudhi { + +namespace witness_complex { + +template< typename Active_witness, + typename Id_distance_pair, + typename INS_iterator > +class Active_witness_iterator + : public boost::iterator_facade< Active_witness_iterator +, Id_distance_pair const +, boost::forward_traversal_tag +, Id_distance_pair const> { + friend class boost::iterator_core_access; + + //typedef Active_witness Active_witness; + typedef typename std::vector::iterator Pair_iterator; + typedef typename Gudhi::witness_complex::Active_witness_iterator Iterator; + + + Active_witness *aw_; + Pair_iterator lh_; // landmark handle + //INS_iterator iterator_last; + //INS_iterator iterator_end; + +public: + Active_witness_iterator(Active_witness* aw) + : aw_(aw), lh_(aw_->end_pointer) + { + } + + Active_witness_iterator(Active_witness* aw, Pair_iterator lh_) + { + } + +private : + + Id_distance_pair dereference() const + { + return *lh_; + } + + bool equal(const Iterator& other) const + { + return (lh_ == other.lh_); + } + + void increment() + { + // if the id of the current landmark is the same as the last one + if (lh_->first == aw_->iterator_last_->first) { + // if the next iterator is end, lh_it = nullptr + if (++(aw_->iterator_last_) == aw_->iterator_end_) { + lh_ = aw_->end_pointer; + return; + } + else + aw_->nearest_landmark_table_.push_back(*(aw_->iterator_last_)); + } + lh_++; + } + +}; + +} +} + +#endif -- cgit v1.2.3