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 /R | |
| 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
Diffstat (limited to 'R')
| -rw-r--r-- | R/idframe.R | 1 |
1 files changed, 1 insertions, 0 deletions
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 |