Merge branch 'nasa:master' into master

porfanid · May 6, 2024 · 812783d · 812783d
2 parents bc175e3 + e043925
commit 812783d
Show file tree

Hide file tree

Showing 948 changed files with 64,793 additions and 66,090 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,14 +4,25 @@
 *.class
 *~
 *.old
+*.log
 *.mold
 *.pyc
 *.bak
 *.csv
 *.out
+*.txt
+*.draw
 tmp/
 mold/
 tests/
+Java/*.daa
+Java/*.xyz
+Java/*.conf
+Java/*.pdf
+C++/*.daa
+C++/*.xyz
+C++/*.conf
+C++/*.pdf
 C++/DaidalusExample
 C++/DaidalusAlerting
 C++/DaidalusBatch
diff --git a/C++/.cppcheck-config/cppcheck-suppressions.txt b/C++/.cppcheck-config/cppcheck-suppressions.txt
@@ -0,0 +1,14 @@
+stlFindInsert:src/Detection3DParameterReader.cpp
+stlFindInsert:src/SequenceReader.cpp
+uninitMemberVar:src/AircraftState.cpp
+missingIncludeSystem
+duplInheritedMember
+invalidPointerCast
+missingOverride
+cstyleCast
+shadowFunction
+useStlAlgorithm:src/DaidalusParameters.cpp
+useStlAlgorithm:src/SequenceReader.cpp
+useStlAlgorithm:include/DaidalusParameters.h
+missingInclude:include/Util.h
+unusedFunction
diff --git a/C++/.gitignore b/C++/.gitignore
@@ -0,0 +1 @@
+.cppcheck-config
diff --git a/C++/Doxyfile b/C++/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = DAIDALUS
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v2.0.1
+PROJECT_NUMBER         = v2.0.4
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/C++/Makefile b/C++/Makefile
@@ -1,7 +1,7 @@
 # Simple Makefile to build DAIDALUS library and example applications
 NAME=DAIDALUS
 MAJOR=2
-MINOR=.0.3
+MINOR=.0.4
 VERSION=$(NAME)$(MAJOR)
 RELEASE=$(NAME)v$(MAJOR)$(MINOR)
 
@@ -11,7 +11,7 @@ OBJS   = $(SRC:.cpp=.o)
 INCLUDEFLAGS = -Iinclude 
 CXXFLAGS = $(INCLUDEFLAGS) -Wall -O 
 
-all: clean lib examples
+all: lib examples
 
 lib: $(OBJS)
 	@echo "** Building lib/$(RELEASE).a library"
@@ -51,6 +51,9 @@ configs: examples
 clean:
 	rm -f DaidalusExample DaidalusAlerting DaidalusBatch src/*.o examples/*.o lib/*.a
 
+check:
+	cppcheck --enable=all --cppcheck-build-dir=.cppcheck-config --suppressions-list=.cppcheck-config/cppcheck-suppressions.txt $(INCLUDEFLAGS) -q $(SRC) examples/
+
 mold: examples
 	./DaidalusExample --config no_sum --verbose > ../Regression/C++/DaidalusExample-no_sum.out
 	./DaidalusExample --config nom_a --verbose > ../Regression/C++/DaidalusExample-nom_a.out

diff --git a/C++/README.md b/C++/README.md
@@ -1,7 +1,7 @@
 DAIDALUS: Detect and Avoid Alerting Logic for Unmanned Systems
 ---------------------------------------------------------
 
-Release: v2.0.3a (C++), September-8-2023
+Release: v2.0.4 (C++), October-31-2023
 
 Copyright: Copyright (c) 2021 United States Government as represented by 
 the National Aeronautics and Space Administration.  No copyright 
@@ -60,8 +60,8 @@ To run a simple DAIDALUS application in a Unix environment, type
 $ ./DaidalusExample
 ```
 
-Several DAA metrics can be computed in batch mode for a given
-encounter file using the sample
+Several DAA metrics can be computed in batch mode for given
+configuration and encounter files using the sample
 program `DaidalusAlerting`, e.g.,
 
 ```
@@ -75,7 +75,7 @@ The generated file ` H1_DO_365B_no_SUM.csv` contains  alerting information compu
 for the encounter [`H1.daa`](../Scenarios/H1.daa) assuming [DO-365B (no SUM)](../Configurations/DO_365B_no_SUM.conf) configuration.
 
 The sample program `DaidalusBatch` generates alerting and banding
-information from a given encounter file, e.g.,
+information for given configuration and encounter files, e.g.,
 
 ```
 $ ./DaidalusBatch --conf  ../Configurations/DO_365B_no_SUM.conf ../Scenarios/H1.daa

diff --git a/C++/RELEASE-NOTES.txt b/C++/RELEASE-NOTES.txt
@@ -1,13 +1,24 @@
 DAIDALUS: Detect and Avoid Alerting Logic for Unmanned Systems
 -----------------------------------------------------
-Release:  v2.0.3-FormalATM-v2.7.5 (C++), September-8-2023
+Release:  v2.0.4-FormalATM-v2.7.5 (C++), November-30-2023
 Contact: Cesar Munoz (cesar.a.munoz@nasa.gov)
 
 Copyright: Copyright (c) 2021 United States Government as represented by 
 the National Aeronautics and Space Administration.  No copyright 
 is claimed in the United States under Title 17, U.S.Code. All Other 
 Rights Reserved.
 
+Release DAIDALUS-v2.0.4:
+------------------
+* November 30, 2023
+- Cleaned Java and C++ code (removed stale code)
+- Added support for horizontal speed = 0
+- Added parameter min_airspeed, which is used to compute horizontal
+direction bands when horizontal speed is less than min_airspeed.
+- Added parameter hdir_bands_below_min_as, which specifies 
+instantaneous or kinematic horizontal_speed_bands when horizontal
+speed is less than min_airspeed, i.e., (1:Instantaneous, -1:Kinematic)
+
 Release DAIDALUS-v2.0.3:
 ------------------
 * September-8-2023

diff --git a/C++/doc/_a_c_co_r_d_config_8h_source.html b/C++/doc/_a_c_co_r_d_config_8h_source.html
diff --git a/C++/doc/_aircraft_state_8h_source.html b/C++/doc/_aircraft_state_8h_source.html
diff --git a/C++/doc/_alert_thresholds_8h_source.html b/C++/doc/_alert_thresholds_8h_source.html
diff --git a/C++/doc/_alerter_8h_source.html b/C++/doc/_alerter_8h_source.html
diff --git a/C++/doc/_azi_equi_projection_8h_source.html b/C++/doc/_azi_equi_projection_8h_source.html
diff --git a/C++/doc/_bands_hysteresis_8h_source.html b/C++/doc/_bands_hysteresis_8h_source.html
diff --git a/C++/doc/_bands_mof_n_8h_source.html b/C++/doc/_bands_mof_n_8h_source.html
diff --git a/C++/doc/_bands_range_8h_source.html b/C++/doc/_bands_range_8h_source.html
diff --git a/C++/doc/_bands_region_8h_source.html b/C++/doc/_bands_region_8h_source.html
diff --git a/C++/doc/_c_d2_d_8h_source.html b/C++/doc/_c_d2_d_8h_source.html
diff --git a/C++/doc/_c_d3_d_8h_source.html b/C++/doc/_c_d3_d_8h_source.html
diff --git a/C++/doc/_c_d_cylinder_8h_source.html b/C++/doc/_c_d_cylinder_8h_source.html
diff --git a/C++/doc/_color_value_8h_source.html b/C++/doc/_color_value_8h_source.html
diff --git a/C++/doc/_conflict_data_8h_source.html b/C++/doc/_conflict_data_8h_source.html
diff --git a/C++/doc/_constants_8h_source.html b/C++/doc/_constants_8h_source.html
diff --git a/C++/doc/_consts_8h_source.html b/C++/doc/_consts_8h_source.html
diff --git a/C++/doc/_criteria_core_8h_source.html b/C++/doc/_criteria_core_8h_source.html
diff --git a/C++/doc/_d_c_p_a_urgency_strategy_8h_source.html b/C++/doc/_d_c_p_a_urgency_strategy_8h_source.html
diff --git a/C++/doc/_daidalus_8h_source.html b/C++/doc/_daidalus_8h_source.html
diff --git a/C++/doc/_daidalus_alt_bands_8h_source.html b/C++/doc/_daidalus_alt_bands_8h_source.html
diff --git a/C++/doc/_daidalus_core_8h_source.html b/C++/doc/_daidalus_core_8h_source.html
diff --git a/C++/doc/_daidalus_dir_bands_8h_source.html b/C++/doc/_daidalus_dir_bands_8h_source.html
diff --git a/C++/doc/_daidalus_file_walker_8h_source.html b/C++/doc/_daidalus_file_walker_8h_source.html
diff --git a/C++/doc/_daidalus_hs_bands_8h_source.html b/C++/doc/_daidalus_hs_bands_8h_source.html
diff --git a/C++/doc/_daidalus_integer_bands_8h_source.html b/C++/doc/_daidalus_integer_bands_8h_source.html
diff --git a/C++/doc/_daidalus_parameters_8h_source.html b/C++/doc/_daidalus_parameters_8h_source.html
diff --git a/C++/doc/_daidalus_processor_8h_source.html b/C++/doc/_daidalus_processor_8h_source.html
diff --git a/C++/doc/_daidalus_real_bands_8h_source.html b/C++/doc/_daidalus_real_bands_8h_source.html
diff --git a/C++/doc/_daidalus_vs_bands_8h_source.html b/C++/doc/_daidalus_vs_bands_8h_source.html
diff --git a/C++/doc/_debug_8h_source.html b/C++/doc/_debug_8h_source.html
diff --git a/C++/doc/_detection3_d_8h_source.html b/C++/doc/_detection3_d_8h_source.html
diff --git a/C++/doc/_detection3_d_parameter_reader_8h_source.html b/C++/doc/_detection3_d_parameter_reader_8h_source.html
diff --git a/C++/doc/_detection3_d_parameter_writer_8h_source.html b/C++/doc/_detection3_d_parameter_writer_8h_source.html
diff --git a/C++/doc/_e_n_u_projection_8h_source.html b/C++/doc/_e_n_u_projection_8h_source.html
diff --git a/C++/doc/_error_log_8h_source.html b/C++/doc/_error_log_8h_source.html
diff --git a/C++/doc/_error_reporter_8h_source.html b/C++/doc/_error_reporter_8h_source.html
diff --git a/C++/doc/_euclidean_projection_8h_source.html b/C++/doc/_euclidean_projection_8h_source.html
diff --git a/C++/doc/_fixed_aircraft_urgency_strategy_8h_source.html b/C++/doc/_fixed_aircraft_urgency_strategy_8h_source.html
diff --git a/C++/doc/_function_8h_source.html b/C++/doc/_function_8h_source.html