Release

.appveyor.yml

@@ -0,0 +1,18 @@
+image: Visual Studio 2017
+
+platform:
+  - x64
+
+configuration:
+  - Release
+
+before_build:
+  - cd tests
+  - cmake -G "Visual Studio 15 2017 Win64" .
+
+build:
+  project: $(APPVEYOR_BUILD_FOLDER)\tests\$(APPVEYOR_PROJECT_NAME)-tests.sln
+
+test_script:
+  - 'cd %APPVEYOR_BUILD_FOLDER%\tests\bin'
+  - '.\tests.exe'

.clang-format

@@ -4,7 +4,7 @@ IndentWidth: 4
 Language: Cpp
 AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: true
+AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
 AlignEscapedNewlines: DontAlign
 AlignOperands: true

.codecov.yml

@@ -0,0 +1,19 @@
+comment:
+  layout: "reach, diff, flags, files"
+  behavior: default
+  require_changes: false  # if true: only post the comment if coverage changes
+  require_base: no        # [yes :: must have a base report to post]
+  require_head: no        # [yes :: must have a head report to post]
+  branches: null
+coverage:
+  status:
+    project:
+      default:
+        target: auto
+        threshold: null
+        base: pr
+    patch:
+      default:
+        target: auto
+        threshold: null
+        base: pr

.travis.yml

