Minor extensions for Python exposure

tudat-team · Dec 18, 2023 · 8838caf · 8838caf
1 parent 7e61a61
commit 8838caf
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/include/tudat/basics/utilities.h b/include/tudat/basics/utilities.h
@@ -873,7 +873,7 @@ std::vector< T > getStlVectorSegment( const std::vector< T > originalVector, con
 }
 
 template< typename T, typename S >
-std::vector< T > staticCastVector( const std::vector< S > originalVector )
+std::vector< T > staticCastVector( const std::vector< S >& originalVector )
 {
     std::vector< T > castVector;
     for( unsigned int i = 0; i < originalVector.size( ); i++ )
@@ -883,6 +883,17 @@ std::vector< T > staticCastVector( const std::vector< S > originalVector )
     return castVector;
 }
 
+template< typename T, typename S, typename U >
+std::map< T, U > staticCastMapKeys( const std::map< S, U >& originalMap )
+{
+    std::map< T, U > castMap;
+    for( auto it : originalMap )
+    {
+        castMap[ static_cast< T >( it.first) ] = it.second;
+    }
+    return castMap;
+}
+
 template <typename T>
 Eigen::Matrix< T, Eigen::Dynamic, 1 > getSuccesivelyConcatenatedVector(
     const Eigen::Matrix< T, Eigen::Dynamic, 1 > baseVector, const unsigned int numberOfConcatenations )

diff --git a/include/tudat/simulation/propagation_setup/dynamicsSimulator.h b/include/tudat/simulation/propagation_setup/dynamicsSimulator.h
@@ -1132,6 +1132,8 @@ class SingleArcDynamicsSimulator: public DynamicsSimulator< StateScalarType, Tim
         return propagationResults_->equationsOfMotionNumericalSolution_;
     }
 
+
+
     //! Function to return the map of state history of numerically integrated bodies, in propagation coordinates.
     /*!
      * Function to return the map of state history of numerically integrated bodies, in propagation coordinates.

diff --git a/include/tudat/simulation/propagation_setup/propagationResults.h b/include/tudat/simulation/propagation_setup/propagationResults.h
@@ -212,6 +212,11 @@ namespace tudat
                 return equationsOfMotionNumericalSolution_;
             }
 
+            std::map< double, Eigen::Matrix< StateScalarType, Eigen::Dynamic, 1 > > getEquationsOfMotionNumericalSolutionDouble( )
+            {
+                return utilities::staticCastMapKeys< double, Time, Eigen::Matrix< StateScalarType, Eigen::Dynamic, 1 > >( equationsOfMotionNumericalSolution_ );
+            }
+
             std::map <TimeType, Eigen::Matrix<StateScalarType, Eigen::Dynamic, 1>> &
             getEquationsOfMotionNumericalSolutionRaw( )
             {
-Original file line number
+Diff line change
@@ Expand Up @@
             return propagationResults_->equationsOfMotionNumericalSolution_;
         }
         //! Function to return the map of state history of numerically integrated bodies, in propagation coordinates.
         /*!
          * Function to return the map of state history of numerically integrated bodies, in propagation coordinates.
@@ Expand Down @@