version 1.0.4

cran · Dec 3, 2014 · ba47cfc · ba47cfc
1 parent 99b8f61
commit ba47cfc
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: crqa
 Type: Package
 Title: Cross-Recurrence Quantification Analysis for Categorical and
         Continuous Time-Series
-Version: 1.0.3
+Version: 1.0.4
 Date: 2014-12-03
 Author: Moreno I. Coco and Rick Dale
 Maintainer: Moreno I. Coco <[email protected]>
@@ -14,12 +14,12 @@ Description:
     at the diagonal recurrent points, as well as more
     in-depth measures of the whole cross-recurrence plot,
     e.g., recurrence rate.
-Depends: R (>= 1.8.0), Matrix, tseriesChaos, fields
+Depends: R (>= 3.0.0), Matrix, tseriesChaos, fields
 License: GPL (>= 2)
 Collate: 'CTcrqa.R' 'calcphi.R' 'checkts.R' 'crqa.R' 'drpdfromts.R'
         'optimizeParam.R' 'runcrqa.R' 'simts.R' 'spdiags.R' 'takephi.R'
         'theiler.R' 'tt.R' 'wincrqa.R' 'windowdrp.R'
-Packaged: 2014-03-12 10:53:56 UTC; moreno
+Packaged: 2014-03-17 11:30:57 UTC; root
 NeedsCompilation: yes
 Repository: CRAN
-Date/Publication: 2014-03-12 13:14:14
+Date/Publication: 2014-03-17 12:54:38
diff --git a/MD5 b/MD5
@@ -1,9 +1,9 @@
-c73422ef379866e5043ffa4b7be48f22 *DESCRIPTION
+6d5a3c039a49659684234ddbfca30662 *DESCRIPTION
 1cee7a78a67f9d3c8cd68e9ffc4ade52 *NAMESPACE
 28ae7e1d4c946f1c5b80da067e9d2586 *R/CTcrqa.R
 fd4d3e5903396c9dd00c5d77bb712d2c *R/calcphi.R
 b51bdcb8367be865d0aa541d9a4b3649 *R/checkts.R
-68256e9c8151d9725944f10bc32c8bb9 *R/crqa.R
+341931e900fd6808faac508992e58472 *R/crqa.R
 df7954f7b92ca063bb3bd4fff8f61d2d *R/drpdfromts.R
 fc7bb8a825747019e0e789157d3eb4b3 *R/optimizeParam.R
 dcf5e486656a61ad8de9f92095ff67f2 *R/runcrqa.R
@@ -24,7 +24,7 @@ da138fa547a6838629fe7d5b93ba8e90 *data/crqa.RData
 99f7ac521d1511f667ac9e2d3c3b0456 *man/crqa.Rd
 212ae1a69c55e5fa7968d72a095be035 *man/drpdfromts.Rd
 ef2141e99f7f3f2cff924104b4f7fc8e *man/leftmov.Rd
-9c82d5ab954f947db0e3de804c304401 *man/optimizeParam.Rd
+27dbde773468780efc5ad7ea06d1cf44 *man/optimizeParam.Rd
 6548ea97f5c7480527001f75262cba19 *man/rightmov.Rd
 068ea7765083d3e35a109cd2cd53cc6d *man/runcrqa.Rd
 a02045e8733e9ba46c6d094654cfdb68 *man/simts.Rd

diff --git a/R/crqa.R b/R/crqa.R
@@ -2,6 +2,7 @@
 ## crqa, adapted from a Matlab code developed at
 ## summer school Nonlinear Methods for Psychological Science
 ## organized by the University of Cincinnati, 2012
+## next time i check change sd(matrix) with sapply(matrix, sd)
 
 ## arguments to pass to crqa:
 ## ts1, ts2: times series of integers indicating the states

diff --git a/man/optimizeParam.Rd b/man/optimizeParam.Rd
@@ -103,19 +103,28 @@ optimizeParam(ts1, ts2, par)
 
 \examples{
 
-data(crqa)
+## initialize the parameters
 
 par = list(lgM =  20, steps = seq(1, 6, 1),
 cut.del = seq(1, 40,1), 
-radiusspan = 100, radiussample = 10, 
+radiusspan = 100, radiussample = 40, 
 normalize = 0, rescale = 1, mindiagline = 2, 
 minvertline = 2, tw = 0, whiteline = FALSE, 
 recpt = FALSE)
 
-ans = optimizeParam(leftmov, rightmov, par)
+## generate two random uniform series
+ts1 = runif(100)
+ts2 = runif(100)
 
+ans = optimizeParam(ts1,ts2,par)
 print(ans)
 
+## utilize leftmov, rightmov for an application to real-data
+## reduce radiussample to increase computational speed
+
+## data(crqa)
+## ans = optimizeParam(leftmov, rightmov, par)
+## print(ans)
 
 }