From 08650e3ee0e9fccc77bb7cd853f12ffee4a09100 Mon Sep 17 00:00:00 2001 From: Cesar Munoz Date: Mon, 5 Oct 2020 20:09:39 -0400 Subject: [PATCH] Fixed bug in Daidalus class, where numberOfAircraft was used instead of lastTrafficIndex --- C++/RELEASE-NOTES.txt | 4 ++++ C++/src/Daidalus.cpp | 12 ++++++------ Java/RELEASE-NOTES.txt | 4 ++++ Java/src/gov/nasa/larcfm/ACCoRD/Daidalus.java | 12 ++++++------ 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/C++/RELEASE-NOTES.txt b/C++/RELEASE-NOTES.txt index 4e679aa8..07090baf 100644 --- a/C++/RELEASE-NOTES.txt +++ b/C++/RELEASE-NOTES.txt @@ -10,6 +10,10 @@ Rights Reserved. Release DAIDALUS-v2.0.1: ------------------ +* October 5, 2020 +- Fixed bug in Daidalus class, where numberOfAircraft was used instead +of lastTrafficIndex. + * September 29, 2020 - Added documentation (automatically generated from code), updated README. diff --git a/C++/src/Daidalus.cpp b/C++/src/Daidalus.cpp index 6362fa58..5ab50f9b 100644 --- a/C++/src/Daidalus.cpp +++ b/C++/src/Daidalus.cpp @@ -498,7 +498,7 @@ void Daidalus::setAlerter(int ac_idx, const std::string& alerter) { * at ac_idx. */ int Daidalus::alerterIndexBasedOnAlertingLogic(int ac_idx) { - if (0 <= ac_idx && ac_idx <= numberOfAircraft()) { + if (0 <= ac_idx && ac_idx <= lastTrafficIndex()) { return core_.alerter_index_of(getAircraftStateAt(ac_idx)); } return 0; @@ -527,7 +527,7 @@ int Daidalus::mostSevereAlertLevel(int ac_idx) { * s_EN_std: East/North position standard deviation in internal units */ void Daidalus::setHorizontalPositionUncertainty(int ac_idx, double s_EW_std, double s_NS_std, double s_EN_std) { - if (0 <= ac_idx && ac_idx <= numberOfAircraft()) { + if (0 <= ac_idx && ac_idx <= lastTrafficIndex()) { if (ac_idx == 0) { core_.ownship.setHorizontalPositionUncertainty(s_EW_std,s_NS_std,s_EN_std); } else { @@ -552,7 +552,7 @@ void Daidalus::setHorizontalPositionUncertainty(int ac_idx, double s_EW_std, dou * sz_std : Vertical position standard deviation in internal units */ void Daidalus::setVerticalPositionUncertainty(int ac_idx, double sz_std) { - if (0 <= ac_idx && ac_idx <= numberOfAircraft()) { + if (0 <= ac_idx && ac_idx <= lastTrafficIndex()) { if (ac_idx == 0) { core_.ownship.setVerticalPositionUncertainty(sz_std); } else { @@ -577,7 +577,7 @@ void Daidalus::setVerticalPositionUncertainty(int ac_idx, double sz_std, const s * v_EN_std: East/North position standard deviation in internal units */ void Daidalus::setHorizontalVelocityUncertainty(int ac_idx, double v_EW_std, double v_NS_std, double v_EN_std) { - if (0 <= ac_idx && ac_idx <= numberOfAircraft()) { + if (0 <= ac_idx && ac_idx <= lastTrafficIndex()) { if (ac_idx == 0) { core_.ownship.setHorizontalVelocityUncertainty(v_EW_std,v_NS_std,v_EN_std); } else { @@ -602,7 +602,7 @@ void Daidalus::setHorizontalVelocityUncertainty(int ac_idx, double v_EW_std, dou * vz_std : Vertical speed standard deviation in internal units */ void Daidalus::setVerticalSpeedUncertainty(int ac_idx, double vz_std) { - if (0 <= ac_idx && ac_idx <= numberOfAircraft()) { + if (0 <= ac_idx && ac_idx <= lastTrafficIndex()) { if (ac_idx == 0) { core_.ownship.setVerticalSpeedUncertainty(vz_std); } else { @@ -624,7 +624,7 @@ void Daidalus::setVerticalSpeedUncertainty(int ac_idx, double vz_std, const std: * Reset all uncertainties of aircraft at index ac_idx */ void Daidalus::resetUncertainty(int ac_idx) { - if (0 <= ac_idx && ac_idx <= numberOfAircraft()) { + if (0 <= ac_idx && ac_idx <= lastTrafficIndex()) { if (ac_idx == 0) { core_.ownship.resetUncertainty(); } else { diff --git a/Java/RELEASE-NOTES.txt b/Java/RELEASE-NOTES.txt index 01a85631..6dce8cd0 100644 --- a/Java/RELEASE-NOTES.txt +++ b/Java/RELEASE-NOTES.txt @@ -10,6 +10,10 @@ Rights Reserved. Release DAIDALUS-v2.0.1: ------------------ +* October 5, 2020 +- Fixed bug in Daidalus class, where numberOfAircraft was used instead +of lastTrafficIndex. + * September 29, 2020 - Added documentation (automatically generated from code), updated README. diff --git a/Java/src/gov/nasa/larcfm/ACCoRD/Daidalus.java b/Java/src/gov/nasa/larcfm/ACCoRD/Daidalus.java index 5cf3337d..ed749079 100644 --- a/Java/src/gov/nasa/larcfm/ACCoRD/Daidalus.java +++ b/Java/src/gov/nasa/larcfm/ACCoRD/Daidalus.java @@ -550,7 +550,7 @@ public void setAlerter(int ac_idx, String alerter) { * at ac_idx. */ public int alerterIndexBasedOnAlertingLogic(int ac_idx) { - if (0 <= ac_idx && ac_idx <= numberOfAircraft()) { + if (0 <= ac_idx && ac_idx <= lastTrafficIndex()) { return core_.alerter_index_of(getAircraftStateAt(ac_idx)); } return 0; @@ -579,7 +579,7 @@ public int mostSevereAlertLevel(int ac_idx) { * s_EN_std: East/North position standard deviation in internal units */ public void setHorizontalPositionUncertainty(int ac_idx, double s_EW_std, double s_NS_std, double s_EN_std) { - if (0 <= ac_idx && ac_idx <= numberOfAircraft()) { + if (0 <= ac_idx && ac_idx <= lastTrafficIndex()) { if (ac_idx == 0) { core_.ownship.setHorizontalPositionUncertainty(s_EW_std,s_NS_std,s_EN_std); } else { @@ -604,7 +604,7 @@ public void setHorizontalPositionUncertainty(int ac_idx, double s_EW_std, double * sz_std : Vertical position standard deviation in internal units */ public void setVerticalPositionUncertainty(int ac_idx, double sz_std) { - if (0 <= ac_idx && ac_idx <= numberOfAircraft()) { + if (0 <= ac_idx && ac_idx <= lastTrafficIndex()) { if (ac_idx == 0) { core_.ownship.setVerticalPositionUncertainty(sz_std); } else { @@ -629,7 +629,7 @@ public void setVerticalPositionUncertainty(int ac_idx, double sz_std, String u) * v_EN_std: East/North position standard deviation in internal units */ public void setHorizontalVelocityUncertainty(int ac_idx, double v_EW_std, double v_NS_std, double v_EN_std) { - if (0 <= ac_idx && ac_idx <= numberOfAircraft()) { + if (0 <= ac_idx && ac_idx <= lastTrafficIndex()) { if (ac_idx == 0) { core_.ownship.setHorizontalVelocityUncertainty(v_EW_std,v_NS_std,v_EN_std); } else { @@ -654,7 +654,7 @@ public void setHorizontalVelocityUncertainty(int ac_idx, double v_EW_std, double * vz_std : Vertical speed standard deviation in internal units */ public void setVerticalSpeedUncertainty(int ac_idx, double vz_std) { - if (0 <= ac_idx && ac_idx <= numberOfAircraft()) { + if (0 <= ac_idx && ac_idx <= lastTrafficIndex()) { if (ac_idx == 0) { core_.ownship.setVerticalSpeedUncertainty(vz_std); } else { @@ -676,7 +676,7 @@ public void setVerticalSpeedUncertainty(int ac_idx, double vz_std, String u) { * Reset all uncertainties of aircraft at index ac_idx */ public void resetUncertainty(int ac_idx) { - if (0 <= ac_idx && ac_idx <= numberOfAircraft()) { + if (0 <= ac_idx && ac_idx <= lastTrafficIndex()) { if (ac_idx == 0) { core_.ownship.resetUncertainty(); } else {