fix: addSegment method on Sequence (#275)

* fix: remove overload on addSegment for Sequence and use addSegments for array input * test: adapt cpp and python tests
open-space-collective · Nov 20, 2023 · aaed350 · aaed350
1 parent a77605d
commit aaed350
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/bindings/python/src/OpenSpaceToolkitAstrodynamicsPy/Trajectory/Sequence.cpp b/bindings/python/src/OpenSpaceToolkitAstrodynamicsPy/Trajectory/Sequence.cpp
@@ -60,7 +60,7 @@ inline void OpenSpaceToolkitAstrodynamicsPy_Trajectory_Sequence(pybind11::module
 
                 Returns:
                     Instant: The instant at which the access starts.
-                
+
             )doc"
         )
         .def(
@@ -94,7 +94,7 @@ inline void OpenSpaceToolkitAstrodynamicsPy_Trajectory_Sequence(pybind11::module
 
                 Returns:
                     float: The initial mass.
-            
+
             )doc"
         )
         .def(
@@ -116,7 +116,7 @@ inline void OpenSpaceToolkitAstrodynamicsPy_Trajectory_Sequence(pybind11::module
 
                 Returns:
                     Duration: The propagation duration.
-                
+
             )doc"
         )
 
@@ -128,7 +128,7 @@ inline void OpenSpaceToolkitAstrodynamicsPy_Trajectory_Sequence(pybind11::module
 
                 Returns:
                     float: The delta mass.
-                
+
             )doc"
         )
         .def(
@@ -142,7 +142,7 @@ inline void OpenSpaceToolkitAstrodynamicsPy_Trajectory_Sequence(pybind11::module
 
                 Returns:
                     float: The delta V.
-                
+
             )doc",
             arg("specific_impulse")
         )
@@ -203,7 +203,7 @@ inline void OpenSpaceToolkitAstrodynamicsPy_Trajectory_Sequence(pybind11::module
 
                     Returns:
                         list[Segment]: The segments.
-                    
+
                 )doc"
             )
             .def(
@@ -236,13 +236,13 @@ inline void OpenSpaceToolkitAstrodynamicsPy_Trajectory_Sequence(pybind11::module
 
                     Returns:
                         Duration: The maximum propagation duration.
-                    
+
                 )doc"
             )
 
             .def(
                 "add_segment",
-                overload_cast<const Segment&>(&Sequence::addSegment),
+                &Sequence::addSegment,
                 R"doc(
                     Add a segment.
 
@@ -253,8 +253,8 @@ inline void OpenSpaceToolkitAstrodynamicsPy_Trajectory_Sequence(pybind11::module
                 arg("segment")
             )
             .def(
-                "add_segment",
-                overload_cast<const Array<Segment>&>(&Sequence::addSegment),
+                "add_segments",
+                &Sequence::addSegments,
                 arg("segments"),
                 R"doc(
                     Add segments.

diff --git a/bindings/python/test/trajectory/test_sequence.py b/bindings/python/test/trajectory/test_sequence.py
@@ -362,7 +362,7 @@ def test_add_segment(
 
         segments_count = len(sequence.get_segments())
 
-        sequence.add_segment([coast_duration_segment, coast_duration_segment])
+        sequence.add_segments([coast_duration_segment, coast_duration_segment])
 
         assert len(sequence.get_segments()) == segments_count + 2
 

diff --git a/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Sequence.hpp b/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Sequence.hpp
@@ -132,7 +132,7 @@ class Sequence
     ///
     /// @param                  [in] aTrajectorySegmentArray An array of trajectory segments.
 
-    void addSegment(const Array<Segment>& aTrajectorySegmentArray);
+    void addSegments(const Array<Segment>& aTrajectorySegmentArray);
 
     /// @brief                  Add a coast segment.
     ///

diff --git a/src/OpenSpaceToolkit/Astrodynamics/Trajectory/Sequence.cpp b/src/OpenSpaceToolkit/Astrodynamics/Trajectory/Sequence.cpp
@@ -211,9 +211,9 @@ void Sequence::addSegment(const Segment& aSegment)
     segments_.add(aSegment);
 }
 
-void Sequence::addSegment(const Array<Segment>& someSegments)
+void Sequence::addSegments(const Array<Segment>& aTrajectorySegmentArray)
 {
-    segments_.add(someSegments);
+    segments_.add(aTrajectorySegmentArray);
 }
 
 void Sequence::addCoastSegment(const Shared<EventCondition>& anEventConditionSPtr)

diff --git a/test/OpenSpaceToolkit/Astrodynamics/Trajectory/Sequence.test.cpp b/test/OpenSpaceToolkit/Astrodynamics/Trajectory/Sequence.test.cpp
@@ -274,7 +274,7 @@ TEST_F(OpenSpaceToolkit_Astrodynamics_Trajectory_Sequence, AddSegment)
     }
 
     {
-        EXPECT_NO_THROW(defaultSequence_.addSegment({coastSegment_, coastSegment_}));
+        EXPECT_NO_THROW(defaultSequence_.addSegments({coastSegment_, coastSegment_}));
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         {
-            EXPECT_NO_THROW(defaultSequence_.addSegment({coastSegment_, coastSegment_}));
+            EXPECT_NO_THROW(defaultSequence_.addSegments({coastSegment_, coastSegment_}));
         }
     }
@@ Expand Down @@