diff --git a/.DS_Store b/.DS_Store
index 6e23d7b..23ffaae 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/.cproject b/.cproject
deleted file mode 100644
index d3615d8..0000000
--- a/.cproject
+++ /dev/null
@@ -1,304 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index d48cd5c..98c4d6b 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,10 +1,32 @@
-FROM artifacts.mitre.org:8200/idealab/rocky/idealab-basic:2.1.0
-ENV container docker
+FROM rockylinux:9 AS build
+ENV container=docker
+
+# ----------------------------------------------------------------------------
+# Internal MITRE only...comment out otherwise
+# ----------------------------------------------------------------------------
+RUN curl -ksSL \
+ https://gitlab.mitre.org/mitre-scripts/mitre-pki/raw/master/os_scripts/install_certs.sh \
+ | MODE=centos sh
# Set the TZ
ENV TZ=America/New_York
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-RUN dnf install -y ccache
+
+RUN dnf -y install epel-release dnf-plugins-core
+RUN dnf -y install initscripts \
+ ccache \
+ git \
+ gcc \
+ gcc-c++ \
+ cmake \
+ make \
+ wget \
+ tar \
+ netcdf-devel \
+ netcdf-cxx \
+ libaec \
+ eccodes
+RUN dnf --enablerepo=devel install -y eccodes-devel
# ----------------------------------------------------------------------------
# AAESim-specific artifacts are pulled into the container below
@@ -12,22 +34,13 @@ RUN dnf install -y ccache
# BUILD DEPENDENCIES---
# RUN DEPENDENCIES---
-# BADA data (needed by AAESim/FMACM in order to run a scenario)
-RUN mkdir /data \
- && mkdir /data/aaesim \
- && mkdir /data/aaesim/regressionScens \
- && git clone -b master --depth 1 https://mustache.mitre.org/scm/aaes/bada-data.git /data/aaesim/regressionScens/bada
# TEST DEPENDENCIES---
-# NOTE: you only need this repo if you intend to run aaesim unit/regression tests inside the container
-# BEWARE: this clone operation takes a long time for some reason
-# RUN git clone -b main --depth 1 https://mustache.mitre.org/scm/aaes/regression_input_data.git /data/aaesim/regression_input_data
-COPY --from=artifacts.mitre.org:8200/docker/sbowman/aaesim_regression_data:latest /data/aaesim/regression_input_data /data/aaesim/regression_input_data
# ----------------------------------------------------------------------------
# Final configuration steps
-RUN dnf -y install zsh dotnet-sdk-7.0 aspnetcore-runtime-7.0
+# RUN dnf -y install zsh dotnet-sdk-7.0 aspnetcore-runtime-7.0
# Make sure sshd is running (clion uses this for communication)
-CMD ["/usr/sbin/sshd", "-D", "-e", "-f", "/etc/ssh/sshd_config"]
+# CMD ["/usr/sbin/sshd", "-D", "-e", "-f", "/etc/ssh/sshd_config"]
diff --git a/.devcontainer/Dockerfile.deploy_v3 b/.devcontainer/Dockerfile.deploy_v3
deleted file mode 100644
index 7c1cec1..0000000
--- a/.devcontainer/Dockerfile.deploy_v3
+++ /dev/null
@@ -1,67 +0,0 @@
-# You can control the aaesim branch/tag in this container from the command line, like this:
-# >> docker build -t aaesim:3.5.2 --build-arg ARG_AAESIM_GIT_TAG=v3.5.2 -f Dockerfile.deploy_v3 .
-FROM artifacts.mitre.org:8200/docker/idealab/centos7/idealab-basic:1.0.2 AS build
-ENV container docker
-
-# Install Run Dependencies
-# BADA data (needed by AAESim/FMACM in order to run a scenario)
-RUN mkdir /data \
- && mkdir /data/aaesim \
- && mkdir /data/aaesim/regressionScens \
- && git clone -b master --depth 1 https://mustache.mitre.org/scm/aaes/bada-data.git /data/aaesim/regressionScens/bada
-
-# Older releases of aaesim contained some hardcoded NFS path dependencies in the cmake definition.
-# Install these dependencies so that this container can build older code revisions.
-USER root
-ARG DEVEL_WINDAPI="/devel/caasdwind/release/v2.5.1"
-ENV WINDAPI_PATH=${DEVEL_WINDAPI}
-COPY --from=artifacts.mitre.org:8200/docker/sbowman/windapi:v2.5.1 ${DEVEL_WINDAPI} ${DEVEL_WINDAPI}
-
-ARG DEVEL_GEOLIB="/devel/aaesim/bamboo/geolib-idealab/v3.2.7-SNAPSHOT"
-ENV GEOLIB_PATH=${DEVEL_WINDAPI}
-COPY --from=geolib-idealab:v3.2.7-SNAPSHOT ${DEVEL_GEOLIB} ${DEVEL_GEOLIB}
-
-# System must have a "cmake3" for aaesim builds
-USER root
-RUN ln -s /usr/local/bin/cmake /usr/local/bin/cmake3
-
-# Install AAESim code
-ARG ARG_AAESIM_GIT_TAG='v3.5.3'
-ENV AAESIM_VERSION=$ARG_AAESIM_GIT_TAG
-USER demo
-RUN cd /home/demo \
- && git clone --branch ${AAESIM_VERSION} --depth 1 https://mustache.mitre.org/scm/aaes/aaesim.git aaesim
-
-# Build aaesim
-USER demo
-RUN cd /home/demo/aaesim \
- && mkdir build \
- && cd build \
- && cmake .. \
- && make
-
-# Install Test Dependencies
-# NOTE: this container is ~7GB! You only need it if you intend to run aaesim unit/regression tests inside the container
-COPY --from=artifacts.mitre.org:8200/docker/sbowman/aaesim_regression_data:latest /data/aaesim/regression_input_data /data/aaesim/regression_input_data
-
-# Unit Test
-USER demo
-RUN cd /home/demo/aaesim/build \
- && make run
-
-# Regression Test
-# NOTE: regression testing can run for a long time. Only use the "mini" test target to expedite this step
-RUN cd /home/demo/aaesim/regression \
- && make mini
-
-# ---
-# Buildinfo Example: docker run --rm -it aaesim:
-# Run Local Config Example: docker run --rm -it -v `pwd`:`pwd` -w `pwd` aaesim:
-FROM artifacts.mitre.org:8200/docker/aaesim/aaesim-minimal:1.0.0
-ENV container docker
-USER demo
-COPY --from=build /data/aaesim/regressionScens/bada /data/aaesim/regressionScens/bada
-COPY --from=build /home/demo/aaesim/bin/aaesim /home/demo/aaesim/bin/aaesim
-COPY --from=build /devel/caasdwind/release/v2.5.1/local /devel/caasdwind/release/v2.5.1/local
-ENTRYPOINT ["/home/demo/aaesim/bin/aaesim"]
-CMD ["--buildinfo"]
\ No newline at end of file
diff --git a/.devcontainer/Dockerfile.deploy_v4 b/.devcontainer/Dockerfile.deploy_v4
deleted file mode 100644
index a61612c..0000000
--- a/.devcontainer/Dockerfile.deploy_v4
+++ /dev/null
@@ -1,58 +0,0 @@
-# You can control the aaesim branch/tag in this container from the command line, like this:
-# >> docker build -t aaesim:4.0.0 --build-arg ARG_AAESIM_GIT_TAG=v4.0.0 -f Dockerfile.deploy_v4 .
-FROM artifacts.mitre.org:8200/idealab/rocky/idealab-basic:2.0.0 AS build
-ENV container docker
-
-# Install Run Dependencies
-# BADA data (needed by AAESim/FMACM in order to run a scenario)
-RUN mkdir /data \
- && mkdir /data/aaesim \
- && mkdir /data/aaesim/regressionScens \
- && git clone -b master --depth 1 https://mustache.mitre.org/scm/aaes/bada-data.git /data/aaesim/regressionScens/bada
-
-# Install AAESim code
-ARG ARG_AAESIM_GIT_TAG='main'
-ENV AAESIM_VERSION=$ARG_AAESIM_GIT_TAG
-USER demo
-RUN cd /home/demo \
- && git clone --branch ${AAESIM_VERSION} --depth 1 https://mustache.mitre.org/scm/aaes/aaesim.git aaesim
-
-# System must have a "cmake3" for aaesim builds
-USER root
-RUN ln -s /usr/local/bin/cmake /usr/local/bin/cmake3
-
-# Build aaesim
-USER demo
-RUN cd /home/demo/aaesim \
- && cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release \
- && cmake --build build --target aaesim FMACM
-
-# Begin Testing --------------------------
-
-# Install Test Data Dependencies
-# NOTE: this container is ~7GB! You only need it if you intend to run aaesim unit/regression tests inside the container
-# USER root
-# COPY --from=artifacts.mitre.org:8200/docker/sbowman/aaesim_regression_data:latest /data/aaesim/regression_input_data /data/aaesim/regression_input_data
-
-# Unit Test
-# USER demo
-# RUN cd /home/demo/aaesim/build \
-# && make run
-
-# Regression Test
-# NOTE: complete regression testing can run for a long time. Only use the "mini" test target to expedite this last step
-# RUN cd /home/demo/aaesim/regression \
-# && make mini
-
-# End Testing --------------------------
-
-# ---
-# Buildinfo Example: docker run --rm -it aaesim:
-# Run Local Config Example: docker run --rm -it -v `pwd`:`pwd` -w `pwd` aaesim:
-FROM artifacts.mitre.org:8200/aaesim/aaesim-minimal:2.2.0
-ENV container docker
-COPY --from=build /data/aaesim/regressionScens/bada /data/aaesim/regressionScens/bada
-COPY --from=build /home/demo/aaesim/bin/aaesim /home/demo/aaesim/bin/aaesim
-COPY --from=build /home/demo/aaesim/build/_deps/caasdwind-src/local /home/demo/aaesim/build/_deps/caasdwind-src/local
-ENTRYPOINT ["/home/demo/aaesim/bin/aaesim"]
-CMD ["--buildinfo"]
\ No newline at end of file
diff --git a/.devcontainer/Dockerfile.deploy_v5 b/.devcontainer/Dockerfile.deploy_v5
deleted file mode 100644
index 7a56bb0..0000000
--- a/.devcontainer/Dockerfile.deploy_v5
+++ /dev/null
@@ -1,39 +0,0 @@
-# You can control the aaesim branch/tag in this container from the command line, like this:
-# >> docker build -t aaesim:5.0.0 --build-arg ARG_AAESIM_GIT_TAG=v5.0.0 -f Dockerfile.deploy_v5 .
-FROM --platform=$BUILDPLATFORM artifacts.mitre.org:8200/idealab/rocky/idealab-basic:3.0.1 AS build
-ENV container=docker
-
-RUN dnf --enablerepo=powertools install -y netcdf-devel netcdf-cxx libaec eccodes
-RUN dnf --enablerepo=devel install -y eccodes-devel
-
-# Install Run Dependencies
-# BADA data (needed by AAESim/FMACM in order to run a scenario)
-RUN mkdir -p /data/aaesim/regressionScens \
- && git clone -b master --depth 1 https://mustache.mitre.org/scm/aaes/bada-data.git /data/aaesim/regressionScens/bada
-
-# Install AAESim code
-ARG ARG_AAESIM_GIT_TAG='v5.0.1'
-ENV AAESIM_VERSION=$ARG_AAESIM_GIT_TAG
-USER demo
-RUN cd /home/demo \
- && git clone --branch ${AAESIM_VERSION} --depth 1 https://mustache.mitre.org/scm/aaes/aaesim.git aaesim_code
-
-# System must have a "cmake3" for aaesim builds
-USER root
-RUN ln -s /usr/local/bin/cmake /usr/local/bin/cmake3
-
-# Build aaesim
-USER demo
-RUN cd /home/demo/aaesim_code \
- && cmake3 -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=FALSE -DBUILD_TESTING=FALSE\
- && cmake3 --build build --target FMACM aaesim
-
-# ---
-# Buildinfo Example: docker run --rm -it aaesim:
-# Run Local Config Example: docker run --rm -it -v `pwd`:`pwd` -w `pwd` aaesim:
-FROM --platform=$BUILDPLATFORM artifacts.mitre.org:8200/aaesim/aaesim-minimal:2.3.0
-ENV container=docker
-COPY --from=build /data/aaesim/regressionScens/bada /data/aaesim/regressionScens/bada
-COPY --from=build /home/demo/aaesim_code/bin/aaesim /home/demo/aaesim_code/bin/aaesim
-ENTRYPOINT ["/home/demo/aaesim_code/bin/aaesim"]
-CMD ["--buildinfo"]
\ No newline at end of file
diff --git a/.devcontainer/Dockerfile.minimal b/.devcontainer/Dockerfile.minimal
deleted file mode 100644
index 7c35f7e..0000000
--- a/.devcontainer/Dockerfile.minimal
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM rockylinux:8-minimal
-ENV container=docker
-
-# MITRE SSL Fun
-RUN curl -ksSL \
- https://gitlab.mitre.org/mitre-scripts/mitre-pki/raw/master/os_scripts/install_certs.sh \
- | MODE=centos sh
-
-RUN microdnf -y install epel-release
-RUN microdnf --enablerepo=powertools install -y netcdf-devel netcdf-cxx redhat-lsb libaec eccodes
-RUN microdnf --enablerepo=devel install eccodes-devel
diff --git a/.devcontainer/Dockerfile.regression_data b/.devcontainer/Dockerfile.regression_data
deleted file mode 100644
index 39e982f..0000000
--- a/.devcontainer/Dockerfile.regression_data
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM centos:7
-ENV container docker
-
-# MITRE SSL Fun
-RUN curl -ksSL \
- https://gitlab.mitre.org/mitre-scripts/mitre-pki/raw/master/os_scripts/install_certs.sh \
- | MODE=centos sh
-
-RUN yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm \
- && yum -y install git
-
-RUN git clone -b main --depth 1 https://mustache.mitre.org/scm/aaes/regression_input_data.git /data/aaesim/regression_input_data
diff --git a/.devcontainer/Dockerfile.zsh b/.devcontainer/Dockerfile.zsh
deleted file mode 100644
index 7a7c2b8..0000000
--- a/.devcontainer/Dockerfile.zsh
+++ /dev/null
@@ -1,36 +0,0 @@
-FROM artifacts.mitre.org:8200/docker/idealab/centos7/idealab-basic:1.0.2 AS build
-ENV container docker
-
-# Set the TZ
-ENV TZ=America/New_York
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-# ENV CPM_SOURCE_CACHE=$HOME/.cache/CPM
-
-RUN yum install -y zsh && \
- zsh -c 'git clone --recursive https://github.com/sorin-ionescu/prezto.git "${ZDOTDIR:-$HOME}/.zprezto"' && \
- zsh -c 'setopt EXTENDED_GLOB; for rcfile in "${ZDOTDIR:-$HOME}"/.zprezto/runcoms/^README.md(.N); do ln -s "$rcfile" "${ZDOTDIR:-$HOME}/.${rcfile:t}"; done' && \
- chsh -s /bin/zsh
-
-# ----------------------------------------------------------------------------
-# AAESim-specific artifacts are pulled into the container below
-
-# BUILD DEPENDENCIES---
-
-# RUN DEPENDENCIES---
-# BADA data (needed by AAESim/FMACM in order to run a scenario)
-RUN mkdir /data \
- && mkdir /data/aaesim \
- && mkdir /data/aaesim/regressionScens \
- && git clone -b master --depth 1 https://mustache.mitre.org/scm/aaes/bada-data.git /data/aaesim/regressionScens/bada
-
-# TEST DEPENDENCIES---
-# NOTE: you only need this repo if you intend to run aaesim unit/regression tests inside the container
-# BEWARE: this clone operation takes a long time for some reason
-# RUN git clone -b main --depth 1 https://mustache.mitre.org/scm/aaes/regression_input_data.git /data/aaesim/regression_input_data
-
-
-# ----------------------------------------------------------------------------
-# Final configuration steps
-
-# Make sure sshd is running (clion uses this for communication)
-CMD ["/usr/sbin/sshd", "-D", "-e", "-f", "/etc/ssh/sshd_config"]
diff --git a/.devcontainer/README.md b/.devcontainer/README.md
deleted file mode 100644
index 2d4fbe6..0000000
--- a/.devcontainer/README.md
+++ /dev/null
@@ -1,113 +0,0 @@
-# AAESim Development Container
-
-This folder provides docker containers that allow local development of aaesim (even for IDEs like VSCode & CLion). Deploy containers are also here.
-
-## Developer Images
-
-### To Build
-
-Let's do this from the command line. First, build the image to use locally:
-
-`>> docker build -t aaesim-devel .`
-
-### To Run
-
-Run the docker container locally. This will create a running container called `aaesim-dev-sandbox`. In docker hub, you'll see it pop up as a running container.
-
-`>> docker run -d --cap-add sys_ptrace -p127.0.0.1:2222:22 --name aaesim-dev-sandbox aaesim-devel`
-
-If you want to stop the container:
-
-`>> docker stop aaesim-dev-sandbox`
-
-### Remote Debugging
-
-#### VSCode
-
-`vscode` can run a local container and host your code in that container. There are different ways to do this and you should [get smart](https://code.visualstudio.com/docs/containers/overview) before diving in here.
-
-TL;DR: On your host system, open the root repository folder (e.g. `aaesim`) in `vscode`. The IDE will read the file `.devcontainer/devcontainer.json` and ask you if you'd like to open your code in the container defined in that file. If you select yes, `vscode` will do some magic to start the container and mount your code in the container. From there, you can develop, debug, & commit with happiness using launch and task settings.
-
-Some `vscode` extensions are necessary for this: ms-azuretools.vscode-docker, ms-vscode-remote.remote-containers, ms-vscode-remote.remote-ssh.
-
-#### CLion
-
-In CLion, setup a remote toolchain using `localhost` and port `2222`. The user will be `user` and the password is `password`. This means that all operations performed by CLion in your container will be performed as `user` not `root`.
-
-For more information about running a containerized dev environment for clion, see also [their official blog post](https://blog.jetbrains.com/clion/2020/01/using-docker-with-clion/).
-
-### Data Access
-
-It is possible to run the container and also connect a volume mount from your host machine. This can be used to allow transparent transfer of data between your host and your container. So, if you need to provide quick access to data that exists on your host machine, just make it available in that shared volume.
-
-**Note**: symlinks created in the volume mount on the host machine that point to external locations on the host machine may not be visible to your container.
-
-#### For AAESim
-
-`aaesim` needs plenty of data at run-time in order to do anything interesting: BADA data files, RUC/RAP wind files, etc. In the IDEA Lab, this data exists conveniently on the NFS. This container resolves enough of the external data needs to facilitate running unit and regression tests. When you build the image, docker pulls in the git repos that contains the BADA data files and also the wind files necessary for testing. You can examine this yourself: once inside your container, you can find these data files in `/data/aaesim/` (which mimics the location on the NFS).
-
-All other data needs are up to you to provide. Wind data, beyond the few files needed for testing, is huge and does not exist in a git repo. Nor would you want it all on your local machine anyway! One possibility is to cherry-pick the files you need to run with and provide them to your docker container via a local volume mount. That is up to you.
-
-## Deployable Containers
-
-Deployed images are [available on internal Artifactory](https://artifacts.mitre.org/ui/repos/tree/General/docker-local/docker/aaesim). Generally only releases are deployed and those releases are automated on [Bamboo](https://pandafood.mitre.org/browse/AAES-AAESTAGS). These polished containers allow downstream users to run aaesim on their local computer.
-
-Build the deployable container. The docker file is parameterized with `ARG_AAESIM_GIT_TAG` to allow building _any_ branch or tag using a command line variable. Use this kind of command:
-
-For local runs on `arm64`:
-
-```bash
-docker buildx build --platform linux/arm64 --load --build-arg ARG_AAESIM_GIT_TAG=v5.0.1 -t aaesim:5.0.1 -f Dockerfile.deploy_v5 .
-```
-
-For deployable images:
-
-```bash
-docker buildx build --platform linux/arm64,linux/amd64 --load --build-arg ARG_AAESIM_GIT_TAG=v5.0.1 -t aaesim:5.0.1 -f Dockerfile.deploy_v5 .
-docker tag aaesim:5.0.1 artifacts.mitre.org:8200/aaesim/aaesim:5.0.1
-docker push artifacts.mitre.org:8200/aaesim/aaesim:5.0.1
-```
-
-With no command line arguments provided, the container will run aaesim and self-report the build details.
-
-```bash
-docker run --rm -it artifacts.mitre.org:8200/aaesim/aaesim:5.0.1
-```
-
-To execute aaesim using a configuration that is stored on the local host computer, use volume mounts. This example mounts the current directory `pwd` to run a configuration file there:
-
-```bash
-docker run --rm -it -v `pwd`:`pwd` -w `pwd` artifacts.mitre.org:8200/aaesim/aaesim:5.0.1 ./
-```
-
-The above will execute aaesim using the configuration file specified. All data produced by aaesim will be written back to the host computer in the current directory.
-
-> **Note**: to run aaesim successfully requires input data. Bada data is already in the container at `/data/aaesim/regressionScens/bada`; use that path in your aaesim scenarios. All other input data (e.g. wind grb files) must be provided by volume mounts in the docker command line arguments!
-
-### Minimum Run Container
-
-The deployable containers are kept as small as possible, especially with respect to the supporting Linux packages. To facilitate this, the `Dockerfile.minimal` exists. It builds the smallest possible _base_ container for hosting an AAESim binary to run inside. `Dockerfile.minimal` does not ever contain an aaesim binary in it.
-
-This container must be built using a multi-platform approach.
-
-```bash
-docker buildx build --platform linux/arm64,linux/amd64 --push -t artifacts.mitre.org:8200/aaesim/aaesim-minimal:2.2.0 -f Dockerfile.minimal .
-```
-
-Please be sure to update the version whenever a new `minimal` image is deployed to Artifactory.
-
-- Major: indicates an OS change
-- Minor: indicates progress/maintenance within an OS definition
-- Patch: rarely used. Probably 0.
-
-## Earlier Version Builds
-
-While not generally needed, it is possible to still build earlier versions releases in an image. Select the correct docker file for your needs.
-
-- v3 releases: `Dockerfile.deploy_v3`
-- v4 releases: `Dockerfile.deploy_v4`
-- v5 releases: `Dockerfile.deploy_v5`
-
-----
-
-~Happy Developing~
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 1fd3df7..882c01a 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -13,13 +13,13 @@
}
},
"containerEnv": {"CPM_SOURCE_CACHE":"/tmp/cpm_cache/"},
- "workspaceMount": "source=${localWorkspaceFolder},target=/home/demo/gitrepos/aaesim,type=bind,consistency=cached",
- "workspaceFolder": "/home/demo/gitrepos/aaesim",
+ "workspaceMount": "source=${localWorkspaceFolder},target=/workspace/fmacm,type=bind,consistency=cached",
+ "workspaceFolder": "/workspace/fmacm",
// "mounts": [
// "source=/Users/sbowman/gitrepos/fmacm-airs-scenarios,target=/home/demo/gitrepos/aaesim/fmacm-validation-scenarios,type=bind,consistency=cached",
// "source=/Users/sbowman/gitrepos/aaesim-to-fmacm,target=/home/demo/gitrepos/aaesim/aaesim-to-fmacm,type=bind,consistency=cached"
// ]
- "mounts": [
- "source=/Users/sbowman/gitrepos/fmacm-airs-scenarios,target=/home/demo/gitrepos/aaesim/fmacm-validation-scenarios,type=bind,consistency=cached"
- ]
+ // "mounts": [
+ // "source=/Users/sbowman/gitrepos/fmacm-airs-scenarios,target=/home/demo/gitrepos/aaesim/fmacm-validation-scenarios,type=bind,consistency=cached"
+ // ]
}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..c49ad1d
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,72 @@
+name: CI
+
+on:
+ push:
+ branches: [main, master]
+ pull_request:
+ branches: [main, master]
+
+jobs:
+ build:
+ runs-on: ${{ matrix.os }}
+ container: ${{ matrix.container }}
+ strategy:
+ matrix:
+ include:
+ - os: macos-latest
+ container: ''
+ install: |
+ brew update
+ brew upgrade
+ - os: ubuntu-latest
+ container: rockylinux:9
+ install: |
+ dnf -y install gcc gcc-c++ make cmake git
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: Install dependencies
+ run: ${{ matrix.install }}
+
+ - name: Configure and Build
+ run: |
+ cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release
+ cmake --build build --target FMACM -j
+ ./bin/FMACM --version
+
+
+
+ run_all_tests:
+ runs-on: ubuntu-latest
+ container:
+ image: rockylinux:9
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Install dependencies
+ run: |
+ dnf -y install gcc gcc-c++ make cmake git
+
+ - name: Build project
+ run: |
+ cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release
+
+ - name: Run public tests
+ run: |
+ cmake --build build --target run_public_test run_fmacm_test -j
+
+ - name: Upload test results
+ uses: actions/upload-artifact@v4
+ with:
+ name: public-test-results
+ path: unittest/*results.xml
+
+ # - name: Publish JUnit test results
+ # uses: dorny/test-reporter@v2
+ # if: always()
+ # with:
+ # name: Public Library Tests
+ # path: unittest/*results.xml
+ # reporter: jest-junit
+ # fail-on-error: true
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index f5fdefd..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-sudo: true
-dist: trusty
-language: cpp
-os:
- - linux
-compiler:
- - gcc
-addons:
- apt:
- packages: lcov
-before_install:
- - git config core.filemode false # this is needed to keep the next line from causing git to think the project has changed
- - chmod +x ./configure
-install:
- - ./configure
-script:
- - mkdir build
- - cd build
- - cmake -DCMAKE_BUILD_TYPE=Debug ..
- - make -j4
- - cd ..
-after_script:
- - export LD_LIBRARY_PATH=/usr/local/lib/ # this is needed to ensure run-time linking occurs
- - bin/FMACM --buildinfo
- - cd build
- - make run # run tests
- - lcov --capture --directory . --output-file coverage.info # Create lcov report
- - lcov --remove coverage.info '/usr/*' --output-file coverage.info # filter system-files
- - lcov --remove coverage.info 'unitsLib/*' --output-file coverage.info # filter unitslib files
- - lcov --remove coverage.info 'unittest/*' --output-file coverage.info # filter unitslib files
- - lcov --list coverage.info # debug info
- - bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports" # Uploading report to CodeCov
diff --git a/AircraftDynamicsTestFramework/Bada.cpp b/AircraftDynamicsTestFramework/Bada.cpp
deleted file mode 100644
index 3bef0f7..0000000
--- a/AircraftDynamicsTestFramework/Bada.cpp
+++ /dev/null
@@ -1,278 +0,0 @@
-// ****************************************************************************
-// NOTICE
-//
-// This work was produced for the U.S. Government under Contract 693KA8-22-C-00001
-// and is subject to Federal Aviation Administration Acquisition Management System
-// Clause 3.5-13, Rights In Data-General, Alt. III and Alt. IV (Oct. 1996).
-//
-// The contents of this document reflect the views of the author and The MITRE
-// Corporation and do not necessarily reflect the views of the Federal Aviation
-// Administration (FAA) or the Department of Transportation (DOT). Neither the FAA
-// nor the DOT makes any warranty or guarantee, expressed or implied, concerning
-// the content or accuracy of these views.
-//
-// For further information, please contact The MITRE Corporation, Contracts Management
-// Office, 7515 Colshire Drive, McLean, VA 22102-7539, (703) 983-6000.
-//
-// 2022 The MITRE Corporation. All Rights Reserved.
-// ****************************************************************************
-
-#include "public/BadaUtils.h"
-#include "aaesim/Bada.h"
-
-#include
-
-using namespace std;
-using namespace aaesim;
-
-char Bada::input_path[512];
-
-/**
- * Maps the aircraft type to an 8-character file name (no extension).
- * Multiple type codes may map to the same value.
- */
-string Bada::get_file(char *type_code /** aircraft type abbreviation, e.g. B737 */) { return (char *)NULL; }
-
-/**
- * Reads the .OPF file, which contains all the thrust,
- * drag and fuel coefficients to be used in TEM together
- * with information on weights, speeds, maximum altitude, etc.
- */
-bool Bada::read_OPF() { return false; }
-
-/**
- * Reads the .APF file, which contains a default operational
- * climb, cruise and descent speed schedule that is likely
- * to be used by an airline.
- */
-bool Bada::read_APF() { return false; }
-
-/**
- * Reads the .PTF file, which contains a table of performance
- * data.
- */
-bool Bada::read_PTF() { return false; }
-
-/**
- * The init() function reads in new data from somewhere
- * based on type_code. It calls get_file to map the
- * type to a file name and then read_APF, read_OPF, and
- * read_PTF.
- */
-void Bada::init(char *type_code /** aircraft type abbreviation, e.g. B737 */) {}
-
-const Bada &Bada::operator=(const Bada &obj) {
-
- if (this != &obj) {
- if (obj.type_name != NULL) {
- type_name = new char(sizeof(obj.type_name));
- strcpy(type_name, obj.type_name);
- } else {
- type_name = NULL;
- }
-
- base_name = obj.base_name;
- m_aircraft_type = obj.m_aircraft_type;
- m_mass = obj.m_mass;
- m_flight_envelope = obj.m_flight_envelope;
- m_aerodynamics = obj.m_aerodynamics;
- m_engine_thrust = obj.m_engine_thrust;
- m_fuel_flow = obj.m_fuel_flow;
- m_ground_movement = obj.m_ground_movement;
-
- for (auto ix = 0; ix < 3; ix++) {
- m_procedures[ix] = obj.m_procedures[ix];
- }
-
- m_performance.speed = obj.m_performance.speed;
- m_performance.mass = obj.m_performance.mass;
- for (auto ix = 0; ix < aaesim::open_source::bada_utils::FL_NMAX; ix++) {
- m_performance.cruise[ix] = obj.m_performance.cruise[ix];
- m_performance.climb[ix] = obj.m_performance.climb[ix];
- m_performance.descent[ix] = obj.m_performance.descent[ix];
- }
- }
-
- return *this;
-}
-
-bool Bada::operator==(const Bada &obj) const {
- bool match(true);
-
- if ((type_name == NULL) && (obj.type_name == NULL)) {
- match = true;
- } else if ((type_name == NULL) || (obj.type_name == NULL)) {
- match = false;
- } else {
- match = (strcmp(type_name, obj.type_name) == 0);
- }
-
- match = match && (base_name == obj.base_name);
-
- // aircraft type
-
- match = match && (m_aircraft_type.n_eng == obj.m_aircraft_type.n_eng);
- match = match && (m_aircraft_type.engine_type == obj.m_aircraft_type.engine_type);
- match = match && (m_aircraft_type.wake_category == obj.m_aircraft_type.wake_category);
-
- // mass
-
- match = match && (m_mass.m_ref == obj.m_mass.m_ref);
- match = match && (m_mass.m_min == obj.m_mass.m_min);
- match = match && (m_mass.m_max == obj.m_mass.m_max);
- match = match && (m_mass.m_pyld == obj.m_mass.m_pyld);
-
- // flight envelope
-
- match = match && (m_flight_envelope.V_mo == obj.m_flight_envelope.V_mo);
- match = match && (m_flight_envelope.M_mo == obj.m_flight_envelope.M_mo);
- match = match && (m_flight_envelope.h_mo == obj.m_flight_envelope.h_mo);
- match = match && (m_flight_envelope.h_max == obj.m_flight_envelope.h_max);
- match = match && (m_flight_envelope.G_w == obj.m_flight_envelope.G_w);
-
- // m_aerodynamics
-
- match = match && (m_aerodynamics.S == obj.m_aerodynamics.S);
- match = match && (m_aerodynamics.C_Lbo == obj.m_aerodynamics.C_Lbo);
- match = match && (m_aerodynamics.K == obj.m_aerodynamics.K);
- match = match && (m_aerodynamics.C_M16 == obj.m_aerodynamics.C_M16);
-
- match = match && (m_aerodynamics.cruise.V_stall == obj.m_aerodynamics.cruise.V_stall);
- match = match && (m_aerodynamics.cruise.cd0 == obj.m_aerodynamics.cruise.cd0);
- match = match && (m_aerodynamics.cruise.cd2 == obj.m_aerodynamics.cruise.cd2);
-
- match = match && (m_aerodynamics.initial_climb.V_stall == obj.m_aerodynamics.initial_climb.V_stall);
- match = match && (m_aerodynamics.initial_climb.cd0 == obj.m_aerodynamics.initial_climb.cd0);
- match = match && (m_aerodynamics.initial_climb.cd2 == obj.m_aerodynamics.initial_climb.cd2);
-
- match = match && (m_aerodynamics.take_off.V_stall == obj.m_aerodynamics.take_off.V_stall);
- match = match && (m_aerodynamics.take_off.cd0 == obj.m_aerodynamics.take_off.cd0);
- match = match && (m_aerodynamics.take_off.cd2 == obj.m_aerodynamics.take_off.cd2);
-
- match = match && (m_aerodynamics.approach.V_stall == obj.m_aerodynamics.approach.V_stall);
- match = match && (m_aerodynamics.approach.cd0 == obj.m_aerodynamics.approach.cd0);
- match = match && (m_aerodynamics.approach.cd2 == obj.m_aerodynamics.approach.cd2);
-
- match = match && (m_aerodynamics.landing.V_stall == obj.m_aerodynamics.landing.V_stall);
- match = match && (m_aerodynamics.landing.cd0 == obj.m_aerodynamics.landing.cd0);
- match = match && (m_aerodynamics.landing.cd2 == obj.m_aerodynamics.landing.cd2);
-
- match = match && (m_aerodynamics.landing_gear.cd0 == obj.m_aerodynamics.landing_gear.cd0);
-
- // engine thrust
-
- match = match && (m_engine_thrust.max_climb.CT_c1 == obj.m_engine_thrust.max_climb.CT_c1);
- match = match && (m_engine_thrust.max_climb.CT_c2 == obj.m_engine_thrust.max_climb.CT_c2);
- match = match && (m_engine_thrust.max_climb.CT_c3 == obj.m_engine_thrust.max_climb.CT_c3);
- match = match && (m_engine_thrust.max_climb.CT_c4 == obj.m_engine_thrust.max_climb.CT_c4);
- match = match && (m_engine_thrust.max_climb.CT_c5 == obj.m_engine_thrust.max_climb.CT_c5);
-
- match = match && (m_engine_thrust.descent.CT_low == obj.m_engine_thrust.descent.CT_low);
- match = match && (m_engine_thrust.descent.CT_high == obj.m_engine_thrust.descent.CT_high);
- match = match && (m_engine_thrust.descent.h == obj.m_engine_thrust.descent.h);
- match = match && (m_engine_thrust.descent.CT_app == obj.m_engine_thrust.descent.CT_app);
- match = match && (m_engine_thrust.descent.CT_ld == obj.m_engine_thrust.descent.CT_ld);
- match = match && (m_engine_thrust.descent.V_ref == obj.m_engine_thrust.descent.V_ref);
- match = match && (m_engine_thrust.descent.M_ref == obj.m_engine_thrust.descent.M_ref);
-
- // fuel flow
-
- match = match && (m_fuel_flow.C_f1 == obj.m_fuel_flow.C_f1);
- match = match && (m_fuel_flow.C_f2 == obj.m_fuel_flow.C_f2);
- match = match && (m_fuel_flow.C_f3 == obj.m_fuel_flow.C_f3);
- match = match && (m_fuel_flow.C_f4 == obj.m_fuel_flow.C_f4);
- match = match && (m_fuel_flow.C_fcr == obj.m_fuel_flow.C_fcr);
-
- // ground movement
-
- match = match && (m_ground_movement.TOL == obj.m_ground_movement.TOL);
- match = match && (m_ground_movement.LDL == obj.m_ground_movement.LDL);
- match = match && (m_ground_movement.span == obj.m_ground_movement.span);
- match = match && (m_ground_movement.length == obj.m_ground_movement.length);
-
- // procedures
-
- for (auto ix = 0; match && (ix < 3); ix++) {
- match = match && (m_procedures[ix].climb.V1 == obj.m_procedures[ix].climb.V1);
- match = match && (m_procedures[ix].climb.V2 == obj.m_procedures[ix].climb.V2);
- match = match && (m_procedures[ix].climb.M == obj.m_procedures[ix].climb.M);
-
- match = match && (m_procedures[ix].cruise.V1 == obj.m_procedures[ix].cruise.V1);
- match = match && (m_procedures[ix].cruise.V2 == obj.m_procedures[ix].cruise.V2);
- match = match && (m_procedures[ix].cruise.M == obj.m_procedures[ix].cruise.M);
-
- match = match && (m_procedures[ix].descent.V1 == obj.m_procedures[ix].descent.V1);
- match = match && (m_procedures[ix].descent.V2 == obj.m_procedures[ix].descent.V2);
- match = match && (m_procedures[ix].descent.M == obj.m_procedures[ix].descent.M);
- }
-
- // performance
-
- match = match && (m_performance.speed.climb.CAS.LO == obj.m_performance.speed.climb.CAS.LO);
- match = match && (m_performance.speed.climb.CAS.HI == obj.m_performance.speed.climb.CAS.HI);
- match = match && (m_performance.speed.climb.Mach == obj.m_performance.speed.climb.Mach);
-
- match = match && (m_performance.speed.cruise.CAS.LO == obj.m_performance.speed.cruise.CAS.LO);
- match = match && (m_performance.speed.cruise.CAS.HI == obj.m_performance.speed.cruise.CAS.HI);
- match = match && (m_performance.speed.cruise.Mach == obj.m_performance.speed.cruise.Mach);
-
- match = match && (m_performance.speed.descent.CAS.LO == obj.m_performance.speed.descent.CAS.LO);
- match = match && (m_performance.speed.descent.CAS.HI == obj.m_performance.speed.descent.CAS.HI);
- match = match && (m_performance.speed.descent.Mach == obj.m_performance.speed.descent.Mach);
-
- match = match && (m_performance.mass.low == obj.m_performance.mass.low);
- match = match && (m_performance.mass.nominal == obj.m_performance.mass.nominal);
- match = match && (m_performance.mass.high == obj.m_performance.mass.high);
-
- for (auto ix = 0; match && (ix < aaesim::open_source::bada_utils::FL_NMAX); ix++) {
- match = match && (m_performance.cruise[ix].FL == obj.m_performance.cruise[ix].FL);
- match = match && ((isnan(Units::MetersPerSecondSpeed(m_performance.cruise[ix].TAS).value()) &&
- isnan(Units::MetersPerSecondSpeed(obj.m_performance.cruise[ix].TAS).value())) ||
- (m_performance.cruise[ix].TAS == obj.m_performance.cruise[ix].TAS));
-
- match = match && ((isnan(Units::KilogramsPerHourMassFlowRate(m_performance.cruise[ix].fuel.lo).value()) &&
- isnan(Units::KilogramsPerHourMassFlowRate(obj.m_performance.cruise[ix].fuel.lo).value())) ||
- (m_performance.cruise[ix].fuel.lo == obj.m_performance.cruise[ix].fuel.lo));
- match = match && ((isnan(Units::KilogramsPerHourMassFlowRate(m_performance.cruise[ix].fuel.nom).value()) &&
- isnan(Units::KilogramsPerHourMassFlowRate(obj.m_performance.cruise[ix].fuel.nom).value())) ||
- (m_performance.cruise[ix].fuel.nom == obj.m_performance.cruise[ix].fuel.nom));
- match = match && ((isnan(Units::KilogramsPerHourMassFlowRate(m_performance.cruise[ix].fuel.hi).value()) &&
- isnan(Units::KilogramsPerHourMassFlowRate(obj.m_performance.cruise[ix].fuel.hi).value())) ||
- (m_performance.cruise[ix].fuel.hi == obj.m_performance.cruise[ix].fuel.hi));
-
- match = match && (m_performance.climb[ix].FL == obj.m_performance.climb[ix].FL);
- match = match && ((isnan(Units::MetersPerSecondSpeed(m_performance.climb[ix].TAS).value()) &&
- isnan(Units::MetersPerSecondSpeed(obj.m_performance.climb[ix].TAS).value())) ||
- (m_performance.climb[ix].TAS == obj.m_performance.climb[ix].TAS));
-
- match = match && ((isnan(Units::MetersPerSecondSpeed(m_performance.climb[ix].ROCD.lo).value()) &&
- isnan(Units::MetersPerSecondSpeed(obj.m_performance.climb[ix].ROCD.lo).value())) ||
- (m_performance.climb[ix].ROCD.lo == obj.m_performance.climb[ix].ROCD.lo));
- match = match && ((isnan(Units::MetersPerSecondSpeed(m_performance.climb[ix].ROCD.nom).value()) &&
- isnan(Units::MetersPerSecondSpeed(obj.m_performance.climb[ix].ROCD.nom).value())) ||
- (m_performance.climb[ix].ROCD.nom == obj.m_performance.climb[ix].ROCD.nom));
- match = match && ((isnan(Units::MetersPerSecondSpeed(m_performance.climb[ix].ROCD.hi).value()) &&
- isnan(Units::MetersPerSecondSpeed(obj.m_performance.climb[ix].ROCD.hi).value())) ||
- (m_performance.climb[ix].ROCD.hi == obj.m_performance.climb[ix].ROCD.hi));
-
- match = match && ((isnan(Units::KilogramsPerHourMassFlowRate(m_performance.climb[ix].fuel).value()) &&
- isnan(Units::KilogramsPerHourMassFlowRate(obj.m_performance.climb[ix].fuel).value())) ||
- (m_performance.climb[ix].fuel == obj.m_performance.climb[ix].fuel));
-
- match = match && (m_performance.descent[ix].FL == obj.m_performance.descent[ix].FL);
-
- match = match && ((isnan(Units::MetersPerSecondSpeed(m_performance.descent[ix].TAS).value()) &&
- isnan(Units::MetersPerSecondSpeed(obj.m_performance.descent[ix].TAS).value())) ||
- (m_performance.descent[ix].TAS == obj.m_performance.descent[ix].TAS));
-
- match = match && ((isnan(Units::MetersPerSecondSpeed(m_performance.descent[ix].ROCD).value()) &&
- isnan(Units::MetersPerSecondSpeed(obj.m_performance.descent[ix].ROCD).value())) ||
- (m_performance.descent[ix].ROCD == obj.m_performance.descent[ix].ROCD));
-
- match = match && ((isnan(Units::KilogramsPerHourMassFlowRate(m_performance.descent[ix].fuel).value()) &&
- isnan(Units::KilogramsPerHourMassFlowRate(obj.m_performance.descent[ix].fuel).value())) ||
- (m_performance.descent[ix].fuel == obj.m_performance.descent[ix].fuel));
- }
-
- return match;
-}
diff --git a/AircraftDynamicsTestFramework/BadaPerformanceCalculator.cpp b/AircraftDynamicsTestFramework/BadaPerformanceCalculator.cpp
deleted file mode 100644
index 24a95d7..0000000
--- a/AircraftDynamicsTestFramework/BadaPerformanceCalculator.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// ****************************************************************************
-// NOTICE
-//
-// This work was produced for the U.S. Government under Contract 693KA8-22-C-00001
-// and is subject to Federal Aviation Administration Acquisition Management System
-// Clause 3.5-13, Rights In Data-General, Alt. III and Alt. IV (Oct. 1996).
-//
-// The contents of this document reflect the views of the author and The MITRE
-// Corporation and do not necessarily reflect the views of the Federal Aviation
-// Administration (FAA) or the Department of Transportation (DOT). Neither the FAA
-// nor the DOT makes any warranty or guarantee, expressed or implied, concerning
-// the content or accuracy of these views.
-//
-// For further information, please contact The MITRE Corporation, Contracts Management
-// Office, 7515 Colshire Drive, McLean, VA 22102-7539, (703) 983-6000.
-//
-// 2022 The MITRE Corporation. All Rights Reserved.
-// ****************************************************************************
-
-#include "aaesim/BadaPerformanceCalculator.h"
-
-using namespace aaesim;
-
-// Gets configuration when flying trajectory
-//-----------------
-// INPUTS:
-// ac: aircraft parameter structure
-// Calibrated air speed, V_cas: kts
-// alt: altitude in meters.
-// altAtFAF: altitude at FAF (or
-// last waypoint) in meters.
-// OUTPUTS:
-// cd0,cd2,gear: drag coefficients for the specific configuration
-void BadaPerformanceCalculator::GetDragCoefficientsAndIncrementFlapConfiguration(
- const Units::Speed &calibrated_airspeed, /** [in] Calibrated airspeed in knots */
- const Units::Length &altitude_msl, /** [in] Altitude in meters */
- double &cd0, /** [out] parasitic drag coefficient */
- double &cd2, /** [out] induced drag coefficient */
- double &gear, /** [out] landing gear drag coefficient */
- aaesim::open_source::bada_utils::FlapConfiguration &updated_flap_setting /** [out] flap configuration */) {}
-
-// Gets configuration for trajectory building.
-//-----------------
-// INPUTS:
-// ac: aircraft parameter structure
-// Calibrated air speed, V_cas: kts
-// alt: altitude in meters.
-// altAtFAF: altitude at FAF (or
-// last waypoint) in meters.
-// OUTPUTS:
-// cd0,cd2,gear: drag coefficients for the specific configuration
-void BadaPerformanceCalculator::GetDragCoefficients(
- const Units::Speed &calibrated_airspeed, /** [in] Calibrated airspeed in knots */
- const Units::Length &altitude_msl, /** [in] Altitude in meters */
- const aaesim::open_source::bada_utils::FlapConfiguration ¤t_flap_configuration, /** [in] flap configuration
- */
- double &cd0, /** [out] parasitic drag coefficient */
- double &cd2, /** [out] induced drag coefficient */
- double &gear, /** [out] landing gear drag coefficient */
- aaesim::open_source::bada_utils::FlapConfiguration &flap_configuration /** [out] flap configuration */
-) const {}
-
-// Configures Aircraft is extra drag is needed and speed is less than max configuration speed
-//-----------------
-// INPUTS:
-// ac: aircraft parameter structure
-// Calibrated air speed, V_cas: kts
-// alt: altitude in meters.
-// altAtFAF: altitude at FAF (or
-// last waypoint) in meters.
-// OUTPUTS:
-// mode: configuration
-void BadaPerformanceCalculator::GetConfigurationForIncreasedDrag(
- const Units::Speed &calibrated_airspeed, /** [in] Calibrated airspeed in knots */
- const Units::Length &altitude, /** [in] Altitude in meters */
- aaesim::open_source::bada_utils::FlapConfiguration &updated_flap_setting) /** [out] flap configuration */
-{}
-
-// gets maximum aircraft thrust
-Units::NewtonsForce BadaPerformanceCalculator::GetMaxThrust(
- const Units::Length &altitude, aaesim::open_source::bada_utils::FlapConfiguration mode,
- aaesim::open_source::bada_utils::EngineThrustMode engine_thrust_mode,
- Units::AbsCelsiusTemperature temperature_offset) const {
- return Units::NewtonsForce(0);
-}
-
-BadaPerformanceCalculator *BadaPerformanceCalculator::MakeBadaPerformance(
- std::string aircraft_type, /** Aircraft type */
- BoundedValue mass_percentile, /** Mass percentile: 0.0=mass.m_min, 1.0=mass.m_max */
- Units::Length faf_altitude_msl, /** Used to ensure flaps don't deploy too early */
- open_source::bada_utils::FlapConfiguration initial_flap_configuration /** Initialize flaps configuration */) {
- std::cout << "BadaPerformanceCalculator.cpp: Implement me!" << std::endl;
- return nullptr;
-}
diff --git a/AircraftDynamicsTestFramework/BadaWithCalc.cpp b/AircraftDynamicsTestFramework/BadaWithCalc.cpp
deleted file mode 100644
index 3a991e7..0000000
--- a/AircraftDynamicsTestFramework/BadaWithCalc.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-// ****************************************************************************
-// NOTICE
-//
-// This is the copyright work of The MITRE Corporation, and was produced
-// for the U. S. Government under Contract Number DTFAWA-10-C-00080, and
-// is subject to Federal Aviation Administration Acquisition Management
-// System Clause 3.5-13, Rights In Data-General, Alt. III and Alt. IV
-// (Oct. 1996). No other use other than that granted to the U. S.
-// Government, or to those acting on behalf of the U. S. Government,
-// under that Clause is authorized without the express written
-// permission of The MITRE Corporation. For further information, please
-// contact The MITRE Corporation, Contracts Office, 7515 Colshire Drive,
-// McLean, VA 22102-7539, (703) 983-6000.
-//
-// Copyright 2020 The MITRE Corporation. All Rights Reserved.
-// ****************************************************************************
-
-#include "aaesim/BadaWithCalc.h"
-#include "public/AircraftCalculations.h"
-#include "utility/constants.h"
-#include
-
-BadaWithCalc::BadaWithCalc() {
- std::cout << "BadaWithCalc.cpp: Implement this class!" << std::endl;
- mAircraftMass = mass.m_ref; // default
-}
-
-BadaWithCalc::~BadaWithCalc() {
-}
-
-/**
- * getAircraftParameters() does two things:
- *
- * 1. Loads the data files by calling init(), if not already done.
- * 2. Sets ac_mass based on the percentile.
- */
-void BadaWithCalc::getAircraftParameters(std::string aircraft_type,
- double mass_percentile) {
-// INPUTS:
-// aircraft type
-// OUTPUTS:
-// struct ac:
-// ac.mass, ac.ref_mass: kg
-// ac.S: m^2
-// ac.__.cd0,cd2,gear: unitless
-// ac.__.Vstall: kts (CAS)
-}
-
-
-// Gets configuration when flying trajectory
-
-//-----------------
-// INPUTS:
-// ac: aircraft parameter structure
-// Calibrated air speed, V_cas: kts
-// alt: altitude in meters.
-// altAtFAF: altitude at FAF (or
-// last waypoint) in meters.
-// OUTPUTS:
-// cd0,cd2,gear: drag coefficients for the specific configuration
-void BadaWithCalc::getConfig(
- const Units::Speed &velocity_cas, /** [in] Calibrated airspeed in knots */
- const Units::Length &altitude, /** [in] Altitude in meters */
- const Units::Length &altitude_faf, /** [in] Altitude at final approach fix */
- int modeLast, /** [in] previous flap configuration (0-3) */
- double &cd0, /** [out] parasitic drag coefficient */
- double &cd2, /** [out] induced drag coefficient */
- double &gear, /** [out] landing gear drag coefficient */
- int &mode /** [out] flap configuration (0-3):
- 0=cruise, 1=approach, 2=landing, 3=gear down */) const {
-
-}
-
-
-
-// Gets configuration for trajectory building.
-
-//-----------------
-// INPUTS:
-// ac: aircraft parameter structure
-// Calibrated air speed, V_cas: kts
-// alt: altitude in meters.
-// altAtFAF: altitude at FAF (or
-// last waypoint) in meters.
-// OUTPUTS:
-// cd0,cd2,gear: drag coefficients for the specific configuration
-void BadaWithCalc::getConfigTrajGen(
- const Units::Speed &velocity_cas, /** [in] Calibrated airspeed in knots */
- const Units::Length &altitude, /** [in] Altitude in meters */
- const Units::Length &altitude_faf, /** [in] Altitude at final approach fix */
- double &cd0, /** [out] parasitic drag coefficient */
- double &cd2, /** [out] induced drag coefficient */
- double &gear, /** [out] landing gear drag coefficient */
- int &mode /** [out] flap configuration (0-3):
- 0=cruise, 1=approach, 2=landing, 3=gear down */) const {
-
-}
-
-// Configures Aircraft is extra drag is needed and speed is less than max configuration speed
-
-//-----------------
-// INPUTS:
-// ac: aircraft parameter structure
-// Calibrated air speed, V_cas: kts
-// alt: altitude in meters.
-// altAtFAF: altitude at FAF (or
-// last waypoint) in meters.
-// OUTPUTS:
-// mode: configuration
-void BadaWithCalc::getConfigForDrag(
- const Units::Speed &velocity_cas, /** [in] Calibrated airspeed in knots */
- const Units::Length &altitude, /** [in] Altitude in meters */
- const Units::Length &altitude_faf, /** [in] Altitude at final approach fix */
- int modeLast, /** [in] previous flap configuration (0-3) */
- int &mode) const /** [out] flap configuration (0-3): 0=cruise, 1=approach, 2=landing, 3=gear down */
-{
-
-}
-
-
-// gets maximum aircraft thrust, takes input as altitude in Meters
-double BadaWithCalc::getMaxThrust(const Units::Length &altitude,
- int mode,
- std::string type) const {
- return 0;
-}
-
-void BadaWithCalc::setFlapSpeeds(const std::string &aircraftType) {
-}
-
-
-BadaWithCalc &BadaWithCalc::operator=(const BadaWithCalc &obj) {
- if (this != &obj) {
- Bada::operator=(obj);
-
- mAircraftMass = obj.mAircraftMass;
- mFlapSpeeds = obj.mFlapSpeeds;
- }
-
- return *this;
-
-}
-
-
-bool BadaWithCalc::operator==(const BadaWithCalc &obj) const {
-
- bool match = Bada::operator==(obj);
-
- match = match && (mAircraftMass == obj.mAircraftMass);
-
- match = match && (mFlapSpeeds.VappMin == obj.mFlapSpeeds.VappMin);
- match = match && (mFlapSpeeds.VappMax == obj.mFlapSpeeds.VappMax);
- match = match && (mFlapSpeeds.VlndMin == obj.mFlapSpeeds.VlndMin);
- match = match && (mFlapSpeeds.VlndMax == obj.mFlapSpeeds.VlndMax);
- match = match && (mFlapSpeeds.VgearMin == obj.mFlapSpeeds.VgearMin);
- match = match && (mFlapSpeeds.VgearMax == obj.mFlapSpeeds.VgearMax);
-
- return match;
-
-}
-
-
-bool BadaWithCalc::operator!=(const BadaWithCalc &obj) const {
-
- // Generic not equals operator.
- //
- // obj:comparison object.
- // returns true if obj doesn't match.
- // false if obj matches.
-
- return !operator==(obj);
-
-}
diff --git a/AircraftDynamicsTestFramework/CMakeLists.for_public_repo b/AircraftDynamicsTestFramework/CMakeLists.for_public_repo
deleted file mode 100644
index 7e48755..0000000
--- a/AircraftDynamicsTestFramework/CMakeLists.for_public_repo
+++ /dev/null
@@ -1,76 +0,0 @@
-cmake_minimum_required(VERSION 3.14)
-project(aaesim VERSION 4.3.0.1) # the nano value is a boolean. 1 == SNAPSHOT, 0 == release
-
-set (CMAKE_CXX_STANDARD 20)
-
-# Include a suite of helper functions for output and building the aaesim package
-include(${PROJECT_SOURCE_DIR}/.cmake/functions.cmake)
-include(${PROJECT_SOURCE_DIR}/.cmake/CPM.cmake)
-
-CPMAddPackage(
- NAME cppmanifest
- GIT_REPOSITORY https://mustache.mitre.org/scm/idea/cppmanifest.git
- GIT_TAG v1.3
- DOWNLOAD_ONLY TRUE
-)
-if (cppmanifest_ADDED)
- include(${cppmanifest_SOURCE_DIR}/cppmanifest_configure.cmake)
- cppmanifest_configure(${PROJECT_SOURCE_DIR}/include/cppmanifest)
-endif()
-
-# cppmanifest does not do strings in the version, but we want them.
-# Append -SNAPSHOT to the version name if this is a pre-release version
-if (${PROJECT_VERSION_TWEAK})
- set(aaesim_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}-SNAPSHOT)
-else()
- set(aaesim_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
-endif()
-message("-- Generating build for ${PROJECT_NAME} version ${aaesim_VERSION}")
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wno-unused-function -Wno-sign-compare -O0 -g")
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -Wno-unused-function -Wno-sign-compare -O3 -g3")
-
-# Add stuff to turn on code coverage only if a Debug build
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
- include(.cmake/CodeCoverage.cmake)
- APPEND_COVERAGE_COMPILER_FLAGS()
-endif()
-
-CPMAddPackage(
- NAME unitslib
- GIT_REPOSITORY https://mustache.mitre.org/scm/uom/cpp-uom.git
- GIT_TAG v2.1
-)
-
-CPMAddPackage(
- NAME log4cplus
- GITHUB_REPOSITORY log4cplus/log4cplus
- GIT_TAG REL_2_0_8
- OPTIONS
- "BUILD_SHARED_LIBS FALSE"
- "LOG4CPLUS_BUILD_TESTING FALSE"
- "LOG4CPLUS_BUILD_LOGGINGSERVER FALSE"
-)
-
-# Create some common paths
-if (unitslib_ADDED)
- set(unitslib_INCLUDE_DIRS ${unitslib_SOURCE_DIR}/units-2.1/src/)
-endif ()
-if (log4cplus_ADDED)
- set (LOG4CPLUS_DIRS
- ${log4cplus_BINARY_DIR}/include
- ${log4cplus_SOURCE_DIR}/include)
-endif ()
-
-set (LOADER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Loader)
-set (PUBLIC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Public)
-set (UNITTEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/unittest)
-set (FRAMEWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR}/AircraftDynamicsTestFramework)
-set (aaesim_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include )
-
-add_subdirectory(${LOADER_DIR})
-add_subdirectory(${PUBLIC_DIR})
-
-include(${UNITTEST_DIR}/unittest.cmake OPTIONAL)
-include(${FRAMEWORK_DIR}/framework.cmake OPTIONAL)
diff --git a/AircraftDynamicsTestFramework/TestFrameworkScenario.cpp b/AircraftDynamicsTestFramework/TestFrameworkScenario.cpp
index 68739cf..ee48f71 100644
--- a/AircraftDynamicsTestFramework/TestFrameworkScenario.cpp
+++ b/AircraftDynamicsTestFramework/TestFrameworkScenario.cpp
@@ -25,7 +25,6 @@
#include "bada/Bada3Factory.h"
#endif
-const Units::SecondsTime TestFrameworkScenario::SIMULATION_TIME_STEP = Units::SecondsTime(1.0);
log4cplus::Logger TestFrameworkScenario::m_logger = log4cplus::Logger::getInstance("TestFrameworkScenario");
TestFrameworkScenario::TestFrameworkScenario() : Scenario(), m_aircraft_in_scenario() {
@@ -51,20 +50,16 @@ bool TestFrameworkScenario::load(DecodedStream *input) {
void TestFrameworkScenario::PostLoad(const std::string &bada_data_path,
std::vector &aircraft_loaders) {
-
#ifdef MITRE_BADA3_LIBRARY
aaesim::bada::Bada3Factory::SetBadaDataPath(bada_data_path, Atmosphere::AtmosphereType::BADA37);
#endif
- aaesim::open_source::SimulationTime::SetSimulationTimeStep(SIMULATION_TIME_STEP);
-
std::for_each(aircraft_loaders.begin(), aircraft_loaders.end(), [this](fmacm::FrameworkAircraftLoader loader) {
m_aircraft_in_scenario.push_back(loader.BuildAircraft());
});
}
void TestFrameworkScenario::SimulateAllIterations() {
-
#ifdef SAMPLE_ALGORITHM_LIBRARY
m_sample_algorithm_writer->SetScenarioName(GetScenarioName());
m_sample_algorithm_kinematic_writer->SetScenarioName(GetScenarioName());
diff --git a/AircraftDynamicsTestFramework/dev-notes.md b/AircraftDynamicsTestFramework/dev-notes.md
deleted file mode 100644
index 7b22ea7..0000000
--- a/AircraftDynamicsTestFramework/dev-notes.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# FIM MOPS Aircraft and Control Model (FMACM)
-
-This library (`framework`) and executable binary (`FMACM`) are part of an [open source](https://mitre.github.io/FMACM/) capability offered by MITRE to external parties. The usage agreement is governed by the Apache 2.0 License (see online documentation).
-
-Important concepts:
-* absolutely no MITRE-IP is allowed in this code base;
-* this code must be able to compile _outside of MITRE_ which means we do not allow required dependencies on internal libraries;
- * OPTIONAL dependencies on internal libraries are acceptable to support internal testing tasks
-
-The dependency map should look like this:
-
-```mermaid
-flowchart TD
- Public(libpublic)-->Loader(libloader)
- BADA(libbada)-->Public(libpublic)
- IntervalManagement(libimalgs)-->Public(libpublic)
- FMACM-->Public(libpublic)
- FMACM-- optional internal lib -->BADA(libbada)
- FMACM-- optional public lib -->IntervalManagement(libimalgs)
-```
diff --git a/AircraftDynamicsTestFramework/framework.cmake b/AircraftDynamicsTestFramework/framework.cmake
index 23ba846..d7644a1 100644
--- a/AircraftDynamicsTestFramework/framework.cmake
+++ b/AircraftDynamicsTestFramework/framework.cmake
@@ -1,12 +1,38 @@
+add_subdirectory(${FRAMEWORK_DIR})
+
if(NOT ${BUILD_LIBARIES_ONLY})
- add_subdirectory(${FRAMEWORK_DIR})
+ # CPMAddPackage(
+ # NAME cppmanifest_fmacm
+ # GIT_REPOSITORY https://mustache.mitre.org/scm/idea/cppmanifest.git
+ # GIT_TAG v1.7
+ # DOWNLOAD_ONLY TRUE
+ # )
+ # if(cppmanifest_fmacm_ADDED AND IS_READABLE "${cppmanifest_fmacm_SOURCE_DIR}")
+ # include(${cppmanifest_fmacm_SOURCE_DIR}/cppmanifest_configure.cmake)
+ # set(PATH_FOR_CPPMANIFEST "${CMAKE_CURRENT_BINARY_DIR}/include/cppmanifest")
+ # cppmanifest_configure(${PATH_FOR_CPPMANIFEST})
+ # set(cppmanifest_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/include")
+ # else()
+ # message(FATAL_ERROR "Unable to configure cppmanifest header files: ${cppmanifest_fmacm_SOURCE_DIR}")
+ # endif()
+ set(cppmanifest_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/include")
SET(FMACM_MAIN_SRC ${FRAMEWORK_DIR}/fmacm.cpp)
add_executable(FMACM ${FMACM_MAIN_SRC})
target_link_libraries(FMACM framework)
- target_include_directories(FMACM PUBLIC ${aaesim_INCLUDE_DIRS})
+ target_include_directories(FMACM PUBLIC
+ $
+ $
+ $
+ $
+ $
+ ${LOG4CPLUS_DIRS}
+ )
set_target_properties(FMACM PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin
)
+else()
+ # Ensure framework library is a build target even though nothing depends on it
+ set_target_properties(framework PROPERTIES EXCLUDE_FROM_ALL FALSE)
endif()
\ No newline at end of file
diff --git a/AircraftDynamicsTestFramework/loaders/FrameworkAircraftLoader.cpp b/AircraftDynamicsTestFramework/loaders/FrameworkAircraftLoader.cpp
index 806cc92..d3161a2 100644
--- a/AircraftDynamicsTestFramework/loaders/FrameworkAircraftLoader.cpp
+++ b/AircraftDynamicsTestFramework/loaders/FrameworkAircraftLoader.cpp
@@ -19,21 +19,22 @@
#include "framework/FrameworkAircraftLoader.h"
+#include "framework/ForeWindReader.h"
+#include "framework/NullAircraftPerformance.h"
+#include "framework/PreloadedAdsbReceiver.h"
#include "loader/NullLoader.h"
-#include "public/SpeedOnPitchControl.h"
-#include "public/SpeedOnThrustControl.h"
+#include "public/AircraftControllerFactory.h"
+#include "public/EllipsoidalPositionEstimator.h"
+#include "public/FullWindTrueWeatherOperator.h"
+#include "public/LegacyPositionEstimator.h"
#include "public/NullADSBReceiver.h"
#include "public/NullAtmosphere.h"
-#include "public/WeatherPrediction.h"
-#include "public/PassThroughAssap.h"
#include "public/NullFlightDeckApplication.h"
-#include "public/EllipsoidalPositionEstimator.h"
-#include "public/LegacyPositionEstimator.h"
-#include "framework/PreloadedAdsbReceiver.h"
-#include "framework/ForeWindReader.h"
-#include "framework/NullAircraftPerformance.h"
-#include "public/FullWindTrueWeatherOperator.h"
+#include "public/PassThroughAssap.h"
+#include "public/SpeedOnPitchControl.h"
+#include "public/SpeedOnThrustControl.h"
#include "public/USStandardAtmosphere1976.h"
+#include "public/WeatherPrediction.h"
#include "scalar/Length.h"
#ifdef SAMPLE_ALGORITHM_LIBRARY
@@ -140,7 +141,8 @@ std::shared_ptr FrameworkAircraftLoader::
std::shared_ptr true_weather_operator =
std::make_shared(true_weather);
auto dynamics = std::make_shared();
- dynamics->Initialize(performance, initial_wgs84_position, m_initial_local_position, initial_altitude, initial_tas,
+ dynamics->Initialize(aaesim::open_source::SimulationTime::Of(Units::SecondsTime(m_start_time)), performance,
+ initial_wgs84_position, m_initial_local_position, initial_altitude, initial_tas,
initial_heading, m_mass_fraction, position_estimator, true_weather_operator);
return dynamics;
}
@@ -215,17 +217,19 @@ std::shared_ptr FrameworkAircraftLoader::Buil
std::shared_ptr FrameworkAircraftLoader::BuildAircraftControl(
std::string control_method, std::shared_ptr &bada_calculator) {
- std::shared_ptr aircraft_control;
-
- const Units::Angle max_bank_angle = Units::DegreesAngle(30);
+ AircraftControllerFactory::DescentSpeedControlStrategy descent_strategy{
+ AircraftControllerFactory::DescentSpeedControlStrategy::NONE};
+ std::transform(control_method.cbegin(), control_method.cend(), control_method.begin(),
+ [](unsigned char c) { return std::tolower(c); });
if (control_method == "thrust") {
- aircraft_control = std::make_shared(max_bank_angle);
+ descent_strategy = AircraftControllerFactory::DescentSpeedControlStrategy::THRUST;
} else if (control_method == "pitch") {
- aircraft_control = std::make_shared(
- Units::KnotsSpeed(20.0), Units::FeetLength(500.0), max_bank_angle);
- } else {
- throw std::runtime_error("Supported speed_management_type values are 'thrust' and 'pitch'");
+ descent_strategy = AircraftControllerFactory::DescentSpeedControlStrategy::PITCH;
}
+ auto descent_config = AircraftControllerFactory::DescentSpeedControlConfig{descent_strategy, Units::KnotsSpeed(20.0),
+ Units::FeetLength(500.0)};
+ auto config = AircraftControllerFactory::AircraftControllerConfig{descent_config, Units::DegreesAngle{30}};
+ auto aircraft_control = AircraftControllerFactory::BuildForCruiseDescentOnly(config);
aircraft_control->Initialize(bada_calculator);
return aircraft_control;
}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7e113d..45479a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
-project(aaesim VERSION 4.3.0.1) # the nano value is a boolean. 1 == SNAPSHOT, 0 == release
+project(aaesim VERSION 5.2.0.0) # the nano value is a boolean. 1 == SNAPSHOT, 0 == release # the nano value is a boolean. 1 == SNAPSHOT, 0 == release
set (CMAKE_CXX_STANDARD 20)
@@ -27,19 +27,19 @@ include(${PROJECT_SOURCE_DIR}/.cmake/functions.cmake)
CPMAddPackage(
NAME Ccache.cmake
GITHUB_REPOSITORY TheLartians/Ccache.cmake
- VERSION 1.2
+ VERSION 1.2.5
)
-CPMAddPackage(
- NAME cppmanifest
- GIT_REPOSITORY https://mustache.mitre.org/scm/idea/cppmanifest.git
- GIT_TAG v1.4
- DOWNLOAD_ONLY TRUE
-)
-if (cppmanifest_ADDED)
- include(${cppmanifest_SOURCE_DIR}/cppmanifest_configure.cmake)
- cppmanifest_configure(${PROJECT_SOURCE_DIR}/include/cppmanifest)
-endif()
+# CPMAddPackage(
+# NAME cppmanifest
+# GIT_REPOSITORY https://mustache.mitre.org/scm/idea/cppmanifest.git
+# GIT_TAG v1.7
+# DOWNLOAD_ONLY TRUE
+# )
+# if (cppmanifest_ADDED)
+# include(${cppmanifest_SOURCE_DIR}/cppmanifest_configure.cmake)
+# cppmanifest_configure(${PROJECT_SOURCE_DIR}/include/cppmanifest)
+# endif()
# cppmanifest does not do strings in the version, but we want them.
# Append -SNAPSHOT to the version name if this is a pre-release version
@@ -54,38 +54,22 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wno-unused-function -Wno-sign-compare -O0 -g")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -Wno-unused-function -Wno-sign-compare -O3 -g3")
-# Add stuff to turn on code coverage only if a Debug build
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
- include(.cmake/CodeCoverage.cmake)
- APPEND_COVERAGE_COMPILER_FLAGS()
-endif()
-
-CPMAddPackage(
- NAME unitslib
- GIT_REPOSITORY https://mustache.mitre.org/scm/uom/cpp-uom.git
- GIT_TAG v2.1
-)
-
CPMAddPackage(
NAME log4cplus
GITHUB_REPOSITORY log4cplus/log4cplus
- GIT_TAG REL_2_0_8
+ GIT_TAG REL_2_1_2
OPTIONS
"BUILD_SHARED_LIBS FALSE"
"LOG4CPLUS_BUILD_TESTING FALSE"
"LOG4CPLUS_BUILD_LOGGINGSERVER FALSE"
)
-
-# Create some common paths
-if (unitslib_ADDED)
- set(unitslib_INCLUDE_DIRS ${unitslib_SOURCE_DIR}/units-2.1/src/)
-endif ()
if (log4cplus_ADDED)
set (LOG4CPLUS_DIRS
${log4cplus_BINARY_DIR}/include
${log4cplus_SOURCE_DIR}/include)
endif ()
+set (unitslib_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/unitsLib/units-2.1)
set (LOADER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Loader)
set (PUBLIC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Public)
set (FRAMEWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR}/AircraftDynamicsTestFramework)
diff --git a/Doxyfile.in b/Doxyfile.in
deleted file mode 100644
index 6b902bf..0000000
--- a/Doxyfile.in
+++ /dev/null
@@ -1,1808 +0,0 @@
-# Doxyfile 1.8.2
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING = UTF-8
-
-# The PROJECT_NAME tag is a single word (or sequence of words) that should
-# identify the project. Note that if you do not use Doxywizard you need
-# to put quotes around the project name if it contains spaces.
-
-PROJECT_NAME = Airborne Application Evaluation Simulator (AAESim)
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER =
-
-# 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 quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF =
-
-# With the PROJECT_LOGO tag one can specify an logo or icon that is
-# included in the documentation. The maximum height of the logo should not
-# exceed 55 pixels and the maximum width should not exceed 200 pixels.
-# Doxygen will copy the logo to the output directory.
-
-PROJECT_LOGO =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY = ./docs
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
-
-OUTPUT_LANGUAGE = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip. Note that you specify absolute paths here, but also
-# relative paths, which will be relative from the directory where doxygen is
-# started.
-
-STRIP_FROM_PATH =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH = include
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful if your file system
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE = 4
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES =
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding
-# "class=itcl::class" will allow you to use the command class in the
-# itcl::class meaning.
-
-TCL_SUBST =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension,
-# and language is one of the parsers supported by doxygen: IDL, Java,
-# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,
-# C++. For instance to make doxygen treat .inc files as Fortran files (default
-# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note
-# that for custom extensions you also need to set FILE_PATTERNS otherwise the
-# files are not read by doxygen.
-
-EXTENSION_MAPPING =
-
-# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
-# comments according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you
-# can mix doxygen, HTML, and XML commands with Markdown formatting.
-# Disable only in case of backward compatibilities issues.
-
-MARKDOWN_SUPPORT = YES
-
-# When enabled doxygen tries to link words that correspond to documented classes,
-# or namespaces to their corresponding documentation. Such a link can be
-# prevented in individual cases by by putting a % sign in front of the word or
-# globally by setting AUTOLINK_SUPPORT to NO.
-
-AUTOLINK_SUPPORT = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also makes the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-
-CPP_CLI_SUPPORT = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate getter and setter methods for a property. Setting this option to YES (the default) will make doxygen replace the get and set methods by a property in the documentation. This will only work if the methods are indeed getting or setting a simple type. If this is not the case, or you want to show the methods anyway, you should set this option to NO.
-
-IDL_PROPERTY_SUPPORT = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
-# unions are shown inside the group in which they are included (e.g. using
-# @ingroup) instead of on a separate page (for HTML and Man pages) or
-# section (for LaTeX and RTF).
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
-# unions with only public data fields will be shown inline in the documentation
-# of the scope in which they are defined (i.e. file, namespace, or group
-# documentation), provided this scope is documented. If set to NO (the default),
-# structs, classes, and unions are shown on a separate page (for HTML and Man
-# pages) or section (for LaTeX and RTF).
-
-INLINE_SIMPLE_STRUCTS = NO
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT = NO
-
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penalty.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will roughly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols.
-
-SYMBOL_CACHE_SIZE = 0
-
-# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
-# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
-# their name and scope. Since this can be an expensive process and often the
-# same symbol appear multiple times in the code, doxygen keeps a cache of
-# pre-resolved symbols. If the cache is too small doxygen will become slower.
-# If the cache is too large, memory is wasted. The cache size is given by this
-# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols.
-
-LOOKUP_CACHE_SIZE = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
-# scope will be included in the documentation.
-
-EXTRACT_PACKAGE = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES = YES
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespaces are hidden.
-
-EXTRACT_ANON_NSPACES = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES = YES
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
-# will list include files with double quotes in the documentation
-# rather than with sharp brackets.
-
-FORCE_LOCAL_INCLUDES = NO
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
-
-SORT_BRIEF_DOCS = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
-# will sort the (brief and detailed) documentation of class members so that
-# constructors and destructors are listed first. If set to NO (the default)
-# the constructors will appear in the respective orders defined by
-# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
-# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
-# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
-# do proper type resolution of all parameters of a function it will reject a
-# match between the prototype and the implementation of a member function even
-# if there is only one candidate or it is obvious which candidate to choose
-# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
-# will still accept a match between prototype and implementation in such cases.
-
-STRICT_PROTO_MATCHING = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or macro consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and macros in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES = NO
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
-
-SHOW_FILES = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page.
-# This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
-
-SHOW_NAMESPACES = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command , where is the value of
-# the FILE_VERSION_FILTER tag, and is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option.
-# You can optionally specify a file name after the option, if omitted
-# DoxygenLayout.xml will be used as the name of the layout file.
-
-# LAYOUT_FILE = /vobs/msp/third_party/doxygen/config/DoxygenLayout.xml
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files
-# containing the references data. This must be a list of .bib files. The
-# .bib extension is automatically appended if omitted. Using this command
-# requires the bibtex tool to be installed. See also
-# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
-# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
-# feature you need bibtex and perl available in the search path.
-
-CITE_BIB_FILES =
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
-WARNINGS = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR = YES
-
-# The WARN_NO_PARAMDOC option can be enabled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
-
-WARN_NO_PARAMDOC = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
-WARN_LOGFILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT =
-
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
-
-INPUT_ENCODING = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
-# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
-# *.f90 *.f *.for *.vhd *.vhdl
-
-FILE_PATTERNS = *.cpp *.h
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
-RECURSIVE = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE = unittest/gtest-1.7.0 unitsLib tcas
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-
-EXCLUDE_SYMLINKS = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS = */noinclude/*
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS = log4cplus std testing* proto2
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH = ./Run_Files
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
-EXAMPLE_PATTERNS =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
-IMAGE_PATH =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command , where
-# is the value of the INPUT_FILTER tag, and is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
-# ignored.
-
-INPUT_FILTER =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.
-# Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.
-# The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty or if
-# non of the patterns match the file name, INPUT_FILTER is applied.
-
-FILTER_PATTERNS =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
-# and it is also possible to disable source filtering for a specific pattern
-# using *.ext= (so without naming a filter). This option only has effect when
-# FILTER_SOURCE_FILES is enabled.
-
-FILTER_SOURCE_PATTERNS =
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C, C++ and Fortran comments will always remain visible.
-
-STRIP_CODE_COMMENTS = NO
-
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.
-# Otherwise they will link to the documentation.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
-
-USE_HTAGS = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX = YES
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX = 5
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header. Note that when using a custom header you are responsible
-# for the proper inclusion of any scripts and style sheets that doxygen
-# needs, which is dependent on the configuration options used.
-# It is advised to generate a default header using "doxygen -w html
-# header.html footer.html stylesheet.css YourConfigFile" and then modify
-# that header. Note that the header is subject to change so you typically
-# have to redo this when upgrading to a newer version of doxygen or when
-# changing the value of configuration settings such as GENERATE_TREEVIEW!
-
-# HTML_HEADER = /vobs/msp/third_party/doxygen/src/html/header.html
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
-# HTML_FOOTER = /vobs/msp/third_party/doxygen/src/html/footer.html
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If left blank doxygen will
-# generate a default style sheet. Note that it is recommended to use
-# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this
-# tag will in the future become obsolete.
-
-HTML_STYLESHEET =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional
-# user-defined cascading style sheet that is included after the standard
-# style sheets created by doxygen. Using this option one can overrule
-# certain style aspects. This is preferred over using HTML_STYLESHEET
-# since it does not replace the standard style sheet and is therefor more
-# robust against future updates. Doxygen will copy the style sheet file to
-# the output directory.
-
-HTML_EXTRA_STYLESHEET =
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that
-# the files will be copied as-is; there are no commands or markers available.
-
-HTML_EXTRA_FILES =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
-# Doxygen will adjust the colors in the style sheet and background images
-# according to this color. Hue is specified as an angle on a colorwheel,
-# see http://en.wikipedia.org/wiki/Hue for more information.
-# For instance the value 0 represents red, 60 is yellow, 120 is green,
-# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
-# The allowed range is 0 to 359.
-
-HTML_COLORSTYLE_HUE = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
-# the colors in the HTML output. For a value of 0 the output will use
-# grayscales only. A value of 255 will produce the most vivid colors.
-
-HTML_COLORSTYLE_SAT = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
-# the luminance component of the colors in the HTML output. Values below
-# 100 gradually make the output lighter, whereas values above 100 make
-# the output darker. The value divided by 100 is the actual gamma applied,
-# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
-# and 100 does not change the gamma.
-
-HTML_COLORSTYLE_GAMMA = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting
-# this to NO can help when comparing the output of multiple runs.
-
-HTML_TIMESTAMP = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-
-HTML_DYNAMIC_SECTIONS = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
-# entries shown in the various tree structured indices initially; the user
-# can expand and collapse entries dynamically later on. Doxygen will expand
-# the tree to such a level that at most the specified number of entries are
-# visible (unless a fully collapsed tree already exceeds this amount).
-# So setting the number of entries 1 will produce a full collapsed tree by
-# default. 0 is a special value representing an infinite number of entries
-# and will result in a full expanded tree by default.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-
-GENERATE_DOCSET = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
-
-DOCSET_FEEDNAME = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
-
-DOCSET_BUNDLE_ID = org.doxygen.Project
-
-# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely
-# identify the documentation publisher. This should be a reverse domain-name
-# style string, e.g. com.mycompany.MyDocSet.documentation.
-
-DOCSET_PUBLISHER_ID = org.doxygen.Publisher
-
-# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
-
-DOCSET_PUBLISHER_NAME = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output directory.
-
-CHM_FILE =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
-
-CHM_INDEX_ENCODING =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
-# that can be used as input for Qt's qhelpgenerator to generate a
-# Qt Compressed Help (.qch) of the generated HTML documentation.
-
-GENERATE_QHP = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
-
-QCH_FILE =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
-
-QHP_NAMESPACE = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
-
-QHP_VIRTUAL_FOLDER = doc
-
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
-# add. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
-
-QHP_CUST_FILTER_NAME =
-
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see
-#
-# Qt Help Project / Custom Filters.
-
-QHP_CUST_FILTER_ATTRS =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's
-# filter section matches.
-#
-# Qt Help Project / Filter Attributes.
-
-QHP_SECT_FILTER_ATTRS =
-
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file.
-
-QHG_LOCATION =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
-# will be generated, which together with the HTML files, form an Eclipse help
-# plugin. To install this plugin and make it available under the help contents
-# menu in Eclipse, the contents of the directory containing the HTML and XML
-# files needs to be copied into the plugins directory of eclipse. The name of
-# the directory within the plugins directory should be the same as
-# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
-# the help appears.
-
-GENERATE_ECLIPSEHELP = NO
-
-# A unique identifier for the eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have
-# this name.
-
-ECLIPSE_DOC_ID = org.doxygen.Project
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
-# at top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it. Since the tabs have the same information as the
-# navigation tree you can set this option to NO if you already set
-# GENERATE_TREEVIEW to YES.
-
-DISABLE_INDEX = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to YES, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-# Windows users are probably better off using the HTML help feature.
-# Since the tree basically has the same information as the tab index you
-# could consider to set DISABLE_INDEX to NO when enabling this option.
-
-GENERATE_TREEVIEW = YES
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
-# (range [0,1..20]) that doxygen will group on one line in the generated HTML
-# documentation. Note that a value of 0 will completely suppress the enum
-# values from appearing in the overview section.
-
-ENUM_VALUES_PER_LINE = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
-TREEVIEW_WIDTH = 250
-
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
-# links to external symbols imported via tag files in a separate window.
-
-EXT_LINKS_IN_WINDOW = NO
-
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
-
-FORMULA_FONTSIZE = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are
-# not supported properly for IE 6.0, but are supported on all modern browsers.
-# Note that when changing this option you need to delete any form_*.png files
-# in the HTML output before the changes have effect.
-
-FORMULA_TRANSPARENT = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
-# (see http://www.mathjax.org) which uses client side Javascript for the
-# rendering instead of using prerendered bitmaps. Use this if you do not
-# have LaTeX installed or if you want to formulas look prettier in the HTML
-# output. When enabled you may also need to install MathJax separately and
-# configure the path to it using the MATHJAX_RELPATH option.
-
-USE_MATHJAX = NO
-
-# When MathJax is enabled you need to specify the location relative to the
-# HTML output directory using the MATHJAX_RELPATH option. The destination
-# directory should contain the MathJax.js script. For instance, if the mathjax
-# directory is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to
-# the MathJax Content Delivery Network so you can quickly see the result without
-# installing MathJax.
-# However, it is strongly recommended to install a local
-# copy of MathJax from http://www.mathjax.org before deployment.
-
-MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
-# names that should be enabled during MathJax rendering.
-
-MATHJAX_EXTENSIONS =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-# for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using
-# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-# (GENERATE_DOCSET) there is already a search function so this one should
-# typically be disabled. For large projects the javascript based search engine
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
-
-SEARCHENGINE = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a PHP enabled web server instead of at the web client
-# using Javascript. Doxygen will generate the search PHP script and index
-# file to put on the web server. The advantage of the server
-# based approach is that it scales better to large projects and allows
-# full text search. The disadvantages are that it is more difficult to setup
-# and does not have live searching capabilities.
-
-SERVER_BASED_SEARCH = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-# Note that when enabling USE_PDFLATEX this option is only used for
-# generating bitmaps for formulas in the HTML output, but not in the
-# Makefile that is written to the output directory.
-
-LATEX_CMD_NAME = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
-MAKEINDEX_CMD_NAME = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_LATEX = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, letter, legal and
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE = a4
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
-# the generated latex document. The footer should contain everything after
-# the last chapter. If it is left blank doxygen will generate a
-# standard footer. Notice: only use this tag if you know what you are doing!
-
-LATEX_FOOTER =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS = YES
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
-USE_PDFLATEX = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
-
-LATEX_HIDE_INDICES = NO
-
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include
-# source code with syntax highlighting in the LaTeX output.
-# Note that which sources are shown also depends on other settings
-# such as SOURCE_BROWSER.
-
-LATEX_SOURCE_CODE = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
-# http://en.wikipedia.org/wiki/BibTeX for more info.
-
-LATEX_BIB_STYLE = plain
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
-GENERATE_RTF = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_RTF = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS = NO
-
-# Load style sheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
-GENERATE_MAN = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT = man
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
-
-GENERATE_XML = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
-GENERATE_PERLMOD = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.
-# This is useful
-# if you want to understand what is going on.
-# On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY = YES
-
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
-
-ENABLE_PREPROCESSING = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# pointed to by INCLUDE_PATH will be searched when a #include is found.
-
-SEARCH_INCLUDES = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
-
-INCLUDE_PATH =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
-
-INCLUDE_FILE_PATTERNS =
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
-
-PREDEFINED =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition that
-# overrules the definition found in the source code.
-
-EXPAND_AS_DEFINED =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all references to function-like macros
-# that are alone on a line, have an all uppercase name, and do not end with a
-# semicolon, because these will confuse the parser if not removed.
-
-SKIP_FUNCTION_MACROS = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles. For each
-# tag file the location of the external documentation should be added. The
-# format of a tag file without this location is as follows:
-#
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-#
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths
-# or URLs. Note that each tag file must have a unique name (where the name does
-# NOT include the path). If a tag file is not located in the directory in which
-# doxygen is run, you must also specify the path to the tagfile here.
-
-TAGFILES =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE =
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
-
-ALLEXTERNALS = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
-
-EXTERNAL_GROUPS = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option also works with HAVE_DOT disabled, but it is recommended to
-# install and use dot, since it yields more powerful graphs.
-
-CLASS_DIAGRAMS = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH =
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT = NO
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
-# allowed to run in parallel. When set to 0 (the default) doxygen will
-# base this on the number of processors available in the system. You can set it
-# explicitly to a value larger than 0 to get control over the balance
-# between CPU load and processing speed.
-
-DOT_NUM_THREADS = 0
-
-# By default doxygen will use the Helvetica font for all dot files that
-# doxygen generates. When you want a differently looking font you can specify
-# the font name using DOT_FONTNAME. You need to make sure dot is able to find
-# the font, which can be done by putting it in a standard location or by setting
-# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
-# directory containing the font.
-
-DOT_FONTNAME = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-# The default size is 10pt.
-
-DOT_FONTSIZE = 10
-
-# By default doxygen will tell dot to use the Helvetica font.
-# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
-# set the path where dot can find it.
-
-DOT_FONTPATH =
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH = YES
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-
-UML_LOOK = YES
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside
-# the class node. If there are many fields or methods and many nodes the
-# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
-# threshold limits the number of items for each type to make the size more
-# managable. Set this to 0 for no limit. Note that the threshold may be
-# exceeded by 50% before the limit is enforced.
-
-UML_LIMIT_NUM_FIELDS = 10
-
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
-
-INCLUDE_GRAPH = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH = YES
-
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
-
-CALL_GRAPH = YES
-
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
-
-CALLER_GRAPH = YES
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will generate a graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY = YES
-
-# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are svg, png, jpg, or gif.
-# If left blank png will be used. If you choose svg you need to set
-# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible in IE 9+ (other browsers do not have this requirement).
-
-DOT_IMAGE_FORMAT = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-# Note that this requires a modern browser other than Internet Explorer.
-# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
-# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible. Older versions of IE do not have SVG support.
-
-INTERACTIVE_SVG = NO
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
-
-DOTFILE_DIRS =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the
-# \mscfile command).
-
-MSCFILE_DIRS =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
-
-DOT_TRANSPARENT = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS = NO
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
-
-DOT_CLEANUP = YES
diff --git a/Loader/DecodedStream.cpp b/Loader/DecodedStream.cpp
index 99cb182..fe6c9f1 100644
--- a/Loader/DecodedStream.cpp
+++ b/Loader/DecodedStream.cpp
@@ -18,6 +18,7 @@
// ****************************************************************************
#include "loader/DecodedStream.h"
+
#include
using namespace std;
@@ -283,11 +284,8 @@ bool DecodedStream::get_datum(bool &s) {
bool DecodedStream::get_datum(long &s) {
string temp = get_next().get_Data();
- static const long big = numeric_limits::max();
- static const long small = numeric_limits::min();
- if (temp.empty() || !DecodedStream::ok()) // if temp is empty or stream not ok
- {
+ if (temp.empty() || !DecodedStream::ok()) {
return false;
}
@@ -295,22 +293,20 @@ bool DecodedStream::get_datum(long &s) {
return false;
}
- if (atoi(temp.c_str()) == big) // too big to be int
- {
- return false;
- }
- if (atoi(temp.c_str()) == small) // too small to be int
- {
- return false;
- }
- if (temp != "0") {
- if (atoi(temp.c_str()) == 0) {
+ try {
+ size_t idx = 0;
+ long value = std::stol(temp, &idx, 10);
+ if (idx != temp.size()) {
+ // Not all characters were consumed, so not a valid number
return false;
}
+ s = value;
+ return true;
+ } catch (const std::invalid_argument &) {
+ return false;
+ } catch (const std::out_of_range &) {
+ return false;
}
- s = atoi(temp.c_str());
-
- return true;
}
bool DecodedStream::get_datum(float &s) {
diff --git a/Loader/Loadable.cpp b/Loader/Loadable.cpp
index 299a6ef..aa97c33 100644
--- a/Loader/Loadable.cpp
+++ b/Loader/Loadable.cpp
@@ -18,6 +18,7 @@
// ****************************************************************************
#include "loader/Loadable.h"
+
#include "loader/LoadError.h"
using namespace std;
@@ -39,7 +40,10 @@ void Loadable::operator=(const Loadable &in) {
stream = in.stream;
}
-void Loadable::cleanup() { lookup_table.clear(); }
+void Loadable::cleanup() {
+ lookup_table.clear();
+ stream = nullptr;
+}
bool Loadable::test_load() {
string error_message;
diff --git a/Loader/dev-notes.md b/Loader/dev-notes.md
deleted file mode 100644
index c337add..0000000
--- a/Loader/dev-notes.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Loader Library Dev Notes
-
-This library is comprised entirely of legacy code. The library reads text files in that are a specific format. The code was auto-generated using a tool. All knowledge of that process and who did it are lost. As developers, our goal is to understand the behavior of this library and maintain it as little as possible. It suffices for our needs for now, but should not be expanded. The only reason to open this code is to fix bugs. Otherwise we leave it alone.
-
-## Format
-
-The semicolon `;` is a comment character and can occur anywhere in a line. Any text on a line that occurs to the right of the semicolon is ignored during loading.
-
-All white space is ignored. White space can be tab or space characters.
-
-Keyword-Variable inputs occur on a single line like this:
-```
-keyword value
-```
-
-Complex inputs are separated into their own area using curly braces like this:
-```
-complex_stuff {
- keyword1 value1
- keyword2 value2
-}
-```
-Long files can be split out into multiple files using `#include path/to/file.txt` syntax like this:
-```
-keyword value
-complex_stuff {
- keyword1 value1
- keyword2 value2
- #include more_values.txt
-}
-```
\ No newline at end of file
diff --git a/Math/.gitignore b/Math/.gitignore
deleted file mode 100644
index 5761abc..0000000
--- a/Math/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.o
diff --git a/Math/CMakeLists.txt b/Math/CMakeLists.txt
deleted file mode 100644
index 02da99d..0000000
--- a/Math/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-cmake_minimum_required(VERSION 3.14)
-
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-
-set(SOURCE_FILES
- CustomMath.cpp
- DMatrix.cpp
- DVector.cpp
- InvalidIndexException.cpp
- RandomGenerator.cpp
- Statistics.cpp)
-
-set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib)
-
-add_library(math STATIC ${SOURCE_FILES})
-target_include_directories(math PUBLIC
- ${LOG4CPLUS_DIRS}
- ${unitslib_INCLUDE_DIRS}
- ${aaesim_INCLUDE_DIRS})
-
-target_link_libraries(math)
-target_compile_definitions(math PUBLIC -D_LINUX_ -Dunix)
diff --git a/Math/CustomMath.cpp b/Math/CustomMath.cpp
deleted file mode 100644
index 5bfdf08..0000000
--- a/Math/CustomMath.cpp
+++ /dev/null
@@ -1,323 +0,0 @@
-// ****************************************************************************
-// NOTICE
-//
-// This work was produced for the U.S. Government under Contract 693KA8-22-C-00001
-// and is subject to Federal Aviation Administration Acquisition Management System
-// Clause 3.5-13, Rights In Data-General, Alt. III and Alt. IV (Oct. 1996).
-//
-// The contents of this document reflect the views of the author and The MITRE
-// Corporation and do not necessarily reflect the views of the Federal Aviation
-// Administration (FAA) or the Department of Transportation (DOT). Neither the FAA
-// nor the DOT makes any warranty or guarantee, expressed or implied, concerning
-// the content or accuracy of these views.
-//
-// For further information, please contact The MITRE Corporation, Contracts Management
-// Office, 7515 Colshire Drive, McLean, VA 22102-7539, (703) 983-6000.
-//
-// 2022 The MITRE Corporation. All Rights Reserved.
-// ****************************************************************************
-
-/* CustomMath.cpp Initial code from Survsim 2.00R1 11/2/99*/
-
-#include
-#include
-#include
-#include "math/CustomMath.h"
-#include "utility/constants.h"
-
-using namespace aaesim::constants;
-
-// generate a uniform random number between 0 and 1
-// From "Numerical Recipe"
-
-double atan3(double x, double y) {
-
- // returns arc tangent as an angle measured from north in the range 0, 2pi
-
- double temp;
-
- temp = (double)atan2(x, y);
-
- if (temp < 0.0) {
- temp = temp + 2.0 * PI;
- }
-
- return (temp);
-
-} // atan3
-
-double quantize(double value, double lsb) {
- // quantizes value to lsb (least significant bit)
- if (lsb == 0) return value;
- double r = round(value / lsb);
- if (r == -0) {
- r = 0;
- }
- return (lsb * r);
-} // quantize
-
-Units::Length quantize(Units::Length value, Units::Length lsb) {
- // quantizes value to lsb (least significant bit)
- if (lsb == Units::zero()) return value;
- double r = round(value / lsb);
- if (r == -0) {
- r = 0;
- }
- return (lsb * r);
-}
-
-Units::Speed quantize(Units::Speed value, Units::Speed lsb) {
- // quantizes value to lsb (least significant bit)
- if (lsb == Units::zero()) return value;
- double r = round(value / lsb);
- if (r == -0) {
- r = 0;
- }
- return (lsb * r);
-}
-
-Units::Time quantize(Units::Time value, Units::Time lsb) {
- // quantizes value to lsb (least significant bit)
- if (lsb == Units::zero()) return value;
- double r = round(value / lsb);
- if (r == -0) {
- r = 0;
- }
- return (lsb * r);
-}
-
-double subtract_headings(double hd1, double hd2) {
- // subtract heading 2 from heading 1 with the following convention:
- // negative (counterclockwise) deltas are indicated by being greater than pi.
- // positive (clockwise) deltas are less than pi.
-
- double t;
-
- t = hd1 - hd2;
-
- if (t < 0.) {
- t = TWO_PI + t;
- }
-
- return (t);
-
-} // subtract_headings
-
-//-------------------------------------------------------------
-// Speed conversion using MACH & altitude as inputs; unit of output is FPS
-//-------------------------------------------------------------
-double MachToTas(double mach, double altitude) {
-
- float speedOfSound;
- double tas;
-
- if (0 <= altitude && altitude <= 36000) {
- speedOfSound = 662.4 - 243.0 * altitude / 100000.0;
- } else if (36000 < altitude && altitude <= 82000) {
- speedOfSound = 573.8;
- } else if (82000 < altitude && altitude <= 99900) {
- speedOfSound = 120 * altitude / 100000. + 475.4;
- } else {
- char msg[200];
- sprintf(msg, "Unexpected altitude in MachToTas: %lf", altitude);
- throw std::logic_error(msg);
- }
-
- tas = (mach * speedOfSound);
-
- // before this point tas is in knots
- // gwang 2009-03
- tas *= KNOTS_TO_FEET_PER_SECOND;
- // end gwang
-
- return (tas); // FPS
-}
-
-// output CAS in FPS
-double MachToCas_MITRE(double mach, double alt) {
- double cas, thetas, deltam;
-
- if (alt < 36089.24) {
- thetas = (1.0 - 6.8755856E-6 * alt);
- deltam = pow(thetas, 5.2558797);
- } else {
- thetas = 0.7519;
- // It appears the value of e is hardcoded to only 4 significant digits.
- // FIXME use exp() instead of pow()
- deltam = 0.2233609 * pow(2.718, (-((alt - 36089.24) / 20806.0)));
- }
- cas = 661.4786 *
- sqrt(5.0 * ((pow((1.0 + deltam * ((pow((1.0 + 0.2 * mach * mach), 3.5) - 1.0))), (2.0 / 7.0))) - 1.0));
-
- cas *= KNOTS_TO_FEET_PER_SECOND;
-
- return (cas);
-
-} /* MachToCas_MITRE */
-
-// inverse = inverse(in)
-/* Gauss-Jordan elimination from Numerical recipe:*/
-bool inverse(DMatrix &in, int n, DMatrix &out) {
- int irow = -1, icol = -1;
-
- DVector indxc(1, n);
- DVector indxr(1, n);
- DVector ipiv(1, n);
- DMatrix a(1, n, 1, n);
-
- // copy the "in" matrix into the "a" matrix:
- int in_min_row = in.GetMinRow();
- int in_min_column = in.GetMinColumn();
- for (int i = 1; i <= n; i++) {
- for (int j = 1; j <= n; j++) {
- a.Set(i, j, in.Get(i - 1 + in_min_row, j - 1 + in_min_column));
- }
- }
-
- for (int j = 1; j <= n; j++) {
- ipiv.Set(j, 0.);
- }
-
- for (int i = 1; i <= n; i++) {
- double big = 0.0;
- for (int j = 1; j <= n; j++) {
- if (ipiv.Get(j) != 1.) {
- for (int k = 1; k <= n; k++) {
- if (ipiv.Get(k) == 0.0) {
- if (fabs(a.Get(j, k)) >= big) {
- big = fabs(a.Get(j, k));
- irow = j;
- icol = k;
- }
- } else if (ipiv.Get(k) > 1.) {
- // singular matrix
- printf("\nWarning: Inversion of a singular matrix in the inverse() function (> 1 val).\n");
- return false;
- }
- } // end for(int k=1; k<=n; k++)
- } // end if(ipiv.get(j) != 1.)
- } // end for(int j=1; i<=n; j++)
- ipiv.Set(icol, ipiv.Get(icol) + 1);
- if (irow != icol) {
- // swap
- for (int l = 1; l <= n; l++) {
- double temp_swap;
- temp_swap = a.Get(irow, l);
- a.Set(irow, l, a.Get(icol, l));
- a.Set(icol, l, temp_swap);
- } // end for(int l=1; l<=n; l++)
- } // end if(irow != icol)
- indxr.Set(i, (double)irow);
- indxc.Set(i, (double)icol);
- if (a.Get(icol, icol) == 0.0) {
- // singular matrix
- printf("\nWarning: Inversion of a singular matrix in the inverse() function (0 val).\n");
- return false;
- }
- double pivinv = 1.0 / a.Get(icol, icol);
- a.Set(icol, icol, 1.);
- for (int l = 1; l <= n; l++) {
- a.Set(icol, l, pivinv * a.Get(icol, l));
- } // end for(int l=1; l<=n; l++)
-
- for (int ll = 1; ll <= n; ll++) {
- if (ll != icol) {
- double dum = a.Get(ll, icol);
- a.Set(ll, icol, 0.);
- for (int l = 1; l <= n; l++) {
- a.Set(ll, l, a.Get(ll, l) - dum * a.Get(icol, l));
- } // end for(int l=1; l<=n; l++)
- } // end if(ll != icol)
- } // end for(int ll=1; ll<=n; ll++)
- } // end for(int i=1; i<=n; i++)
-
- for (int l = n; l >= 1; l--) {
- if (indxr.Get(l) != indxc.Get(l)) {
- for (int k = 1; k <= n; k++) {
- // swap:
- double temp;
- temp = a.Get(k, (int)indxr.Get(l));
- a.Set(k, (int)indxr.Get(l), a.Get(k, (int)indxc.Get(l)));
- a.Set(k, (int)indxc.Get(l), temp);
- }
- } // end if(indxr.get(l) != indxc.get(l))
- } // end for(int l=n; l>=1; l--)
-
- // copy the "a" matrix into the "out" matrix:
- int out_min_row = out.GetMinRow();
- int out_min_column = out.GetMinColumn();
- for (int i = 1; i <= n; i++) {
- for (int j = 1; j <= n; j++) {
- out.Set(i - 1 + out_min_row, j - 1 + out_min_column, a.Get(i, j));
- }
- }
- return true;
-}
-
-void matrix_times_vector(DMatrix &matrix_in, DVector &vector_in, int n, DVector &vector_out) {
-
- for (int i = 0; i < n; i++) {
- int ii = i + vector_out.GetMin();
- vector_out[ii] = 0.0;
- for (int j = 0; j < n; j++) {
- vector_out[ii] +=
- matrix_in[i + matrix_in.GetMinRow()][j + matrix_in.GetMinColumn()] * vector_in[j + vector_in.GetMin()];
- }
- }
-}
-
-#ifndef _LINUX_
-int roundToInt(double d) {
- // Rounds double to int, away from 0 for the midpoint values.
- //
- // d:double value to be rounded
- //
- // returns rounded integer value.
-
- double val = d;
- int i = 0;
-
- if (val > 0) {
- val = val + 0.5;
- i = floor(val);
- } else if (val < 0) {
- val = val - 0.5;
- i = ceil(val);
- }
-
- return i;
-}
-#endif
-
-/**
- * Create a matrix which executes a 3-D rotation of a
- * point around a vector when a single-row
- * matrix [x y z] is post-multiplied by the rotation
- * matrix.
- */
-DMatrix &createRotationMatrix(double l, double m, double n, const Units::Angle theta) {
-
- // basic formula acquired from:
- // https://en.wikipedia.org/wiki/Transformation_matrix#Rotation_2
- // Wikipedia uses T * coord_column, while we use coord_row * T.
- // Therefore, we must transpose the matrix.
-
- // we need a unit vector
- double mag2 = l * l + m * m + n * n;
- if (mag2 != 1) {
- double mag = sqrt(mag2);
- l /= mag;
- m /= mag;
- n /= mag;
- }
-
- double cosT = cos(theta);
- double sinT = sin(theta);
- double cosT1 = 1 - cosT;
-
- double a[3][3] = {{l * l * cosT1 + cosT, m * l * cosT1 + n * sinT, n * l * cosT1 - m * sinT},
- {l * m * cosT1 - n * sinT, m * m * cosT1 + cosT, n * m * cosT1 + l * sinT},
- {l * n * cosT1 + m * sinT, m * n * cosT1 - l * sinT, n * n * cosT1 + cosT}};
- DMatrix *result = new DMatrix((double **)&a, 0, 2, 0, 2);
- return *result;
-}
diff --git a/Math/DMatrix.cpp b/Math/DMatrix.cpp
deleted file mode 100644
index 4160870..0000000
--- a/Math/DMatrix.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-// ****************************************************************************
-// NOTICE
-//
-// This work was produced for the U.S. Government under Contract 693KA8-22-C-00001
-// and is subject to Federal Aviation Administration Acquisition Management System
-// Clause 3.5-13, Rights In Data-General, Alt. III and Alt. IV (Oct. 1996).
-//
-// The contents of this document reflect the views of the author and The MITRE
-// Corporation and do not necessarily reflect the views of the Federal Aviation
-// Administration (FAA) or the Department of Transportation (DOT). Neither the FAA
-// nor the DOT makes any warranty or guarantee, expressed or implied, concerning
-// the content or accuracy of these views.
-//
-// For further information, please contact The MITRE Corporation, Contracts Management
-// Office, 7515 Colshire Drive, McLean, VA 22102-7539, (703) 983-6000.
-//
-// 2022 The MITRE Corporation. All Rights Reserved.
-// ****************************************************************************
-
-#include "math/DMatrix.h"
-#include "math/InvalidIndexException.h"
-#include
-
-char *DMatrix::MULTIPLICATION_DIMENSIONS_MESSAGE = (char *)"Cannot multiply DMatrix unless inner dimensions match.";
-
-DMatrix::DMatrix() {
- m_min_row = 0;
- m_max_row = -1;
- m_rows = NULL;
-}
-
-DMatrix::~DMatrix() {
- delete[] m_rows;
- m_rows = NULL;
-}
-
-DMatrix::DMatrix(const DMatrix &in) {
- int size = in.m_max_row - in.m_min_row + 1;
-
- m_max_row = in.m_max_row;
- m_min_row = in.m_min_row;
-
- m_rows = new DVector[size];
-
- for (int loop = 0; loop < size; loop++) {
- m_rows[loop] = in.m_rows[loop];
- }
-}
-
-DMatrix::DMatrix(int inRowMin, int inRowMax, int inColMin, int inColMax) {
- // calculates the size of the DMatrix
- int size = inRowMax - inRowMin + 1;
-
- // sets row min/max
- m_max_row = inRowMax;
- m_min_row = inRowMin;
-
- // allocates the new DMatrix (array of DVectors)
- m_rows = new DVector[size];
-
- // loop to set the colomn size (DVector min/max)
- for (int loop = 0; loop < size; loop++) {
- m_rows[loop].SetBounds(inColMin, inColMax);
- }
-}
-
-DMatrix::DMatrix(double **array_in, int inRowMin, int inRowMax, int inColMin, int inColMax) {
- // calculates the size of the DMatrix
- int size = inRowMax - inRowMin + 1;
-
- // sets row min/max
- m_max_row = inRowMax;
- m_min_row = inRowMin;
-
- // allocates the new DMatrix (array of DVectors)
- m_rows = new DVector[size];
-
- // loop to set the colomn size (DVector min/max)
- for (int loop = 0; loop < size; loop++) {
- m_rows[loop].SetBounds(inColMin, inColMax);
- }
-
- // NOTE this is dangerous code, the array MUST be the same size as the given row/colomn information
- // failure to match the bounds given will cause dangerous memory access!!!
- // this only works because 2d arrays are stored in sequential memory addresses
- // if the array is dynamically allocated this WILL cause dangerous memory access!!!
- double *memory_pointer; // pointer to point to the memory address of the 2d array
- memory_pointer = (double *)array_in; // accesses the the memory address of the first element
- for (int outer = 0; outer < size; outer++) {
- for (int inner = inColMin; inner <= inColMax; inner++) {
- m_rows[outer].Set(inner, (*memory_pointer));
- memory_pointer++; // iterates the memory address
- }
- }
-}
-
-double DMatrix::Get(const int row, const int column) const {
- // check if in valid range of DMatrix
- if (InRange(row)) {
- // uses the DVectors overloaded array operator to get the value
- return m_rows[row - m_min_row][column];
- }
-
- // if not in valid range throw Invalid Index Exception
- throw InvalidIndexException(row, m_min_row, m_max_row);
-}
-
-void DMatrix::Set(const int row, const int column, const double value) {
- // check if in valid range of DMatrix
- if (InRange(row)) {
- // uses the DVector overloaded array operator to set the value
- m_rows[row - m_min_row][column] = value;
- } else {
- // else not in range throw Invalid Index Exception
- throw InvalidIndexException(row, m_min_row, m_max_row);
- }
-}
-
-void DMatrix::SetBounds(int row_min, int row_max, int column_min, int column_max) {
- // calculates the size of the DMatrix
- int size = row_max - row_min + 1;
-
- // sets row min/max
- m_max_row = row_max;
- m_min_row = row_min;
-
- // allocates the new DMatrix (array of DVectors)
- delete[] m_rows;
- m_rows = new DVector[size];
-
- // loop to set the colomn size (DVector min/max)
- for (int loop = 0; loop < size; loop++) {
- m_rows[loop].SetBounds(column_min, column_max);
- }
-}
-
-bool DMatrix::InRange(const int row, const int colomn) const {
- // initializes results to false
- bool results = false;
-
- // check if row is in the range of [min,max] inclusive
- if (row >= m_min_row && row <= m_max_row) {
- // if in rows range call the DVector of that row and check range
- results = m_rows[row].IsIndexInRange(colomn);
- }
-
- return results;
-}
-
-bool DMatrix::InRange(const int row) const {
- // initializes results to false
- bool results = false;
-
- // check if row is in the range of [min,max] inclusive
- if (row >= m_min_row && row <= m_max_row) {
- // if in rows range then results is true
- results = true;
- }
-
- return results;
-}
-
-DVector &DMatrix::operator[](int row) {
- // check if in valid range of DMatrix
- if (InRange(row)) {
- // returns the DVector of the given row
- return m_rows[row - m_min_row];
- }
-
- // if not in valid range throw Invalid Index Exception
- throw InvalidIndexException(row, m_min_row, m_max_row);
-}
-
-const DVector &DMatrix::operator[](int row) const {
- // check if in valid range of DMatrix
- if (InRange(row)) {
- // returns the DVector of the given row
- return m_rows[row - m_min_row];
- }
-
- // if not in valid range throw Invalid Index Exception
- throw InvalidIndexException(row, m_min_row, m_max_row);
-}
-
-DMatrix &DMatrix::operator=(const DMatrix &in) {
- if (this != &in) {
- // calculates size of Matrix
- int size = in.m_max_row - in.m_min_row + 1;
-
- // sets row min/max
- m_max_row = in.m_max_row;
- m_min_row = in.m_min_row;
-
- delete[] m_rows;
-
- // allocates the new DMatrix (array of DVectors)
- m_rows = new DVector[size];
-
- // loop to copy the values of the given DMatrix
- for (int loop = 0; loop < size; loop++) {
- m_rows[loop] = in.m_rows[loop];
- }
- }
-
- return *this;
-}
-
-DMatrix &DMatrix::operator*(const DMatrix &that) const {
- int rowStart1 = GetMinRow();
- int rowEnd1 = GetMaxRow();
- int colStart1 = GetMinColumn();
- int colEnd1 = GetMaxColumn();
- int rowStart2 = that.GetMinRow();
- int rowEnd2 = that.GetMaxRow();
- int colStart2 = that.GetMinColumn();
- int colEnd2 = that.GetMaxColumn();
- if (colStart1 != rowStart2 || colEnd1 != rowEnd2) {
- // cannot be multiplied because inner dimensions don't match
- throw IncompatibleDimensionsException(MULTIPLICATION_DIMENSIONS_MESSAGE);
- }
- DMatrix *result = new DMatrix(rowStart1, rowEnd1, colStart2, colEnd2);
- for (int i = rowStart1; i <= rowEnd1; i++) {
- for (int j = colStart2; j <= colEnd2; j++) {
- double x = 0;
- for (int k = colStart1; k <= colEnd1; k++) {
- x += (*this)[i][k] * that[k][j];
- }
- result->Set(i, j, x);
- }
- }
- return *result;
-}
-
-void DMatrix::AscendSort() { std::sort(&m_rows[0], &m_rows[m_max_row - m_min_row + 1]); }
-
-int DMatrix::GetMinRow() const { return m_min_row; }
-
-int DMatrix::GetMaxRow() const { return m_max_row; }
-
-int DMatrix::GetMinColumn() const { return m_rows[0].GetMin(); }
-
-int DMatrix::GetMaxColumn() const { return m_rows[0].GetMax(); }
-
-DMatrix::IncompatibleDimensionsException::IncompatibleDimensionsException(char *explanation)
- : exception(), m_explanation(explanation) {}
-
-DMatrix::IncompatibleDimensionsException::~IncompatibleDimensionsException() throw() {}
-
-const char *DMatrix::IncompatibleDimensionsException::what() const throw() { return m_explanation; }
diff --git a/Math/DVector.cpp b/Math/DVector.cpp
deleted file mode 100644
index f4003e4..0000000
--- a/Math/DVector.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-// ****************************************************************************
-// NOTICE
-//
-// This work was produced for the U.S. Government under Contract 693KA8-22-C-00001
-// and is subject to Federal Aviation Administration Acquisition Management System
-// Clause 3.5-13, Rights In Data-General, Alt. III and Alt. IV (Oct. 1996).
-//
-// The contents of this document reflect the views of the author and The MITRE
-// Corporation and do not necessarily reflect the views of the Federal Aviation
-// Administration (FAA) or the Department of Transportation (DOT). Neither the FAA
-// nor the DOT makes any warranty or guarantee, expressed or implied, concerning
-// the content or accuracy of these views.
-//
-// For further information, please contact The MITRE Corporation, Contracts Management
-// Office, 7515 Colshire Drive, McLean, VA 22102-7539, (703) 983-6000.
-//
-// 2022 The MITRE Corporation. All Rights Reserved.
-// ****************************************************************************
-
-#include "math/DVector.h"
-
-#include
-
-#include "math/InvalidIndexException.h"
-
-using std::cout;
-using std::endl;
-
-DVector::DVector() {
- m_min_index = 0;
- m_max_index = -1;
- m_vector = NULL;
-}
-
-// NOTE: max index is inclusive
-DVector::DVector(int min, int max) {
-
- int size = max - min + 1;
-
- m_min_index = min;
- m_max_index = max;
-
- m_vector = new double[size];
-}
-
-DVector::DVector(const DVector &in) {
- int size = in.m_max_index - in.m_min_index + 1;
- m_min_index = in.m_min_index;
- m_max_index = in.m_max_index;
- m_vector = new double[size];
-
- for (int loop = 0; loop < size; loop++) {
- m_vector[loop] = in.m_vector[loop];
- }
-}
-
-DVector::~DVector() {
- delete[] m_vector;
- m_vector = NULL;
-}
-
-double DVector::Get(int index) {
- if (IsIndexInRange(index)) {
- return m_vector[index - m_min_index];
- }
-
- throw InvalidIndexException(index, m_min_index, m_max_index);
-}
-
-void DVector::Set(int index, double value) {
- if (IsIndexInRange(index)) {
- m_vector[index - m_min_index] = value;
- } else {
- throw InvalidIndexException(index, m_min_index, m_max_index);
- }
-}
-
-// NOTE: the max index is inclusive
-bool DVector::IsIndexInRange(int index) const {
- bool result = false;
-
- if (index >= m_min_index && index <= m_max_index) {
- result = true;
- }
-
- return result;
-}
-
-// NOTE: max index is inclusive
-void DVector::SetBounds(int min, int max) {
- int size0 = m_max_index - m_min_index + 1;
- m_min_index = min;
- m_max_index = max;
-
- int size = max - min + 1;
-
- if (size != size0) {
- delete[] m_vector;
- m_vector = new double[size];
- }
-}
-
-double &DVector::operator[](int index) {
- if (IsIndexInRange(index)) {
- return m_vector[index - m_min_index];
- }
- throw InvalidIndexException(index, m_min_index, m_max_index);
-}
-
-const double &DVector::operator[](int index) const {
- if (IsIndexInRange(index)) {
- return m_vector[index - m_min_index];
- }
- throw InvalidIndexException(index, m_min_index, m_max_index);
-}
-
-DVector &DVector::operator=(const DVector &in) {
- if (this != &in) {
- SetBounds(in.m_min_index, in.m_max_index);
- int size = m_max_index - m_min_index + 1;
-
- for (int loop = 0; loop < size; loop++) {
- m_vector[loop] = in.m_vector[loop];
- }
- }
-
- return *this;
-}
-
-bool DVector::operator<(const DVector &other) const { return m_vector[0] < other.m_vector[0]; }
-
-int DVector::GetMin() { return m_min_index; }
-
-int DVector::GetMax() { return m_max_index; }
diff --git a/Math/InvalidIndexException.cpp b/Math/InvalidIndexException.cpp
deleted file mode 100644
index fb0b03b..0000000
--- a/Math/InvalidIndexException.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// ****************************************************************************
-// NOTICE
-//
-// This work was produced for the U.S. Government under Contract 693KA8-22-C-00001
-// and is subject to Federal Aviation Administration Acquisition Management System
-// Clause 3.5-13, Rights In Data-General, Alt. III and Alt. IV (Oct. 1996).
-//
-// The contents of this document reflect the views of the author and The MITRE
-// Corporation and do not necessarily reflect the views of the Federal Aviation
-// Administration (FAA) or the Department of Transportation (DOT). Neither the FAA
-// nor the DOT makes any warranty or guarantee, expressed or implied, concerning
-// the content or accuracy of these views.
-//
-// For further information, please contact The MITRE Corporation, Contracts Management
-// Office, 7515 Colshire Drive, McLean, VA 22102-7539, (703) 983-6000.
-//
-// 2022 The MITRE Corporation. All Rights Reserved.
-// ****************************************************************************
-
-#include "math/InvalidIndexException.h"
-
-#include
-#include "utility/Logging.h"
-
-InvalidIndexException::InvalidIndexException(const int value, const int low_limit, const int high_limit) : exception() {
- log4cplus::Logger logger = log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("InvalidIndexException"));
- LOG4CPLUS_ERROR(logger, "attempted to access index " << value << " between " << low_limit << " and " << high_limit);
-}
-
-InvalidIndexException::InvalidIndexException(char *value) : exception() { std::cout << value << std::endl; }
diff --git a/Math/RandomGenerator.cpp b/Math/RandomGenerator.cpp
deleted file mode 100755
index 79a7cd6..0000000
--- a/Math/RandomGenerator.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-// ****************************************************************************
-// NOTICE
-//
-// This work was produced for the U.S. Government under Contract 693KA8-22-C-00001
-// and is subject to Federal Aviation Administration Acquisition Management System
-// Clause 3.5-13, Rights In Data-General, Alt. III and Alt. IV (Oct. 1996).
-//
-// The contents of this document reflect the views of the author and The MITRE
-// Corporation and do not necessarily reflect the views of the Federal Aviation
-// Administration (FAA) or the Department of Transportation (DOT). Neither the FAA
-// nor the DOT makes any warranty or guarantee, expressed or implied, concerning
-// the content or accuracy of these views.
-//
-// For further information, please contact The MITRE Corporation, Contracts Management
-// Office, 7515 Colshire Drive, McLean, VA 22102-7539, (703) 983-6000.
-//
-// 2022 The MITRE Corporation. All Rights Reserved.
-// ****************************************************************************
-
-#include "math/RandomGenerator.h"
-#include
-#include
-#include
-#include "utility/constants.h"
-
-const double RandomGenerator::m_IA = 16807;
-const double RandomGenerator::m_IM = 2147483647;
-const double RandomGenerator::m_AM = 1.0 / m_IM;
-const double RandomGenerator::m_IQ = 127773.0;
-const double RandomGenerator::m_IR = 2836.0;
-
-log4cplus::Logger RandomGenerator::m_logger = log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("RandomGenerator"));
-
-RandomGenerator::RandomGenerator() {
- double seed = time(NULL);
- long k = seed / m_IM;
- m_seed = seed - (k * m_IM);
-}
-
-RandomGenerator::RandomGenerator(const double seed) {
- assert(seed != 0.0);
- long k = seed / m_IM;
- m_seed = seed - (k * m_IM);
-}
-
-RandomGenerator::~RandomGenerator() {}
-
-const double RandomGenerator::UniformSample() {
- long k = m_seed / m_IQ;
-
- m_seed = m_IA * (m_seed - k * m_IQ) - m_IR * k;
-
- if (m_seed < 0.0) {
- m_seed += m_IM;
- }
-
- double sample = m_AM * m_seed;
-
- LOG4CPLUS_TRACE(m_logger, m_seed << "," << sample);
-
- return sample;
-}
-
-const double RandomGenerator::GaussianSample() {
- double u1 = UniformSample();
- double u2 = UniformSample();
-
- double eln = -2.0 * log(u1);
- double ang = 2.0 * M_PI * u2;
-
- double v1 = sqrt(eln) * cos(ang);
-
- LOG4CPLUS_TRACE(m_logger, m_seed);
-
- return v1;
-}
-
-const double RandomGenerator::TruncatedGaussianSample(const double max_standard_deviation) {
- double val = max_standard_deviation + 1.0;
-
- while (val > (max_standard_deviation) || val < (-max_standard_deviation)) {
- val = GaussianSample();
- }
- LOG4CPLUS_TRACE(m_logger, m_seed);
-
- return val;
-}
-
-const double RandomGenerator::RayleighSample() {
- double u1 = UniformSample();
- double v1 = (sqrt(-2.0 * log(u1)) - 1.253) / sqrt(0.429);
-
- return v1;
-}
-
-const double RandomGenerator::LaplaceSample() {
- double uni = UniformSample();
- double err = -log(uni);
- uni = UniformSample();
-
- if (uni < 0.5) {
- err = -err;
- }
-
- return err;
-}
-
-void RandomGenerator::SetSeed(const double seed) {
- assert(seed != 0.0);
- m_seed = seed;
-}
-
-const double RandomGenerator::GetSeed(void) { return m_seed; }
diff --git a/Math/Statistics.cpp b/Math/Statistics.cpp
deleted file mode 100644
index 4583add..0000000
--- a/Math/Statistics.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// ****************************************************************************
-// NOTICE
-//
-// This work was produced for the U.S. Government under Contract 693KA8-22-C-00001
-// and is subject to Federal Aviation Administration Acquisition Management System
-// Clause 3.5-13, Rights In Data-General, Alt. III and Alt. IV (Oct. 1996).
-//
-// The contents of this document reflect the views of the author and The MITRE
-// Corporation and do not necessarily reflect the views of the Federal Aviation
-// Administration (FAA) or the Department of Transportation (DOT). Neither the FAA
-// nor the DOT makes any warranty or guarantee, expressed or implied, concerning
-// the content or accuracy of these views.
-//
-// For further information, please contact The MITRE Corporation, Contracts Management
-// Office, 7515 Colshire Drive, McLean, VA 22102-7539, (703) 983-6000.
-//
-// 2022 The MITRE Corporation. All Rights Reserved.
-// ****************************************************************************
-
-#include "math/Statistics.h"
-#include
-#include
-
-Statistics::Statistics() {
- m_sum_of_samples = 0;
- m_max = 0.0;
- m_min = 0.0;
-}
-
-Statistics::~Statistics() {}
-
-void Statistics::Insert(double value) {
- if (m_samples.size() == 0) {
- m_max = value;
- m_min = value;
- } else {
- m_max = std::max(m_max, value);
- m_min = std::min(m_min, value);
- }
-
- m_samples.push_back(value);
-
- m_sum_of_samples += value;
-}
-
-double Statistics::ComputeStandardDeviation() const {
- double sDev = -1.0;
-
- if (m_samples.size() > 0) {
-
- double variance_sum = 0.0;
- for (int loop = 0; loop < (int)m_samples.size(); loop++) {
- if (loop != 0) {
- variance_sum += pow(m_samples[loop] - GetMean(), 2);
- } else {
- variance_sum = pow(m_samples[loop] - GetMean(), 2);
- }
- }
- sDev = sqrt(variance_sum / m_samples.size());
- }
-
- return sDev;
-}
-
-double Statistics::GetPercentile(double percentage) {
- int desired_sample_num;
- double result;
- vector samples_sorted;
-
- for (unsigned int i = 0; i < m_samples.size(); i++) {
- double tmp = m_samples.at(i);
- samples_sorted.push_back(tmp);
- }
-
- stable_sort(samples_sorted.begin(), samples_sorted.end());
-
- desired_sample_num = (int)(percentage * m_samples.size());
-
- if (desired_sample_num == 0) {
- result = samples_sorted.at(0);
- } else {
- result = samples_sorted.at(desired_sample_num - 1);
- }
-
- return (result);
-}
-
-double Statistics::Get95thBounds() {
- double bound95 = -1.0;
-
- double n = (double)m_samples.size();
- double prob = 0.0;
- double delta = 0.1;
-
- while (prob < 0.95) {
- double size = 0.0;
-
- for (unsigned int ix = 0; ix < m_samples.size(); ix++) {
- if (fabs(m_samples[ix]) < delta) {
- size = size + 1.0;
- }
- }
-
- prob = size / n;
-
- bound95 = delta;
- delta = delta + 0.1;
- }
-
- return bound95;
-}
diff --git a/Public/AircraftCalculations.cpp b/Public/AircraftCalculations.cpp
index 499221c..8f30358 100644
--- a/Public/AircraftCalculations.cpp
+++ b/Public/AircraftCalculations.cpp
@@ -18,11 +18,12 @@
// ****************************************************************************
#include "public/AircraftCalculations.h"
-#include
+
#include
-#include
#include
+#include
+
using namespace std;
using namespace aaesim::open_source;
@@ -32,7 +33,6 @@ bool AircraftCalculations::LegacyGetPositionFromPathLength(const Units::Length &
const std::vector &horizontal_trajectory,
Units::Length &x_position, Units::Length &y_position,
Units::UnsignedAngle &course, int &traj_index) {
-
PositionCalculator position_calculator(horizontal_trajectory, TrajectoryIndexProgressionDirection::UNDEFINED);
bool is_valid =
position_calculator.CalculatePositionFromAlongPathDistance(distance_to_go, x_position, y_position, course);
@@ -57,14 +57,12 @@ void AircraftCalculations::LegacyGetPathLengthFromPosition(const Units::Length x
vector AircraftCalculations::ComputePathDistances(
const Units::Length x, const Units::Length y, const std::vector::size_type &starting_index,
const vector &hTraj) {
-
// returns distances and cross track errors for all points in a vector
// ordered ascending by distance.
vector path_distances;
for (auto i = starting_index; i < hTraj.size(); ++i) {
-
PathDistance pd;
Units::MetersLength d = sqrt(Units::sqr(x - Units::MetersLength(hTraj[i].GetXPositionMeters())) +
@@ -80,7 +78,6 @@ vector AircraftCalculations::ComputePathDist
if (path_distances.empty()) {
path_distances.push_back(pd);
} else {
-
auto path_distance_iter = path_distances.begin();
while (path_distance_iter < path_distances.end()) {
@@ -118,7 +115,6 @@ void AircraftCalculations::CrossTrackError(const Units::Length position_enu_x, c
int current_trajectory_index,
const vector &horizontal_trajectory,
int &next_trajectory_index, Units::Length &cross_track_error) {
-
// Calculates the cross track for a segment leading to a horizontal
// trajectory point. The calculation is performed differently for a
// turn segment and for a straight segment.
@@ -195,7 +191,7 @@ void AircraftCalculations::CrossTrackError(const Units::Length position_enu_x, c
cross_track_error =
abs(Units::MetersLength(sqrt(pow(x0 - dx, 2) + pow(y0 - dy, 2))) -
Units::MetersLength(horizontal_trajectory[current_trajectory_index].m_turn_info.radius));
- } // otherwise return not in segment
+ } // otherwise return not in segment
} else { // previous segment is straight
// Use Pythagorean Theorem
if (current_trajectory_index >= horizontal_trajectory.size() - 2) {
@@ -231,7 +227,6 @@ void AircraftCalculations::CrossTrackError(const Units::Length position_enu_x, c
return;
} else if (horizontal_trajectory[current_trajectory_index].m_segment_type == HorizontalPath::SegmentType::STRAIGHT) {
-
const double x0 = horizontal_trajectory[current_trajectory_index + 1].GetXPositionMeters(); // start of segment
const double y0 = horizontal_trajectory[current_trajectory_index + 1].GetYPositionMeters();
const double x1 = horizontal_trajectory[current_trajectory_index].GetXPositionMeters(); // end of segment
@@ -353,7 +348,6 @@ bool AircraftCalculations::CalculateDistanceAlongPathFromPosition(
const std::vector &horizontal_trajectory,
const std::vector::size_type starting_trajectory_index, Units::Length &distance_along_path,
Units::Angle &course, std::vector::size_type &resolved_trajectory_index) {
-
static const Units::NauticalMilesLength cte_tolerance(2.5); // legacy tolerance. do not change.
return CalculateDistanceAlongPathFromPosition(cte_tolerance, position_x, position_y, horizontal_trajectory,
starting_trajectory_index, distance_along_path, course,
@@ -389,7 +383,6 @@ bool AircraftCalculations::CalculateDistanceAlongPathFromPosition(
int nextTrajIx = -1;
Units::NauticalMilesLength cte;
for (auto i = 0; ((i < distances.size()) && (nextTrajIx == -1)); ++i) {
-
int computedNextIx;
AircraftCalculations::CrossTrackError(position_x, position_y, distances[i].m_horizontal_path_index,
horizontal_trajectory, computedNextIx, cte);
@@ -408,12 +401,13 @@ bool AircraftCalculations::CalculateDistanceAlongPathFromPosition(
* it is sometimes normal. See AAES-382, AAES-633
*/
char msg[500];
- sprintf(msg,
- "Trajectory point with acceptable cross track error not found %lf nmi\nThis can occur for two "
- "reasons:\n\t1. Position cannot be projected onto a route segment (before beginning or after end),\n\t2. "
- "Position is farther than horizontal tolerance from horizontal trajectory.\nThe second can occur for "
- "clearance type of CAPTURE or MAINTAIN (see Issue AAES-1037)",
- cte.value());
+ snprintf(
+ msg, sizeof(msg),
+ "Trajectory point with acceptable cross track error not found %lf nmi\nThis can occur for two "
+ "reasons:\n\t1. Position cannot be projected onto a route segment (before beginning or after end),\n\t2. "
+ "Position is farther than horizontal tolerance from horizontal trajectory.\nThe second can occur for "
+ "clearance type of CAPTURE or MAINTAIN (see Issue AAES-1037)",
+ cte.value());
throw logic_error(msg);
}
@@ -421,7 +415,6 @@ bool AircraftCalculations::CalculateDistanceAlongPathFromPosition(
Units::Length dap;
Units::RadiansAngle theta;
if (horizontal_trajectory[nextTrajIx].m_segment_type == HorizontalPath::SegmentType::STRAIGHT) {
-
Units::Length d =
sqrt(Units::sqr(position_x - Units::MetersLength(horizontal_trajectory[nextTrajIx].GetXPositionMeters())) +
Units::sqr(position_y - Units::MetersLength(horizontal_trajectory[nextTrajIx].GetYPositionMeters())));
@@ -444,7 +437,6 @@ bool AircraftCalculations::CalculateDistanceAlongPathFromPosition(
}
} else if (horizontal_trajectory[nextTrajIx].m_segment_type == HorizontalPath::SegmentType::TURN) {
-
Units::MetersLength dx =
position_x - Units::MetersLength(horizontal_trajectory[nextTrajIx].m_turn_info.x_position_meters);
Units::MetersLength dy =
diff --git a/Public/AircraftControl.cpp b/Public/AircraftControl.cpp
index d706b25..58b8d0e 100644
--- a/Public/AircraftControl.cpp
+++ b/Public/AircraftControl.cpp
@@ -17,266 +17,51 @@
// 2023 The MITRE Corporation. All Rights Reserved.
// ****************************************************************************
-#include
-#include "public/CoreUtils.h"
#include "public/AircraftControl.h"
-#include "public/Environment.h"
-#include "public/BadaUtils.h"
-using namespace aaesim::open_source;
+#include
-log4cplus::Logger AircraftControl::m_logger = log4cplus::Logger::getInstance("AircraftControl");
+using namespace aaesim::open_source;
-AircraftControl::AircraftControl(const Units::Angle max_bank_angle)
- : m_speed_brake_gain(0.0), m_bada_calculator(nullptr), m_max_bank_angle(max_bank_angle) {}
+AircraftControl::AircraftControl(
+ const std::map,
+ std::shared_ptr>> &controller_pairs) {
+ controller_map_ = controller_pairs;
+}
void AircraftControl::Initialize(
std::shared_ptr aircraft_performance) {
- m_bada_calculator = aircraft_performance;
- m_ac_mass = m_bada_calculator->GetAircraftMass();
- m_wing_area = m_bada_calculator->GetAerodynamicsInformation().S;
- m_is_level_flight = true;
-}
-
-Units::Frequency AircraftControl::CalculateThrustGain() {
- const double zeta = 0.88;
- m_natural_frequency = Units::HertzFrequency(0.20);
- const Units::Frequency thrustGain = 2 * zeta * m_natural_frequency;
- return thrustGain;
-}
-
-void AircraftControl::ConfigureFlapsAndEstimateKineticForces(
- const EquationsOfMotionState &equations_of_motion_state, Units::Force &lift, Units::Force &drag,
- aaesim::open_source::bada_utils::FlapConfiguration &new_flap_configuration) {
- Units::Speed calibrated_airspeed = m_sensed_weather->GetTrueWeather()->TAS2CAS(
- Units::MetersPerSecondSpeed(equations_of_motion_state.true_airspeed),
- Units::MetersLength(equations_of_motion_state.altitude_msl));
-
- // Get temp, density, and pressure
- Units::KilogramsMeterDensity rho;
- Units::Pressure pressure;
- m_sensed_weather->GetTrueWeather()->getAtmosphere()->AirDensity(equations_of_motion_state.altitude_msl, rho,
- pressure);
-
- // Get AC Configuration
- double cd0, cd2;
- double gear;
- m_bada_calculator->GetDragCoefficientsAndIncrementFlapConfiguration(
- calibrated_airspeed, equations_of_motion_state.altitude_msl, cd0, cd2, gear, new_flap_configuration);
-
- // Lift and Drag Estimate Calculations
- double cL =
- (2. * m_ac_mass * Units::ONE_G_ACCELERATION) /
- (rho * Units::sqr(equations_of_motion_state.true_airspeed) * m_wing_area * cos(equations_of_motion_state.phi));
- double cD = cd0 + gear + cd2 * pow(cL, 2);
- if (equations_of_motion_state.speed_brake_percentage != 0.0) {
- cD = (1.0 + 0.6 * equations_of_motion_state.speed_brake_percentage) * cD;
- }
-
- drag = 1. / 2. * rho * cD * Units::sqr(equations_of_motion_state.true_airspeed) * m_wing_area;
- lift = 1. / 2. * rho * cL * Units::sqr(equations_of_motion_state.true_airspeed) * m_wing_area;
-
- if (m_logger.getLogLevel() == log4cplus::TRACE_LOG_LEVEL) {
- using json = nlohmann::json;
- json j;
- j["calibrated_airspeed_kts"] = Units::KnotsSpeed(calibrated_airspeed).value();
- j["equations_of_motion_state.altitude_msl_ft"] =
- Units::FeetLength(equations_of_motion_state.altitude_msl).value();
- j["new_flap_configuration"] = GetFlapConfigurationAsString(new_flap_configuration);
- j["drag_newtons"] = Units::NewtonsForce(drag).value();
- j["lift_newtons"] = Units::NewtonsForce(lift).value();
- LOG4CPLUS_TRACE(m_logger, j.dump());
- }
-}
-
-void AircraftControl::CalculateSensedWind(
- std::shared_ptr &sensed_weather,
- const Units::MetersLength &altitude_msl) {
- m_sensed_weather = sensed_weather;
- m_Vwx = m_sensed_weather->GetWindSpeedEast();
- m_Vwy = m_sensed_weather->GetWindSpeedNorth();
- m_dVwx_dh = m_sensed_weather->GetWindSpeedVerticalDerivativeEast();
- m_dVwy_dh = m_sensed_weather->GetWindSpeedVerticalDerivativeNorth();
-}
-
-Units::Angle AircraftControl::DoLateralControl(const Guidance &guidance,
- const EquationsOfMotionState &equations_of_motion_state) {
- const Units::InvertedLength k_xtrk = Units::PerMeterInvertedLength(5e-4); // meters^-1
- const double k_trk = 3; // unitless
-
- // States
- const Units::Speed tas = equations_of_motion_state.true_airspeed; // true airspeed
- const Units::Angle gamma = equations_of_motion_state.gamma; // flight-path angle
- const Units::Angle psi = equations_of_motion_state.psi_enu; // heading angle measured from east counter-clockwise
-
- const Units::Speed Vw_para = m_Vwx * cos(guidance.m_enu_track_angle) + m_Vwy * sin(guidance.m_enu_track_angle);
- const Units::Speed Vw_perp = -m_Vwx * sin(guidance.m_enu_track_angle) + m_Vwy * cos(guidance.m_enu_track_angle);
-
- const Units::Speed wind_magnitude = sqrt(Units::sqr(m_Vwx) + Units::sqr(m_Vwy));
- const Units::Speed estimated_ground_speed = sqrt(Units::sqr(tas * cos(gamma)) - Units::sqr(Vw_perp)) + Vw_para;
-
- double temp = (Units::sqr(tas * cos(gamma)) + Units::sqr(estimated_ground_speed) - Units::sqr(wind_magnitude)) /
- (tas * 2 * cos(gamma) * estimated_ground_speed);
-
- // Limit temp so acos function doesn't give undefined value.
- if (temp > 1.0) {
- temp = 1.0;
- } else if (temp < -1.0) {
- temp = -1.0;
- }
-
- const Units::Angle beta =
- Units::RadiansAngle(acos(temp)) * -1.0 * CoreUtils::SignOfValue(Units::MetersPerSecondSpeed(Vw_perp).value());
-
- // Convert track guidance to heading using winds (beta is the Wind Correction Angle)
- Units::Angle heading_command = guidance.m_enu_track_angle + beta;
-
- // Error in heading angle
- Units::SignedAngle e_trk = heading_command - psi;
- e_trk.normalize();
-
- // Along-path distance and Cross-track Error
- Units::Length e_xtrk = Units::zero();
-
- // check if guidance has cross track error and use it if so
- if (guidance.m_use_cross_track) {
- if (guidance.m_reference_bank_angle != Units::ZERO_ANGLE) {
- e_xtrk = guidance.m_cross_track_error - (guidance.m_reference_bank_angle / k_xtrk);
- } else {
- e_xtrk = guidance.m_cross_track_error;
+ for (auto &entry : controller_map_) {
+ const auto &vertical = entry.second.second;
+ if (vertical) {
+ vertical->Initialize(aircraft_performance);
}
}
-
- // Calculate commanded roll angle
- // We had to add a conversion from unitless to radians in the formula for roll_angle_command.
- Units::Angle roll_angle_command = -k_xtrk * e_xtrk * Units::ONE_RADIAN_ANGLE - k_trk * e_trk;
- const double unlimited_roll_angle_command = Units::RadiansAngle(roll_angle_command).value();
-
- // Limit the commanded roll angle
- double sign_roll_command = CoreUtils::SignOfValue(unlimited_roll_angle_command);
- if (roll_angle_command * sign_roll_command > m_max_bank_angle) {
- roll_angle_command = m_max_bank_angle * sign_roll_command;
- }
-
- if (m_logger.getLogLevel() == log4cplus::TRACE_LOG_LEVEL) {
- using json = nlohmann::json;
- json j;
- j["cross_track_error_ft"] = Units::FeetLength(e_xtrk).value();
- j["track_angle_error_deg"] = Units::DegreesAngle(e_trk).value();
- j["roll_command_deg"] = Units::DegreesAngle(roll_angle_command).value();
- LOG4CPLUS_TRACE(m_logger, j.dump());
- }
-
- return roll_angle_command;
}
-ControlCommands AircraftControl::CalculateControlCommands(
+std::pair AircraftControl::CalculateControlCommands(
const Guidance &guidance, const EquationsOfMotionState &equations_of_motion_state,
std::shared_ptr sensed_weather) {
- // Update environmental wind
- CalculateSensedWind(sensed_weather, Units::MetersLength(equations_of_motion_state.altitude_msl));
-
- Units::Angle phi_command;
- aaesim::open_source::bada_utils::FlapConfiguration new_flap_config;
- double speed_brake_command = 0.0;
- Units::Force thrust_command;
- Units::Angle gamma_command;
- Units::Speed true_airspeed_command;
- if (guidance.m_active_guidance_phase == CLIMB) {
- phi_command = DoLateralControl(guidance, equations_of_motion_state);
- DoClimbingControl(guidance, equations_of_motion_state, thrust_command, gamma_command, true_airspeed_command,
- new_flap_config);
- } else if (guidance.m_active_guidance_phase == CRUISE_DESCENT) {
- phi_command = DoLateralControl(guidance, equations_of_motion_state);
- DoVerticalControl(guidance, equations_of_motion_state, thrust_command, gamma_command, true_airspeed_command,
- speed_brake_command, new_flap_config);
- } else if (guidance.m_active_guidance_phase == TAKEOFF_ROLL) {
- phi_command = Units::zero();
- thrust_command = m_bada_calculator->GetMaxThrust(
- equations_of_motion_state.altitude_msl, bada_utils::FlapConfiguration::TAKEOFF,
- bada_utils::EngineThrustMode::MAXIMUM_CLIMB, Units::ZERO_CELSIUS);
- gamma_command = Units::zero();
- speed_brake_command = 0;
- new_flap_config = bada_utils::TAKEOFF;
- true_airspeed_command =
- m_sensed_weather->GetTrueWeather()->CAS2TAS(guidance.m_ias_command, equations_of_motion_state.altitude_msl);
- } else {
- throw std::runtime_error("Design Error: Missing phase of flight implementation");
- }
-
- ControlCommands controlCommands(phi_command, thrust_command, gamma_command, true_airspeed_command,
- speed_brake_command, new_flap_config);
- return controlCommands;
-}
-
-void AircraftControl::DoClimbingControl(const Guidance &guidance,
- const EquationsOfMotionState &equations_of_motion_state,
- Units::Force &thrust_command, Units::Angle &gamma_command,
- Units::Speed &tas_command,
- aaesim::open_source::bada_utils::FlapConfiguration &new_flap_configuration) {
-
- const Units::Frequency gain_altitude = Units::HertzFrequency(0.20);
- const Units::Frequency thrust_gain = CalculateThrustGain();
- const Units::Frequency velocity_gain = Units::sqr(m_natural_frequency) / thrust_gain;
-
- const Units::Speed hdot_ref = guidance.m_vertical_speed;
- const Units::Length alt_ref = guidance.m_reference_altitude;
- const Units::Length error_alt = alt_ref - equations_of_motion_state.altitude_msl;
-
- double temp_gamma = -(hdot_ref + gain_altitude * error_alt) /
- equations_of_motion_state.true_airspeed; // calculate change in altitude
- // if fabs(change) > 1 set to 1 required for asin calculation
- if (temp_gamma > 1.0) {
- temp_gamma = 1.0;
- } else if (temp_gamma < -1.0) {
- temp_gamma = -1.0;
- }
- gamma_command = Units::RadiansAngle(asin(temp_gamma));
-
- // Speed Control
- tas_command =
- m_sensed_weather->GetTrueWeather()->CAS2TAS(guidance.m_ias_command, equations_of_motion_state.altitude_msl);
-
- // Speed Error
- Units::Speed error_tas = tas_command - equations_of_motion_state.true_airspeed;
- Units::Acceleration vel_dot_com = velocity_gain * error_tas;
-
- // Estimate kinetic forces for this state
- Units::Force lift, drag;
- ConfigureFlapsAndEstimateKineticForces(equations_of_motion_state, lift, drag, new_flap_configuration);
-
- // Thrust to maintain speed
- // Nominal Thrust (no acceleration) at desired speed
- Units::Force thrust_nominal;
- thrust_nominal = m_ac_mass * vel_dot_com + drag -
- m_ac_mass * Units::ONE_G_ACCELERATION * sin(equations_of_motion_state.gamma) -
- m_ac_mass * equations_of_motion_state.true_airspeed *
- (m_dVwx_dh * cos(equations_of_motion_state.psi_enu) +
- m_dVwy_dh * sin(equations_of_motion_state.psi_enu)) *
- sin(equations_of_motion_state.gamma) * cos(equations_of_motion_state.gamma);
-
- thrust_command = thrust_nominal;
-
- // Thrust Limits
- Units::Force max_thrust = Units::NewtonsForce(m_bada_calculator->GetMaxThrust(
- equations_of_motion_state.altitude_msl, new_flap_configuration,
- aaesim::open_source::bada_utils::EngineThrustMode::MAXIMUM_CLIMB, Units::ZERO_CELSIUS));
- Units::Force min_thrust = Units::NewtonsForce(m_bada_calculator->GetMaxThrust(
- equations_of_motion_state.altitude_msl, new_flap_configuration,
- aaesim::open_source::bada_utils::EngineThrustMode::DESCENT, Units::ZERO_CELSIUS));
-
- if (m_logger.getLogLevel() == log4cplus::TRACE_LOG_LEVEL) {
- using json = nlohmann::json;
- json j;
- j["altitude_error"] = Units::FeetLength(error_alt).value();
- j["thrust_command"] = Units::NewtonsForce(thrust_command).value();
- j["dynamics_thrust"] = Units::NewtonsForce(equations_of_motion_state.thrust).value();
- j["max_thrust"] = Units::NewtonsForce(max_thrust).value();
- j["min_thrust"] = Units::NewtonsForce(min_thrust).value();
- j["new_flap_configuration"] = bada_utils::GetFlapConfigurationAsString(new_flap_configuration);
- j["true_airspeed_error"] = Units::KnotsSpeed(error_tas).value();
- j["true_airspeed_command"] = Units::KnotsSpeed(tas_command).value();
- j["gamma_command"] = Units::DegreesAngle(gamma_command).value();
- LOG4CPLUS_TRACE(m_logger, j.dump());
- }
+ const auto &pair = controller_map_.at(guidance.m_active_guidance_phase);
+ const auto &lateral_controller = pair.first;
+ const auto &vertical_controller = pair.second;
+
+ Units::Angle phi_command =
+ lateral_controller->ComputeRollCommand(guidance, equations_of_motion_state, sensed_weather);
+
+ aaesim::open_source::bada_utils::FlapConfiguration flap_configuration{
+ aaesim::open_source::bada_utils::FlapConfiguration::UNDEFINED};
+ BoundedValue speed_brake_command{0};
+ Units::Force thrust_command{Units::zero()};
+ Units::Angle gamma_command{Units::zero()};
+ Units::Speed true_airspeed_command{Units::zero()};
+ vertical_controller->ComputeVerticalCommands(guidance, equations_of_motion_state, sensed_weather, thrust_command,
+ gamma_command, true_airspeed_command, speed_brake_command,
+ flap_configuration);
+
+ return std::make_pair(ControlCommands{phi_command, thrust_command, gamma_command, true_airspeed_command,
+ speed_brake_command, flap_configuration},
+ ControlGains{vertical_controller->GetGammaGain(), vertical_controller->GetThrustGain(),
+ lateral_controller->GetRollGain(), vertical_controller->GetSpeedBrakeGain()});
}
diff --git a/Public/AircraftIntent.cpp b/Public/AircraftIntent.cpp
index 236a7c0..f1a21bf 100644
--- a/Public/AircraftIntent.cpp
+++ b/Public/AircraftIntent.cpp
@@ -20,89 +20,26 @@
#include "public/AircraftIntent.h"
#include
+
#include "public/CoreUtils.h"
#include "public/InvalidIndexException.h"
#include "public/SingleTangentPlaneSequence.h"
-log4cplus::Logger AircraftIntent::m_logger = log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("AircraftIntent"));
-
-const int AircraftIntent::UNINITIALIZED_AIRCRAFT_ID = -1;
-
-AircraftIntent::AircraftIntent()
- : m_route_data(),
- m_planned_cruise_mach(0),
- m_all_waypoints(),
- m_is_loaded(false),
- m_ascent_waypoints(),
- m_cruise_waypoints(),
- m_descent_waypoints(),
- m_planned_cruise_altitude(),
- m_id(UNINITIALIZED_AIRCRAFT_ID),
- m_arinc424_dictionary() {
- Initialize();
-}
+AircraftIntent::AircraftIntent() { Initialize(); }
-AircraftIntent::AircraftIntent(const AircraftIntent &in)
- : m_route_data(),
- m_planned_cruise_mach(0),
- m_all_waypoints(),
- m_is_loaded(false),
- m_ascent_waypoints(),
- m_cruise_waypoints(),
- m_descent_waypoints(),
- m_planned_cruise_altitude(),
- m_id(UNINITIALIZED_AIRCRAFT_ID),
- m_arinc424_dictionary() {
+AircraftIntent::AircraftIntent(const AircraftIntent &in) {
Initialize();
-
Copy(in);
}
void AircraftIntent::Initialize() {
m_all_waypoints.clear();
-
- m_route_data.m_name.clear();
- m_route_data.m_nominal_altitude.clear();
- m_route_data.m_latitude.clear();
- m_route_data.m_longitude.clear();
- m_route_data.m_nominal_ias.clear();
-
- // the new constraint values
- m_route_data.m_high_altitude_constraint.clear();
- m_route_data.m_low_altitude_constraint.clear();
- m_route_data.m_high_speed_constraint.clear();
- m_route_data.m_low_speed_constraint.clear();
-
- // RF Leg values
- m_route_data.m_rf_latitude.clear();
- m_route_data.m_rf_longitude.clear();
- m_route_data.m_rf_radius.clear();
- m_route_data.m_rf_latitude.clear();
- m_route_data.m_rf_longitude.clear();
-
+ DeleteRouteDataContent();
m_planned_cruise_altitude = Units::ZERO_LENGTH;
-
- m_arinc424_dictionary.insert(
- std::pair("IF", AircraftIntent::Arinc424LegType::IF));
- m_arinc424_dictionary.insert(
- std::pair("UNSET", AircraftIntent::Arinc424LegType::UNSET));
- m_arinc424_dictionary.insert(
- std::pair("RF", AircraftIntent::Arinc424LegType::RF));
- m_arinc424_dictionary.insert(
- std::pair("TF", AircraftIntent::Arinc424LegType::TF));
- m_arinc424_dictionary.insert(
- std::pair("VI", AircraftIntent::Arinc424LegType::VI));
- m_arinc424_dictionary.insert(
- std::pair("CF", AircraftIntent::Arinc424LegType::CF));
- m_arinc424_dictionary.insert(
- std::pair("VA", AircraftIntent::Arinc424LegType::VA));
- m_arinc424_dictionary.insert(
- std::pair("CA", AircraftIntent::Arinc424LegType::CA));
}
AircraftIntent &AircraftIntent::operator=(const AircraftIntent &in) {
Copy(in);
-
return *this;
}
@@ -133,7 +70,6 @@ void AircraftIntent::DeleteRouteDataContent() {
void AircraftIntent::ClearAndResetRouteDataContent(const std::vector &ascent_waypoints,
const std::vector &cruise_waypoints,
const std::vector &descent_waypoints) {
-
m_ascent_waypoints = ascent_waypoints;
m_cruise_waypoints = cruise_waypoints;
m_descent_waypoints = descent_waypoints;
@@ -194,7 +130,6 @@ void AircraftIntent::ClearAndResetRouteDataContent(const std::vector &
void AircraftIntent::LoadWaypointsFromList(const std::list &ascent_waypoints,
const std::list &cruise_waypoints,
const std::list &descent_waypoints) {
-
const bool has_ascent = !ascent_waypoints.empty();
const bool has_cruise = !cruise_waypoints.empty();
const bool has_descent = !descent_waypoints.empty();
@@ -312,15 +247,12 @@ void AircraftIntent::Dump(std::ostream &fileOut) const {
}
void AircraftIntent::Copy(const AircraftIntent &in) {
+ DeleteRouteDataContent();
m_id = in.m_id;
m_planned_cruise_altitude = in.m_planned_cruise_altitude;
m_planned_cruise_mach = in.m_planned_cruise_mach;
m_is_loaded = in.m_is_loaded;
-
- DeleteRouteDataContent();
-
m_route_data = in.m_route_data;
-
m_tangent_plane_sequence = in.m_tangent_plane_sequence;
m_all_waypoints = in.m_all_waypoints;
m_descent_waypoints = in.m_descent_waypoints;
@@ -329,7 +261,6 @@ void AircraftIntent::Copy(const AircraftIntent &in) {
}
bool AircraftIntent::load(DecodedStream *input) {
-
set_stream(input);
std::list waypoints, descent_waypoints;
@@ -371,7 +302,6 @@ void AircraftIntent::DumpParms(std::string str) const {
void AircraftIntent::GetLatLonFromXYZ(const Units::Length &xMeters, const Units::Length &yMeters,
const Units::Length &zMeters, Units::Angle &lat, Units::Angle &lon) const {
-
// use the ellipsoidal model
EarthModel::LocalPositionEnu localPos;
localPos.x = xMeters;
@@ -398,7 +328,6 @@ std::pair AircraftIntent::FindCommonWaypoint(const AircraftIntent &int
while ((ix >= 0) && (tx >= 0)) {
if (GetWaypointName(ix) == intent.GetWaypointName(tx)) {
-
thisIndex = ix;
thatIndex = tx;
ix--;
@@ -439,7 +368,6 @@ void AircraftIntent::InsertPairAtIndex(const std::string &wpname, const Units::L
}
void AircraftIntent::InsertWaypointAtIndex(const Waypoint &wp, int index) {
-
if (index < m_ascent_waypoints.size()) {
std::vector new_vector(m_ascent_waypoints);
auto itr = std::next(new_vector.begin(), index);
diff --git a/Public/AlongPathDistanceCalculator.cpp b/Public/AlongPathDistanceCalculator.cpp
index 7b562f4..3d808ce 100644
--- a/Public/AlongPathDistanceCalculator.cpp
+++ b/Public/AlongPathDistanceCalculator.cpp
@@ -17,12 +17,11 @@
// 2023 The MITRE Corporation. All Rights Reserved.
// ****************************************************************************
-#include
-
-#include
+#include "public/AlongPathDistanceCalculator.h"
#include
-#include "public/AlongPathDistanceCalculator.h"
+
+#include
using namespace aaesim::open_source;
@@ -34,7 +33,6 @@ Units::Length AlongPathDistanceCalculator::CAPTURE_CROSS_TRACK_TOLERANCE = Units
AlongPathDistanceCalculator::AlongPathDistanceCalculator(const std::vector &horizontal_path,
TrajectoryIndexProgressionDirection expected_index_progression)
: HorizontalPathTracker(horizontal_path, expected_index_progression) {
-
m_is_first_call = true;
m_cross_track_tolerance = CROSS_TRACK_TOLERANCE;
}
@@ -84,7 +82,6 @@ bool AlongPathDistanceCalculator::CalculateAlongPathDistanceFromPosition(const U
Units::Length &distance_along_path,
Units::UnsignedAngle &course,
Units::UnsignedAngle &pt_to_pt_course) {
-
std::vector::size_type resolved_index;
Units::Length calculated_distance_along_path;
bool return_boolean = IsPositionOnNode(position_x, position_y, resolved_index);
@@ -138,10 +135,11 @@ bool AlongPathDistanceCalculator::CalculateAlongPathDistanceFromPosition(const U
} else {
// resolved_index looks incorrect. Throw.
char msg[300];
- std::sprintf(msg,
- "Invalid index progression encountered from CalculatePositionFromDistanceAlongPath(), current_index "
- "%lu, resolved_index %lu",
- m_current_index, resolved_index);
+ std::snprintf(
+ msg, sizeof(msg),
+ "Invalid index progression encountered from CalculatePositionFromDistanceAlongPath(), current_index "
+ "%lu, resolved_index %lu",
+ m_current_index, resolved_index);
LOG4CPLUS_FATAL(m_logger, msg);
auto high_index = std::max(m_current_index, resolved_index) + 1;
auto low_index = std::min(m_current_index, resolved_index);
diff --git a/Public/CMakeLists.txt b/Public/CMakeLists.txt
index 83b7d21..e91cecd 100644
--- a/Public/CMakeLists.txt
+++ b/Public/CMakeLists.txt
@@ -62,7 +62,6 @@ set(SOURCE_FILES
PrecalcConstraint.cpp
PrecalcWaypoint.cpp
ScenarioUtils.cpp
- SimulationTime.cpp
SingleTangentPlaneSequence.cpp
SpeedOnPitchControl.cpp
SpeedOnThrustControl.cpp
@@ -100,6 +99,8 @@ set(SOURCE_FILES
USStandardAtmosphere1976.cpp
ZeroWindTrueWeatherOperator.cpp
FullWindTrueWeatherOperator.cpp
+ DefaultLateralController.cpp
+ ClimbPhaseVerticalController.cpp
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib)
diff --git a/Public/ClimbPhaseVerticalController.cpp b/Public/ClimbPhaseVerticalController.cpp
new file mode 100644
index 0000000..8cd2651
--- /dev/null
+++ b/Public/ClimbPhaseVerticalController.cpp
@@ -0,0 +1,78 @@
+// ****************************************************************************
+// NOTICE
+//
+// This work was produced for the U.S. Government under Contract 693KA8-22-C-00001
+// and is subject to Federal Aviation Administration Acquisition Management System
+// Clause 3.5-13, Rights In Data-General, Alt. III and Alt. IV (Oct. 1996).
+//
+// The contents of this document reflect the views of the author and The MITRE
+// Corporation and do not necessarily reflect the views of the Federal Aviation
+// Administration (FAA) or the Department of Transportation (DOT). Neither the FAA
+// nor the DOT makes any warranty or guarantee, expressed or implied, concerning
+// the content or accuracy of these views.
+//
+// For further information, please contact The MITRE Corporation, Contracts Management
+// Office, 7515 Colshire Drive, McLean, VA 22102-7539, (703) 983-6000.
+//
+// 2023 The MITRE Corporation. All Rights Reserved.
+// ****************************************************************************
+
+#include "public/ClimbPhaseVerticalController.h"
+
+void aaesim::open_source::ClimbPhaseVerticalController::ComputeAscentCommands(
+ const Guidance &guidance, const EquationsOfMotionState &equations_of_motion_state,
+ std::shared_ptr &sensed_weather, Units::Force &thrust_command,
+ Units::Angle &gamma_command, Units::Speed &tas_command,
+ aaesim::open_source::bada_utils::FlapConfiguration &flap_command) {
+ const Units::Frequency gain_altitude = Units::HertzFrequency(0.20);
+ const Units::Frequency velocity_gain = Units::sqr(natural_frequency_) / thrust_gain_;
+
+ const Units::Speed hdot_ref = guidance.m_vertical_speed;
+ const Units::Length alt_ref = guidance.m_reference_altitude;
+ const Units::Length error_alt = alt_ref - equations_of_motion_state.altitude_msl;
+
+ double temp_gamma = -(hdot_ref + gain_altitude * error_alt) /
+ equations_of_motion_state.true_airspeed; // calculate change in altitude
+ // if fabs(change) > 1 set to 1 required for asin calculation
+ if (temp_gamma > 1.0) {
+ temp_gamma = 1.0;
+ } else if (temp_gamma < -1.0) {
+ temp_gamma = -1.0;
+ }
+ gamma_command = Units::RadiansAngle(asin(temp_gamma));
+
+ // Speed Control
+ tas_command =
+ sensed_weather->GetTrueWeather()->CAS2TAS(guidance.m_ias_command, equations_of_motion_state.altitude_msl);
+
+ // Speed Error
+ Units::Speed error_tas = tas_command - equations_of_motion_state.true_airspeed;
+ Units::Acceleration vel_dot_com = velocity_gain * error_tas;
+
+ // Estimate kinetic forces for this state
+ Units::Force lift{}, drag{};
+ ConfigureFlapsAndEstimateKineticForces(equations_of_motion_state, sensed_weather, aircraft_performance_, lift, drag,
+ flap_command);
+
+ // Thrust to maintain speed
+ // Nominal Thrust (no acceleration) at desired speed
+ const auto ac_mass = aircraft_performance_->GetAircraftMass();
+ Units::Force thrust_nominal =
+ ac_mass * vel_dot_com + drag - ac_mass * Units::ONE_G_ACCELERATION * sin(equations_of_motion_state.gamma) -
+ ac_mass * equations_of_motion_state.true_airspeed *
+ (sensed_weather->GetWindSpeedVerticalDerivativeEast() * cos(equations_of_motion_state.psi_enu) +
+ sensed_weather->GetWindSpeedVerticalDerivativeNorth() * sin(equations_of_motion_state.psi_enu)) *
+ sin(equations_of_motion_state.gamma) * cos(equations_of_motion_state.gamma);
+ thrust_command = thrust_nominal;
+
+ // Thrust Limits
+ Units::Force max_thrust = Units::NewtonsForce(aircraft_performance_->GetMaxThrust(
+ equations_of_motion_state.altitude_msl, flap_command,
+ aaesim::open_source::bada_utils::EngineThrustMode::MAXIMUM_CLIMB, Units::ZERO_CELSIUS));
+ Units::Force min_thrust = Units::NewtonsForce(aircraft_performance_->GetMaxThrust(
+ equations_of_motion_state.altitude_msl, flap_command,
+ aaesim::open_source::bada_utils::EngineThrustMode::DESCENT, Units::ZERO_CELSIUS));
+
+ DoLogging(error_alt, thrust_command, equations_of_motion_state.thrust, min_thrust, max_thrust, flap_command,
+ error_tas, tas_command, gamma_command);
+};
\ No newline at end of file
diff --git a/Public/CoreUtils.cpp b/Public/CoreUtils.cpp
index 61f227a..6d70668 100644
--- a/Public/CoreUtils.cpp
+++ b/Public/CoreUtils.cpp
@@ -17,23 +17,19 @@
// 2023 The MITRE Corporation. All Rights Reserved.
// ****************************************************************************
-#include
+#include "public/CoreUtils.h"
+
#include
#include
+#include
-#include "public/CoreUtils.h"
-#include "public/SimulationTime.h"
#include "public/GeolibUtils.h"
#include "public/LatitudeLongitudePoint.h"
+#include "public/SimulationTime.h"
using namespace std;
-log4cplus::Logger CoreUtils::m_logger = log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("CoreUtils"));
-const std::string CoreUtils::INTERMEDIATE_WAYPOINT_ROOT_NAME = "intermediate";
-Units::NauticalMilesLength CoreUtils::MAXIMUM_ALLOWABLE_SINGLE_LEG_LENGTH(10);
-
int CoreUtils::FindNearestIndex(const double &value_to_find, const vector &vector_to_search) {
-
int idx;
if (value_to_find > vector_to_search.back()) {
// Special handling that upper_bound() won't accomplish
@@ -48,10 +44,10 @@ int CoreUtils::FindNearestIndex(const double &value_to_find, const vector &x_values, const std::vector &y_values) {
-
if (upper_index < 1 || upper_index >= x_values.size()) {
char msg[200];
- sprintf(msg, "upper_index (%d) is not between 1 and %d", upper_index, static_cast(x_values.size() - 1));
+ snprintf(msg, sizeof(msg), "upper_index (%d) is not between 1 and %d", upper_index,
+ static_cast(x_values.size() - 1));
LOG4CPLUS_FATAL(m_logger, msg);
throw out_of_range(msg);
}
@@ -63,7 +59,7 @@ double CoreUtils::LinearlyInterpolate(int upper_index, double x_interpolation_va
if ((x_interpolation_value - v1) * (x_interpolation_value - v2) > 0) {
char msg[200];
- sprintf(msg, "ratio (%lf) is not between %lf and %lf.", x_interpolation_value, v1, v2);
+ snprintf(msg, sizeof(msg), "ratio (%lf) is not between %lf and %lf.", x_interpolation_value, v1, v2);
double ratio = (x_interpolation_value - v1) / (x_interpolation_value - v2);
if (upper_index + 1 == x_values.size() && (ratio < .1 || ratio > 10)) {
@@ -105,7 +101,6 @@ const int CoreUtils::SignOfValue(double value) { return (((value) == (0)) ? 0 :
std::list CoreUtils::ShortenLongLegs(const std::list &ordered_waypoints,
Units::Length maximum_allowable_length) {
-
using namespace geolib_idealab;
using namespace aaesim;
@@ -135,7 +130,6 @@ std::list CoreUtils::ShortenLongLegs(const std::list &ordere
std::list CoreUtils::GetIntermediateWaypointsForLongLeg(const aaesim::LineOnEllipsoid &line_on_ellipsoid,
Units::Length maximum_allowable_single_leg_distance) {
-
using namespace geolib_idealab;
using namespace aaesim;
diff --git a/Public/DefaultLateralController.cpp b/Public/DefaultLateralController.cpp
new file mode 100644
index 0000000..ad6328c
--- /dev/null
+++ b/Public/DefaultLateralController.cpp
@@ -0,0 +1,90 @@
+// ****************************************************************************
+// NOTICE
+//
+// This work was produced for the U.S. Government under Contract 693KA8-22-C-00001
+// and is subject to Federal Aviation Administration Acquisition Management System
+// Clause 3.5-13, Rights In Data-General, Alt. III and Alt. IV (Oct. 1996).
+//
+// The contents of this document reflect the views of the author and The MITRE
+// Corporation and do not necessarily reflect the views of the Federal Aviation
+// Administration (FAA) or the Department of Transportation (DOT). Neither the FAA
+// nor the DOT makes any warranty or guarantee, expressed or implied, concerning
+// the content or accuracy of these views.
+//
+// For further information, please contact The MITRE Corporation, Contracts Management
+// Office, 7515 Colshire Drive, McLean, VA 22102-7539, (703) 983-6000.
+//
+// 2023 The MITRE Corporation. All Rights Reserved.
+// ****************************************************************************
+
+#include "public/DefaultLateralController.h"
+
+#include "public/CoreUtils.h"
+
+Units::Angle aaesim::open_source::DefaultLateralController::ComputeRollCommand(
+ const Guidance &guidance, const EquationsOfMotionState &equations_of_motion_state,
+ std::shared_ptr &sensed_weather) {
+ const Units::InvertedLength k_xtrk = Units::PerMeterInvertedLength(5e-4); // meters^-1
+ const double k_trk = 3; // unitless
+
+ // States
+ const Units::Speed tas = equations_of_motion_state.true_airspeed; // true airspeed
+ const Units::Angle gamma = equations_of_motion_state.gamma; // flight-path angle
+ const Units::Angle psi = equations_of_motion_state.psi_enu; // heading angle measured from east counter-clockwise
+
+ const Units::Speed Vw_para = sensed_weather->GetWindSpeedEast() * cos(guidance.m_enu_track_angle) +
+ sensed_weather->GetWindSpeedNorth() * sin(guidance.m_enu_track_angle);
+ const Units::Speed Vw_perp = -sensed_weather->GetWindSpeedEast() * sin(guidance.m_enu_track_angle) +
+ sensed_weather->GetWindSpeedNorth() * cos(guidance.m_enu_track_angle);
+
+ const Units::Speed wind_magnitude =
+ sqrt(Units::sqr(sensed_weather->GetWindSpeedEast()) + Units::sqr(sensed_weather->GetWindSpeedNorth()));
+ const Units::Speed estimated_ground_speed = sqrt(Units::sqr(tas * cos(gamma)) - Units::sqr(Vw_perp)) + Vw_para;
+
+ double temp = (Units::sqr(tas * cos(gamma)) + Units::sqr(estimated_ground_speed) - Units::sqr(wind_magnitude)) /
+ (tas * 2 * cos(gamma) * estimated_ground_speed);
+
+ // Limit temp so acos function doesn't give undefined value.
+ if (temp > 1.0) {
+ temp = 1.0;
+ } else if (temp < -1.0) {
+ temp = -1.0;
+ }
+
+ const Units::Angle beta =
+ Units::RadiansAngle(acos(temp)) * -1.0 * CoreUtils::SignOfValue(Units::MetersPerSecondSpeed(Vw_perp).value());
+
+ // Convert track guidance to heading using winds (beta is the Wind Correction Angle)
+ Units::Angle heading_command = guidance.m_enu_track_angle + beta;
+
+ // Error in heading angle
+ Units::SignedAngle e_trk = heading_command - psi;
+ e_trk.normalize();
+
+ // Along-path distance and Cross-track Error
+ Units::Length e_xtrk = Units::zero();
+
+ // check if guidance has cross track error and use it if so
+ if (guidance.m_use_cross_track) {
+ if (guidance.m_reference_bank_angle != Units::ZERO_ANGLE) {
+ e_xtrk = guidance.m_cross_track_error - (guidance.m_reference_bank_angle / k_xtrk);
+ } else {
+ e_xtrk = guidance.m_cross_track_error;
+ }
+ }
+
+ // Calculate commanded roll angle
+ // We had to add a conversion from unitless to radians in the formula for roll_angle_command.
+ Units::Angle roll_angle_command = -k_xtrk * e_xtrk * Units::ONE_RADIAN_ANGLE - k_trk * e_trk;
+ const double unlimited_roll_angle_command = Units::RadiansAngle(roll_angle_command).value();
+
+ // Limit the commanded roll angle
+ double sign_roll_command = CoreUtils::SignOfValue(unlimited_roll_angle_command);
+ if (roll_angle_command * sign_roll_command > max_bank_angle_) {
+ roll_angle_command = max_bank_angle_ * sign_roll_command;
+ }
+
+ DoLogging(e_xtrk, e_trk, roll_angle_command);
+
+ return roll_angle_command;
+};
diff --git a/Public/DirectionOfFlightCourseCalculator.cpp b/Public/DirectionOfFlightCourseCalculator.cpp
index 5f3a3e2..749aa25 100644
--- a/Public/DirectionOfFlightCourseCalculator.cpp
+++ b/Public/DirectionOfFlightCourseCalculator.cpp
@@ -32,7 +32,6 @@ DirectionOfFlightCourseCalculator::DirectionOfFlightCourseCalculator(
const std::vector &horizontal_path,
TrajectoryIndexProgressionDirection expected_index_progression)
: HorizontalPathTracker(horizontal_path, expected_index_progression) {
-
m_end_course = Units::RadiansAngle(horizontal_path.front().m_path_course) + Units::PI_RADIANS_ANGLE;
m_start_course = Units::RadiansAngle(horizontal_path.back().m_path_course) + Units::PI_RADIANS_ANGLE;
}
@@ -82,17 +81,18 @@ bool DirectionOfFlightCourseCalculator::CalculateCourseAtAlongPathDistance(const
// happen. For now, it helps a lot to allow this. But, we should consider this deprecated behavior and throw in
// the future.
char msg[300];
- std::sprintf(msg, "Very long distance_along_path encountered. Too long for path. Allowing for now: %f",
- Units::MetersLength(distance_along_path).value());
+ std::snprintf(msg, sizeof(msg),
+ "Very long distance_along_path encountered. Too long for path. Allowing for now: %f",
+ Units::MetersLength(distance_along_path).value());
LOG4CPLUS_ERROR(m_logger, msg);
} else {
// resolved_index looks incorrect. Throw.
char msg[300];
- std::sprintf(msg,
- "Invalid index progression encountered from CalculateCourseAtAlongPathDistance(), current_index "
- "%lu, resolved_index %lu",
- m_current_index, resolved_index);
+ std::snprintf(msg, sizeof(msg),
+ "Invalid index progression encountered from CalculateCourseAtAlongPathDistance(), current_index "
+ "%lu, resolved_index %lu",
+ m_current_index, resolved_index);
LOG4CPLUS_FATAL(m_logger, msg);
throw std::logic_error(msg);
}
diff --git a/Public/EuclideanTrajectoryPredictor.cpp b/Public/EuclideanTrajectoryPredictor.cpp
index 89a4adb..28529f8 100644
--- a/Public/EuclideanTrajectoryPredictor.cpp
+++ b/Public/EuclideanTrajectoryPredictor.cpp
@@ -1104,89 +1104,7 @@ const vector &EuclideanTrajectoryPredictor::GetHorizontalPath()
void EuclideanTrajectoryPredictor::UpdateWeatherPrediction(
aaesim::open_source::WeatherPrediction &weather,
- const std::shared_ptr &position_converter) const {
- if (weather.GetPredictedWindOption() == MULTIPLE_DTG_ALONG_ROUTE) {
- if (weather.GetUpdateCount() > 0) {
- LOG4CPLUS_TRACE(m_logger, "Skipping weather update for AC " << m_aircraft_intent.GetId()
- << " ptr=" << &(weather.east_west()));
- return;
- }
- LOG4CPLUS_TRACE(m_logger,
- "Doing weather update for AC " << m_aircraft_intent.GetId() << " ptr=" << &(weather.east_west()));
-
- // save initial point
- Units::MetersLength alt0 = weather.east_west().GetAltitude(weather.east_west().GetMaxRow());
- Units::Speed windX0 = weather.east_west().GetSpeed(weather.east_west().GetMaxRow());
- Units::Speed windY0 = weather.north_south().GetSpeed(weather.north_south().GetMaxRow());
-
- const VerticalPath verticalPath(m_vertical_predictor->GetVerticalPath());
- int iVert(0);
- auto iHoriz = m_horizontal_path.begin();
- auto prevHoriz = iHoriz;
- iHoriz++;
-
- vector x, y, h;
-
- // go through waypoints
- for (auto iWaypoint = m_waypoint_vector.begin(); iWaypoint != m_waypoint_vector.end(); ++iWaypoint) {
-
- double dx = prevHoriz->GetXPositionMeters() - iWaypoint->m_x_pos_meters.value();
- double dy = prevHoriz->GetYPositionMeters() - iWaypoint->m_y_pos_meters.value();
- double prevDist2 = dx * dx + dy * dy;
-
- while (iHoriz != m_horizontal_path.end()) {
- dx = iHoriz->GetXPositionMeters() - iWaypoint->m_x_pos_meters.value();
- dy = iHoriz->GetYPositionMeters() - iWaypoint->m_y_pos_meters.value();
- double dist2 = dx * dx + dy * dy;
- if (dist2 > prevDist2 + 100) {
- // first significant movement away from waypoint == passed it
- break;
- }
- prevDist2 = dist2;
- prevHoriz = iHoriz;
- iHoriz++;
- }
-
- // find altitude for prev dtg
- double dtg = prevHoriz->m_path_length_cumulative_meters;
- while (verticalPath.along_path_distance_m[iVert] < dtg) {
- iVert++;
- }
-
- double alt = verticalPath.altitude_m[iVert];
- if (iVert > 0) {
- // interpolate to get alt for horiz dtg
- double weight = (dtg - verticalPath.along_path_distance_m[iVert - 1]) /
- (verticalPath.along_path_distance_m[iVert] - verticalPath.along_path_distance_m[iVert - 1]);
- alt = weight * verticalPath.altitude_m[iVert] + (1 - weight) * verticalPath.altitude_m[iVert - 1];
- }
-
- if (alt < alt0.value()) {
- if (h.empty() || h.back().value() + 30 < alt) {
- x.push_back(Units::MetersLength(prevHoriz->GetXPositionMeters()));
- y.push_back(Units::MetersLength(prevHoriz->GetYPositionMeters()));
- h.push_back(Units::MetersLength(alt));
- }
- }
- }
-
- // set bounds of weather
- weather.east_west().SetBounds(1, h.size() + 1);
- weather.north_south().SetBounds(1, h.size() + 1);
-
- // look up the wind for each point
- for (int i = 0; i < h.size(); i++) {
- Units::KnotsSpeed wind_x, wind_y;
- weather.GetForecastWind()->InterpolateForecastWind(position_converter, x[i], y[i], h[i], wind_x, wind_y);
- weather.east_west().Insert(i + 1, h[i], wind_x);
- weather.north_south().Insert(i + 1, h[i], wind_y);
- }
- weather.east_west().Insert(h.size() + 1, alt0, windX0);
- weather.north_south().Insert(h.size() + 1, alt0, windY0);
-
- weather.IncrementUpdateCount();
- }
-}
+ const std::shared_ptr &position_converter) const {}
void EuclideanTrajectoryPredictor::SetAtmosphere(std::shared_ptr atmosphere) {
m_atmosphere = atmosphere;
diff --git a/Public/KinematicDescent4DPredictor.cpp b/Public/KinematicDescent4DPredictor.cpp
index 1763f11..5e2d73b 100644
--- a/Public/KinematicDescent4DPredictor.cpp
+++ b/Public/KinematicDescent4DPredictor.cpp
@@ -17,10 +17,12 @@
// 2023 The MITRE Corporation. All Rights Reserved.
// ****************************************************************************
-#include "public/Waypoint.h"
-#include
#include "public/KinematicDescent4DPredictor.h"
+
+#include
+
#include "public/SimulationTime.h"
+#include "public/Waypoint.h"
using namespace std;
using namespace aaesim::open_source;
@@ -96,7 +98,6 @@ void KinematicDescent4DPredictor::ConstrainedVerticalPath(vector
double const_gamma_cas_er, double const_gamma_mach,
const WeatherPrediction &weather_prediction,
const Units::Length &aircraft_distance_to_go) {
-
m_vertical_path_waypoint_index.clear();
VerticalPath trajTemp;
trajTemp.mass_kg.push_back(-1.0);
@@ -211,7 +212,6 @@ void KinematicDescent4DPredictor::ConstrainedVerticalPath(vector
horizontal_path, weather_prediction, aircraft_distance_to_go);
} else if (m_precalculated_constraints.active_flag == ActiveFlagType::BELOW_ALT_SLOW) {
-
if (m_precalculated_constraints.index < precalc_waypoints.size()) {
m_vertical_path = ConstantDecelerationVerticalPath(
m_vertical_path, m_precalculated_constraints.constraint_along_path_distance,
@@ -235,10 +235,10 @@ void KinematicDescent4DPredictor::ConstrainedVerticalPath(vector
(Units::MetersLength(m_precalculated_constraints.constraint_along_path_distance).value() -
last_state.along_path_distance_m.back()));
Units::DegreesAngle uFPA = Units::RadiansAngle(FPA);
- if (FPA > Units::RadiansAngle(m_descent_angle_max).value())
+ if (FPA > Units::RadiansAngle(DESCENT_ANGLE_MAX).value())
LOG4CPLUS_WARN(m_logger, "prediction FPA is " << uFPA.value() << " which is greater than "
- << m_descent_angle_warning.value());
- if (uFPA < m_descent_angle_max) {
+ << DESCENT_ANGLE_WARNING.value());
+ if (uFPA < DESCENT_ANGLE_MAX) {
m_vertical_path = ConstantFpaDecelerationVerticalPath(
last_state, Units::MetersLength(m_precalculated_constraints.constraint_altLow).value(),
m_deceleration_fpa_mps,
@@ -377,7 +377,7 @@ void KinematicDescent4DPredictor::ConstrainedVerticalPath(vector
double altitude_to_aircraft_m =
Units::MetersLength(m_start_altitude_msl).value() - m_vertical_path.altitude_m[start_index];
double FPA = atan2(altitude_to_aircraft_m, distance_to_aircraft_m);
- if (FPA < Units::RadiansAngle(m_descent_angle_max).value()) {
+ if (FPA < Units::RadiansAngle(DESCENT_ANGLE_MAX).value()) {
// found a point where the FPA is not too large. Check if FPA will violate altitude constraints
fpa_start_found = true;
for (unsigned int loop = start_index + 1; loop < precalc_waypoints.size(); loop++) {
@@ -412,7 +412,6 @@ void KinematicDescent4DPredictor::ConstrainedVerticalPath(vector
}
if (m_vertical_path.altitude_m.back() < Units::MetersLength(m_start_altitude_msl).value()) {
-
LOG4CPLUS_TRACE(m_logger,
"Did not complete FPA above transition altitude. " << m_vertical_path.altitude_m.back());
}
@@ -974,7 +973,6 @@ VerticalPath KinematicDescent4DPredictor::LevelDecelerationVerticalPath(Vertical
vector &horizontal_path,
const WeatherPrediction &weather_prediction,
const Units::Length &aircraft_distance_to_go) {
-
VerticalPath result = vertical_path;
const double delta_t = -TIME_STEP_SECONDS;
@@ -1064,7 +1062,6 @@ VerticalPath KinematicDescent4DPredictor::LevelDecelerationVerticalPath(Vertical
vector &horizontal_path,
const WeatherPrediction &weather_prediction,
const Units::Length &aircraft_distance_to_go) {
-
VerticalPath result = vertical_path;
const double delta_t = -TIME_STEP_SECONDS;
@@ -1368,7 +1365,6 @@ VerticalPath KinematicDescent4DPredictor::ConstantFpaToCurrentPositionVerticalPa
VerticalPath vertical_path, std::vector &horizontal_path,
std::vector &precalc_waypoints, double const_gamma_mach,
const WeatherPrediction &weather_prediction, const Units::Length &aircraft_distance_to_go) {
-
Units::Length distance_to_plan = aircraft_distance_to_go;
// Should probably throw exception if trying to re-predict with aircraft distance to go set to infinite
@@ -1410,8 +1406,8 @@ VerticalPath KinematicDescent4DPredictor::ConstantFpaToCurrentPositionVerticalPa
LOG4CPLUS_TRACE(m_logger, "Aircraft position too close to waypoint for adequate FPA. See Issue AAES-1025");
LOG4CPLUS_TRACE(m_logger, "dist_left: " << (distance_left - dist) << ", alt_change: "
<< (m_start_altitude_msl.value() - h) << ", fpa: " << fpa);
- if (fpa > Units::RadiansAngle(m_descent_angle_max).value()) {
- fpa = Units::RadiansAngle(m_descent_angle_max).value();
+ if (fpa > Units::RadiansAngle(DESCENT_ANGLE_MAX).value()) {
+ fpa = Units::RadiansAngle(DESCENT_ANGLE_MAX).value();
}
result = ConstantGeometricFpaVerticalPath(result, altitude_at_end, fpa, horizontal_path, precalc_waypoints,
weather_prediction, Units::Length(Units::infinity()));
diff --git a/Public/PositionCalculator.cpp b/Public/PositionCalculator.cpp
index c633767..1d3dca9 100644
--- a/Public/PositionCalculator.cpp
+++ b/Public/PositionCalculator.cpp
@@ -17,11 +17,10 @@
// 2023 The MITRE Corporation. All Rights Reserved.
// ****************************************************************************
-#include
-#include
-#include
#include "public/PositionCalculator.h"
+#include "public/CoreUtils.h"
+
using namespace aaesim::open_source;
log4cplus::Logger PositionCalculator::m_logger = log4cplus::Logger::getInstance("PositionCalculator");
@@ -75,17 +74,19 @@ bool PositionCalculator::CalculatePositionFromAlongPathDistance(const Units::Len
// happen. For now, it helps a lot to allow this. But, we should consider this deprecated behavior and throw in
// the future.
char msg[300];
- std::sprintf(msg, "Very long distance_along_path encountered. Too long for path. Allowing for now: %f",
- Units::MetersLength(distance_along_path).value());
+ std::snprintf(msg, sizeof(msg),
+ "Very long distance_along_path encountered. Too long for path. Allowing for now: %f",
+ Units::MetersLength(distance_along_path).value());
LOG4CPLUS_ERROR(m_logger, msg);
} else {
// resolved_index looks incorrect. Throw.
char msg[300];
- std::sprintf(msg,
- "Invalid index progression encountered from CalculatePositionFromDistanceAlongPath(), current_index "
- "%lu, resolved_index %lu",
- m_current_index, resolved_index);
+ std::snprintf(
+ msg, sizeof(msg),
+ "Invalid index progression encountered from CalculatePositionFromDistanceAlongPath(), current_index "
+ "%lu, resolved_index %lu",
+ m_current_index, resolved_index);
LOG4CPLUS_FATAL(m_logger, msg);
throw std::logic_error(msg);
}
@@ -99,7 +100,6 @@ bool PositionCalculator::CalculatePosition(const Units::Length &distance_along_p
Units::Length &x_position, Units::Length &y_position,
Units::UnsignedAngle &course,
std::vector::size_type &resolved_trajectory_index) {
-
Units::Angle turn_theta;
Units::Length turn_radius;
const bool found = CalculateForwardCourse(distance_along_path, horizontal_trajectory, starting_trajectory_index,
diff --git a/Public/PrecalcWaypoint.cpp b/Public/PrecalcWaypoint.cpp
index baec320..9744fb1 100644
--- a/Public/PrecalcWaypoint.cpp
+++ b/Public/PrecalcWaypoint.cpp
@@ -20,7 +20,7 @@
#include "public/PrecalcWaypoint.h"
PrecalcWaypoint::PrecalcWaypoint() {
- m_name = "noname";
+ m_name = "";
m_leg_length = Units::zero();
m_course_angle = Units::DegreesAngle(0.0);
diff --git a/Public/SimulationTime.cpp b/Public/SimulationTime.cpp
deleted file mode 100644
index c3178b0..0000000
--- a/Public/SimulationTime.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// ****************************************************************************
-// NOTICE
-//
-// This work was produced for the U.S. Government under Contract 693KA8-22-C-00001
-// and is subject to Federal Aviation Administration Acquisition Management System
-// Clause 3.5-13, Rights In Data-General, Alt. III and Alt. IV (Oct. 1996).
-//
-// The contents of this document reflect the views of the author and The MITRE
-// Corporation and do not necessarily reflect the views of the Federal Aviation
-// Administration (FAA) or the Department of Transportation (DOT). Neither the FAA
-// nor the DOT makes any warranty or guarantee, expressed or implied, concerning
-// the content or accuracy of these views.
-//
-// For further information, please contact The MITRE Corporation, Contracts Management
-// Office, 7515 Colshire Drive, McLean, VA 22102-7539, (703) 983-6000.
-//
-// 2023 The MITRE Corporation. All Rights Reserved.
-// ****************************************************************************
-
-#include
-#include "public/SimulationTime.h"
-
-using namespace aaesim::open_source;
-
-Units::SecondsTime SimulationTime::m_simulation_time_step(1.0);
-log4cplus::Logger SimulationTime::m_logger = log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("SimulationTime"));
-
-SimulationTime::SimulationTime() : m_cycle(0), m_current_time(Units::SecondsTime(0.0)) {}
-
-void SimulationTime::Increment() {
- ++m_cycle;
- m_current_time += m_simulation_time_step;
-}
-
-Units::SecondsTime SimulationTime::GetCurrentSimulationTime() const { return m_current_time; }
-
-int SimulationTime::GetCycle() const { return m_cycle; }
-
-void SimulationTime::SetCycle(int cycle_in) {
- m_cycle = cycle_in;
- m_current_time = m_simulation_time_step * m_cycle;
-}
-
-SimulationTime::SimulationTime(const SimulationTime &in) { Copy(in); }
-
-SimulationTime &SimulationTime::operator=(const SimulationTime &in) {
- if (this != &in) {
- Copy(in);
- }
- return *this;
-}
-
-const SimulationTime SimulationTime::Of(const Units::SecondsTime time) {
- int cyc = static_cast(Units::SecondsTime(time / m_simulation_time_step).value());
-
- SimulationTime simtime;
- simtime.SetCycle(cyc);
-
- if (time != simtime.GetCurrentSimulationTime()) {
- LOG4CPLUS_ERROR(SimulationTime::m_logger, "Inconsistent SimulationTime::Of result computing cycle from time "
- << time.value() << " for step "
- << SimulationTime::GetSimulationTimeStep().value());
- }
-
- return simtime;
-}
-
-void SimulationTime::Copy(SimulationTime const &in) {
- this->m_current_time = in.m_current_time;
- this->m_cycle = in.m_cycle;
- this->m_simulation_time_step = in.m_simulation_time_step;
-}
-
-std::string SimulationTime::GetCurrentSimulationTimeAsString() const {
- std::ostringstream strs;
- strs << this->m_current_time.value();
- return strs.str();
-}
diff --git a/Public/SpeedOnPitchControl.cpp b/Public/SpeedOnPitchControl.cpp
index 96613d3..58e5c12 100644
--- a/Public/SpeedOnPitchControl.cpp
+++ b/Public/SpeedOnPitchControl.cpp
@@ -17,71 +17,45 @@
// 2023 The MITRE Corporation. All Rights Reserved.
// ****************************************************************************
-#include
#include "public/SpeedOnPitchControl.h"
-using namespace aaesim::open_source;
+#include
-Units::Frequency SpeedOnPitchControl::m_gain_alt = Units::HertzFrequency(0.20);
-Units::Frequency SpeedOnPitchControl::m_gain_gamma = Units::HertzFrequency(0.40);
-Units::Frequency SpeedOnPitchControl::m_gain_phi = Units::HertzFrequency(0.40);
-double SpeedOnPitchControl::m_gain_speedbrake = 0.10;
-
-log4cplus::Logger SpeedOnPitchControl::m_logger = log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("SpeedOnPitchControl"));
-
-SpeedOnPitchControl::SpeedOnPitchControl(const Units::Speed speed_threshold, const Units::Length altitude_threshold,
- const Units::Angle max_bank_angle)
- : SpeedOnThrustControl(max_bank_angle) {
- m_alt_gain = m_gain_alt;
- m_gamma_gain = m_gain_gamma;
- m_phi_gain = m_gain_phi;
- m_speed_brake_gain = m_gain_speedbrake;
- m_thrust_gain = CalculateThrustGain();
- m_gain_velocity = Units::sqr(m_natural_frequency) / m_thrust_gain;
-
- m_speed_threshold = speed_threshold;
- m_altitude_threshold = altitude_threshold;
- m_is_level_flight = true;
- m_min_thrust_counter = 0.0;
- m_speed_brake_counter = 0.0;
- m_is_speed_brake_on = false;
-}
+using namespace aaesim::open_source;
void SpeedOnPitchControl::Initialize(
- std::shared_ptr bada_calculator) {
- AircraftControl::Initialize(bada_calculator);
- m_is_level_flight = true;
- m_min_thrust_counter = 0.0;
- m_speed_brake_counter = 0.0;
- m_is_speed_brake_on = false;
+ std::shared_ptr &aircraft_performance) {
+ AbstractDescentController::Initialize(aircraft_performance);
+ speed_on_thrust_controller_->Initialize(aircraft_performance_);
}
-void SpeedOnPitchControl::DoVerticalControl(
- const Guidance &guidance, const EquationsOfMotionState &equations_of_motion_state, Units::Force &thrust_command,
- Units::Angle &gamma_command, Units::Speed &true_airspeed_command, double &speed_brake_command,
- aaesim::open_source::bada_utils::FlapConfiguration &new_flap_configuration) {
- // Estimate kinetic forces for this state
+void SpeedOnPitchControl::ComputeVerticalCommands(
+ const Guidance &guidance, const EquationsOfMotionState &equations_of_motion_state,
+ std::shared_ptr &sensed_weather, Units::Force &thrust_command,
+ Units::Angle &gamma_command, Units::Speed &true_airspeed_command, BoundedValue &speed_brake_command,
+ aaesim::open_source::bada_utils::FlapConfiguration &flap_configuration) {
Units::Force lift, drag;
- ConfigureFlapsAndEstimateKineticForces(equations_of_motion_state, lift, drag, new_flap_configuration);
+ ConfigureFlapsAndEstimateKineticForces(equations_of_motion_state, sensed_weather, aircraft_performance_, lift, drag,
+ flap_configuration);
// Commands
const Units::Speed ias_com = guidance.m_ias_command;
- true_airspeed_command = m_sensed_weather->GetTrueWeather()->CAS2TAS(ias_com, equations_of_motion_state.altitude_msl);
- const Units::Force max_thrust = Units::NewtonsForce(m_bada_calculator->GetMaxThrust(
- equations_of_motion_state.altitude_msl, new_flap_configuration,
+ true_airspeed_command = sensed_weather->GetTrueWeather()->CAS2TAS(ias_com, equations_of_motion_state.altitude_msl);
+ const Units::Force max_thrust = Units::NewtonsForce(aircraft_performance_->GetMaxThrust(
+ equations_of_motion_state.altitude_msl, flap_configuration,
aaesim::open_source::bada_utils::EngineThrustMode::MAXIMUM_CRUISE, Units::ZERO_CELSIUS));
- const Units::Force min_thrust = Units::NewtonsForce(m_bada_calculator->GetMaxThrust(
- equations_of_motion_state.altitude_msl, new_flap_configuration,
+ const Units::Force min_thrust = Units::NewtonsForce(aircraft_performance_->GetMaxThrust(
+ equations_of_motion_state.altitude_msl, flap_configuration,
aaesim::open_source::bada_utils::EngineThrustMode::DESCENT, Units::ZERO_CELSIUS));
const Units::Length alt_ref = Units::FeetLength(guidance.m_reference_altitude);
const Units::Length error_alt = equations_of_motion_state.altitude_msl - alt_ref;
const Units::Speed guidance_vertical_speed = guidance.m_vertical_speed;
const Units::Speed error_tas = true_airspeed_command - equations_of_motion_state.true_airspeed;
- if (m_is_level_flight) {
- // manage speed with thrust and altitude with pitch
- SpeedOnThrustControl::DoVerticalControl(guidance, equations_of_motion_state, thrust_command, gamma_command,
- true_airspeed_command, speed_brake_command, new_flap_configuration);
+ if (is_level_flight_) {
+ speed_on_thrust_controller_->ComputeVerticalCommands(guidance, equations_of_motion_state, sensed_weather,
+ thrust_command, gamma_command, true_airspeed_command,
+ speed_brake_command, flap_configuration);
// determine if staying in level flight
const static Units::Length tolerance = Units::FeetLength(200);
@@ -90,138 +64,81 @@ void SpeedOnPitchControl::DoVerticalControl(
tolerance;
const bool altitude_rate_nonzero = guidance_vertical_speed != Units::zero();
if (altitude_above_constraint && altitude_rate_nonzero) {
- m_is_level_flight = false;
+ is_level_flight_ = false;
thrust_command = min_thrust;
}
- } else {
- // manage altitude with thrust, speed with pitch
- double esf = m_sensed_weather->GetTrueWeather()->ESFconstantCAS(equations_of_motion_state.true_airspeed,
- equations_of_motion_state.altitude_msl);
-
- // adjust esf based on velocity error compared to the speed threshold
- if (error_tas <= -m_speed_threshold) {
- esf = 0.3;
- } else if (error_tas > -m_speed_threshold && error_tas < Units::ZERO_SPEED) {
- esf = (esf - 0.3) / m_speed_threshold * error_tas + esf;
- } else if (error_tas > Units::ZERO_SPEED && error_tas < m_speed_threshold) {
- esf = (1.7 - esf) / m_speed_threshold * error_tas + esf;
- } else if (error_tas >= m_speed_threshold) {
- esf = 1.7;
- }
+ return;
+ }
- // descent rate
- Units::Speed dh_dt = ((equations_of_motion_state.thrust - drag) * equations_of_motion_state.true_airspeed) /
- (m_ac_mass * Units::ONE_G_ACCELERATION) * esf;
+ // manage altitude with thrust, speed with pitch
+ double esf = sensed_weather->GetTrueWeather()->ESFconstantCAS(equations_of_motion_state.true_airspeed,
+ equations_of_motion_state.altitude_msl);
+
+ // adjust esf based on velocity error compared to the speed threshold
+ if (error_tas <= -speed_threshold_) {
+ esf = 0.3;
+ } else if (error_tas > -speed_threshold_ && error_tas <= Units::ZERO_SPEED) {
+ esf = (esf - 0.3) / speed_threshold_ * error_tas + esf;
+ } else if (error_tas > Units::ZERO_SPEED && error_tas <= speed_threshold_) {
+ esf = (1.7 - esf) / speed_threshold_ * error_tas + esf;
+ } else if (error_tas > speed_threshold_) {
+ esf = 1.7;
+ }
- gamma_command = Units::RadiansAngle(asin(-dh_dt / equations_of_motion_state.true_airspeed));
+ // descent rate
+ const auto ac_mass = aircraft_performance_->GetAircraftMass();
+ Units::Speed dh_dt = ((equations_of_motion_state.thrust - drag) * equations_of_motion_state.true_airspeed) /
+ (ac_mass * Units::ONE_G_ACCELERATION) * esf;
- if (error_alt < -m_altitude_threshold) {
- thrust_command = 0.50 * max_thrust;
- } else if (error_alt > m_altitude_threshold) {
- thrust_command = min_thrust;
- } else {
- thrust_command = (min_thrust - 0.50 * max_thrust) / (m_altitude_threshold * 2) * error_alt +
- (0.50 * max_thrust + min_thrust) / 2.0;
- }
+ gamma_command = Units::RadiansAngle(asin(-dh_dt / equations_of_motion_state.true_airspeed));
- // Check if flight should level off
- const bool altitude_near_constraint_low =
- equations_of_motion_state.altitude_msl - guidance.m_active_precalc_constraints.constraint_altLow <
- Units::FeetLength(100);
- const bool altitude_rate_is_zero = guidance_vertical_speed == Units::zero();
- if (altitude_near_constraint_low || altitude_rate_is_zero) {
- m_is_level_flight = true;
- }
+ if (error_alt < -altitude_threshold_) {
+ thrust_command = 0.50 * max_thrust;
+ } else if (error_alt > altitude_threshold_) {
+ thrust_command = min_thrust;
+ } else {
+ thrust_command = (min_thrust - 0.50 * max_thrust) / (altitude_threshold_ * 2) * error_alt +
+ (0.50 * max_thrust + min_thrust) / 2.0;
+ }
+
+ // Check if flight should level off
+ const bool altitude_near_constraint_low =
+ equations_of_motion_state.altitude_msl - guidance.m_active_precalc_constraints.constraint_altLow <
+ Units::FeetLength(100);
+ const bool altitude_rate_is_zero = guidance_vertical_speed == Units::zero();
+ if (altitude_near_constraint_low || altitude_rate_is_zero) {
+ is_level_flight_ = true;
}
// limit thrust to max and min limits
+ bool min_thrust_commanded = false;
if (thrust_command > max_thrust) {
thrust_command = max_thrust;
} else if (thrust_command < min_thrust) {
thrust_command = min_thrust;
+ min_thrust_commanded = true;
}
// Determine if speed brake is needed
- Units::Speed v_cas = m_sensed_weather->GetTrueWeather()->TAS2CAS(equations_of_motion_state.true_airspeed,
- equations_of_motion_state.altitude_msl);
-
- if (thrust_command == min_thrust) {
-
- aaesim::open_source::bada_utils::FlapConfiguration updated_flap_configuration =
- aaesim::open_source::bada_utils::FlapConfiguration::UNDEFINED;
-
- if (m_is_level_flight || (error_alt > m_altitude_threshold)) {
- m_bada_calculator->GetConfigurationForIncreasedDrag(
+ if (min_thrust_commanded) {
+ aaesim::open_source::bada_utils::FlapConfiguration updated_flap_configuration{
+ aaesim::open_source::bada_utils::FlapConfiguration::UNDEFINED};
+ if (error_alt > altitude_threshold_) {
+ Units::Speed v_cas = sensed_weather->GetTrueWeather()->TAS2CAS(equations_of_motion_state.true_airspeed,
+ equations_of_motion_state.altitude_msl);
+ aircraft_performance_->GetConfigurationForIncreasedDrag(
v_cas, Units::MetersLength(equations_of_motion_state.altitude_msl), updated_flap_configuration);
- new_flap_configuration = updated_flap_configuration;
- }
- // test for minThrustCounter > 14, because in SpeedOnThrustControl, minThrustCounter
- // is incremented before this test instead of after.
- if (m_is_level_flight && m_min_thrust_counter > 14.0 && error_tas < Units::KnotsSpeed(-5.0)) {
- if (new_flap_configuration <= aaesim::open_source::bada_utils::FlapConfiguration::LANDING) {
- if (!m_is_speed_brake_on) {
- m_speed_brake_counter = 0.0;
- speed_brake_command = 0.5;
- m_is_speed_brake_on = true;
- } else {
- m_speed_brake_counter += 1;
- speed_brake_command = 0.5;
- }
- } else {
- m_speed_brake_counter = 0.0;
- speed_brake_command = 0.0;
- m_is_speed_brake_on = false;
- }
- }
-
- if (error_alt > m_altitude_threshold) {
- m_bada_calculator->GetConfigurationForIncreasedDrag(
- v_cas, Units::MetersLength(equations_of_motion_state.altitude_msl), updated_flap_configuration);
-
- if (updated_flap_configuration == new_flap_configuration &&
+ if (updated_flap_configuration == flap_configuration &&
updated_flap_configuration <= aaesim::open_source::bada_utils::FlapConfiguration::LANDING) {
- speed_brake_command = 0.5;
- m_is_speed_brake_on = true;
- m_speed_brake_counter = m_speed_brake_counter + 1;
+ speed_brake_controller_->Deploy();
}
-
- new_flap_configuration = updated_flap_configuration;
+ flap_configuration = updated_flap_configuration;
}
- m_min_thrust_counter = m_min_thrust_counter + 1;
- } else {
- m_min_thrust_counter = 0;
}
+ speed_brake_command = speed_brake_controller_->Update(min_thrust_commanded);
- // If no longer commanding Min Thrust
- if (m_is_speed_brake_on && m_speed_brake_counter <= 30.0) {
- m_speed_brake_counter = m_speed_brake_counter + 1;
- speed_brake_command = 0.5;
- } else if (m_is_speed_brake_on && m_speed_brake_counter > 30.0) {
- if (m_min_thrust_counter == 0) {
- m_speed_brake_counter = 0.0;
- speed_brake_command = 0.0;
- m_is_speed_brake_on = false;
- } else {
- m_speed_brake_counter = m_speed_brake_counter + 1;
- speed_brake_command = 0.5;
- }
- }
-
- if (m_logger.getLogLevel() == log4cplus::TRACE_LOG_LEVEL) {
- using json = nlohmann::json;
- json j;
- j["altitude_error_ft"] = Units::FeetLength(error_alt).value();
- j["is_level_flight_bool"] = m_is_level_flight;
- j["thrust_command_newtons"] = Units::NewtonsForce(thrust_command).value();
- j["dynamics_thrust_newtons"] = Units::NewtonsForce(equations_of_motion_state.thrust).value();
- j["max_thrust_newtons"] = Units::NewtonsForce(max_thrust).value();
- j["min_thrust_newtons"] = Units::NewtonsForce(min_thrust).value();
- j["true_airspeed_error_knots"] = Units::KnotsSpeed(error_tas).value();
- j["speed_brake_command"] = speed_brake_command;
- j["new_flap_configuration"] = bada_utils::GetFlapConfigurationAsString(new_flap_configuration);
- j["gamma_command_deg"] = Units::DegreesAngle(gamma_command).value();
- LOG4CPLUS_TRACE(m_logger, j.dump());
- }
+ DoLogging(logger_, equations_of_motion_state, error_alt, is_level_flight_, thrust_command, max_thrust, min_thrust,
+ error_tas, speed_brake_command, flap_configuration, gamma_command);
}
diff --git a/Public/SpeedOnThrustControl.cpp b/Public/SpeedOnThrustControl.cpp
index b30e0e7..4d64c6a 100644
--- a/Public/SpeedOnThrustControl.cpp
+++ b/Public/SpeedOnThrustControl.cpp
@@ -25,46 +25,16 @@
using namespace aaesim::open_source;
-Units::Frequency SpeedOnThrustControl::m_gain_altitude = Units::HertzFrequency(0.20);
-Units::Frequency SpeedOnThrustControl::m_gain_gamma = Units::HertzFrequency(0.20);
-Units::Frequency SpeedOnThrustControl::m_gain_phi = Units::HertzFrequency(0.40);
-double SpeedOnThrustControl::m_gain_speedbrake = 0.20;
-
-log4cplus::Logger SpeedOnThrustControl::m_logger =
- log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("SpeedOnThrustControl"));
-
-SpeedOnThrustControl::SpeedOnThrustControl(const Units::Angle max_bank_angle) : AircraftControl(max_bank_angle) {
- m_alt_gain = m_gain_altitude;
- m_gamma_gain = m_gain_gamma;
- m_phi_gain = m_gain_phi;
- m_speed_brake_gain = m_gain_speedbrake;
- m_thrust_gain = CalculateThrustGain();
- m_gain_velocity = Units::sqr(m_natural_frequency) / m_thrust_gain;
-
- m_min_thrust_counter = 0.0;
- m_speedbrake_counter = 0.0;
- m_is_speedbrake_on = false;
-}
-
-void SpeedOnThrustControl::Initialize(
- std::shared_ptr bada_calculator) {
- AircraftControl::Initialize(bada_calculator);
- m_min_thrust_counter = 0.0;
- m_speedbrake_counter = 0.0;
- m_is_speedbrake_on = false;
-}
-
-void SpeedOnThrustControl::DoVerticalControl(
- const Guidance &guidance, const EquationsOfMotionState &equations_of_motion_state, Units::Force &thrust_command,
- Units::Angle &gamma_command, Units::Speed &tas_command, double &speed_brake_command,
- aaesim::open_source::bada_utils::FlapConfiguration &new_flap_configuration) {
+void SpeedOnThrustControl::ComputeVerticalCommands(
+ const Guidance &guidance, const EquationsOfMotionState &equations_of_motion_state,
+ std::shared_ptr &sensed_weather, Units::Force &thrust_command,
+ Units::Angle &gamma_command, Units::Speed &tas_command, BoundedValue &speed_brake_command,
+ aaesim::open_source::bada_utils::FlapConfiguration &flap_configuration) {
const Units::Speed hdot_ref = guidance.m_vertical_speed;
const Units::Length alt_ref = guidance.m_reference_altitude;
const Units::Length error_alt = alt_ref - equations_of_motion_state.altitude_msl;
- double temp_gamma = -(hdot_ref + m_gain_altitude * error_alt) /
- equations_of_motion_state.true_airspeed; // calculate change in altitude
- // if fabs(change) > 1 set to 1 required for asin calculation
+ double temp_gamma = -(hdot_ref + gain_altitude_ * error_alt) / equations_of_motion_state.true_airspeed;
if (temp_gamma > 1.0) {
temp_gamma = 1.0;
} else if (temp_gamma < -1.0) {
@@ -72,111 +42,65 @@ void SpeedOnThrustControl::DoVerticalControl(
}
gamma_command = Units::RadiansAngle(asin(temp_gamma));
- // Speed Control
tas_command =
- m_sensed_weather->GetTrueWeather()->CAS2TAS(guidance.m_ias_command, equations_of_motion_state.altitude_msl);
+ sensed_weather->GetTrueWeather()->CAS2TAS(guidance.m_ias_command, equations_of_motion_state.altitude_msl);
- // Speed Error
const Units::Speed error_tas = tas_command - equations_of_motion_state.true_airspeed;
- const Units::Acceleration vel_dot_com = m_gain_velocity * error_tas;
+ const Units::Acceleration vel_dot_com = gain_true_airspeed_ * error_tas;
- // Estimate kinetic forces for this state
- Units::Force lift, drag;
- ConfigureFlapsAndEstimateKineticForces(equations_of_motion_state, lift, drag, new_flap_configuration);
+ Units::Force lift{}, drag{};
+ ConfigureFlapsAndEstimateKineticForces(equations_of_motion_state, sensed_weather, aircraft_performance_, lift, drag,
+ flap_configuration);
// Thrust to maintain speed
- // Nominal Thrust (no acceleration) at desired speed
+ const auto ac_mass = aircraft_performance_->GetAircraftMass();
const Units::Force thrust_equilibrium =
- m_ac_mass * vel_dot_com + drag - m_ac_mass * Units::ONE_G_ACCELERATION * sin(equations_of_motion_state.gamma) -
- m_ac_mass * equations_of_motion_state.true_airspeed *
- (m_dVwx_dh * cos(equations_of_motion_state.psi_enu) +
- m_dVwy_dh * sin(equations_of_motion_state.psi_enu)) *
+ ac_mass * vel_dot_com + drag - ac_mass * Units::ONE_G_ACCELERATION * sin(equations_of_motion_state.gamma) -
+ ac_mass * equations_of_motion_state.true_airspeed *
+ (sensed_weather->GetWindSpeedVerticalDerivativeEast() * cos(equations_of_motion_state.psi_enu) +
+ sensed_weather->GetWindSpeedVerticalDerivativeNorth() * sin(equations_of_motion_state.psi_enu)) *
sin(equations_of_motion_state.gamma) * cos(equations_of_motion_state.gamma);
-
- // Thrust Limits
- const Units::Force max_thrust = Units::NewtonsForce(m_bada_calculator->GetMaxThrust(
- equations_of_motion_state.altitude_msl, new_flap_configuration,
+ const Units::Force max_thrust = Units::NewtonsForce(aircraft_performance_->GetMaxThrust(
+ equations_of_motion_state.altitude_msl, flap_configuration,
aaesim::open_source::bada_utils::EngineThrustMode::MAXIMUM_CRUISE, Units::ZERO_CELSIUS));
- const Units::Force min_thrust = Units::NewtonsForce(m_bada_calculator->GetMaxThrust(
- equations_of_motion_state.altitude_msl, new_flap_configuration,
+ const Units::Force min_thrust = Units::NewtonsForce(aircraft_performance_->GetMaxThrust(
+ equations_of_motion_state.altitude_msl, flap_configuration,
aaesim::open_source::bada_utils::EngineThrustMode::DESCENT, Units::ZERO_CELSIUS));
// Check Configuration if min_thrust is commanded
thrust_command = thrust_equilibrium;
+ bool min_thrust_commanded{false};
if (thrust_equilibrium < min_thrust) {
-
thrust_command = min_thrust;
+ min_thrust_commanded = true;
+ ++min_thrust_counter_;
- const Units::Speed calibrated_airspeed = m_sensed_weather->GetTrueWeather()->TAS2CAS(
+ const Units::Speed calibrated_airspeed = sensed_weather->GetTrueWeather()->TAS2CAS(
equations_of_motion_state.true_airspeed, equations_of_motion_state.altitude_msl);
aaesim::open_source::bada_utils::FlapConfiguration updated_flap_configuration =
aaesim::open_source::bada_utils::FlapConfiguration::UNDEFINED;
- m_bada_calculator->GetConfigurationForIncreasedDrag(calibrated_airspeed, equations_of_motion_state.altitude_msl,
- updated_flap_configuration);
-
- new_flap_configuration = updated_flap_configuration;
-
- m_min_thrust_counter++;
-
+ aircraft_performance_->GetConfigurationForIncreasedDrag(
+ calibrated_airspeed, equations_of_motion_state.altitude_msl, updated_flap_configuration);
+ flap_configuration = updated_flap_configuration;
} else {
- m_min_thrust_counter = 0;
-
- // Limit Thrust if thrust_command exceeds Max Thrust
+ min_thrust_counter_ = 0;
if (thrust_equilibrium > max_thrust) {
thrust_command = max_thrust;
}
}
- // Use speed brakes, if necessary
- static const Units::KnotsSpeed tas_error_tolerance(-5);
- if (m_min_thrust_counter > 15 && error_tas < tas_error_tolerance) {
- if (new_flap_configuration <= aaesim::open_source::bada_utils::FlapConfiguration::LANDING) {
- if (!m_is_speedbrake_on) {
- m_speedbrake_counter = 0;
- speed_brake_command = 0.5;
- m_is_speedbrake_on = true;
- } else {
- m_speedbrake_counter++;
- speed_brake_command = 0.5;
- }
+ static const Units::KnotsSpeed tas_error_tolerance{-5};
+ static const unsigned int minimum_thrust_duration{15};
+ if (min_thrust_counter_ > minimum_thrust_duration and error_tas < tas_error_tolerance) {
+ if (flap_configuration <= aaesim::open_source::bada_utils::FlapConfiguration::LANDING) {
+ speed_brake_controller_->Deploy();
} else {
- m_speedbrake_counter = 0.0;
- speed_brake_command = 0.0;
- m_is_speedbrake_on = false;
+ speed_brake_controller_->Retract();
}
}
+ speed_brake_command = speed_brake_controller_->Update(min_thrust_commanded);
- // If no longer commanding Min Thrust
- if (m_is_speedbrake_on && m_speedbrake_counter <= 30) {
- m_speedbrake_counter++;
- speed_brake_command = 0.5;
- } else if (m_is_speedbrake_on && m_speedbrake_counter > 30) {
- if (m_min_thrust_counter == 0) {
- m_speedbrake_counter = 0;
- speed_brake_command = 0.0;
- m_is_speedbrake_on = false;
- } else {
- m_speedbrake_counter++;
- speed_brake_command = 0.5;
- }
- }
-
- if (m_logger.getLogLevel() == log4cplus::TRACE_LOG_LEVEL) {
- using json = nlohmann::json;
- json j;
- j["altitude_error_ft"] = Units::FeetLength(error_alt).value();
- j["is_level_flight_bool"] = m_is_level_flight;
- j["thrust_equilibrium_newtons"] = Units::NewtonsForce(thrust_equilibrium).value();
- j["thrust_command_newtons"] = Units::NewtonsForce(thrust_command).value();
- j["dynamics_thrust_newtons"] = Units::NewtonsForce(equations_of_motion_state.thrust).value();
- j["max_thrust_newtons"] = Units::NewtonsForce(max_thrust).value();
- j["min_thrust_newtons"] = Units::NewtonsForce(min_thrust).value();
- j["speed_brake_command"] = speed_brake_command;
- j["new_flap_configuration"] = bada_utils::GetFlapConfigurationAsString(new_flap_configuration);
- j["true_airspeed_error_knots"] = Units::KnotsSpeed(error_tas).value();
- j["true_airspeed_command_knots"] = Units::KnotsSpeed(tas_command).value();
- j["gamma_command_deg"] = Units::DegreesAngle(gamma_command).value();
- LOG4CPLUS_TRACE(m_logger, j.dump());
- }
+ DoLogging(logger_, equations_of_motion_state, error_alt, true, thrust_command, max_thrust, min_thrust, error_tas,
+ speed_brake_command, flap_configuration, gamma_command);
}
diff --git a/Public/TangentPlaneSequence.cpp b/Public/TangentPlaneSequence.cpp
index 771619d..e133762 100644
--- a/Public/TangentPlaneSequence.cpp
+++ b/Public/TangentPlaneSequence.cpp
@@ -35,7 +35,7 @@ void TangentPlaneSequence::Copy(const TangentPlaneSequence &in) {
this->waypoints_from_initialization_ = in.waypoints_from_initialization_;
}
-void TangentPlaneSequence::Initialize(std::list &waypoint_list) {
+void TangentPlaneSequence::Initialize(const std::list &waypoint_list) {
shared_ptr tangent_plane = shared_ptr((LocalTangentPlane *)NULL);
EarthModel::LocalPositionEnu enu;
enu.x = enu.y = enu.z = Units::zero();
@@ -99,7 +99,6 @@ void TangentPlaneSequence::ConvertLocalToGeodetic(EarthModel::LocalPositionEnu l
void TangentPlaneSequence::ConvertGeodeticToLocal(EarthModel::GeodeticPosition geo_position,
EarthModel::LocalPositionEnu &local_position) const {
-
EarthModel::AbsolutePositionEcef ecef_position;
Environment::GetInstance()->GetEarthModel()->ConvertGeodeticToAbsolute(geo_position, ecef_position);
std::vector areas;
diff --git a/Public/ThreeDOFDynamics.cpp b/Public/ThreeDOFDynamics.cpp
index d25e11e..1647649 100644
--- a/Public/ThreeDOFDynamics.cpp
+++ b/Public/ThreeDOFDynamics.cpp
@@ -32,7 +32,7 @@ using namespace aaesim::open_source;
AircraftState ThreeDOFDynamics::Update(const int unique_acid, const aaesim::open_source::SimulationTime &simtime,
const Guidance &guidance, const shared_ptr &aircraft_control) {
auto dynamics_state = Integrate(guidance, aircraft_control);
- m_dynamics_history.insert(std::make_pair(simtime.GetCurrentSimulationTime(), dynamics_state));
+ m_dynamics_history.insert(std::make_pair(simtime, dynamics_state));
LatLonDerivative position_rate;
m_position_estimator->ComputePosition(simtime, m_equations_of_motion_state, m_equations_of_motion_state_derivative,
@@ -68,20 +68,20 @@ DynamicsState ThreeDOFDynamics::Integrate(const Guidance &guidance,
const shared_ptr &aircraft_control) {
const Units::SecondsTime dt = SimulationTime::GetSimulationTimeStep();
UpdateTrueWeatherConditions();
- ControlCommands control_commands =
+ const auto controller_response =
aircraft_control->CalculateControlCommands(guidance, m_equations_of_motion_state, m_true_weather_operator);
- bool perform_takeoff_roll_logic =
- control_commands.getFlapMode() == bada_utils::TAKEOFF &&
- control_commands.getTrueAirspeed() < m_bada_calculator->GetAerodynamicsInformation().take_off.V_stall;
+ bool perform_takeoff_roll_logic = controller_response.first.flap_configuration == bada_utils::TAKEOFF &&
+ controller_response.first.true_airspeed_command <
+ m_bada_calculator->GetAerodynamicsInformation().take_off.V_stall;
if (perform_takeoff_roll_logic) {
- m_equations_of_motion_state_derivative = StatePropagationOnRunway(control_commands, guidance);
+ m_equations_of_motion_state_derivative = StatePropagationOnRunway(controller_response.first, guidance);
} else {
// First-order derivative of the state calculated by the EOM
- m_equations_of_motion_state_derivative =
- StatePropagation(m_true_weather_operator->GetWindSpeedVerticalDerivativeEast(),
- m_true_weather_operator->GetWindSpeedVerticalDerivativeNorth(),
- aircraft_control->GetGammaGain(), aircraft_control->GetThrustGain(),
- aircraft_control->GetPhiGain(), aircraft_control->GetSpeedBrakeGain(), control_commands);
+ m_equations_of_motion_state_derivative = StatePropagation(
+ m_true_weather_operator->GetWindSpeedVerticalDerivativeEast(),
+ m_true_weather_operator->GetWindSpeedVerticalDerivativeNorth(),
+ controller_response.second.k_flight_path_angle, controller_response.second.k_thrust,
+ controller_response.second.k_roll, controller_response.second.k_speed_brake, controller_response.first);
}
// Integrate the state
@@ -96,6 +96,10 @@ DynamicsState ThreeDOFDynamics::Integrate(const Guidance &guidance,
m_equations_of_motion_state.speed_brake_percentage +=
m_equations_of_motion_state_derivative.speed_brake_deriv * dt.value();
m_equations_of_motion_state.flap_configuration = m_equations_of_motion_state_derivative.flap_configuration;
+
+ m_equations_of_motion_state.speed_brake_percentage = m_equations_of_motion_state.speed_brake_percentage < 1e-10
+ ? 0.0
+ : m_equations_of_motion_state.speed_brake_percentage;
return ComputeDynamicsState(m_equations_of_motion_state, m_equations_of_motion_state_derivative);
}
@@ -124,15 +128,15 @@ EquationsOfMotionStateDeriv ThreeDOFDynamics::StatePropagation(Units::Frequency
dX.enu_velocity_z = Units::MetersPerSecondSpeed(-true_airspeed * sin(gamma));
dX.true_airspeed_deriv = (thrust - drag) / ac_mass + Units::ONE_G_ACCELERATION * sin(gamma) +
true_airspeed * (dVwx_dh * cos(psi) + dVwy_dh * sin(psi)) * sin(gamma) * cos(gamma);
- dX.gamma_deriv = k_gamma * (commands.getGamma() - gamma) -
+ dX.gamma_deriv = k_gamma * (commands.flight_path_angle_command - gamma) -
(dVwx_dh * cos(psi) + dVwy_dh * sin(psi)) * pow(sin(gamma), 2) * Units::ONE_RADIAN_ANGLE;
dX.heading_deriv = (-lift * sin(phi) / (ac_mass * true_airspeed * cos(gamma)) -
(dVwx_dh * sin(psi) - dVwy_dh * cos(psi)) * tan(gamma)) *
Units::ONE_RADIAN_ANGLE;
- dX.thrust_deriv = k_t * (commands.getThrust() - thrust);
- dX.roll_rate = k_phi * (commands.getPhi() - phi);
- dX.speed_brake_deriv = k_speedBrake * (commands.getSpeedBrake() - speed_brake_percentage);
- dX.flap_configuration = commands.getFlapMode();
+ dX.thrust_deriv = k_t * (commands.thrust_command - thrust);
+ dX.roll_rate = k_phi * (commands.roll_angle_command - phi);
+ dX.speed_brake_deriv = k_speedBrake * (commands.speed_brake_command - speed_brake_percentage);
+ dX.flap_configuration = commands.flap_configuration;
return dX;
}
@@ -225,6 +229,7 @@ Units::SignedRadiansAngle ThreeDOFDynamics::CalculateTrimmedPsiForWind(Units::Si
}
void ThreeDOFDynamics::Initialize(
+ const aaesim::open_source::SimulationTime &simulation_time,
std::shared_ptr aircraft_performance,
const EarthModel::GeodeticPosition &initial_position, const EarthModel::LocalPositionEnu &initial_position_enu,
Units::Length initial_altitude_msl, Units::Speed initial_true_airspeed, Units::Angle initial_ground_course_enu,
@@ -301,7 +306,7 @@ void ThreeDOFDynamics::Initialize(
}
m_equations_of_motion_state.thrust = equilibrium_thrust_required;
}
- m_dynamics_history.insert(std::make_pair(Units::SecondsTime{-1}, initial_dynamics_state));
+ m_dynamics_history.insert(std::make_pair(simulation_time, initial_dynamics_state));
}
EquationsOfMotionStateDeriv ThreeDOFDynamics::StatePropagationOnRunway(ControlCommands commands,
@@ -311,7 +316,7 @@ EquationsOfMotionStateDeriv ThreeDOFDynamics::StatePropagationOnRunway(ControlCo
const Units::Mass ac_mass = m_bada_calculator->GetAircraftMass();
const Units::Speed true_airspeed = m_equations_of_motion_state.true_airspeed;
const Units::Force thrust =
- m_bada_calculator->GetMaxThrust(m_equations_of_motion_state.altitude_msl, commands.getFlapMode(),
+ m_bada_calculator->GetMaxThrust(m_equations_of_motion_state.altitude_msl, commands.flap_configuration,
bada_utils::EngineThrustMode::MAXIMUM_CLIMB, Units::ZERO_CELSIUS);
const Units::Speed wind_magnitude =
Units::sqrt(Units::sqr(m_wind_velocity_east) + Units::sqr(m_wind_velocity_north));
@@ -336,13 +341,13 @@ EquationsOfMotionStateDeriv ThreeDOFDynamics::StatePropagationOnRunway(ControlCo
dX.thrust_deriv = Units::zero();
dX.roll_rate = Units::zero();
dX.speed_brake_deriv = 0;
- dX.flap_configuration = commands.getFlapMode();
+ dX.flap_configuration = commands.flap_configuration;
return dX;
}
DynamicsState ThreeDOFDynamics::ComputeDynamicsState(
const EquationsOfMotionState &equations_of_motion_state,
- const EquationsOfMotionStateDeriv &equations_of_motion_state_derivative) {
+ const EquationsOfMotionStateDeriv &equations_of_motion_state_derivative) const {
DynamicsState dynamics_state;
dynamics_state.h = m_equations_of_motion_state.altitude_msl;
@@ -361,8 +366,6 @@ DynamicsState ThreeDOFDynamics::ComputeDynamicsState(
dynamics_state.xd = equations_of_motion_state_derivative.enu_velocity_x;
dynamics_state.yd = equations_of_motion_state_derivative.enu_velocity_y;
- // Check Thrust Limits and Limit Appropriately
-
aaesim::open_source::bada_utils::FlapConfiguration mode = m_bada_calculator->GetCurrentFlapConfiguration();
Units::Force max_thrust, min_thrust;
switch (mode) {
diff --git a/Public/VerticalPredictor.cpp b/Public/VerticalPredictor.cpp
index c00b1fa..5551899 100644
--- a/Public/VerticalPredictor.cpp
+++ b/Public/VerticalPredictor.cpp
@@ -18,6 +18,7 @@
// ****************************************************************************
#include "public/VerticalPredictor.h"
+
#include "public/CoreUtils.h"
using namespace std;
@@ -25,11 +26,7 @@ using namespace aaesim::open_source;
using namespace aaesim::open_source::constants;
VerticalPredictor::VerticalPredictor()
- : m_low_groundspeed_warning(50),
- m_low_groundspeed_fatal(0.1),
- m_descent_angle_max(6.0),
- m_descent_angle_warning(4.0) {
-
+ : LOW_GROUNDSPEED_WARNING(50), LOW_GROUNDSPEED_FATAL(0.1), DESCENT_ANGLE_MAX(6.0), DESCENT_ANGLE_WARNING(4.0) {
m_transition_altitude_msl = Units::FeetLength(0.0);
m_cruise_altitude_msl = Units::FeetLength(37000);
m_transition_ias = Units::KnotsSpeed(310);
@@ -49,7 +46,6 @@ void VerticalPredictor::SetMembers(const VerticalPredictor &vertical_predictor)
Guidance VerticalPredictor::Update(const AircraftState ¤t_state, const Guidance ¤t_guidance,
const Units::Length distance_to_go) {
-
Guidance guidanceout = CalculateGuidanceCommands(current_state, distance_to_go, current_guidance);
return guidanceout;
@@ -220,7 +216,6 @@ Guidance VerticalPredictor::CalculateGuidanceCommands(const AircraftState &state
double VerticalPredictor::CalculateEsfUsingConstantCAS(const double true_airspeed_mps, const double altitude_msl_meter,
const Units::Temperature temperature) {
-
double esf;
const Units::KelvinTemperature temperature_kelvin(temperature);
double mach;
@@ -307,7 +302,6 @@ void VerticalPredictor::TrimDuplicatesFromVerticalPath() {
}
VerticalPredictor &VerticalPredictor::operator=(const VerticalPredictor &obj) {
-
if (this != &obj) {
this->m_wind_calculator = obj.m_wind_calculator;
this->m_transition_altitude_msl = obj.m_transition_altitude_msl;
@@ -327,7 +321,6 @@ VerticalPredictor &VerticalPredictor::operator=(const VerticalPredictor &obj) {
}
bool VerticalPredictor::operator==(const VerticalPredictor &obj) const {
-
// Note: not including mCalcWind comparison here because differences
// between this->mCalcWind and obj.mCalcWind should not affect
// processing.
diff --git a/Public/WeatherPrediction.cpp b/Public/WeatherPrediction.cpp
index 4368831..e0d1a52 100644
--- a/Public/WeatherPrediction.cpp
+++ b/Public/WeatherPrediction.cpp
@@ -22,9 +22,8 @@
using namespace aaesim::open_source;
-WeatherPrediction::WeatherPrediction(PredictedWindOption option, std::shared_ptr wind,
- std::shared_ptr atmosphere)
- : WeatherEstimate(std::move(wind), std::move(atmosphere)), m_predicted_wind_option(option), m_update_count(0) {
+WeatherPrediction::WeatherPrediction(std::shared_ptr wind, std::shared_ptr atmosphere)
+ : WeatherEstimate(std::move(wind), std::move(atmosphere)), m_update_count(0) {
// inhibit 3-D predicted temperature for now.
m_temperature_checked = true;
m_temperature_available = false;
diff --git a/Public/Wgs84PrecalcWaypoint.cpp b/Public/Wgs84PrecalcWaypoint.cpp
index 10f0b1e..eeedf20 100644
--- a/Public/Wgs84PrecalcWaypoint.cpp
+++ b/Public/Wgs84PrecalcWaypoint.cpp
@@ -22,7 +22,7 @@
using namespace aaesim;
Wgs84PrecalcWaypoint::Wgs84PrecalcWaypoint() {
- m_name = "noname";
+ m_name = "";
m_leg_type = AircraftIntent::Arinc424LegType::UNSET;
m_leg_length = Units::zero();
m_enu_course_in_angle = Units::DegreesAngle(0.0);
@@ -40,7 +40,6 @@ Wgs84PrecalcWaypoint::Wgs84PrecalcWaypoint() {
}
bool Wgs84PrecalcWaypoint::operator==(const Wgs84PrecalcWaypoint &obj) const {
-
bool match = (m_leg_length == obj.m_leg_length);
match = match && (m_name == obj.m_name);
match = match && (m_bank_angle == obj.m_bank_angle);
diff --git a/Public/dev-notes.md b/Public/dev-notes.md
deleted file mode 100644
index c375b35..0000000
--- a/Public/dev-notes.md
+++ /dev/null
@@ -1 +0,0 @@
-# Open-Source Library Dev Notes
diff --git a/README.md b/README.md
index 813e8f0..f6dc140 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
-[](https://travis-ci.org/mitre/FMACM)
-[](https://codecov.io/gh/mitre/fmacm)
+# FMACM
-# NOTICE
-This is the copyright work of The MITRE Corporation, and was produced
+> This is the copyright work of The MITRE Corporation, and was produced
for the U. S. Government under Contract Number DTFAWA-10-C-00080, and
is subject to Federal Aviation Administration Acquisition Management
System Clause 3.5-13, Rights In Data-General, Alt. III and Alt. IV
@@ -11,93 +9,29 @@ Government, or to those acting on behalf of the U. S. Government,
under that Clause is authorized without the express written
permission of The MITRE Corporation. For further information, please
contact The MITRE Corporation, Contracts Office, 7515 Colshire Drive,
-McLean, VA 22102-7539, (703) 983-6000.
+McLean, VA 22102-7539, (703) 983-6000.
+>
+> Copyright 2020 The MITRE Corporation. All Rights Reserved.
+> Approved for Public Release; Distribution Unlimited. 15-1482
-Copyright 2020 The MITRE Corporation. All Rights Reserved.
-Approved for Public Release; Distribution Unlimited. 15-1482
+This project contains content developed by The MITRE Corporation. If this code is used in a deployment or embedded within another project, it is requested that you send an email to [opensource@mitre.org](mailto:opensource@mitre.org) in order to let us know where this software is being used.
-This project contains content developed by The MITRE Corporation. If this code is used in a deployment or embedded within another project, it is requested that you send an email to opensource@mitre.org in order to let us know where this software is being used.
+
-# Licensing
-[Apache 2.0](https://github.com/mitre/FMACM/blob/master/LICENSE)
-
-# Documentation
-Documentation is provided via two publications:
-- Model [technical documentation](https://www.mitre.org/publications/technical-papers/derivation-of-a-point-mass-aircraft-model-used-for-fast-time) in form of a paper available from MITRE
-- Official [RTCA SC-186](http://www.rtca.org/content.asp?pl=108&sl=33&contentid=88) documentation. In particular see DO-328B and DO-361A. Please contact RTCA for more information.
-
-# Licensing questions
-Any questions related to MITRE Open Source technologies may be emailed to opensource@mitre.org
-
-# Developer Notice
-
-### EUROCONTROL BADA Development Necessary
-This code uses [EUROCONTROL's BADA](https://eurocontrol.int/services/bada) for aircraft performance data that drive the aircraft dynamics modeling. However, BADA functionality and code cannot be provided due to licensing restrictions imposed by EUROCONTROL. Therefore, stub classes exist in this code repository that represent MITRE's suggested implementation in order to use this software. See Bada.cpp and BadaPerformanceCalculator.cpp. Please complete the implementation in these classes before using the code.
-
-### Log4Cplus Dependency
-Log4Cplus is a logging application used by this code base. It needs to be installed prior to building this code. You can download it from [their GitHub repo](https://github.com/log4cplus/log4cplus).
-
-### Continuous Integration & Testing
-To view a successful build and any public-facing tests, please also refer to the [Travis-CI job](https://travis-ci.org/mitre/FMACM) that is always building and testing this repo's master branch.
-
-### Compile
-No attempt has been made to ensure that this code will compile on all operating systems. This code compiles successfully on Linux machines, specifically [CentOs](https://www.centos.org/) 7 using gcc 4.8.5. For all other computing environments, YMMV.
-
-The [CMake](https://cmake.org/) utility is used to compile this code. If not already installed on the target environment, it is easily installed via `apt`. Please use version 3.0+. From the root directory, execute:
+
+
-```
->> mkdir build
->> cd build
->> cmake ..
->> make
-```
+
+
-The resulting executable will be found in /bin and is named `FMACM`.
+## Licensing
-### Run Unit Tests
-Unit tests can be run via the CMake infrastructure.
-
-Assuming the software already compiles:
-```
->> cd build
->> make run
-```
-
-### Run
-A configuration file must be provided as the only command-line argument to the FMACM program. The file must be formatted as plain text and contain paths to each scenario that is to be run. The contents of the configuration file must look like this:
-
-```
-# number of scenarios to run
-2
-
-# path to each scenario file, one per line, as many as the number above indicates
-path/to/scenario.txt
-path/to/scenario2.txt
-```
-
-Users may list as many scenario files as desired. The scenario file provides detailed instructions about the scenario that FMACM is to run. An example configuration and scenario file is provided in ```./Run_Files/```.
-
-The executable is then executed in this manner:
-```
-./bin/FMACM configuration.txt
-```
-
-Output is found in the run-time directory.
-
-### Inputs
+[Apache 2.0](https://github.com/mitre/FMACM/blob/master/LICENSE)
-The format of the [horizontal flight path](../Run_Files/FimAcTv-P~W_JET_HFP.csv) input file has changed since the last release. There is a new script to convert any files you may have in the old format:
-```
-./.python/convert_pre_april_2020_hfp_files.py
-```
+## Documentation
-Navigate to the directory that you want your nex file to be generated in:
-```
-cd Run_Files/
-```
+:eyes: Dive [right in](https://mitre.github.io/FMACM/)! :four_leaf_clover:
-Run the script with the path to the file you wish to convert, and the desired output filename as command line arguments:
-```
-../.python/convert_pre_april_2020_hfp_files.py path/to/input.csv output_filename
+---
-```
+Happy Simulating!
diff --git a/Utility/.gitignore b/Utility/.gitignore
deleted file mode 100644
index 8ae648d..0000000
--- a/Utility/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.cbp
-*.*~
-*.o
diff --git a/Utility/CMakeLists.txt b/Utility/CMakeLists.txt
deleted file mode 100644
index 13fabea..0000000
--- a/Utility/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-cmake_minimum_required(VERSION 3.14)
-include(${PROJECT_SOURCE_DIR}/.cmake/CPM.cmake)
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-
-CPMAddPackage(
- NAME nlohmann_json
- GITHUB_REPOSITORY nlohmann/json
- VERSION 3.9.1
-)
-
-set(SOURCE_FILES
- FilePath.cpp
- constants.cpp
- Logging.cpp)
-
-set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib)
-
-add_library(utility STATIC ${SOURCE_FILES})
-target_include_directories(utility PUBLIC
- ${LOG4CPLUS_DIRS}
- ${aaesim_INCLUDE_DIRS}
- ${nlohmann_json_SOURCE_DIR}/include)
-target_link_libraries(utility log4cplusS nlohmann_json::nlohmann_json)
-target_compile_definitions(utility PUBLIC -D_LINUX_ -Dunix)
diff --git a/Utility/FilePath.cpp b/Utility/FilePath.cpp
deleted file mode 100644
index 40deb41..0000000
--- a/Utility/FilePath.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-// ****************************************************************************
-// NOTICE
-//
-// This work was produced for the U.S. Government under Contract 693KA8-22-C-00001
-// and is subject to Federal Aviation Administration Acquisition Management System
-// Clause 3.5-13, Rights In Data-General, Alt. III and Alt. IV (Oct. 1996).
-//
-// The contents of this document reflect the views of the author and The MITRE
-// Corporation and do not necessarily reflect the views of the Federal Aviation
-// Administration (FAA) or the Department of Transportation (DOT). Neither the FAA
-// nor the DOT makes any warranty or guarantee, expressed or implied, concerning
-// the content or accuracy of these views.
-//
-// For further information, please contact The MITRE Corporation, Contracts Management
-// Office, 7515 Colshire Drive, McLean, VA 22102-7539, (703) 983-6000.
-//
-// 2022 The MITRE Corporation. All Rights Reserved.
-// ****************************************************************************
-
-#include "utility/FilePath.h"
-
-using namespace std;
-
-FilePath::FilePath() {}
-
-FilePath::~FilePath() {}
-
-FilePath::FilePath(const string &name) {
- m_error = false;
- int end;
- int index;
-
- if (name.length() == 0) {
- m_error = true;
- }
-
- m_full_path = name;
-
- ExtractPop(name);
- end = ExtractType(name);
- index = ExtractDisk(name);
-
- ExtractPath(name, index, end);
-
- m_number_of_wildcards = GetNumberOfWildCards(name);
-
- if (m_list_of_directories.size() == 0) {
- m_file_name = "";
- } else {
- m_file_name = m_list_of_directories.at(m_list_of_directories.size() - 1);
- }
-
- size_t find_space;
- find_space = name.find_last_of(" ");
- if (find_space != string::npos) {
- if (find_space == name.length() - 1) {
- m_error = true;
- }
- }
-}
-
-bool FilePath::operator==(const FilePath &rhs) const {
- if (m_full_path == rhs.m_full_path) {
- return true;
- }
-
- if (m_number_of_wildcards > 0) {
- size_t found = m_full_path.find("*");
- if (found == 0) {
- std::string end = m_full_path.substr(1);
- if (rhs.m_full_path.substr((rhs.m_full_path.length() - end.length())) == end) {
- return true;
- }
- } else {
- if (rhs.m_full_path.find(m_full_path.substr(0, found - 1)) != std::string::npos) {
- return true;
- }
- }
- }
-
- if (rhs.m_number_of_wildcards > 0) {
- size_t found = rhs.m_full_path.find("*");
- if (found == 0) {
- std::string end = rhs.m_full_path.substr(1);
- if (m_full_path.substr((m_full_path.length() - end.length())) == end) {
- return true;
- }
- } else {
- if (rhs.m_full_path.find(m_full_path.substr(0, found - 1)) != std::string::npos) {
- return true;
- }
- }
- }
- return false;
-}
-
-string FilePath::GetFullPath() const { return m_full_path; }
-
-string FilePath::GetType() const { return m_type; }
-
-string FilePath::GetDisk() const { return m_drive; }
-
-string FilePath::RemoveLastDirectory() const { return m_last_directory; }
-
-int FilePath::GetNumberOfDirectories() const { return m_number_of_directories; }
-
-vector FilePath::ListDirectories() const { return m_list_of_directories; }
-
-FilePath FilePath::Pop() const {
- FilePath out = FilePath(m_last_directory);
- return out;
-}
-
-FilePath FilePath::Push(const FilePath &more) const {
- string pushed;
- string last = m_full_path.substr(m_full_path.length() - 1, 1);
- if (last == "\\" || last == "/") {
- pushed = m_full_path + more.m_full_path;
- } else {
- pushed = m_full_path + "/" + more.m_full_path;
- }
- FilePath out = FilePath(pushed);
- return out;
-}
-
-FilePath FilePath::Cd(const FilePath &fp) const {
- string full = fp.m_full_path;
- string full1 = m_full_path;
- FilePath temp = FilePath(full1);
- FilePath out, temp2;
- if (full.substr(0, 2) == "..") {
- if (full == ".." || full == "../" || full == "..\\") {
- out = temp.Pop();
- } else if (full.substr(0, 3) == "..\\" || full.substr(0, 3) == "../") {
- temp2 = temp.Pop();
- out = temp2.Push(full.substr(3));
- } else {
- size_t col = full.find_first_of(":");
- int len = full.length();
- if (col != string::npos && col == len - 1) {
- out = fp;
- } else {
- out = temp;
- }
- }
- } else {
- out = temp.Push(fp);
- }
-
- return out;
-}
-
-int FilePath::ExtractDisk(const string &name) {
- if (name.find_first_of(":") != string::npos) {
- m_drive = name.substr(0, name.find_first_of(":"));
- if ((name.length() - 1) == name.find_first_of(":")) {
- m_error = true; // return error if path is just C:
- return -1; // added by ADM jan 24 2011
- } else {
- return name.find_first_of(":") + 1;
- }
- } else {
- m_drive = "";
- return 0;
- }
-}
-
-int FilePath::ExtractType(const string &name) {
- size_t found;
- found = name.find_last_of(".");
- if (found == string::npos) {
- m_type = "";
- return name.length();
- } else {
- // a path cannot have a period at the end
- if (found == name.length() - 1) {
- m_error = true;
- }
- m_type = name.substr(found + 1);
- return int(found);
- }
-}
-
-void FilePath::ExtractPath(const string &name, int &index, int end) {
- m_number_of_directories = 0;
- string temp = name;
- while (index < end) {
- size_t slash = temp.find_first_of("/");
- string directory;
- if (slash != string::npos) {
- directory = name.substr(index, slash + 1);
- m_list_of_directories.push_back(directory);
- m_number_of_directories++;
- index += directory.size();
- temp = name.substr(index);
- } else {
- size_t dot = temp.find_first_of(".");
- directory = name.substr(index, dot);
- m_list_of_directories.push_back(directory);
- m_number_of_directories++;
- index += directory.size();
- temp = name.substr(index);
- }
- }
-}
-
-void FilePath::ExtractPop(const string &rname) {
- size_t slash = rname.find_last_of("/");
- m_last_directory = rname.substr(0, slash + 1);
-}
-
-int FilePath::GetNumberOfWildCards(const string &name) {
- int len = m_full_path.length();
- int index = 0;
- int number = 0;
- while (index < len) {
- if (m_full_path.substr(index, 1) == "*") {
- number++;
- }
- index++;
- }
- return number;
-}
diff --git a/Utility/Logging.cpp b/Utility/Logging.cpp
deleted file mode 100644
index 4c52d3c..0000000
--- a/Utility/Logging.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-// ****************************************************************************
-// NOTICE
-//
-// This work was produced for the U.S. Government under Contract 693KA8-22-C-00001
-// and is subject to Federal Aviation Administration Acquisition Management System
-// Clause 3.5-13, Rights In Data-General, Alt. III and Alt. IV (Oct. 1996).
-//
-// The contents of this document reflect the views of the author and The MITRE
-// Corporation and do not necessarily reflect the views of the Federal Aviation
-// Administration (FAA) or the Department of Transportation (DOT). Neither the FAA
-// nor the DOT makes any warranty or guarantee, expressed or implied, concerning
-// the content or accuracy of these views.
-//
-// For further information, please contact The MITRE Corporation, Contracts Management
-// Office, 7515 Colshire Drive, McLean, VA 22102-7539, (703) 983-6000.
-//
-// 2022 The MITRE Corporation. All Rights Reserved.
-// ****************************************************************************
-
-#include "utility/Logging.h"
-#include
-#include
-#include
-
-static bool Logging_initialized = false;
-
-void InitializeLogging() {
- if (Logging_initialized) {
- return;
- }
- Logging_initialized = true;
-
- log4cplus::initialize();
- log4cplus::Logger logger = log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("logging.init"));
- char *prop_file = getenv("LOG4CPLUS_PROPERTIES");
- if (prop_file == NULL) {
- // fall back to log4cplus.properties
- prop_file = (char *)"log4cplus.properties";
- }
- if (access(prop_file, F_OK) == -1) {
- log4cplus::BasicConfigurator config;
- config.configure();
- LOG4CPLUS_TRACE(logger, "Cannot access LOG4CPLUS_PROPERTIES " << prop_file << ", using BasicConfigurator.");
- } else {
- log4cplus::PropertyConfigurator config(prop_file);
- config.configure();
- LOG4CPLUS_TRACE(logger, "LOG4CPLUS_PROPERTIES file is " << LOG4CPLUS_TEXT(prop_file));
- }
-}
diff --git a/Utility/ProcessingTimeStats.cpp b/Utility/ProcessingTimeStats.cpp
deleted file mode 100644
index 33ce523..0000000
--- a/Utility/ProcessingTimeStats.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// ****************************************************************************
-// NOTICE
-//
-// This is the copyright work of The MITRE Corporation, and was produced
-// for the U. S. Government under Contract Number DTFAWA-10-C-00080, and
-// is subject to Federal Aviation Administration Acquisition Management
-// System Clause 3.5-13, Rights In Data-General, Alt. III and Alt. IV
-// (Oct. 1996). No other use other than that granted to the U. S.
-// Government, or to those acting on behalf of the U. S. Government,
-// under that Clause is authorized without the express written
-// permission of The MITRE Corporation. For further information, please
-// contact The MITRE Corporation, Contracts Office, 7515 Colshire Drive,
-// McLean, VA 22102-7539, (703) 983-6000.
-//
-// Copyright 2018 The MITRE Corporation. All Rights Reserved.
-// ****************************************************************************
-
-#include "utility/ProcessingTimeStats.h"
-#include
-
-
-ProcessingTimeStats::ProcessingTimeStats(void)
- : hdr("") {
- // Basic constructor.
-
- ms = 0.0;
- entries = 0;
-}
-
-ProcessingTimeStats::ProcessingTimeStats(std::string str)
- : hdr(str) {
- // Copy constructor.
-
- ms = 0.0;
- entries = 0;
-}
-
-ProcessingTimeStats::~ProcessingTimeStats(void) {
- // Destructor. Dumps collected stats.
-
- dump();
-}
-
-void ProcessingTimeStats::setHdr(std::string str) {
- // Header setter.
-
- hdr = str;
-}
-
-void ProcessingTimeStats::start(void) {
- // Gets time to start from.
-
- t0 = clock();
-}
-
-void ProcessingTimeStats::stop(void) {
- // Gets time at stop point and gathers time between start and stop time.
-
- t1 = clock();
- gather();
-}
-
-void ProcessingTimeStats::gather(void) {
- // Gathers stats between start and stop time.
-
- double diffticks = t1 - t0;
-
- double denom = ((double) CLOCKS_PER_SEC) / 1000.0;
-
- double diffms = diffticks / denom;
-
- ms += diffms;
- ++entries;
-
-}
-
-void ProcessingTimeStats::dump(void) {
- // Dumps stats.
-
- double avgms = ms / (double) entries;
-
- std::cout << std::endl << "Final timing stats for "
- << hdr.c_str() << std::endl;
- std::cout << "Entries " << entries << std::endl;
- std::cout << "Total ms " << ms << std::endl;
- std::cout << "Avg ms " << avgms << std::endl << std::endl;
-}
diff --git a/Utility/constants.cpp b/Utility/constants.cpp
deleted file mode 100644
index 4039ba0..0000000
--- a/Utility/constants.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-// ****************************************************************************
-// NOTICE
-//
-// This work was produced for the U.S. Government under Contract 693KA8-22-C-00001
-// and is subject to Federal Aviation Administration Acquisition Management System
-// Clause 3.5-13, Rights In Data-General, Alt. III and Alt. IV (Oct. 1996).
-//
-// The contents of this document reflect the views of the author and The MITRE
-// Corporation and do not necessarily reflect the views of the Federal Aviation
-// Administration (FAA) or the Department of Transportation (DOT). Neither the FAA
-// nor the DOT makes any warranty or guarantee, expressed or implied, concerning
-// the content or accuracy of these views.
-//
-// For further information, please contact The MITRE Corporation, Contracts Management
-// Office, 7515 Colshire Drive, McLean, VA 22102-7539, (703) 983-6000.
-//
-// 2022 The MITRE Corporation. All Rights Reserved.
-// ****************************************************************************
-
-#include "utility/constants.h"
-
-const double aaesim::constants::BARO_ALT_ERR_GRAD[aaesim::constants::BARO_ALT_ERR_STEPS] = {
- 0, 0.036295, 0.088049, 0.088403, 0.088811, 0.091698, 0.089787, 0.092764, 0.093378, 0.091659,
- 0.094773, 0.093182, 0.091675, 0.092585, 0.082016, 0.074051, 0.061977, 0.054609, 0.051689, 0.024394,
- 0.014118, 0.011854, 0.009689, 0.001995, -0.005435, -0.012609, -0.017776, -0.017529, -0.017215, -0.018567,
- -0.016385, -0.015868, -0.015283, -0.016331, -0.013906, -0.016481, -0.01393, -0.012989, -0.015292, -0.014196,
- -0.014663, -0.013415, -0.012093, -0.012311, -0.012438, -0.012473, -0.012417, -0.010695, -0.013585, -0.010139,
- -0.011266, -0.012276, -0.010129, -0.010933, -0.010119, -0.009208, -0.009687, -0.008573, -0.008829, -0.008967,
- -0.007541, -0.007453, -0.005816, -0.005499, -0.003646, -0.004502, -0.00382, -0.003016, -0.002087, -0.002401,
- -0.001211, -0.001244, 0.000209, -0.000867, 0.000862, 0.001413, 0.000815, 0.001679, 0.002696, 0.003867,
- 0.003933, 0.004175, 0.004596, 0.005196, 0.004756, 0.005728, 0.006883, 0.007034, 0.007392, 0.009127,
- 0.009894, 0.009722, 0.00865, 0.007839, 0.006182, 0.004814, 0.001584, -0.000241, -0.002793, -0.005003,
- -0.006873, -0.00741, -0.007637, -0.008523, -0.009072, -0.009283, -0.011019, -0.010527, -0.010601, -0.011201,
- -0.011407, -0.012087, -0.011487, -0.012179, -0.01075, -0.012206, -0.012345, -0.011201, -0.011952, -0.010613,
- -0.011066};
-
-const double aaesim::constants::BARO_ALT_ERR_ALTITUDES[aaesim::constants::BARO_ALT_ERR_STEPS] = {
- 0, 4762.888, 4908.52, 5054.808, 5201.752, 5349.024, 5497.28, 5645.864, 5795.104, 5945.328,
- 6095.88, 6247.416, 6399.936, 6553.112, 6708.584, 6866.024, 7026.088, 7188.12, 7351.464, 7520.056,
- 7691.272, 7863.8, 8037.64, 8213.776, 8392.208, 8572.936, 8755.632, 8939.312, 9123.976, 9309.952,
- 9496.584, 9684.2, 9872.8, 10062.712, 10253.28, 10445.488, 10638.352, 10832.2, 11027.688, 11224.16,
- 11421.944, 11620.712, 11820.464, 12021.528, 12223.904, 12427.592, 12632.592, 12838.576, 13046.528, 13255.136,
- 13465.384, 13677.272, 13890.144, 14104.656, 14320.48, 14537.616, 14756.392, 14976.48, 15198.208, 15421.576,
- 15646.256, 15872.576, 16100.208, 16329.48, 16560.064, 16792.616, 17026.808, 17262.64, 17500.112, 17739.552,
- 17980.632, 18223.68, 18468.368, 18715.352, 18963.976, 19214.568, 19467.456, 19722.312, 19979.136, 20237.928,
- 20499.016, 20762.4, 21028.08, 21296.056, 21566.656, 21839.552, 22114.744, 22392.56, 22673, 22955.736,
- 23241.096, 23529.408, 23821, 24115.872, 24414.352, 24716.44, 25022.792, 25333.08, 25647.632, 25966.448,
- 26289.528, 26616.544, 26947.496, 27282.712, 27622.192, 27965.936, 28314.6, 28667.528, 29025.048, 29387.488,
- 29754.848, 30127.456, 30504.984, 30888.088, 31276.112, 31670.368, 32070.528, 32476.264, 32888.56, 33306.76,
- 33731.848};
-
-const double aaesim::constants::BARO_ALT_ERROR[aaesim::constants::BARO_ALT_ERR_STEPS] = {
- 0, 172.86788, 185.69067, 198.623017, 211.673242, 225.177802, 238.489295, 252.272478, 266.208244,
- 279.977651, 294.245917, 308.366412, 322.348685, 336.53044, 349.281572, 360.940138, 370.860393, 379.70877,
- 388.1519, 392.2646, 394.681905, 396.727044, 398.411465, 398.762828, 397.793027, 395.514178, 392.266631,
- 389.046983, 385.868072, 382.414997, 379.357122, 376.380069, 373.497746, 370.396335, 367.746325, 364.578491,
- 361.891919, 359.37402, 356.384526, 353.595503, 350.695363, 348.028884, 345.613193, 343.137807, 340.620633,
- 338.079965, 335.534527, 333.331456, 330.506333, 328.391189, 326.022527, 323.42132, 321.265055, 318.919714,
- 316.735824, 314.736451, 312.61723, 310.73038, 308.772719, 306.769701, 305.075414, 303.388628, 302.064797,
- 300.804093, 299.963429, 298.916493, 298.021768, 297.310559, 296.815036, 296.240255, 295.948198, 295.645798,
- 295.696989, 295.482746, 295.697107, 296.051235, 296.257456, 296.685305, 297.377579, 298.378389, 299.405209,
- 300.504947, 301.72599, 303.118281, 304.405386, 305.968561, 307.862834, 309.817077, 311.8901, 314.470738,
- 317.293949, 320.096912, 322.619134, 324.930569, 326.77574, 328.229859, 328.714974, 328.640115, 327.761446,
- 326.166437, 323.946038, 321.522869, 318.995429, 316.13831, 313.058432, 309.867301, 306.025266, 302.30982,
- 298.519911, 294.460278, 290.269816, 285.765962, 281.429143, 276.763209, 272.591951, 267.779643, 262.839632,
- 258.294975, 253.367165, 248.928873, 244.224815};
diff --git a/Utility/getRealTime.c b/Utility/getRealTime.c
deleted file mode 100644
index ed44ec9..0000000
--- a/Utility/getRealTime.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Author: David Robert Nadeau
- * Site: http://NadeauSoftware.com/
- * License: Creative Commons Attribution 3.0 Unported License
- * http://creativecommons.org/licenses/by/3.0/deed.en_US
- */
-
-#if defined(_WIN32)
-#include
-
-#elif defined(__unix__) || defined(__unix) || defined(unix) || (defined(__APPLE__) && defined(__MACH__))
-#include /* POSIX flags */
-#include /* clock_gettime(), time() */
-#include /* gethrtime(), gettimeofday() */
-
-#if defined(__MACH__) && defined(__APPLE__)
-#include
-#include
-#endif
-
-#else
-#error "Unable to define getRealTime( ) for an unknown OS."
-#endif
-
-
-/**
- * Returns the real time, in seconds, or -1.0 if an error occurred.
- *
- * Time is measured since an arbitrary and OS-dependent start time.
- * The returned real time is only useful for computing an elapsed time
- * between two calls to this function.
- */
-double getRealTime() {
-#if defined(_WIN32)
- FILETIME tm;
- ULONGLONG t;
-#if defined(NTDDI_WIN8) && NTDDI_VERSION >= NTDDI_WIN8
- /* Windows 8, Windows Server 2012 and later. ---------------- */
- GetSystemTimePreciseAsFileTime( &tm );
-#else
- /* Windows 2000 and later. ---------------------------------- */
- GetSystemTimeAsFileTime( &tm );
-#endif
- t = ((ULONGLONG)tm.dwHighDateTime << 32) | (ULONGLONG)tm.dwLowDateTime;
- return (double)t / 10000000.0;
-
-#elif (defined(__hpux) || defined(hpux)) || ((defined(__sun__) || defined(__sun) || defined(sun)) && (defined(__SVR4) || defined(__svr4__)))
- /* HP-UX, Solaris. ------------------------------------------ */
- return (double)gethrtime( ) / 1000000000.0;
-
-#elif defined(__MACH__) && defined(__APPLE__)
- /* OSX. ----------------------------------------------------- */
- static double timeConvert = 0.0;
- if ( timeConvert == 0.0 )
- {
- mach_timebase_info_data_t timeBase;
- (void)mach_timebase_info( &timeBase );
- timeConvert = (double)timeBase.numer /
- (double)timeBase.denom /
- 1000000000.0;
- }
- return (double)mach_absolute_time( ) * timeConvert;
-
-#elif defined(_POSIX_VERSION)
- /* POSIX. --------------------------------------------------- */
-#if defined(_POSIX_TIMERS) && (_POSIX_TIMERS > 0)
- {
- struct timespec ts;
-#if defined(CLOCK_MONOTONIC_PRECISE)
- /* BSD. --------------------------------------------- */
- const clockid_t id = CLOCK_MONOTONIC_PRECISE;
-#elif defined(CLOCK_MONOTONIC_RAW)
- /* Linux. ------------------------------------------- */
- const clockid_t id = CLOCK_MONOTONIC_RAW;
-#elif defined(CLOCK_HIGHRES)
- /* Solaris. ----------------------------------------- */
- const clockid_t id = CLOCK_HIGHRES;
-#elif defined(CLOCK_MONOTONIC)
- /* AIX, BSD, Linux, POSIX, Solaris. ----------------- */
- const clockid_t id = CLOCK_MONOTONIC;
-#elif defined(CLOCK_REALTIME)
- /* AIX, BSD, HP-UX, Linux, POSIX. ------------------- */
- const clockid_t id = CLOCK_REALTIME;
-#else
- const clockid_t id = (clockid_t)-1; /* Unknown. */
-#endif /* CLOCK_* */
- if ( id != (clockid_t)-1 && clock_gettime( id, &ts ) != -1 )
- return (double)ts.tv_sec +
- (double)ts.tv_nsec / 1000000000.0;
- /* Fall thru. */
- }
-#endif /* _POSIX_TIMERS */
-
- /* AIX, BSD, Cygwin, HP-UX, Linux, OSX, POSIX, Solaris. ----- */
- struct timeval tm;
- gettimeofday( &tm, NULL );
- return (double)tm.tv_sec + (double)tm.tv_usec / 1000000.0;
-#else
- return -1.0; /* Failed. */
-#endif
-}
-
diff --git a/configure b/configure
deleted file mode 100644
index 1d1cd5e..0000000
--- a/configure
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-# Install FMACM custom dependencies
-
-# log4cplus (from git zip file)
-wget --no-check-certificate https://github.com/log4cplus/log4cplus/releases/download/REL_1_2_1/log4cplus-1.2.1.zip
-unzip log4cplus-1.2.1.zip
-cd log4cplus-1.2.1
-./configure; make; sudo make install
-cd ..
-
diff --git a/dev-notes.md b/dev-notes.md
deleted file mode 100644
index 65c36b2..0000000
--- a/dev-notes.md
+++ /dev/null
@@ -1,113 +0,0 @@
-# Developer Notes
-
-This document is expected to be maintained by developers. All content is for developers & assumes knowledge of the basics. Each folder in this repo contains its own `dev-notes.md` document. Each document contains content specific to the directory it resides in.
-
-## Behavior Expectations
-
-If you are here, you are a professional developer who is expected to know, understand, and abide by the following while working on `AAESim`:
-
-* The `main` branch represents the most recent, valid work.
-* We use pull requests with team reviewers for changes to `main`.
- * Pull requests with failing tests are not allowed to be merged. All tests must pass prior to merging a PR.
- * All developers are empowered to participate in open PRs and provide critical feedback.
-* We develop code using [SOLID principles](https://www.baeldung.com/solid-principles) as applied [to C++](https://platis.solutions/blog/2020/06/22/how-to-write-solid-cpp/).
-* In this code base, a C++ `struct` is used to define interface behaviors and interactions between objects. Always seek to write code using a `struct` and an extension from that `struct`.
-* We include as few external dependencies as possible and we include _no_ system dependencies other than the standard library.
- * All dependencies must be defined in the build system and available from a URL.
-* We use the C++ standard library extensively for looping, sorting, mapping, &c. Learn it & love it.
-* We include small unit tests as we write new code (test driven development)
- * Small tests produce code coverage results [on bamboo](https://pandafood.mitre.org/browse/AAES-UNIT2/latest/artifact).
-* We include large regression tests as needed for large scale health checks.
- * Large tests produce pass/fail metrics per scenario and per data column in the tested output files.
-* We use [statistical regression](https://pandafood.mitre.org/browse/AAES-SR2) to track the statistical behavior of the simulation over time.
-* We use `pre-commit` to check code quality during every commit operation. The one-time setup requires you to run this:
-
-```bash
-source .scripts/bootstrap.sh
-```
-
-## Libraries
-
-`AAESim` is a binary composed of multiple libraries. Virtually all of the code for the binary is contained in the libraries, so understanding each one is important as well as their relationships to each other. Here's a [mermaid](https://mermaid.js.org/) diagram that shows the dependency mapping (looks best in a rendered view).
-
-```mermaid
-flowchart TD
- Public(libpublic)-->Loader(libloader)
- BADA(libbada)-->Public(libpublic)
- IntervalManagement(libimalgs)-->Public(libpublic)
- Avionic(libavionics)-->BADA(libbada)
- Weather(libweather)-->Public(libpublic)
- Simulation(libsimulation)-->Avionic(libavionics) & IntervalManagement(libimalgs) & Weather(libweather)
- FMACM-->Public(libpublic)
- AAESim-->Simulation(libsimulation)
-```
-
-The diagram above is read like this:
-
-* Library `libloader` is a base module that all others depend upon. Read more [here](./Loader/dev-notes.md).
-* Library `libpublic` depends upon `libloader`. Read more [here](./Public/dev-notes.md).
-* Library `libbada` depends upon `libpublic` to build. Read more [here](./Bada/dev-notes.md).
-* Library `libimalgs` depends upon `libpublic` to build. Read more [here](./IntervalManagement/dev-notes.md).
-* Library `libweather` depends upon `libpublic` to build. Read more [here](./Weather/dev-notes.md).
-* Library `libavionics` depends upon `libbada` to build. Read more [here](./Avionics/dev-notes.md).
-* Library `libsimulation` depends upon `libavionics` & `libimalgs` to build. Read more [here](./AAESim/dev-notes.md).
-* `FMACM` is a binary that links against the library `libpublic`.
-* `AAESim` is a binary that links every library offered.
-
-> NOTE: Be careful that your `#include` statements do not break this dependency map.
-
-You can also use `cmake` to generate the build-time dependency map. From the build directory, run (on linux):
-
-```bash
-cmake --graphviz=aaesim_dependency_map.dot ..
-dot -Tpng aaesim_dependency_map.dot -o aaesim_dependency_map.png
-display aaesim_dependency_map.ps
-```
-
-[CMakeGraphVizOptions.cmake](./CMakeGraphVizOptions.cmake) is being used to control the graphviz options.
-
-## AAESim
-
-`AAESim` is a binary, which in C++ means it has a `main(int argc, char *argv[])` entry point as [defined here](./AAESim/main.cpp).
-
-## FMACM
-
-`FMACM` is a binary, which in C++ means it has a `main(int argc, char *argv[])` entry point as [defined here](./AircraftDynamicsTestFramework/fmacm.cpp).
-
-`FMACM` is also entirely open-source, which means its own code and all dependencies are published openly. See [github/fmacm](https://mitre.github.io/FMACM) for more information. The FMACM software is also documented in RTCA DO-361A, Appendix G.
-
-## Testing
-
-Small, fast tests are developed and maintained in the [unittest folder](./unittest/dev-notes.md). These tests are also run by Bamboo [here](https://pandafood.mitre.org/browse/AAES-UNIT2).
-
-Large, slow tests are developed and maintained in the [regression folder](./regression/dev-notes.md). These tests are also run by Bamboo [here](https://pandafood.mitre.org/browse/AAES-REG2).
-
-## Dependencies
-
-External dependencies must be defined as [CPM modules](https://github.com/cpm-cmake/CPM.cmake). Try to avoid system libraries if at all possible. And dependencies should be declared only at the library level needed.
-
-* Scoped Dependency Example: the [wind library](./AAESim/CMakeLists.txt) is only declared as a dependency in the simulation library.
-* Global Dependency Example: the [scientific units library](./CMakeLists.txt) is declared as a global dependency.
-
-## Build on Mac
-
-> BLUF: AAESim does not officially support research on Apple operating systems/hardware. But since you are a developer...
->
-> * Yes, apple silicon is supported for dev workflows.
-> * No, aaesim results have not been validated on arm64.
-
-To enable this workflow, use `brew` to install [eccodes](https://formulae.brew.sh/formula/eccodes). Optionally, you can also compile with [gcc](https://formulae.brew.sh/formula/gcc@8) (version 8.5 or greater is required).
-
-To run tests, make sure test data have also been installed.
-
-* [wind data](https://mustache.mitre.org/projects/AAES/repos/regression_input_data/browse)
-* [bada data](https://mustache.mitre.org/projects/AAES/repos/bada-data/browse)
-
-Then, try this:
-
-```bash
-cmake -S. -Bbuild -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS:BOOL=FALSE
-cmake --build build --target FMACM aaesim run_tests
-```
-
-And notice also that we are validating the ability to build on MacOs using this [unittest plan on Bamboo](https://pandafood.mitre.org/browse/AAES-UNIT2). Please try to maintain this developer workflow by writing code that cross-compiles!
diff --git a/docs/README.md b/docs/README.md
index 0a5f763..680e25c 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,8 +1,6 @@
-[](https://travis-ci.org/mitre/FMACM)
-[](https://codecov.io/gh/mitre/fmacm)
+# FMACM
-# NOTICE
-This is the copyright work of The MITRE Corporation, and was produced
+> This is the copyright work of The MITRE Corporation, and was produced
for the U. S. Government under Contract Number DTFAWA-10-C-00080, and
is subject to Federal Aviation Administration Acquisition Management
System Clause 3.5-13, Rights In Data-General, Alt. III and Alt. IV
@@ -11,93 +9,85 @@ Government, or to those acting on behalf of the U. S. Government,
under that Clause is authorized without the express written
permission of The MITRE Corporation. For further information, please
contact The MITRE Corporation, Contracts Office, 7515 Colshire Drive,
-McLean, VA 22102-7539, (703) 983-6000.
+McLean, VA 22102-7539, (703) 983-6000.
+>
+> Copyright 2020 The MITRE Corporation. All Rights Reserved.
+> Approved for Public Release; Distribution Unlimited. 15-1482
-Copyright 2020 The MITRE Corporation. All Rights Reserved.
-Approved for Public Release; Distribution Unlimited. 15-1482
+This project contains content developed by The MITRE Corporation. If this code is used in a deployment or embedded within another project, it is requested that you send an email to [opensource@mitre.org](mailto:opensource@mitre.org) in order to let us know where this software is being used.
-This project contains content developed by The MITRE Corporation. If this code is used in a deployment or embedded within another project, it is requested that you send an email to opensource@mitre.org in order to let us know where this software is being used.
+
+
+
+
+
+
+
+
+## Licensing
-# Licensing
[Apache 2.0](https://github.com/mitre/FMACM/blob/master/LICENSE)
-# Documentation
-Documentation is provided via two publications:
-- Model [technical documentation](https://www.mitre.org/publications/technical-papers/derivation-of-a-point-mass-aircraft-model-used-for-fast-time) in form of a paper available from MITRE
-- Official [RTCA SC-186](http://www.rtca.org/content.asp?pl=108&sl=33&contentid=88) documentation. In particular see DO-328B and DO-361A. Please contact RTCA for more information.
+## Documentation
-# Licensing questions
-Any questions related to MITRE Open Source technologies may be emailed to opensource@mitre.org
+1. [Technical documentation](https://www.mitre.org/publications/technical-papers/derivation-of-a-point-mass-aircraft-model-used-for-fast-time) that shows the models and their derivations is provided by MITRE.
+2. Official [RTCA](https://www.rtca.org) standards documentation is available in DO-328B and DO-361A. Please contact [RTCA](https://www.rtca.org) for more information.
-# Developer Notice
+## Licensing questions
-### EUROCONTROL BADA Development Necessary
-This code uses [EUROCONTROL's BADA](https://eurocontrol.int/services/bada) for aircraft performance data that drive the aircraft dynamics modeling. However, BADA functionality and code cannot be provided due to licensing restrictions imposed by EUROCONTROL. Therefore, stub classes exist in this code repository that represent MITRE's suggested implementation in order to use this software. See /include/aaesim/Bada.h and BadaWithCalc.h. Please complete an implementation of these classes before using the code.
+Any questions related to MITRE Open Source technologies may be emailed to [opensource@mitre.org](mailto:opensource@mitre.org).
-### Log4Cplus Dependency
-Log4Cplus is a logging application used by this code base. It needs to be installed prior to building this code. You can download it from [their GitHub repo](https://github.com/log4cplus/log4cplus).
+## Developer Notes
+
+### Aircraft Performance
+
+This code needs aircraft performance data in order to propogate the dynamics models. [EUROCONTROL's BADA v3](https://eurocontrol.int/services/bada) as an example of one such data set and is what MITRE uses internally with this simulation. Our BADA functionality and code cannot be publicly released due to licensing restrictions. You should provide your own implementation by extending [include/public/FixedMassAircraftPerformance.h](../include/public/FixedMassAircraftPerformance.h). We recommend doing this in a fully separate library and then linking that into this code base.
### Continuous Integration & Testing
-To view a successful build and any public-facing tests, please also refer to the [Travis-CI job](https://travis-ci.org/mitre/FMACM) that is always building and testing this repo's master branch.
+
+This code base is heavily tested internally. Publicly, we test using GitHub Actions. See the [ci.yml](../.github/workflows/ci.yml) for details.
### Compile
-No attempt has been made to ensure that this code will compile on all operating systems. This code compiles successfully on Linux machines, specifically [CentOs](https://www.centos.org/) 7 using gcc 4.8.5. For all other computing environments, YMMV.
-The [CMake](https://cmake.org/) utility is used to compile this code. If not already installed on the target environment, it is easily installed via `apt`. Please use version 3.0+. From the root directory, execute:
+No attempt has been made to ensure that this code will compile and run properly on all operating systems. Review the [ci.yml](../.github/workflows/ci.yml) to explore what configurations we choose to test. We build like this:
-```
->> mkdir build
->> cd build
->> cmake ..
->> make
+```bash
+cmake -G Ninja -S . -B build
+cmake --build build --target FMACM
```
-The resulting executable will be found in /bin and is named `FMACM`.
+The resulting executable will be `/bin/FMACM`.
### Run Unit Tests
-Unit tests can be run via the CMake infrastructure.
+Unit tests can be run via the CMake infrastructure.
Assuming the software already compiles:
-```
->> cd build
->> make run
-```
-
-### Run
-A configuration file must be provided as the only command-line argument to the FMACM program. The file must be formatted as plain text and contain paths to each scenario that is to be run. The contents of the configuration file must look like this:
+```bash
+cmake --build build --target run_public_test run_fmacm_test
```
-# number of scenarios to run
-2
-# path to each scenario file, one per line, as many as the number above indicates
-path/to/scenario.txt
-path/to/scenario2.txt
-```
+### Run
-Users may list as many scenario files as desired. The scenario file provides detailed instructions about the scenario that FMACM is to run. An example configuration and scenario file is provided in ```./Run_Files/```.
+Run from the terminal. Or compile the libraries here into a larger code base for richer access.
-The executable is then executed in this manner:
-```
-./bin/FMACM configuration.txt
-```
+The [main entry point](../AircraftDynamicsTestFramework/fmacm.cpp) provides:
-Output is found in the run-time directory.
+- `--version`: report the build version;
+- `--buildinfo`: report the build environment;
+- a single positional argument is used to provide a configuration file.
-### Inputs
+The above command line arguments may not be combined.
+Use them one at a time.
-The format of the [horizontal flight path](../Run_Files/FimAcTv-P~W_JET_HFP.csv) input file has changed since the last release. There is a new script to convert any files you may have in the old format:
-```
-./.python/convert_pre_april_2020_hfp_files.py
-```
+A configuration file must be provided to run a simulation.
+The file must be formatted as plain text and contain paths to each scenario that is to be run.
+An example is provided: [configuration example](../Run_Files/test-framework-configuration.txt).
-Navigate to the directory that you want your nex file to be generated in:
-```
-cd Run_Files/
-```
+The executable is then executed:
-Run the script with the path to the file you wish to convert, and the desired output filename as command line arguments:
+```bash
+./bin/FMACM test-framework-configuration.txt
```
-../.python/convert_pre_april_2020_hfp_files.py path/to/input.csv output_filename
-```
+Output is found in the run-time directory in the form of CSV files.
diff --git a/include/cppmanifest/.gitignore b/include/cppmanifest/.gitignore
deleted file mode 100644
index 424c745..0000000
--- a/include/cppmanifest/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.h
diff --git a/include/cppmanifest/build_info.h b/include/cppmanifest/build_info.h
new file mode 100644
index 0000000..ef99c44
--- /dev/null
+++ b/include/cppmanifest/build_info.h
@@ -0,0 +1,53 @@
+// THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
+// DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#if !defined(aaesim_CPPMANIFEST_BUILDINFO_H)
+#define aaesim_CPPMANIFEST_BUILDINFO_H
+
+#if defined(aaesim_CPPMANIFEST_HAVE_PRAGMA_ONCE)
+#pragma once
+#endif
+
+#include
+#include
+
+#define CPPMANIFEST_MAKE_STR(input) #input
+
+// if suffix is empty, this will end with a hyphen. That will be removed at run-time
+#define CPPMANIFEST_MAKE_VERSION_STR(major, minor, point, suffix) #major "." #minor "." #point "-" #suffix
+
+//! This is CPPMANIFEST user name as a string.
+#define aaesim_CPPMANIFEST_USERNAME_STR CPPMANIFEST_MAKE_STR(sbowman)
+
+//! This is the build timestamp
+#define aaesim_CPPMANIFEST_BUILDTIMESTAMP_STR CPPMANIFEST_MAKE_STR(2025 / 10 / 29 - 12 : 47 : 21)
+
+//! This is the gcc version
+#define aaesim_CPPMANIFEST_BUILD_C_VERSION_STR CPPMANIFEST_MAKE_STR(17.0.0.17000319)
+#define aaesim_CPPMANIFEST_BUILD_CXX_VERSION_STR CPPMANIFEST_MAKE_STR(17.0.0.17000319)
+
+//! Build system info
+#define aaesim_CPPMANIFEST_BUILDSYSTEMNAME_STR CPPMANIFEST_MAKE_STR(Darwin)
+#define aaesim_CPPMANIFEST_BUILDSYSTEMVERSION_STR CPPMANIFEST_MAKE_STR(24.6.0)
+#define aaesim_CPPMANIFEST_BUILDSYSTEMPROCESSOR_STR CPPMANIFEST_MAKE_STR(arm64)
+#define aaesim_CPPMANIFEST_BUILDHOSTNAME_STR CPPMANIFEST_MAKE_STR(MM292068 - PC)
+
+//! Git SCM info
+#define aaesim_CPPMANIFEST_GIT_BRANCH CPPMANIFEST_MAKE_STR(refs / heads / feat / update - to - v5.2.0)
+#define aaesim_CPPMANIFEST_GIT_HASH CPPMANIFEST_MAKE_STR(17478c485d0241c046f655f55bb3f4ce8aad5155)
+#define aaesim_CPPMANIFEST_GIT_TAG CPPMANIFEST_MAKE_STR()
+#define aaesim_CPPMANIFEST_GIT_LOCAL_CHANGES CPPMANIFEST_MAKE_STR(CLEAN)
+
+//! This is CPPMANIFEST version number as a string.
+//! Do not wrap the suffix in quotes, but it may be left empty for a release
+#define aaesim_CPPMANIFEST_VERSION_STR CPPMANIFEST_MAKE_VERSION_STR(5, 2, 0, 0)
+
+#endif
diff --git a/include/cppmanifest/cppmanifest.h b/include/cppmanifest/cppmanifest.h
new file mode 100644
index 0000000..26e0719
--- /dev/null
+++ b/include/cppmanifest/cppmanifest.h
@@ -0,0 +1,98 @@
+// THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
+// DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+/*
+ * This is just an aggregator header file.
+ */
+
+#if !defined(aaesim_CPPMANIFEST_H)
+#define aaesim_CPPMANIFEST_H
+
+#if defined(aaesim_CPPMANIFEST_HAVE_PRAGMA_ONCE)
+#pragma once
+#endif
+
+#include "build_info.h"
+
+namespace aaesim {
+namespace cppmanifest {
+static std::string BUILDINFO_CLI_FLAG = "--buildinfo";
+static std::string CLEAN_STR = "CLEAN";
+static std::string DIRTY_STR = "DIRTY";
+
+static std::string GetUserName() { return aaesim_CPPMANIFEST_USERNAME_STR; }
+
+static std::string GetBuildTimeStamp() { return aaesim_CPPMANIFEST_BUILDTIMESTAMP_STR; }
+
+static std::string GetBuildCompilerVersion() { return aaesim_CPPMANIFEST_BUILD_CXX_VERSION_STR; }
+
+static std::string GetBuildSystemVersion() { return aaesim_CPPMANIFEST_BUILDSYSTEMVERSION_STR; }
+
+static std::string GetBuildSystemName() { return aaesim_CPPMANIFEST_BUILDSYSTEMNAME_STR; }
+
+static std::string GetBuildSystemProcessor() { return aaesim_CPPMANIFEST_BUILDSYSTEMPROCESSOR_STR; }
+
+static std::string GetBuildHostName() { return aaesim_CPPMANIFEST_BUILDHOSTNAME_STR; }
+
+static std::string GetGitBranch() { return aaesim_CPPMANIFEST_GIT_BRANCH; }
+
+static std::string GetGitHash() { return aaesim_CPPMANIFEST_GIT_HASH; }
+
+static std::string GetGitTag() { return aaesim_CPPMANIFEST_GIT_TAG; }
+
+static bool GetGitIsClean() {
+ if (CLEAN_STR.compare(aaesim_CPPMANIFEST_GIT_LOCAL_CHANGES) == 0)
+ return 1;
+ else
+ return 0;
+}
+
+static std::string GetVersion() {
+ std::string version_str(aaesim_CPPMANIFEST_VERSION_STR);
+ bool stripLastChar = version_str.find("-") == version_str.length() - 1;
+ if (stripLastChar) {
+ // dump the last char
+ version_str.resize(version_str.find("-"));
+ }
+ return version_str;
+}
+
+static void PrintMetaData() {
+ std::cout << "Build version: " << GetVersion() << std::endl;
+ std::cout << "Created-by: " << GetUserName() << std::endl;
+ std::cout << "Created-on: " << GetBuildTimeStamp() << std::endl;
+ std::cout << "Built with GCC version: " << GetBuildCompilerVersion() << std::endl;
+ std::cout << "Built on system name: " << GetBuildSystemName() << std::endl;
+ std::cout << "Built on system processor: " << GetBuildSystemProcessor() << std::endl;
+ std::cout << "Built with system ver: " << GetBuildSystemVersion() << std::endl;
+ std::cout << "Built on system hostname: " << GetBuildHostName() << std::endl;
+ std::cout << "Built from git branch: " << GetGitBranch() << std::endl;
+ if (GetGitIsClean())
+ std::cout << "Built from git hash: " << GetGitHash() << std::endl;
+ else
+ std::cout << "Built from git hash: " << GetGitHash() << "-" << DIRTY_STR << std::endl;
+}
+
+static void ProcessCommandLineArgs(int argc, char *argv[]) {
+ for (auto i = 0; i < argc; ++i) {
+ if (BUILDINFO_CLI_FLAG.compare(argv[i]) == 0) {
+ PrintMetaData();
+ break;
+ }
+ }
+}
+} // namespace cppmanifest
+} // namespace aaesim
+
+#endif
+/*
+ * Do not put content below here.
+ */
diff --git a/include/framework/NullAircraftPerformance.h b/include/framework/NullAircraftPerformance.h
index 052da5c..8d25995 100644
--- a/include/framework/NullAircraftPerformance.h
+++ b/include/framework/NullAircraftPerformance.h
@@ -19,10 +19,10 @@
#pragma once
-#include "public/FixedMassAircraftPerformance.h"
-
#include
+#include "public/FixedMassAircraftPerformance.h"
+
namespace fmacm {
class NullAircraftPerformance final : public aaesim::open_source::FixedMassAircraftPerformance {
public:
@@ -38,7 +38,7 @@ class NullAircraftPerformance final : public aaesim::open_source::FixedMassAircr
void GetCurrentDragCoefficients(double &cd0, /** [out] parasitic drag coefficient */
double &cd2, /** [out] induced drag coefficient */
double &gear /** [out] landing gear drag coefficient */
- ) const {
+ ) const override {
throw std::runtime_error("intentionally unimplemented code: please implement BADA v3.7");
}
diff --git a/include/loader/Loadable.h b/include/loader/Loadable.h
index 3f794cd..2ddd725 100644
--- a/include/loader/Loadable.h
+++ b/include/loader/Loadable.h
@@ -19,23 +19,24 @@
#pragma once
-#include
-#include
-#include
+#include
+
#include
#include