[Georob-commits] r4 - in pkg: . R

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

Author: papritz
Date: 2013-05-14 17:58:21 +0200 (Tue, 14 May 2013)
New Revision: 4

Modified:
   pkg/ChangeLog
   pkg/DESCRIPTION
   pkg/NAMESPACE
   pkg/R/variogram.R
Log:
attaching instead of importing functions of package parallel
correction error in handling optional arguments in function plot.sample.variogram

M    pkg/R/variogram.R
M    pkg/DESCRIPTION
M    pkg/ChangeLog
M    pkg/NAMESPACE



Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog	2013-04-29 15:27:19 UTC (rev 3)
+++ pkg/ChangeLog	2013-05-14 15:58:21 UTC (rev 4)
@@ -49,3 +49,16 @@
 
 * georob_example.R: correction of argument names in examples
 
+
+2013-05-12  Andreas Papritz  <papritz at env.ethz.ch>
+
+* variogram.R (plot.sample.variogram): correction of handling optional arguments
+
+
+2013-05-14  Andreas Papritz  <papritz at env.ethz.ch>
+
+* DESCRIPTION: attaching instead of importing functionS of package parallel
+* NAMESPACE: attaching instead of importing functionS of package parallel
+
+
+

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2013-04-29 15:27:19 UTC (rev 3)
+++ pkg/DESCRIPTION	2013-05-14 15:58:21 UTC (rev 4)
@@ -8,8 +8,8 @@
           email =  "andreas.papritz at env.ethz.ch" ),
   person( "Cornelia", "Schwierz", role = "ctb" ))
 Depends: R(>= 2.14.0), lmtest, nlme, 
-         robustbase, sp(>= 0.9-60)
-Imports: constrainedKriging(>= 0.1-9), nleqslv, parallel, quantreg, 
+         robustbase, sp(>= 0.9-60), parallel
+Imports: constrainedKriging(>= 0.1-9), nleqslv, quantreg, 
          RandomFields(>= 2.0.55), spatialCovariance(>= 0.6-4)
 Suggests: geoR
 Description: The georob package provides functions for fitting linear models 

Modified: pkg/NAMESPACE
===================================================================
--- pkg/NAMESPACE	2013-04-29 15:27:19 UTC (rev 3)
+++ pkg/NAMESPACE	2013-05-14 15:58:21 UTC (rev 4)
@@ -1,4 +1,4 @@
-import( parallel, stats )
+import( stats )
 
 importFrom( constrainedKriging, covmodel, f.point.block.cov, K, preCKrige )
 importFrom( lmtest, waldtest, waldtest.default )

Modified: pkg/R/variogram.R
===================================================================
--- pkg/R/variogram.R	2013-04-29 15:27:19 UTC (rev 3)
+++ pkg/R/variogram.R	2013-05-14 15:58:21 UTC (rev 4)
@@ -367,10 +367,11 @@
   
   ## 2012-12-12 A. Papritz
   ## 2012-12-21 AP correction for using col and pch
+  ## 2913-05-12 AP correction for using ...
   
   if( !add ) plot( 
     gamma ~ lag.dist, x, type = "n",
-    xlim = xlim, ylim = ylim, xlab = xlab, ylab = ylab
+    xlim = xlim, ylim = ylim, xlab = xlab, ylab = ylab, ...
   )
   
   if( missing( col ) ){