@@ -0,0 +1,65 @@
+language: cpp
+
+matrix:
+  include:
+    - name: "Linux/GCC"
+      os: linux
+      compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-7
+            - lcov
+      env:
+        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
+      script:
+        - cmake -DCoverage=ON .. $GENERATOR
+        - cmake --build .
+        - lcov -q -c -i -d ./gsap -o coverage_base.info
+        - pushd bin
+        - ./tests
+        - popd
+      after_success:
+        # Create lcov report
+        - lcov -q -c -d ./gsap -o coverage_test.info
+        - lcov -q -a coverage_base.info -a coverage_test.info -o coverage.info
+        - lcov -q -r coverage.info '/usr/*' --o coverage.info # filter system-files
+        # Upload to CodeCov
+        - bash <(curl -s https://codecov.io/bash) -f coverage.info
+    - name: "Linux/Clang"
+      os: linux
+      compiler: clang
+      addons:
+        apt:
+          sources:
+            - llvm-toolchain-trusty-5.0
+          packages:
+            - clang-5.0
+      env:
+        - MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
+    - name: "macOS/Clang"
+      os: osx
+      compiler: clang
+      env:
+        - MATRIX_EVAL=""
+    - name: "macOS/Xcode"
+      os: osx
+      env:
+        - MATRIX_EVAL="GENERATOR='-G Xcode'"
+
+before_install:
+    - eval "${MATRIX_EVAL}"
+
+before_script:
+  - pushd tests
+  - mkdir build
+  - pushd build
+
+script:
+  - cmake .. $GENERATOR
+  - cmake --build .
+  - pushd bin
+  - ./tests
+  - popd

CMakeLists.txt

@@ -1,124 +1,126 @@
 cmake_minimum_required(VERSION 2.8)
 
-project(GSAP)
-
-set(CMAKE_BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bin/)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
-
-#	Build option for enabling compiler and linker flags for gathering coverage data
-#	In command line, set option this way:
-#	cmake -DCoverage=ON <build folder>
+# Build option for enabling compiler and linker flags for gathering coverage data
+# In command line, set option this way:
+# cmake -DCoverage=ON <build folder>
 option(Coverage "Coverage" OFF)
 
-if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-	# -g:                Produce debugging information
-	# -O3:               Optimize as much as possible while remaning standards compliant
-	# -O0:               Disable optimizations
-	# -std:              Determine the language standard.
-	# -Wall:             Enables all the warnings about constructions that some users consider questionable
-	# -Wcast-qual:       Warn whenever a pointer is cast so as to remove a type qualifier from the target type
-	# -Werror:           Make all warnings into errors
-	# -Weffc++:          Warn about violations of some guidelines from Scott Meyers' Effective C++ (Note 2016-07-13: Currently removed because it warns about some things that are perfectly safe)
-	# -Wextra:           Enables some extra warning flags that are not enabled by -Wall
-	# -Wfloat-equal:     Warn if floating-point values are used in equality comparisons.
-	# -Wformat:          Check calls to printf and scanf, etc.
-	# -Winline:          Warn if a function that is declared as inline cannot be inlined
-	# -Wold-style-cast:  Warn on C-style casts
-	# -Wpedantic:        Issue all the warnings demanded by strict ISO C and ISO C++
-	# -Wshadow:          Warn whenever a local variable or type declaration shadows another variable, parameter, type, or class member
-	# -Wsign-conversion: Warn for implicit conversions that may change the sign of an integer value
-	# -Wswitch-default:  Warn whenever a switch statement does not have a default case.
-	# -Wno-unknown-pragmas: (2016-07-13) Temporarily added to disable warnings about #pragma unused
-	set(CMAKE_CXX_FLAGS "-std=c++11 -pthread")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstrict-aliasing")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wcast-qual -Wextra -Wfloat-equal")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wold-style-cast -Wpedantic -Wshadow")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-conversion -Wswitch-default -Wno-unknown-pragmas")
-	set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Winline")
-	set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Werror")
-elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
-	# -g:                Produce debugging information
-	# -O3:               Optimize as much as possible while remaning standards compliant
-	# -Og:               Enable optimizations that don't interfere with debugging
-	# -std:              Determine the language standard.
-	# -Wall:             Enables all the warnings about constructions that some users consider questionable
-	# -Wcast-qual:       Warn whenever a pointer is cast so as to remove a type qualifier from the target type
-	# -Werror:           Make all warnings into errors
-	# -Weffc++:          Warn about violations of some guidelines from Scott Meyers' Effective C++ (Note 2016-07-13: Currently removed because it warns about some things that are perfectly safe)
-	# -Wextra:           Enables some extra warning flags that are not enabled by -Wall
-	# -Wfloat-equal:     Warn if floating-point values are used in equality comparisons.
-	# -Wformat:          Check calls to printf and scanf, etc.
-	# -Winline:          Warn if a function that is declared as inline cannot be inlined
-	# -Wold-style-cast:  Warn on C-style casts
-	# -Wpedantic:        Issue all the warnings demanded by strict ISO C and ISO C++
-	# -Wshadow:          Warn whenever a local variable or type declaration shadows another variable, parameter, type, or class member
-	# -Wsign-conversion: Warn for implicit conversions that may change the sign of an integer value
-	# -Wswitch-default:  Warn whenever a switch statement does not have a default case.
-	# -Wno-unknown-pragmas: (2016-07-13) Temporarily added to disable warnings about #pragma unused
-	set(CMAKE_CXX_FLAGS "-std=c++11 -pthread")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstrict-aliasing")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wcast-qual -Wextra -Wfloat-equal")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wold-style-cast -Wpedantic -Wshadow")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-conversion -Wswitch-default -Wno-unknown-pragmas")
-
-if(Coverage)
-    #	If coverage option enabled, set compiler and linker flags to gather coverage data
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
-    set(CMAKE_EXE_LINKER_FLAGS "-lgcov")
-endif()
-
-	set(CMAKE_CXX_FLAGS_DEBUG "-g -Og -Winline")
-	set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Werror")
-elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
-	# /EHsc: Specifies the model of exception handling.
-	# /GL:   Enables whole program optimization.
-	# /Gm:   Enables minimal rebuild.
-	# /GS:   Buffers security check.
-	# /MD:   Creates a multithreaded DLL using MSVCRT.lib.
-	# /MDd:  Creates a debug multithreaded DLL using MSVCRTD.lib.
-	# /O2:   Creates fast code.
-	# /Od:   Disables optimization.
-	# /Oi:   Generates intrinsic functions.
-	# /RTC1: Enables run-time error checking.
-	# /sdl:  Enables additional (Windows-specific) security features and warnings.
-	# /W4:   Sets which warning level to output.
-	# /wd:   Disable warning
-	# /Zi:   Generates complete debugging information.
-	set(CMAKE_CXX_FLAGS "/EHsc /GS /sdl- /W4 /wd\"4996\" /Zi")
-	set(CMAKE_CXX_FLAGS_DEBUG "/Gm /MDd /Od /RTC1")
-	set(CMAKE_CXX_FLAGS_RELEASE "/GL /Gm- /MD /O2 /Oi")
-else()
-	message(FATAL_ERROR "${CMAKE_CXX_COMPILER_ID} is not recognized.")
-endif()
-
 # Check command line to see if OpenMP is to be used.
 option(UseOpenMP "UseOpenMP" FALSE)
 
 # Build with OpenMP if desired, and package can be found.
 if (UseOpenMP)
