[Soiltexture-commits] r21 - pkg/soiltexture/R

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

Author: jmoeys
Date: 2010-06-01 17:07:15 +0200 (Tue, 01 Jun 2010)
New Revision: 21

Modified:
   pkg/soiltexture/R/soiltexture.R
Log:
Minor changes + moved the require( "sp" ) inside concerned functions.

Modified: pkg/soiltexture/R/soiltexture.R
===================================================================
--- pkg/soiltexture/R/soiltexture.R	2010-06-01 15:00:24 UTC (rev 20)
+++ pkg/soiltexture/R/soiltexture.R	2010-06-01 15:07:15 UTC (rev 21)
@@ -1,5 +1,5 @@
 # source( "C:/_RTOOLS/SWEAVE_WORK/SOIL_TEXTURES/rforge/pkg/soiltexture/R/soiltexture.r" ) 
-# source( "http://r-forge.r-project.org/scm/viewvc.php/*checkout*/pkg/soiltexture/R/soiltexture.r?root=soiltexture" ) 
+# source( "http://r-forge.r-project.org/scm/viewvc.php/*checkout*/pkg/soiltexture/R/soiltexture.R?revision=19&root=soiltexture" ) 
 # +-------------------------------------------------------------------------+
 # |                                                                         |
 # | Julien MOEYS                                                            |
@@ -105,7 +105,7 @@
 #     install.packages("sp")
 # }   #
 
-require( "sp" )
+# require( "sp" )
 
 
 
@@ -5337,6 +5337,8 @@
         )   #
     }   #
     #
+    require( "sp" ) 
+    #
     # Vectorisable and custom wrapper for point.in.polygon():
     points.in.class <- function( 
         X,                  # X = class name
@@ -5916,6 +5918,8 @@
         ...  
     )   #
     #
+    require( "sp" ) 
+    #
     PiP <- as.logical(  point.in.polygon( 
         point.x = xy.grid[["xypos"]][,"xpos"],
         point.y = xy.grid[["xypos"]][,"ypos"], 
@@ -6045,6 +6049,8 @@
         "y" = dens.xy[["y"]]  
     )   #
     #
+    require( "sp" ) 
+    #
     PiP <- as.logical(  point.in.polygon( 
         point.x = ex.dens.xy[,"x"],
         point.y = ex.dens.xy[,"y"], 
@@ -6193,6 +6199,8 @@
             z.vec   = xy.data[,"z"] 
     )   )   #
     #
+    require( "sp" ) 
+    #
     PiP <- as.logical(  point.in.polygon( 
         point.x = xy.grid[["xypos"]][,"xpos"],
         point.y = xy.grid[["xypos"]][,"ypos"],