[Dplr-commits] r699 - in branches/redfit: . R

[noreply at r-forge.r-project.org]

Author: mvkorpel
Date: 2013-10-12 09:34:38 +0200 (Sat, 12 Oct 2013)
New Revision: 699

Modified:
   branches/redfit/DESCRIPTION
   branches/redfit/R/redfit.R
Log:
In redfit.R, added precomputed run test criteria for 16001 <= n <= 20000


Modified: branches/redfit/DESCRIPTION
===================================================================
--- branches/redfit/DESCRIPTION	2013-10-03 07:04:35 UTC (rev 698)
+++ branches/redfit/DESCRIPTION	2013-10-12 07:34:38 UTC (rev 699)
@@ -3,7 +3,7 @@
 Type: Package
 Title: Dendrochronology Program Library in R
 Version: 1.5.7
-Date: 2013-10-03
+Date: 2013-10-12
 Authors at R: c(person(c("Andrew", "G."), "Bunn", role = c("aut", "cph",
         "cre", "trl"), email = "andrew.bunn at wwu.edu"), person("Mikko",
         "Korpela", role = c("aut", "trl")), person("Franco", "Biondi",

Modified: branches/redfit/R/redfit.R
===================================================================
--- branches/redfit/R/redfit.R	2013-10-03 07:04:35 UTC (rev 698)
+++ branches/redfit/R/redfit.R	2013-10-12 07:34:38 UTC (rev 699)
@@ -1027,9 +1027,9 @@
 ##
 runPrecomp <-
     structure(list(list(method = 1,
-                        nMax = 16000,
+                        nMax = 20000,
                         pMin = 0.00999999574400225,
-                        pMax = 0.0100000215448173,
+                        pMax = 0.0100000131426446,
                         diffIdx =
 
                         c(9, 27, 35, 40, 45, 50, 62, 74, 81, 88, 111, 120,
@@ -1048,11 +1048,14 @@
                           9197, 9497, 9649, 10034, 10190, 10269, 10506,
                           10666, 11152, 11650, 11818, 12158, 12330, 12852,
                           13386, 13566, 13657, 13748, 13839, 13930, 14114,
-                          14579, 14767, 14862, 15052, 15147, 15339, 15921)
+                          14579, 14767, 14862, 15052, 15147, 15339, 15921,
+                          16216, 16315, 16614, 17220, 17527, 17630, 17733,
+                          17941, 18149, 18254, 18359, 18464, 18676, 19318,
+                          19643, 19752, 19861)
 
                         ),
                    list(method = 1,
-                        nMax = 16000,
+                        nMax = 20000,
                         pMin = 0.0199999755461175,
                         pMax = 0.0200000250214551,
                         diffIdx =
@@ -1070,13 +1073,14 @@
                           9108, 9523, 9691, 9776, 9861, 10033, 10468, 11002,
                           11093, 11366, 11550, 11829, 12589, 12880, 13472,
                           13672, 13773, 13874, 13975, 14179, 14282, 14385,
-                          14488, 14696, 15221, 15756)
+                          14488, 14696, 15221, 15756, 16521, 16854, 17078,
+                          17530, 17873, 18220, 19041, 19160, 19279)
 
                         ),
                    list(method = 1,
-                        nMax = 16000,
+                        nMax = 20000,
                         pMin = 0.0499999631908032,
-                        pMax = 0.05000007522193,
+                        pMax = 0.050000015182738,
                         diffIdx =
 
                         c(18, 45, 68, 95, 139, 191, 268, 302, 397, 439, 552,
@@ -1085,19 +1089,20 @@
                           4004, 4134, 4333, 4816, 4887, 5031, 5550, 6095,
                           6500, 6749, 7613, 8624, 8719, 9202, 10414, 10941,
                           11048, 11591, 13415, 13772, 14500, 14623, 14871,
-                          15627, 15883)
+                          15627, 15883, 16012, 16141, 16796, 17195, 18007,
+                          18559, 19119, 19975)
 
                         ),
                    list(method = 1,
-                        nMax = 16000,
+                        nMax = 20000,
                         pMin = 0.0999999517957865,
-                        pMax = 0.100000050804151,
+                        pMax = 0.100000038090771,
                         diffIdx =
 
                         c(31, 38, 180, 214, 507, 1422, 1761, 2136, 2250,
                           3337, 4154, 4555, 5593, 6638, 7040, 7454, 8207,
                           8881, 8996, 9228, 10809, 11712, 12379, 12651,
-                          13344, 13485, 14200, 15686, 15992)
+                          13344, 13485, 14200, 15686, 15992, 16928)
 
                         )),
               methodDescriptions =