commit0fbf40cc4b95034e0a8fda35ae9c01c6a9f46958parent67059fc085cc432d0485dcbc3b3aca1208ab5fd8Author:eamoncaddigan <eamon.caddigan@gmail.com>Date:Fri, 20 May 2016 14:21:25 -0400 Fixed docs.Diffstat:

M | R/identifyNMAC.R | | | 20 | ++++++++++---------- |

M | man/identifyNMAC.Rd | | | 16 | ++++++++-------- |

2 files changed, 18 insertions(+), 18 deletions(-)diff --git a/R/identifyNMAC.R b/R/identifyNMAC.R@@ -1,16 +1,16 @@ -#' Determine whether an NMAC (near mid air collision) has occurred at each time +#' Determine whether an NMAC (near mid air collision) has occurred at each time #' point. -#' -#' @param trajectory1 A matrix or SpatialPoints object indicating the trajectory -#' of the first aircraft. -#' @param trajectory2 A matrix or SpatialPoints object indicating the trajectory -#' of the second aircraft. -#' @return The logical vector indicating whether NMAC criteria are met at each +#' +#' @param trajectory1 A flighttrajectory object corresponding to the first +#' aircraft. +#' @param trajectory2 A flighttrajectory object corresponding to the second +#' aircraft. +#' @return The logical vector indicating whether NMAC criteria are met at each #' time point. -#' -#' @details NMAC is a cylinder +/- 100 ft above and below the ownship with a +#' +#' @details NMAC is a cylinder +/- 100 ft above and below the ownship with a #' radius of 500 ft. -#' +#' #' @export identifyNMAC <- function(trajectory1, trajectory2) { if (!is.flighttrajectory(trajectory1) || !is.flighttrajectory(trajectory2)) {diff --git a/man/identifyNMAC.Rd b/man/identifyNMAC.Rd@@ -2,28 +2,28 @@ % Please edit documentation in R/identifyNMAC.R \name{identifyNMAC} \alias{identifyNMAC} -\title{Determine whether an NMAC (near mid air collision) has occurred at each time +\title{Determine whether an NMAC (near mid air collision) has occurred at each time point.} \usage{ identifyNMAC(trajectory1, trajectory2) } \arguments{ -\item{trajectory1}{A matrix or SpatialPoints object indicating the trajectory -of the first aircraft.} +\item{trajectory1}{A flighttrajectory object corresponding to the first +aircraft.} -\item{trajectory2}{A matrix or SpatialPoints object indicating the trajectory -of the second aircraft.} +\item{trajectory2}{A flighttrajectory object corresponding to the second +aircraft.} } \value{ -The logical vector indicating whether NMAC criteria are met at each +The logical vector indicating whether NMAC criteria are met at each time point. } \description{ -Determine whether an NMAC (near mid air collision) has occurred at each time +Determine whether an NMAC (near mid air collision) has occurred at each time point. } \details{ -NMAC is a cylinder +/- 100 ft above and below the ownship with a +NMAC is a cylinder +/- 100 ft above and below the ownship with a radius of 500 ft. }