From a20e93df8a7fa8351ac7bf2279838f529261fff2 Mon Sep 17 00:00:00 2001 From: zejiang-unsw <47626771+zejiang-unsw@users.noreply.github.com> Date: Tue, 3 Nov 2020 11:20:00 +1100 Subject: [PATCH] reset par to default --- .DS_Store | Bin 6148 -> 6148 bytes CRAN-RELEASE | 4 ++-- R/data_gen_Chaotic.R | 2 ++ man/data.gen.Rossler.Rd | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.DS_Store b/.DS_Store index eb89572ff366228a385397db8fdf4ce4f4d2e1e2..fefc5c3d4dbc0e64f99975d81694f9c9d5ec8063 100644 GIT binary patch delta 42 wcmZoMXfc@J&&WJ6z#2&ONC+@9!*e4bUZ)WHC%MSpVQVJLV diff --git a/CRAN-RELEASE b/CRAN-RELEASE index db952b0..82dd81c 100644 --- a/CRAN-RELEASE +++ b/CRAN-RELEASE @@ -1,2 +1,2 @@ -This package was submitted to CRAN on 2020-10-20. -Once it is accepted, delete this file and tag the release (commit 41aee5d). +This package was submitted to CRAN on 2020-10-30. +Once it is accepted, delete this file and tag the release (commit bf79c78). diff --git a/R/data_gen_Chaotic.R b/R/data_gen_Chaotic.R index accc210..135a3ab 100755 --- a/R/data_gen_Chaotic.R +++ b/R/data_gen_Chaotic.R @@ -43,12 +43,14 @@ #' ts.r <- data.gen.Rossler(a = 0.1, b = 0.1, w = 8.7, start = c(-2, -10, 0.2), #' time = seq(0, by=0.05, length.out = 10000)) #' +#' oldpar <- par(no.readonly = TRUE) #' par(mfrow=c(1,1), ps=12, cex.lab=1.5) #' plot.ts(cbind(ts.r$x,ts.r$y,ts.r$z), col=c("black","red","blue")) #' #' par(mfrow=c(1,2), ps=12, cex.lab=1.5) #' plot(ts.r$x,ts.r$y, xlab="x",ylab = "y", type = "l") #' plot(ts.r$x,ts.r$z, xlab="x",ylab = "z", type = "l") +#' par(oldpar) data.gen.Rossler <- function(a = 0.2, b = 0.2, w = 5.7, start=c(-2, -10, 0.2), time = seq(0, by=0.05, length.out = 1000), s) { diff --git a/man/data.gen.Rossler.Rd b/man/data.gen.Rossler.Rd index c5c6381..e654079 100644 --- a/man/data.gen.Rossler.Rd +++ b/man/data.gen.Rossler.Rd @@ -62,12 +62,14 @@ Some initial values may lead to an unstable system that will tend to infinity. ts.r <- data.gen.Rossler(a = 0.1, b = 0.1, w = 8.7, start = c(-2, -10, 0.2), time = seq(0, by=0.05, length.out = 10000)) +oldpar <- par(no.readonly = TRUE) par(mfrow=c(1,1), ps=12, cex.lab=1.5) plot.ts(cbind(ts.r$x,ts.r$y,ts.r$z), col=c("black","red","blue")) par(mfrow=c(1,2), ps=12, cex.lab=1.5) plot(ts.r$x,ts.r$y, xlab="x",ylab = "y", type = "l") plot(ts.r$x,ts.r$z, xlab="x",ylab = "z", type = "l") +par(oldpar) } \references{ Rössler, O. E. 1976. An equation for continuous chaos. Physics Letters A, 57, 397-398.