Merge branch 'codac2_dev' of github.com:codac-team/codac into codac2_dev

Author: SimonRohou

src/extensions/capd/codac2_peibos_capd.cpp

@@ -19,12 +19,12 @@ using namespace std;
 
 namespace codac2
 {
-  std::map<double, std::vector<T>> PEIBOS(const capd::IMap& i_map, double tf, double dt, const AnalyticFunction<VectorType>& psi_0, const vector<OctaSym>& Sigma, double epsilon, bool verbose)
+  std::map<double, std::vector<PEIBOS_CAPD_Result>> PEIBOS(const capd::IMap& i_map, double tf, double dt, const AnalyticFunction<VectorType>& psi_0, const vector<OctaSym>& Sigma, double epsilon, bool verbose)
   {
     return PEIBOS(i_map, tf, dt, psi_0, Sigma, epsilon, Vector::zero(psi_0.output_size()), verbose);
   }
 
-  std::map<double, std::vector<T>> PEIBOS(const capd::IMap& i_map, double tf, double dt, const AnalyticFunction<VectorType>& psi_0, const vector<OctaSym>& Sigma, double epsilon, const Vector& offset, bool verbose)
+  std::map<double, std::vector<PEIBOS_CAPD_Result>> PEIBOS(const capd::IMap& i_map, double tf, double dt, const AnalyticFunction<VectorType>& psi_0, const vector<OctaSym>& Sigma, double epsilon, const Vector& offset, bool verbose)
   {
     std::vector<double> time_points;
     for (double t = 0.; t <= tf; t += dt)
@@ -48,7 +48,7 @@ namespace codac2
     double true_eps = split(Interval(-1.,1.)*IntervalVector::Ones(m), epsilon, boxes);
 
     int nthreads = nb_threads();
-    std::vector<std::map<double, std::vector<T>>> thread_outputs(nthreads);
+    std::vector<std::map<double, std::vector<PEIBOS_CAPD_Result>>> thread_outputs(nthreads);
 
     struct WorkItem { const OctaSym* sigma; const IntervalVector* box; };
     std::vector<WorkItem> work;
@@ -109,7 +109,7 @@ namespace codac2
 
     for (auto& th : threads) th.join();
 
-    std::map<double, std::vector<T>> output;
+    std::map<double, std::vector<PEIBOS_CAPD_Result>> output;
 
     for (auto& vec : thread_outputs)
         for (auto t : time_points)
@@ -130,7 +130,7 @@ namespace codac2
     return output;
   }
 
-  std::map<double,std::vector<Parallelepiped>> reach_set(const std::map<double, std::vector<T>>& peibos_output)
+  std::map<double,std::vector<Parallelepiped>> reach_set(const std::map<double, std::vector<PEIBOS_CAPD_Result>>& peibos_output)
   {
     std::map<double,std::vector<Parallelepiped>> output;
 

src/extensions/capd/codac2_peibos_capd.h

@@ -36,7 +36,7 @@ namespace codac2
     Vector offset;
   };
 
-  using T = std::tuple<PEIBOS_CAPD_Key,IntervalVector,IntervalMatrix>;
+  using PEIBOS_CAPD_Result = std::tuple<PEIBOS_CAPD_Key,IntervalVector,IntervalMatrix>;
 
   /**
    * \brief PEIBOS algorithm using CAPD for guaranteed ODE propagation.
@@ -54,7 +54,7 @@ namespace codac2
    * \li The interval vector \f$\mathbf{z}\f$ containing the image \f$\bar{\mathbf{x}}(t))\f$
    * \li The interval Jacobian matrix \f$\mathbf{J_f}\f$ containing \f$D\mathbf{\left[x\right]}(t)\f$
    */
-  std::map<double, std::vector<T>> PEIBOS(const capd::IMap& i_map, double tf, double dt, const AnalyticFunction<VectorType>& psi_0, const std::vector<OctaSym>& Sigma, double epsilon, bool verbose = false);
+  std::map<double, std::vector<PEIBOS_CAPD_Result>> PEIBOS(const capd::IMap& i_map, double tf, double dt, const AnalyticFunction<VectorType>& psi_0, const std::vector<OctaSym>& Sigma, double epsilon, bool verbose = false);
 
   /**
    * \brief PEIBOS algorithm using CAPD for guaranteed ODE propagation.
@@ -73,7 +73,7 @@ namespace codac2
    * \li The interval vector \f$\mathbf{z}\f$ containing the image \f$\bar{\mathbf{x}}(t))\f$
    * \li The interval Jacobian matrix \f$\mathbf{J_f}\f$ containing \f$D\mathbf{\left[x\right]}(t)\f$
    */
-  std::map<double, std::vector<T>> PEIBOS(const capd::IMap& i_map, double tf, double dt, const AnalyticFunction<VectorType>& psi_0, const std::vector<OctaSym>& Sigma, double epsilon, const Vector& offset, bool verbose = false);
+  std::map<double, std::vector<PEIBOS_CAPD_Result>> PEIBOS(const capd::IMap& i_map, double tf, double dt, const AnalyticFunction<VectorType>& psi_0, const std::vector<OctaSym>& Sigma, double epsilon, const Vector& offset, bool verbose = false);
 
 
   /**
@@ -84,5 +84,5 @@ namespace codac2
    * \return A timed map of reach set parallelepipeds. At each time \f$t\f$, the value is a vector of Parallelepipeds enclosing the reach set at time \f$t\f$.
    * The function \ref parallelepiped_inclusion is used to compute each Parallelepiped from the PEIBOS CAPD output.
    */
-  std::map<double, std::vector<Parallelepiped>> reach_set(const std::map<double, std::vector<T>>& peibos_output);
+  std::map<double, std::vector<Parallelepiped>> reach_set(const std::map<double, std::vector<PEIBOS_CAPD_Result>>& peibos_output);
 }