Merge pull request #537 from tudat-team/fix/535

Fix/535

Author: DominicDirkx

include/tudat/astro/orbit_determination/estimatable_parameters/estimatableParameterSet.h

@@ -331,6 +331,30 @@ class EstimatableParameterSet
         }
     }
 
+    template< typename ParameterScalar >
+    void resetParameterValuesWithoutConsiderParameters( const Eigen::Matrix< ParameterScalar, Eigen::Dynamic, 1 >& newParameterValues )
+    {
+        resetParameterValues< ParameterScalar >( newParameterValues, false );
+    }
+
+    template< typename ParameterScalar >
+    Eigen::Matrix< ParameterScalar, Eigen::Dynamic, 1 > getFullParameterValuesWithoutConsiderParameters( )
+    {
+        return getFullParameterValues< ParameterScalar >( false );
+    }
+
+    template< typename ParameterScalar >
+    void resetParameterValuesWithConsiderParameters( const Eigen::Matrix< ParameterScalar, Eigen::Dynamic, 1 >& newParameterValues )
+    {
+        resetParameterValues< ParameterScalar >( newParameterValues, true );
+    }
+
+    template< typename ParameterScalar >
+    Eigen::Matrix< ParameterScalar, Eigen::Dynamic, 1 > getFullParameterValuesWithConsiderParameters( )
+    {
+        return getFullParameterValues< ParameterScalar >( true );
+    }
+
     //! Function to retrieve double parameter objects.
     /*!
      *  Function to retrieve double parameter objects.

include/tudat/simulation/estimation_setup/observationCollection.h

@@ -1605,6 +1605,7 @@ class ObservationCollection
                                 {
                                     isInTimeBounds = true;
                                 }
+
                                 if( ( isInTimeBounds && ( !observationParser->useOppositeCondition( ) ) ) ||
                                     ( !isInTimeBounds && ( observationParser->useOppositeCondition( ) ) ) )
                                 {

src/tudatpy/dynamics/parameters/expose_parameters.cpp

@@ -111,12 +111,23 @@ void expose_parameters( py::module& m )
       )doc" )
             .def_property( "parameter_vector",
                            &tep::EstimatableParameterSet<
-                                   STATE_SCALAR_TYPE >::getFullParameterValues< double >,
-                           &tep::EstimatableParameterSet< STATE_SCALAR_TYPE >::resetParameterValues<
+                                   STATE_SCALAR_TYPE >::getFullParameterValuesWithoutConsiderParameters< double >,
+                           &tep::EstimatableParameterSet< STATE_SCALAR_TYPE >::resetParameterValuesWithoutConsiderParameters<
                                    double >,
                            R"doc(
 
-         Vector containing the parameter values of all parameters in the set.
+         Vector containing the parameter values of all parameters in the set (excluding consider parameters).
+
+         :type: numpy.ndarray[numpy.float64[m, 1]]
+      )doc" )
+            .def_property( "estimated_and_consider_parameter_vector",
+                           &tep::EstimatableParameterSet<
+                                   STATE_SCALAR_TYPE >::getFullParameterValuesWithConsiderParameters< double >,
+                           &tep::EstimatableParameterSet< STATE_SCALAR_TYPE >::resetParameterValuesWithConsiderParameters<
+                                   double >,
+                           R"doc(
+
+         Vector containing the parameter values of all parameters in the set (including consider parameters; concatenated after estimated parameters).
 
          :type: numpy.ndarray[numpy.float64[m, 1]]
       )doc" )