Merge tag 'tags/gudhi-release-3.7.1' into dfsg/latestdfsg/latest

2 files changed, 10 insertions, 6 deletions

diff --git a/src/Coxeter_triangulation/include/gudhi/Functions/Function_affine_plane_in_Rd.h b/src/Coxeter_triangulation/include/gudhi/Functions/Function_affine_plane_in_Rd.h
index dc6f5f90..a9e2d507 100644
--- a/src/Coxeter_triangulation/include/gudhi/Functions/Function_affine_plane_in_Rd.h
+++ b/src/Coxeter_triangulation/include/gudhi/Functions/Function_affine_plane_in_Rd.h
@@ -57,7 +57,7 @@ struct Function_affine_plane_in_Rd {
    * The dimension of the vector should be the ambient dimension of the manifold.
    */
   Function_affine_plane_in_Rd(const Eigen::MatrixXd& normal_matrix, const Eigen::VectorXd& offset)
-      : normal_matrix_(normal_matrix), d_(normal_matrix.rows()), k_(normal_matrix.cols()), m_(d_ - k_), off_(offset) {
+	  : normal_matrix_(normal_matrix), d_(normal_matrix.rows()), k_(normal_matrix.cols()), off_(offset) {
     normal_matrix_.colwise().normalize();
   }
 
@@ -73,14 +73,13 @@ struct Function_affine_plane_in_Rd {
       : normal_matrix_(normal_matrix),
         d_(normal_matrix.rows()),
         k_(normal_matrix.cols()),
-        m_(d_ - k_),
         off_(Eigen::VectorXd::Zero(d_)) {
     normal_matrix_.colwise().normalize();
   }
 
  private:
   Eigen::MatrixXd normal_matrix_;
-  std::size_t d_, k_, m_;
+  std::size_t d_, k_;
   Eigen::VectorXd off_;
 };
 
diff --git a/src/Coxeter_triangulation/include/gudhi/Functions/Function_moment_curve_in_Rd.h b/src/Coxeter_triangulation/include/gudhi/Functions/Function_moment_curve_in_Rd.h
index 11b379f3..f315d794 100644
--- a/src/Coxeter_triangulation/include/gudhi/Functions/Function_moment_curve_in_Rd.h
+++ b/src/Coxeter_triangulation/include/gudhi/Functions/Function_moment_curve_in_Rd.h
@@ -46,6 +46,11 @@ struct Function_moment_curve_in_Rd {
     return result;
   }
 
+  /** @brief Returns the radius of the moment curve. */
+  double get_radius() const{
+	return r_;
+  }
+
   /**
    * \brief Constructor of the function that defines an implicit moment curve
    * in the d-dimensional Euclidean space.
@@ -53,7 +58,7 @@ struct Function_moment_curve_in_Rd {
    * @param[in] r Numerical parameter.
    * @param[in] d The ambient dimension.
    */
-  Function_moment_curve_in_Rd(double r, std::size_t d) : m_(1), k_(d - 1), d_(d), r_(r) {}
+  Function_moment_curve_in_Rd(double r, std::size_t d) : k_(d - 1), d_(d), r_(r) {}
 
   /**
    * \brief Constructor of the function that defines an implicit moment curve
@@ -64,10 +69,10 @@ struct Function_moment_curve_in_Rd {
    * @param[in] offset The offset of the moment curve.
    */
   Function_moment_curve_in_Rd(double r, std::size_t d, Eigen::VectorXd& offset)
-      : m_(1), k_(d - 1), d_(d), r_(r), off_(offset) {}
+	: k_(d - 1), d_(d), r_(r), off_(offset) {}
 
  private:
-  std::size_t m_, k_, d_;
+  std::size_t k_, d_;
   double r_;
   Eigen::VectorXd off_;
 };