[Soiltexture-commits] r78 - / pkg/soiltexture pkg/soiltexture/R pkg/soiltexture/man

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

Author: jmoeys
Date: 2012-03-07 17:12:10 +0100 (Wed, 07 Mar 2012)
New Revision: 78

Modified:
   SoilTexture_changelog.txt
   pkg/soiltexture/DESCRIPTION
   pkg/soiltexture/R/text.transf.R
   pkg/soiltexture/man/soiltexture-package.Rd
   soiltexture_compile.R
   soiltexture_vignette_compile.R
Log:
Removed unneeded installed.packages()

Modified: SoilTexture_changelog.txt
===================================================================
--- SoilTexture_changelog.txt	2012-03-07 15:51:36 UTC (rev 77)
+++ SoilTexture_changelog.txt	2012-03-07 16:12:10 UTC (rev 78)
@@ -3,6 +3,10 @@
 Julien MOEYS
 -----------------------------------------------------------------------------------------
 
+o version 1.2.9 
+
+  20120307 Removed a useless usage of installed.packages()
+
 o version 1.2.8 
 
   20120125 New attempt to fix xtable package dependence in the vignette.

Modified: pkg/soiltexture/DESCRIPTION
===================================================================
--- pkg/soiltexture/DESCRIPTION	2012-03-07 15:51:36 UTC (rev 77)
+++ pkg/soiltexture/DESCRIPTION	2012-03-07 16:12:10 UTC (rev 78)
@@ -1,5 +1,5 @@
 Package: soiltexture
-Version: 1.2.8
+Version: 1.2.9
 Date: 2012-03-07
 Title: Functions for soil texture plot, classification and transformation
 Author: Julien MOEYS <jules_m78-soiltexture at yahoo.fr>, contributions from Wei Shangguan.

Modified: pkg/soiltexture/R/text.transf.R
===================================================================
--- pkg/soiltexture/R/text.transf.R	2012-03-07 15:51:36 UTC (rev 77)
+++ pkg/soiltexture/R/text.transf.R	2012-03-07 16:12:10 UTC (rev 78)
@@ -179,15 +179,16 @@
     #
 #    old.col.nm   <- colnames( tri.data )
     
-    # Added 2010/06/13 Julien Moeys
-    if( !"drc" %in%  as.character( installed.packages()[,1] ) ) 
-    {   #
-        stop( "The function 'TT.text.transf.Xm' needs the package 'drc'\n Please install it ( install.packages(\"drc\") )" ) 
-    }else{ 
-        require( "drc" ) 
-    }   #
-    
+    # # Added 2010/06/13 Julien Moeys # Removed on 2012/03/07 by Julien Moeys
+    # if( !"drc" %in%  as.character( installed.packages()[,1] ) ) 
+    # {   #
+    #     stop( "The function 'TT.text.transf.Xm' needs the package 'drc'\n Please install it ( install.packages(\"drc\") )" ) 
+    # }else{ 
+    #     require( "drc" ) 
+    # }   #
     #
+    require( "drc" ) 
+    #
     fitpsd <- function(
     y,
     xin,

Modified: pkg/soiltexture/man/soiltexture-package.Rd
===================================================================
--- pkg/soiltexture/man/soiltexture-package.Rd	2012-03-07 15:51:36 UTC (rev 77)
+++ pkg/soiltexture/man/soiltexture-package.Rd	2012-03-07 16:12:10 UTC (rev 78)
@@ -32,7 +32,7 @@
 
 \tabular{ll}{Package: \tab soiltexture\cr
 
-Version: \tab 1.2.8\cr
+Version: \tab 1.2.9\cr
 
 Date: \tab 2012-03-07\cr
 

Modified: soiltexture_compile.R
===================================================================
--- soiltexture_compile.R	2012-03-07 15:51:36 UTC (rev 77)
+++ soiltexture_compile.R	2012-03-07 16:12:10 UTC (rev 78)
@@ -2,7 +2,7 @@
 pkg.dir      <- "C:/_R_PACKAGES/soiltexture/pkg" 
 # pkg.dir      <- "/home/jules/_WORK/R_PACKAGES/soiltexture/pkg" 
 pkg.name     <- "soiltexture" 
-pkg.version  <- "1.2.8" 
+pkg.version  <- "1.2.9" 
 pkg.depends  <- c("sp","MASS") 
 pkg.suggests <- c("drc","plotrix","xtable") 
 RVersion     <- "R (>= 2.4.1)" 

Modified: soiltexture_vignette_compile.R
===================================================================
--- soiltexture_vignette_compile.R	2012-03-07 15:51:36 UTC (rev 77)
+++ soiltexture_vignette_compile.R	2012-03-07 16:12:10 UTC (rev 78)
@@ -9,7 +9,8 @@
     Sweave.wrapper.fun  <- "/home/jules/Documents/_WORK/R_PACKAGES/soiltexture/Sweave_wrapper.R"        
 }   #
 subdir1             <- "doc"
-file.name.root      <- "soiltexture_vignette"  
+file.name.root      <- "soiltexture_vignette" 
+# file.name.root      <- "transformations"  
 sweave.ext          <- ".Rnw"  
 inout.dir           <- ""