[Dplr-commits] r688 - branches/redfit/R

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

Author: mvkorpel
Date: 2013-09-12 18:37:03 +0200 (Thu, 12 Sep 2013)
New Revision: 688

Modified:
   branches/redfit/R/redfit.R
Log:
Edited a comment


Modified: branches/redfit/R/redfit.R
===================================================================
--- branches/redfit/R/redfit.R	2013-09-06 19:43:00 UTC (rev 687)
+++ branches/redfit/R/redfit.R	2013-09-12 16:37:03 UTC (rev 688)
@@ -229,7 +229,7 @@
         ww[, i] <- redfitWinwgt(twk, iwin2)
     }
     ## determine autospectrum of input data
-    lmfitfun <- tryCatch(match.fun(".lm.fit"),
+    lmfitfun <- tryCatch(match.fun("lm.fit"),
                          error = function(...) match.fun("lm.fit"))
     gxx <- .Call(dplR.spectr, t2, x2, np, ww, tr[[1]], tr[[2]], tr[[3]],
                  nseg, nfreq, avgdt, freq, dn50, segskip, lmfitfun)
@@ -330,8 +330,8 @@
         ## can assume that real(nout/2) was supposed to be real(nout)/2.
         ## sqrtHalfNfreq <- sqrt(nfreq %/% 2)
         sqrtHalfNfreq <- sqrt(nfreq / 2)
-        ## dplR: NOTE! Is round() the right function to use? Maybe floor()
-        ## for the lower limit and ceiling for the higher limit?
+        ## dplR: NOTE! Is round() the right function to use? Maybe ceiling
+        ## for the lower limit and floor for the higher limit?
         rcritlo <- round((-0.79557086 + 1.0088719 * sqrtHalfNfreq)^2)
         rcrithi <- round(( 0.75751462 + 0.9955133 * sqrtHalfNfreq)^2)
     } else {