diff options
| author | Suraj Yerramilli | 2016-05-15 12:36:42 +0530 |
|---|---|---|
| committer | Suraj Yerramilli | 2016-05-15 12:36:42 +0530 |
| commit | a41be803ed129181839a8d88811de6b932491fd3 (patch) | |
| tree | 342d319ce725c648ad1d43ce0125745814d67181 | |
| parent | 9af071247246ed6de9e12d3de1923aed43acefbb (diff) | |
| parent | 21554f501f38ab4e6f81384d683f4720c341dc04 (diff) | |
| download | SysID-R-code-a41be803ed129181839a8d88811de6b932491fd3.tar.gz SysID-R-code-a41be803ed129181839a8d88811de6b932491fd3.tar.bz2 SysID-R-code-a41be803ed129181839a8d88811de6b932491fd3.zip | |
removing merge conflicts
Merge branch 'master' of https://github.com/surajy123/R-sysid
Conflicts:
NAMESPACE
R/idframe.R
| -rw-r--r-- | DESCRIPTION | 6 | ||||
| -rw-r--r-- | R/idframe.R | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/DESCRIPTION b/DESCRIPTION index 97bfd31..cc44c17 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -7,9 +7,9 @@ Author: Suraj Yerramilli, Ashwin Raman, Narasimhan Balakrishnan, Arun Tangirala Maintainer: Suraj Yerramilli <surajyerramilli@outlook.com> Description: The sysid package provides functions for constructing mathematical models of dynamic systems from measured input-output data. The package contains - functions for data visualization, data preprocessing, parametric and non- - paramteric model estimation, and model predictions and validation. + functions for data visualization, data pre-processing, parametric and non- + parametric model estimation, and model predictions and validation. License: GPL-3 Imports: - signal,tframe,zoo, ggplot2, reshape2, polynom + signal,tframe, zoo, ggplot2, reshape2, polynom, bitops RoxygenNote: 5.0.1 diff --git a/R/idframe.R b/R/idframe.R index d8ab246..eef9690 100644 --- a/R/idframe.R +++ b/R/idframe.R @@ -141,6 +141,7 @@ deltat.idframe <- function(x){ deltat(x$output) } + #' S3 class constructor for storing frequency response data #' #' @param respData frequency response data. For SISO systems, supply a |