Merge last trunk modificatinos

make sphinx depends on cython target


git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@2155 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: ebb1709872963ffd30a6d31ab596f2715ca14436

1 files changed, 67 insertions, 0 deletions

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..d41a6811
--- /dev/null
+++ b/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h
@@ -0,0 +1,67 @@
+/*    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 (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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ACTIVE_WITNESS_ACTIVE_WITNESS_H_
+#define ACTIVE_WITNESS_ACTIVE_WITNESS_H_
+
+#include <gudhi/Active_witness/Active_witness_iterator.h>
+#include <list>
+
+namespace Gudhi {
+
+namespace witness_complex {
+
+  /* \class Active_witness
+   *  \brief Class representing a list of nearest neighbors to a given witness.
+   *  \details Every element is a pair of a landmark identifier and the squared distance to it.
+  */
+template< typename Id_distance_pair,
+          typename INS_range >
+class Active_witness {
+ public:
+  typedef Active_witness<Id_distance_pair, INS_range> ActiveWitness;
+  typedef typename INS_range::iterator INS_iterator;
+  typedef Active_witness_iterator< ActiveWitness, Id_distance_pair, INS_iterator > iterator;
+  typedef typename std::list<Id_distance_pair> Table;
+
+  Table nearest_landmark_table_;
+  INS_range    search_range_;
+  INS_iterator iterator_next_;
+  INS_iterator iterator_end_;
+
+  Active_witness(const INS_range& search_range)
+    : search_range_(search_range), iterator_next_(search_range_.begin()), iterator_end_(search_range_.end()) {
+  }
+
+  iterator begin() {
+    return iterator(this, nearest_landmark_table_.begin());
+  }
+
+  iterator end() {
+    return iterator(this);
+  }
+};
+
+}  // namespace witness_complex
+}  // namespace Gudhi
+
+#endif  // ACTIVE_WITNESS_ACTIVE_WITNESS_H_