-	message(STATUS "Attempting to find OpenMP package...")
-	find_package(OpenMP)
-	if (OPENMP_FOUND)
-		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+    message(STATUS "Attempting to find OpenMP package...")
+    find_package(OpenMP)
+    if (OPENMP_FOUND)
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D USING_OPENMP")
-		message(STATUS "Added OpenMP to buildsystem")
-	else()
-		message(FATAL_ERROR "Command line asked for OpenMP, but package couldn't be found!")
-	endif()
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D USING_OPENMP")
+        message(STATUS "Added OpenMP to buildsystem")
+    else()
+        message(FATAL_ERROR "Command line asked for OpenMP, but package couldn't be found!")
+    endif()
 endif()
 
-#Libraries
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/support/)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/framework/)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Test/)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/example/)
+set(HEADERS
+    inc/BenchmarkTimer.h
+    inc/CompositeSavePointProvider.h
+    inc/ConfigMap.h
+    inc/Contracts.h
+    inc/DataPoint.h
+    inc/DataPoints.h
+    inc/DataStore.h
+    inc/Datum.h
+    inc/DynamicArray.h
+    inc/AsyncPrognoser.h
+    inc/AsyncPrognoserBuilder.h
+    inc/Exceptions.h
+    inc/Factory.h
+    inc/GaussianVariable.h
+    inc/ISavePointProvider.h
+    inc/Loading/ConstLoadEstimator.h
+    inc/Loading/LoadEstimator.h
+    inc/Loading/LoadEstimatorFactory.h
+    inc/Loading/MovingAverageLoadEstimator.h
+    inc/Loading/ProfileLoadEstimator.h
+    inc/Matrix.h
+    inc/Messages/IMessageProcessor.h
+    inc/Messages/IMessagePublisher.h
+    inc/Messages/Message.h
+    inc/Messages/MessageBus.h
+    inc/Messages/MessageClock.h
+    inc/Messages/MessageId.h
+    inc/Messages/MessageWatcher.h
+    inc/Messages/ProgEventMessage.h
+    inc/Messages/UDataMessage.h
+    inc/Messages/WaypointMessage.h
+    inc/ModelBasedAsyncPrognoserBuilder.h
+    inc/ModelBasedPrognoser.h
+    inc/Models/BatteryModel.h
+    inc/Models/CentrifugalPumpModel.h
+    inc/Models/CircuitBatteryModel.h
+    inc/Models/PrognosticsModel.h
+    inc/Models/PrognosticsModelFactory.h
+    inc/Observers/AsyncObserver.h
+    inc/Observers/Observer.h
+    inc/Observers/ObserverFactory.h
+    inc/Observers/ParticleFilter.h
+    inc/Observers/UnscentedKalmanFilter.h
+    inc/Predictors/AsyncPredictor.h
+    inc/Predictors/MonteCarloPredictor.h
+    inc/Predictors/Predictor.h
+    inc/Predictors/PredictorFactory.h
+    inc/PContainer.h
+    inc/Point3D.h
+    inc/ProgEvent.h
+    inc/Prognoser.h
+    inc/PrognoserFactory.h
+    inc/Singleton.h
+    inc/StatisticalTools.h
+    inc/StringUtils.h
+    inc/Trajectory/AsyncTrajectoryService.h
+    inc/Trajectory/ITrajectoryCorrelator.h
+    inc/Trajectory/TrajectoryService.h
+    inc/ThreadSafeLog.h
+    inc/UData.h
+    inc/UDataInterfaces.h
+)
+
+set(SRCS
+    src/ConfigMap.cpp
+    src/DataPoint.cpp
+    src/DataPoints.cpp
+    src/AsyncPrognoserBuilder.cpp
+    src/GaussianVariable.cpp
+    src/Loading/ConstLoadEstimator.cpp
+    src/Loading/GaussianLoadEstimator.cpp
+    src/Loading/MovingAverageLoadEstimator.cpp
+    src/Loading/ProfileLoadEstimator.cpp
+    src/Matrix.cpp
+    src/Messages/EmptyMessage.cpp
+    src/Messages/Message.cpp
+    src/Messages/MessageBus.cpp
+    src/Messages/MessageId.cpp
+    src/Messages/WaypointMessage.cpp
+    src/ModelBasedAsyncPrognoserBuilder.cpp
+    src/ModelBasedPrognoser.cpp
+    src/Models/BatteryModel.cpp
+    src/Models/CircuitBatteryModel.cpp
+    src/Models/CentrifugalPumpModel.cpp
+    src/Observers/AsyncObserver.cpp
+    src/Observers/ParticleFilter.cpp
+    src/Observers/UnscentedKalmanFilter.cpp
+    src/PContainer.cpp
+    src/Predictors/AsyncPredictor.cpp
+    src/Predictors/MonteCarloPredictor.cpp
+    src/StatisticalTools.cpp
+    src/ThreadSafeLog.cpp
+    src/Trajectory/AsyncTrajectoryService.cpp
+    src/Trajectory/TrajectoryService.cpp
+    src/UData.cpp
+    src/UDataInterfaces.cpp
+)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/inc/)
+add_library(gsap ${HEADERS} ${SRCS})

