From noreply at r-forge.r-project.org Thu Oct 2 13:48:04 2014 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 2 Oct 2014 13:48:04 +0200 (CEST) Subject: [Soiltexture-commits] r115 - / pkg/soiltexture pkg/soiltexture/inst pkg/soiltexture/man Message-ID: <20141002114804.6C8B01874C4@r-forge.r-project.org> Author: jmoeys Date: 2014-10-02 13:48:04 +0200 (Thu, 02 Oct 2014) New Revision: 115 Modified: packageUtilities.R pkg/soiltexture/DESCRIPTION pkg/soiltexture/NAMESPACE pkg/soiltexture/NEWS pkg/soiltexture/inst/SVN_VERSION pkg/soiltexture/man/soiltexture-package.Rd soiltexture_2_RCMDcheck_noexamples.bat soiltexture_3_RCMDINSTALL_build.BAT soiltexture_compile.R Log: moved packages from Depends to Imports Modified: packageUtilities.R =================================================================== --- packageUtilities.R 2014-09-30 15:14:03 UTC (rev 114) +++ packageUtilities.R 2014-10-02 11:48:04 UTC (rev 115) @@ -62,57 +62,30 @@ ### Vector of character strings. Names of the packages that needs to be installed ### prior to the package installation. NULL if none - pkgSuggests=NULL, + pkgImports=NULL, ### Vector of character string. Names of the packages that needs -### to be cited in the "Suggests" field. NULL if none +### to be cited in the "Imports" field. NULL if none - pkgImports=NULL + pkgSuggests=NULL ### Vector of character string. Names of the packages that needs -### to be cited in the "Imports" field. NULL if none +### to be cited in the "Suggests" field. NULL if none ){ # Read the file DESCRIPTION - desc <- readLines( - con = file.path( - pkgDir, - pkgName, - "DESCRIPTION" - ) # - ) # + desc <- packageDescription( + pkg = pkgName, + lib.loc = pkgDir ) - # Find where the "Date:" line is - desc.sel <- substr( - x = desc, - start = 1, - stop = nchar("Date:") - ) == "Date:" # Modify the date - desc[ desc.sel ] <- paste( - "Date:", - Sys.Date() - ) # + desc[[ "Date" ]] <- Sys.Date() - # Find where the "Version:" line is - desc.sel <- substr( - x = desc, - start = 1, - stop = nchar("Version:") - ) == "Version:" - # Modify the version - desc[ desc.sel ] <- paste( - "Version:", - pkgVersion - ) # + # Modify the version + desc[[ "Version" ]] <- pkgVersion - # Find where the "Depends:" line is - desc.sel <- substr( - x = desc, - start = 1, - stop = nchar("Depends:") - ) == "Depends:" + # Modify the dependencies if( is.null( RVersion ) ) { # Get R version: @@ -128,75 +101,46 @@ ) } - # Modify the dependancies - desc[ desc.sel ] <- paste( - "Depends: ", - RVersion, - ifelse(is.null(pkgDepends),"",", "), - paste( pkgDepends, collapse = ", " ), - sep = "" + desc[[ "Depends" ]] <- paste( + c( RVersion, pkgDepends ), + collapse = ", " ) - - # Find where the "Suggests:" line is - desc.sel2 <- substr( - x = desc, - start = 1, - stop = nchar("Suggests:") - ) == "Suggests:" - - suggests.txt <- paste( - "Suggests: ", - paste( pkgSuggests, collapse = ", " ), - sep = "" - ) - - if( is.null( pkgSuggests ) ){ - desc <- desc[ !desc.sel2 ] - + # Write the Suggests field: + if( !is.null( pkgSuggests ) ){ + desc[[ "Suggests" ]] <- paste( + pkgSuggests, + collapse = ", " + ) }else{ - if( any( desc.sel2 ) ){ - desc[ desc.sel2 ] <- suggests.txt - }else{ - desc <- c( - desc, - suggests.txt - ) - } + desc <- desc[ names(desc) != "Suggests" ] } - - # Find where the "Imports:" line is - desc.sel2 <- substr( - x = desc, - start = 1, - stop = nchar("Imports:") - ) == "Imports:" - - imports.txt <- paste( - "Imports: ", - paste( pkgImports, collapse = ", " ), - sep = "" - ) - if( is.null( pkgImports ) ){ - desc <- desc[ !desc.sel2 ] - + # Write the Imports field: + if( !is.null( pkgSuggests ) ){ + desc[[ "Imports" ]] <- paste( + pkgImports, + collapse = ", " + ) }else{ - if( any( desc.sel2 ) ) - { - desc[ desc.sel2 ] <- imports.txt - }else{ - desc <- c( - desc, - imports.txt - ) - } + desc <- desc[ names(desc) != "Imports" ] } + # Final output formatting: + nm <- names( desc ) + desc <- unlist( lapply( + X = 1:length(desc), + FUN = function( X, desc, nm ){ + paste0( nm[X], ": ", desc[[ X ]] ) + }, + desc = desc, + nm = nm + ) ) + # Write again the description file: desc <- writeLines( con = file.path( Modified: pkg/soiltexture/DESCRIPTION =================================================================== --- pkg/soiltexture/DESCRIPTION 2014-09-30 15:14:03 UTC (rev 114) +++ pkg/soiltexture/DESCRIPTION 2014-10-02 11:48:04 UTC (rev 115) @@ -1,21 +1,15 @@ Package: soiltexture -Version: 1.2.19 -Date: 2014-09-29 +Version: 1.2.20 +Date: 2014-10-02 Title: Functions for soil texture plot, classification and transformation -Author: Julien MOEYS , contributions from Wei Shangguan. -Maintainer: Julien MOEYS -Depends: R (>= 3.1.1), sp, MASS +Author: Julien Moeys [aut, cre], Wei Shangguan [ctb] +Authors at R: c( + person( "Julien", "Moeys", role = c("aut", "cre"), email = "jules_m78-soiltexture at yahoo.fr" ), + person( "Wei", "Shangguan", role = "ctb" ) ) +Maintainer: Julien Moeys +Depends: R (>= 3.1.1) Suggests: xtable, tools, utils -Description: "The Soil Texture Wizard" is a set of R functions designed to produce - texture triangles (also called texture plots, texture diagrams, texture ternary plots), - classify and transform soil textures data. These functions virtually allows to plot any - soil texture triangle / classification into any triangle geometry (isosceles, - right-angled triangles, etc.). This set of function is expected to be useful to people - using soil textures data from different soil texture classification or different particle - size systems. Several texture triangles are predefined: USDA; FAO (which is also the - triangle for the soil map of Europe); Aisne (France); GEPPA (France); German triangles - "Bodenkundliche Kartieranleitung 1994", "SEA 1974" and "TGL 1985"; Soil - Survey of England and Wales; Australian triangle; Belgian triangle; Canadian triangle; - ISSS triangle; Romanian triangle; Polish triangle. +Description: "The Soil Texture Wizard" is a set of R functions designed to produce texture triangles (also called texture plots, texture diagrams, texture ternary plots), classify and transform soil textures data. These functions virtually allows to plot any soil texture triangle / classification into any triangle geometry (isosceles, right-angled triangles, etc.). This set of function is expected to be useful to people using soil textures data from different soil texture classification or different particle size systems. Several texture triangles are predefined: USDA; FAO (which is also the triangle for the soil map of Europe); Aisne (France); GEPPA (France); German triangles "Bodenkundliche Kartieranleitung 1994", "SEA 1974" and "TGL 1985"; Soil Survey of England and Wales; Australian triangle; Belgian triangle; Canadian triangle; ISSS triangle; Romanian triangle; Polish triangle. License: AGPL (>=3) -URL: http://soiltexture.r-forge.r-project.org/ +URL: http://soiltexture.r-forge.r-project.org/ +Imports: sp, MASS Modified: pkg/soiltexture/NAMESPACE =================================================================== --- pkg/soiltexture/NAMESPACE 2014-09-30 15:14:03 UTC (rev 114) +++ pkg/soiltexture/NAMESPACE 2014-10-02 11:48:04 UTC (rev 115) @@ -1,4 +1,5 @@ -import(sp, MASS) exportPattern("^[[:alpha:]]+") - +importFrom(sp,point.in.polygon) +importFrom(MASS,kde2d) +importFrom(MASS,mvrnorm) Modified: pkg/soiltexture/NEWS =================================================================== --- pkg/soiltexture/NEWS 2014-09-30 15:14:03 UTC (rev 114) +++ pkg/soiltexture/NEWS 2014-10-02 11:48:04 UTC (rev 115) @@ -1,6 +1,11 @@ package: 'soiltexture' +CHANGES IN VERSION 1.2.20 + + 2014/10/02 Packages Dependecies moved from "Depends" to "Imports" + in package DESCRIPTION and NAMESPACE + CHANGES IN VERSION 1.2.19 2014/09/25 Compiled for R 3.1.1 Modified: pkg/soiltexture/inst/SVN_VERSION =================================================================== --- pkg/soiltexture/inst/SVN_VERSION 2014-09-30 15:14:03 UTC (rev 114) +++ pkg/soiltexture/inst/SVN_VERSION 2014-10-02 11:48:04 UTC (rev 115) @@ -1 +1 @@ -105:113M +105:114M Modified: pkg/soiltexture/man/soiltexture-package.Rd =================================================================== --- pkg/soiltexture/man/soiltexture-package.Rd 2014-09-30 15:14:03 UTC (rev 114) +++ pkg/soiltexture/man/soiltexture-package.Rd 2014-10-02 11:48:04 UTC (rev 115) @@ -8,35 +8,15 @@ \title{Functions for soil texture plot, classification and transformation} -\description{"The Soil Texture Wizard" is a set of R functions designed to produce +\description{"The Soil Texture Wizard" is a set of R functions designed to produce texture triangles (also called texture plots, texture diagrams, texture ternary plots), classify and transform soil textures data. These functions virtually allows to plot any soil texture triangle / classification into any triangle geometry (isosceles, right-angled triangles, etc.). This set of function is expected to be useful to people using soil textures data from different soil texture classification or different particle size systems. Several texture triangles are predefined: USDA; FAO (which is also the triangle for the soil map of Europe); Aisne (France); GEPPA (France); German triangles "Bodenkundliche Kartieranleitung 1994", "SEA 1974" and "TGL 1985"; Soil Survey of England and Wales; Australian triangle; Belgian triangle; Canadian triangle; ISSS triangle; Romanian triangle; Polish triangle.} -texture triangles (also called texture plots, texture diagrams, texture ternary plots), - -classify and transform soil textures data. These functions virtually allows to plot any - -soil texture triangle / classification into any triangle geometry (isosceles, - -right-angled triangles, etc.). This set of function is expected to be useful to people - -using soil textures data from different soil texture classification or different particle - -size systems. Several texture triangles are predefined: USDA; FAO (which is also the - -triangle for the soil map of Europe); Aisne (France); GEPPA (France); German triangles - -"Bodenkundliche Kartieranleitung 1994", "SEA 1974" and "TGL 1985"; Soil - -Survey of England and Wales; Australian triangle; Belgian triangle; Canadian triangle; - -ISSS triangle; Romanian triangle; Polish triangle.} - \details{ \tabular{ll}{Package: \tab soiltexture\cr -Version: \tab 1.2.19\cr +Version: \tab 1.2.20\cr -Date: \tab 2014-09-29\cr +Date: \tab 2014-10-02\cr Title: \tab Functions for soil texture plot, classification and transformation\cr @@ -44,14 +24,16 @@ Maintainer: \tab Julien MOEYS \cr -Depends: \tab R (>= 3.1.1), sp, MASS\cr +Depends: \tab R (>= 3.1.1)\cr Suggests: \tab xtable, tools, utils\cr License: \tab AGPL (>=3)\cr -URL: \tab http://soiltexture.r-forge.r-project.org/\cr} +URL: \tab http://soiltexture.r-forge.r-project.org/\cr +Imports: \tab sp, MASS\cr} + } \author{Julien MOEYS , contributions from Wei Shangguan.} Modified: soiltexture_2_RCMDcheck_noexamples.bat =================================================================== --- soiltexture_2_RCMDcheck_noexamples.bat 2014-09-30 15:14:03 UTC (rev 114) +++ soiltexture_2_RCMDcheck_noexamples.bat 2014-10-02 11:48:04 UTC (rev 115) @@ -1,5 +1,5 @@ set pkgname=soiltexture -set version=1.2.19 +set version=1.2.20 cd /D "%rPackagesDir%\%pkgname%\pkg" Modified: soiltexture_3_RCMDINSTALL_build.BAT =================================================================== --- soiltexture_3_RCMDINSTALL_build.BAT 2014-09-30 15:14:03 UTC (rev 114) +++ soiltexture_3_RCMDINSTALL_build.BAT 2014-10-02 11:48:04 UTC (rev 115) @@ -1,5 +1,5 @@ set pkgname=soiltexture -set version=1.2.19 +set version=1.2.20 cd /D "%rPackagesDir%\%pkgname%\pkg" Modified: soiltexture_compile.R =================================================================== --- soiltexture_compile.R 2014-09-30 15:14:03 UTC (rev 114) +++ soiltexture_compile.R 2014-10-02 11:48:04 UTC (rev 115) @@ -17,9 +17,10 @@ pkgDescription( pkgName = pkgName, pkgDir = pkgDir, - pkgVersion = "1.2.19", - pkgDepends = c( "sp","MASS" ), + pkgVersion = "1.2.20", + pkgDepends = NULL, pkgSuggests = c( "xtable", "tools", "utils" ), # c("drc","plotrix"), + pkgImports = c( "sp","MASS" ), RVersion = NULL ) @@ -27,8 +28,8 @@ package.skeleton.dx( pkgdir = file.path( pkgDir, pkgName ), - namespace = TRUE -) # + namespace = FALSE # Must be edited manually! +) file.copy( From noreply at r-forge.r-project.org Thu Oct 2 13:48:54 2014 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 2 Oct 2014 13:48:54 +0200 (CEST) Subject: [Soiltexture-commits] r116 - pkg/soiltexture/inst Message-ID: <20141002114854.1494D18753F@r-forge.r-project.org> Author: jmoeys Date: 2014-10-02 13:48:53 +0200 (Thu, 02 Oct 2014) New Revision: 116 Modified: pkg/soiltexture/inst/SVN_VERSION Log: Modified: pkg/soiltexture/inst/SVN_VERSION =================================================================== --- pkg/soiltexture/inst/SVN_VERSION 2014-10-02 11:48:04 UTC (rev 115) +++ pkg/soiltexture/inst/SVN_VERSION 2014-10-02 11:48:53 UTC (rev 116) @@ -1 +1 @@ -105:114M +105:115M From noreply at r-forge.r-project.org Thu Oct 2 14:09:07 2014 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 2 Oct 2014 14:09:07 +0200 (CEST) Subject: [Soiltexture-commits] r117 - / pkg/soiltexture Message-ID: <20141002120907.1D765186F15@r-forge.r-project.org> Author: jmoeys Date: 2014-10-02 14:09:06 +0200 (Thu, 02 Oct 2014) New Revision: 117 Modified: packageUtilities.R pkg/soiltexture/DESCRIPTION Log: Modified: packageUtilities.R =================================================================== --- packageUtilities.R 2014-10-02 11:48:53 UTC (rev 116) +++ packageUtilities.R 2014-10-02 12:09:06 UTC (rev 117) @@ -119,7 +119,7 @@ # Write the Imports field: - if( !is.null( pkgSuggests ) ){ + if( !is.null( pkgImports ) ){ desc[[ "Imports" ]] <- paste( pkgImports, collapse = ", " Modified: pkg/soiltexture/DESCRIPTION =================================================================== --- pkg/soiltexture/DESCRIPTION 2014-10-02 11:48:53 UTC (rev 116) +++ pkg/soiltexture/DESCRIPTION 2014-10-02 12:09:06 UTC (rev 117) @@ -3,9 +3,7 @@ Date: 2014-10-02 Title: Functions for soil texture plot, classification and transformation Author: Julien Moeys [aut, cre], Wei Shangguan [ctb] -Authors at R: c( - person( "Julien", "Moeys", role = c("aut", "cre"), email = "jules_m78-soiltexture at yahoo.fr" ), - person( "Wei", "Shangguan", role = "ctb" ) ) +Authors at R: c( person( "Julien", "Moeys", role = c("aut", "cre"), email = "jules_m78-soiltexture at yahoo.fr" ), person( "Wei", "Shangguan", role = "ctb" ) ) Maintainer: Julien Moeys Depends: R (>= 3.1.1) Suggests: xtable, tools, utils