[Soiltexture-commits] r97 - / pkg/soiltexture pkg/soiltexture/R pkg/soiltexture/man pkg/soiltexture/vignettes
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Jan 10 11:42:06 CET 2014
Author: jmoeys
Date: 2014-01-10 11:42:05 +0100 (Fri, 10 Jan 2014)
New Revision: 97
Modified:
2_RCMDcheck_noexamples.bat
3_RCMDINSTALL_build.BAT
pkg/soiltexture/DESCRIPTION
pkg/soiltexture/NEWS
pkg/soiltexture/R/soiltexture.R
pkg/soiltexture/man/soiltexture-package.Rd
pkg/soiltexture/vignettes/soiltexture_vignette.Rnw
soiltexture_compile.R
Log:
Bug fixed in triangle SE74
Modified: 2_RCMDcheck_noexamples.bat
===================================================================
--- 2_RCMDcheck_noexamples.bat 2014-01-09 14:47:07 UTC (rev 96)
+++ 2_RCMDcheck_noexamples.bat 2014-01-10 10:42:05 UTC (rev 97)
@@ -2,7 +2,7 @@
cd /D "%rPackagesDir%\%pkgname%\pkg"
-R CMD check --no-examples --as-cran %pkgname%_1.2.12.tar.gz
+R CMD check --no-examples --as-cran %pkgname%_1.2.13.tar.gz
@REM --as-cran
Modified: 3_RCMDINSTALL_build.BAT
===================================================================
--- 3_RCMDINSTALL_build.BAT 2014-01-09 14:47:07 UTC (rev 96)
+++ 3_RCMDINSTALL_build.BAT 2014-01-10 10:42:05 UTC (rev 97)
@@ -2,6 +2,6 @@
cd /D "%rPackagesDir%\%pkgname%\pkg"
-R CMD INSTALL --build --compact-docs --byte-compile %pkgname%_1.2.12.tar.gz
+R CMD INSTALL --build --compile-both --compact-docs --byte-compile %pkgname%_1.2.13.tar.gz
pause
Modified: pkg/soiltexture/DESCRIPTION
===================================================================
--- pkg/soiltexture/DESCRIPTION 2014-01-09 14:47:07 UTC (rev 96)
+++ pkg/soiltexture/DESCRIPTION 2014-01-10 10:42:05 UTC (rev 97)
@@ -1,6 +1,6 @@
Package: soiltexture
-Version: 1.2.12
-Date: 2014-01-09
+Version: 1.2.13
+Date: 2014-01-10
Title: Functions for soil texture plot, classification and transformation
Author: Julien MOEYS <jules_m78-soiltexture at yahoo.fr>, contributions from Wei Shangguan.
Maintainer: Julien MOEYS <jules_m78-soiltexture at yahoo.fr>
Modified: pkg/soiltexture/NEWS
===================================================================
--- pkg/soiltexture/NEWS 2014-01-09 14:47:07 UTC (rev 96)
+++ pkg/soiltexture/NEWS 2014-01-10 10:42:05 UTC (rev 97)
@@ -3,6 +3,13 @@
Julien MOEYS
-----------------------------------------------------------------
+VERSION 1.2.13
+
+ 2014/01/10 A mistake has been corrected in the texture triangle
+ DE.SEA74.TT (Standortserkundungsanweisung SEA 1974 (DE)),
+ for classes "lehmiger Ton" (lT) and "schluffiger
+ Ton" (uT), where a missing vertex has been added.
+
VERSION 1.2.12
2014/01/09 The triangle named FAO50.TT was in fact erroneously
Modified: pkg/soiltexture/R/soiltexture.R
===================================================================
--- pkg/soiltexture/R/soiltexture.R 2014-01-09 14:47:07 UTC (rev 96)
+++ pkg/soiltexture/R/soiltexture.R 2014-01-10 10:42:05 UTC (rev 97)
@@ -1289,14 +1289,14 @@
# triangle, plotted in SEA 1974, conforms to the GDR standard (TGL 24300-05:1985-06), but
# is 1 Percent larger than the actual German texture triangle in DE.BK94.TT :
# P01 P02 P03 P04 P05 P06 P07 P08 P09 P10 P11 P12 P13
- # P14 P15 P16 P17 P18 P19 P20 P21 P22 P23 P24 P25
+ # P14 P15 P16 P17 P18 P19 P20 P21 P22 P23 P24 P25 P26
"tt.points" = data.frame(
"CLAY" = c( 1.000, 0.450, 0.450, 0.300, 0.300, 0.300, 0.300, 0.180, 0.180, 0.180, 0.150, 0.120, 0.050,
- 0.000, 0.000, 0.000, 0.000, 0.050, 0.100, 0.025, 0.050, 0.080, 0.080, 0.000, 0.000),
+ 0.000, 0.000, 0.000, 0.000, 0.050, 0.100, 0.025, 0.050, 0.080, 0.080, 0.000, 0.000, 0.450 ),
"SILT" = c( 0.000, 0.550, 0.000, 0.700, 0.550, 0.150, 0.000, 0.820, 0.550, 0.150, 0.000, 0.150, 0.550,
- 0.550, 0.200, 0.100, 0.000, 0.000, 0.000, 0.075, 0.150, 0.800, 0.920, 1.000, 0.800),
+ 0.550, 0.200, 0.100, 0.000, 0.000, 0.000, 0.075, 0.150, 0.800, 0.920, 1.000, 0.800, 0.400 ),
"SAND" = c( 0.000, 0.000, 0.550, 0.000, 0.150, 0.550, 0.700, 0.000, 0.270, 0.670, 0.850, 0.730, 0.400,
- 0.450, 0.800, 0.900, 1.000, 0.950, 0.900, 0.900, 0.800, 0.120, 0.000, 0.000, 0.200)
+ 0.450, 0.800, 0.900, 1.000, 0.950, 0.900, 0.900, 0.800, 0.120, 0.000, 0.000, 0.200, 0.150 )
), #
#
# Abreviations; Names of the texture cl; Points marking the class limits (points specified above)
@@ -1308,8 +1308,8 @@
"alS" = list( "name" = "anlehmiger Sand", "points" = c(18, 19, 21, 15, 16, 20 ) ),
"lS" = list( "name" = "lehmiger Sand", "points" = c(19, 11, 12, 13, 14, 15, 21 ) ),
"T" = list( "name" = "Ton", "points" = c(03, 01, 02 ) ),
- "uT" = list( "name" = "schluffiger Ton", "points" = c(05, 02, 04 ) ),
- "lT" = list( "name" = "lehmiger Ton", "points" = c(03, 02, 05, 06 ) ),
+ "uT" = list( "name" = "schluffiger Ton", "points" = c(05, 26, 02, 04 ) ),
+ "lT" = list( "name" = "lehmiger Ton", "points" = c(03, 26, 05, 06 ) ),
"sT" = list( "name" = "sandiger Ton", "points" = c(07, 03, 06 ) ),
"U" = list( "name" = "Schluff", "points" = c(25, 22, 23, 24 ) ),
"UL" = list( "name" = "Schlufflehm", "points" = c(09, 05, 04, 08 ) ),
Modified: pkg/soiltexture/man/soiltexture-package.Rd
===================================================================
--- pkg/soiltexture/man/soiltexture-package.Rd 2014-01-09 14:47:07 UTC (rev 96)
+++ pkg/soiltexture/man/soiltexture-package.Rd 2014-01-10 10:42:05 UTC (rev 97)
@@ -34,9 +34,9 @@
\tabular{ll}{Package: \tab soiltexture\cr
-Version: \tab 1.2.12\cr
+Version: \tab 1.2.13\cr
-Date: \tab 2014-01-09\cr
+Date: \tab 2014-01-10\cr
Title: \tab Functions for soil texture plot, classification and transformation\cr
Modified: pkg/soiltexture/vignettes/soiltexture_vignette.Rnw
===================================================================
--- pkg/soiltexture/vignettes/soiltexture_vignette.Rnw 2014-01-09 14:47:07 UTC (rev 96)
+++ pkg/soiltexture/vignettes/soiltexture_vignette.Rnw 2014-01-10 10:42:05 UTC (rev 97)
@@ -1051,8 +1051,12 @@
Many thanks to Rainer Petzold (Staatsbetrieb Sachsenforst) for
-providing the code of this triangle.
+providing the code of this triangle.\\
+Note (2013/01/10): Prior to version 1.2.13, the triangle has a
+missing vertex in classes "lehmiger Ton" (lT) and "schluffiger Ton"
+(uT). This Vertex (no 26 in the triangle definition) has been added
+from version 1.2.13.\\
The original isosceles version of the triangle can be obtained by typing:
Modified: soiltexture_compile.R
===================================================================
--- soiltexture_compile.R 2014-01-09 14:47:07 UTC (rev 96)
+++ soiltexture_compile.R 2014-01-10 10:42:05 UTC (rev 97)
@@ -18,7 +18,7 @@
pkgDescription(
pkgName = pkgName,
pkgDir = pkgDir,
- pkgVersion = "1.2.12",
+ pkgVersion = "1.2.13",
pkgDepends = c("sp","MASS"),
pkgSuggests = "xtable", # c("drc","plotrix"),
RVersion = NULL
More information about the Soiltexture-commits
mailing list