README.md

@@ -7,9 +7,13 @@ here](https://github.com/nasa/GSAP/wiki)** </div></font>
 The Generic Software Architecture for Prognostics (GSAP) is a framework for
 applying prognostics. It makes applying prognostics easier by implementing many
 of the common elements across prognostic applications. The standard interface
-enables reuse of prognostic algorithms and models across  using the GSAP
+enables reuse of prognostic algorithms and models across using the GSAP
 framework.
 
+There are two operational modes for GSAP: 'async' and 'simple'. These are both described below:
+* 'async': Asynchronous GSAP. This takes advantage of parallization, including automatic thread management to perform calculations on multiple threads. 
+* 'simple': Simple single-threaded GSAP. Resulting prognostics application is smaller and simplier, but does not take advantage of multi-threading. Ideal for resource constrained hardware. 
+
 ![GSAP Layers](images/Layers.png)
 
 The GSAP framework is used through the creation of communicators, prognosers, or
@@ -19,7 +23,7 @@ described further below:
 
 * **Communicators**:
 
-  Communicators are used to communicate data with the outside world. These
+Communicators are used to communicate data with the outside world. These
 function as interfaces with various data sources and sinks. Some examples could
 be a playback agent that reads from a file, a GUI for displaying prognostic
 results, an automated report generator, or a client that connects into a network
@@ -59,7 +63,7 @@ All contributions are welcome! If you are having problems with the plugin, pleas
 
 ## Notices
 
-Copyright ©2016-2018 United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All Rights Reserved.
+Copyright ©2016, 2019 United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All Rights Reserved.
 
 No Warranty: THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF
 ANY KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED