feat: add support for state filter with fixed targets (#552)

* feat: add support for state filter with fixed targets

* Apply suggestions from code review

Co-authored-by: Antoine Paletta <98616558+apaletta3@users.noreply.github.com>

---------

Co-authored-by: Antoine Paletta <98616558+apaletta3@users.noreply.github.com>

Author: vishwa2710

src/OpenSpaceToolkit/Astrodynamics/Access/Generator.cpp

@@ -413,11 +413,6 @@ Array<Array<Access>> Generator::computeAccessesForFixedTargets(
     const bool& coarse
 ) const
 {
-    if (stateFilter_)
-    {
-        throw ostk::core::error::RuntimeError("State filter is not supported for multiple access targets.");
-    }
-
     // create a stacked matrix of SEZ rotations for all access targets
 
     const Index targetCount = someAccessTargets.getSize();
@@ -657,13 +652,24 @@ Array<Array<Access>> Generator::computeAccessesForFixedTargets(
     {
         const Instant& instant = instants[index];
 
+        const State toTrajectoryState = aToTrajectory.getStateAt(instant);
+
         // calculate target to satellite vector in ITRF
         const Vector3d toPositionCoordinates_ITRF =
-            aToTrajectory.getStateAt(instant).inFrame(Frame::ITRF()).getPosition().getCoordinates();
+            toTrajectoryState.inFrame(Frame::ITRF()).getPosition().getCoordinates();
 
         // check if satellite is in access
-        const auto inAccess =
-            visibilityCriterionFilter(fromPositionCoordinates_ITRF, toPositionCoordinates_ITRF, instant);
+        auto inAccess = visibilityCriterionFilter(fromPositionCoordinates_ITRF, toPositionCoordinates_ITRF, instant);
+
+        if (this->getStateFilter())
+        {
+            for (Index i = 0; i < targetCount; ++i)
+            {
+                const State fromState = someAccessTargets[i].accessTrajectory().getStateAt(instant);
+
+                inAccess(i) = inAccess(i) && this->getStateFilter()(fromState, toTrajectoryState);
+            }
+        }
 
         inAccessPerTarget.row(index) = inAccess.cast<int>().transpose();
     }

test/OpenSpaceToolkit/Astrodynamics/Access/Generator.test.cpp

@@ -864,22 +864,6 @@ TEST_F(OpenSpaceToolkit_Astrodynamics_Access_Generator, ComputeAccesses)
                 defaultGenerator_.computeAccesses(interval, {trajectoryTarget, accessTarget}, orbit, true),
                 ostk::core::error::RuntimeError
             );
-
-            {
-                const auto stateFilter = [](const State&, const State&) -> bool
-                {
-                    return true;
-                };
-
-                defaultGenerator_.setStateFilter(stateFilter);
-
-                EXPECT_THROW(
-                    defaultGenerator_.computeAccesses(interval, {accessTarget, accessTarget}, orbit),
-                    ostk::core::error::RuntimeError
-                );
-
-                defaultGenerator_.setStateFilter(nullptr);
-            }
         }
 
         // single target
@@ -1042,6 +1026,32 @@ TEST_F(OpenSpaceToolkit_Astrodynamics_Access_Generator, ComputeAccesses)
                 }
             }
         }
+
+        // Elevation Interval visibility criterion, target with state filter
+
+        {
+            const auto stateFilter = [](const State& aFirstState, const State& aSecondState) -> bool
+            {
+                (void)aFirstState;
+                (void)aSecondState;
+                return false;
+            };
+
+            const Generator generator =
+                Generator(defaultEnvironment_, Duration::Minutes(1.0), Duration::Seconds(5.0), {}, stateFilter);
+
+            const ostk::mathematics::object::Interval<Real> elevationInterval =
+                ostk::mathematics::object::Interval<Real>::Closed(0.0, 90.0);
+
+            const VisibilityCriterion visibilityCriterion =
+                VisibilityCriterion::FromElevationInterval(elevationInterval);
+
+            const AccessTarget accessTarget = AccessTarget::FromLLA(visibilityCriterion, LLAs[0], defaultEarthSPtr_);
+
+            const Array<Access> accesses = generator.computeAccesses(interval, accessTarget, toTrajectory);
+
+            ASSERT_EQ(accesses.getSize(), 0);
+        }
     }
 }