Merge branch 'dev'

codac-team · Feb 19, 2021 · b664d83 · b664d83
2 parents 0c3242f + 1fc32db
commit b664d83
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/python/src/core/variables/trajectory/codac_py_Trajectory.cpp b/python/src/core/variables/trajectory/codac_py_Trajectory.cpp
@@ -141,8 +141,8 @@ void export_Trajectory(py::module& m)
       TRAJECTORY_CONSTTRAJECTORY_DIFF)
 
     .def("finite_diff", &Trajectory::finite_diff,
-        TRAJECTORY_DOUBLE_FINITE_DIFF_DOUBLE,
-        "t"_a)
+        TRAJECTORY_DOUBLE_FINITE_DIFF_DOUBLE_DOUBLE,
+        "t"_a, "h"_a)
 
   // Assignments operators
 

diff --git a/src/core/variables/trajectory/codac_Trajectory.cpp b/src/core/variables/trajectory/codac_Trajectory.cpp
@@ -494,13 +494,24 @@ namespace codac
           break;
 
         case TrajDefnType::MAP_OF_VALUES: // finite difference computation
+        {
           assert(m_map_values.size() > 1);
 
+          double prev_t = m_map_values.begin()->first;
           for(map<double,double>::const_iterator it = m_map_values.begin() ; it != m_map_values.end() ; it++)
-            d.set(finite_diff(it->first), it->first);
+          {
+            double h = it->first - prev_t;
+
+            if(h == 0.) // first value
+              h = next(m_map_values.begin())->first - prev_t;
+
+            d.set(finite_diff(it->first, h), it->first);
+            prev_t = it->first;
+          }
 
           assert(d.tdomain() == tdomain());
           break;
+        }
 
         default:
           assert(false && "unhandled case");
@@ -509,14 +520,13 @@ namespace codac
       return d;
     }
 
-    double Trajectory::finite_diff(double t) const
+    double Trajectory::finite_diff(double t, double h) const
     {
+      // todo: improve this with h not symmetric?
       assert(m_traj_def_type == TrajDefnType::MAP_OF_VALUES);
       assert(m_map_values.find(t) != m_map_values.end()); // key exists
       assert(m_map_values.size() > 2);
 
-      double h = next(m_map_values.begin())->first - m_map_values.begin()->first;
-
       vector<double> fwd;
       map<double,double>::const_iterator it_fwd = m_map_values.find(t);
       double x = it_fwd->second;

diff --git a/src/core/variables/trajectory/codac_Trajectory.h b/src/core/variables/trajectory/codac_Trajectory.h
@@ -329,9 +329,10 @@ namespace codac
        * \note A uniform grid spacing is assumed.
        * 
        * \param t the temporal key (double, must belong to the trajectory's tdomain)
+       * \param h temporal timestep around t
        * \return a derivative trajectory
        */
-      double finite_diff(double t) const;
+      double finite_diff(double t, double h) const;
 
       /// @}
       /// \name Assignments operators

diff --git a/src/core/variables/trajectory/codac_TrajectoryVector.cpp b/src/core/variables/trajectory/codac_TrajectoryVector.cpp
@@ -76,7 +76,9 @@ namespace codac
       assert(!list_t.empty());
       assert(list_t.size() == list_x.size());
 
+      #ifdef DEBUG
       int n = list_x.begin()->size();
+      #endif
 
       list<double>::const_iterator it_t = list_t.begin();
       list<Vector>::const_iterator it_x = list_x.begin();