[Soiltexture-commits] r22 - / pkg pkg/soiltexture pkg/soiltexture/R pkg/soiltexture/inst/doc2 pkg/soiltexture/man pkg/soiltexture/tests
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Mon Jun 7 16:28:14 CEST 2010
Author: jmoeys
Date: 2010-06-07 16:28:13 +0200 (Mon, 07 Jun 2010)
New Revision: 22
Modified:
SoilTexture_changelog.txt
pkg/soiltexture.Rcheck.zip
pkg/soiltexture/DESCRIPTION
pkg/soiltexture/R/soiltexture.R
pkg/soiltexture/inst/doc2/soiltexture_vignette.Rnw
pkg/soiltexture/inst/doc2/soiltexture_vignette.bib
pkg/soiltexture/inst/doc2/soiltexture_vignette.bib.bak
pkg/soiltexture/man/TT.plot.Rd
pkg/soiltexture/man/soiltexture-package.Rd
pkg/soiltexture/tests/TT.plot.R
pkg/soiltexture_1.0.tar.gz
pkg/soiltexture_1.0.zip
Log:
Added Romanian texture triangle + minor changes
Modified: SoilTexture_changelog.txt
===================================================================
--- SoilTexture_changelog.txt 2010-06-01 15:07:15 UTC (rev 21)
+++ SoilTexture_changelog.txt 2010-06-07 14:28:13 UTC (rev 22)
@@ -1,7 +1,14 @@
The Soil Texture Wizard
change log. From 2009/10/09. Most recent changes first / on top.
Julien MOEYS
+-----------------------------------------------------------------------------------------
+20100607 Added the Romanian texture triangle to the list of pre-defined texture
+ triangles, and the Romanian language to the list of possible languages
+ for the texture triangle title and axis labels. many thanks to
+ Rosca Bogdan (Romanian Academy, Iasi Branch, Geography team) for providing
+ the code and translation.
+
20100513 Accuracy problems detected in TT.points.in.classes() for texture data
located right on the boundary of the triangle (or some texture classes),
with some digits after the decimal: due to non-exact trigonometric
@@ -16,9 +23,10 @@
No fix are planned in the close future to fix this error.
Thanks to Wei Shangguan (see below) for pointing this 'bug'.
-20100513 Added the ISSS (not the 'Australian ISSS') texture triangle to the
+20100513 Added the ISSS (not to be confused with the 'Australian ISSS')
+ texture triangle to the
list of pre-defined texture triangles. Many thanks to Wei Shangguan,
- PhD student at the School of geography of Beijing normal university
+ PhD from the School of geography of Beijing normal university
for providing the code of the triangle.
20100416 Added the Canadian texture triangle to the list of pre-defined
Modified: pkg/soiltexture/DESCRIPTION
===================================================================
--- pkg/soiltexture/DESCRIPTION 2010-06-01 15:07:15 UTC (rev 21)
+++ pkg/soiltexture/DESCRIPTION 2010-06-07 14:28:13 UTC (rev 22)
@@ -1,6 +1,6 @@
Package: soiltexture
Version: 1.0
-Date: 2010-06-01
+Date: 2010-06-07
Title: Functions for soil texture plot, classification and transformation
Author: Julien MOEYS <jules_m78-soiltexture at yahoo.fr>
Maintainer: Julien MOEYS <jules_m78-soiltexture at yahoo.fr>
Modified: pkg/soiltexture/R/soiltexture.R
===================================================================
--- pkg/soiltexture/R/soiltexture.R 2010-06-01 15:07:15 UTC (rev 21)
+++ pkg/soiltexture/R/soiltexture.R 2010-06-07 14:28:13 UTC (rev 22)
@@ -215,25 +215,26 @@
lang.par = data.frame(
"lang" = c( "en", "fr", "it",
"es", "de", "nl",
- "se", "fl" ), ##
+ "se", "fl", "ro" ), ##
#
"CLAY" = c( "\"Clay\"", "\"Argile\"", "\"Argilla\"",
"\"Arcilla\"", "\"Ton\"", "\"Lutum\"",
- "\"Ler\"", "\"Klei\"" ), ##
+ "\"Ler\"", "\"Klei\"", "\"Argila\"" ), ##
#
"SILT" = c( "\"Silt\"", "\"Limon\"", "\"Limo\"",
"\"Limo\"", "\"Schluff\"", "\"Silt\"",
- "\"Silt\"", "\"Leem\"" ), ##
+ "\"Silt\"", "\"Leem\"", "\"Praf\"" ), ##
#
"SAND" = c( "\"Sand\"", "\"Sable\"", "\"Sabbia\"",
"\"Arena\"", "\"Sand\"", "\"Zand\"",
- "\"Sand\"", "\"Zand\"" ), ##
+ "\"Sand\"", "\"Zand\"", "\"Nisip\"" ), ##
#
"TT" = c( "\"Texture triangle\"", "\"Triangle de texture\"", "\"Triangolo della tessitura\"",
"\"Tri\\340ngulo de textura\"", "\"Bodenartendiagramm\"", "\"Textuurdriehoek\"",
- "\"Texturtriangel\"", "\"Textuurdriehoek\"" ), ##
+ "\"Texturtriangel\"", "\"Textuurdriehoek\"", "\"Diagrama triunghiulara a texturii\"" ), ##
stringsAsFactors = FALSE
), #
+ # Acknowledgments: Rosca Bogdan, from the Romanian Academy, Iasi Branch, Geography team, provided the Romanian translation (thanks!).
#
# +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+
# | TRIANGLE CUSTOMISATION |
@@ -1035,6 +1036,67 @@
unit.tx = quote(bold('%')),
#
text.sum = 100
+ ), #
+ #
+ "ROM.TT" = list(# ROM TRIANGLE PARAMETERS: Added 2010/06/07
+ # by Rosca Bogdan, Romanian Academy
+ # Iasi Branch, Geography team
+ #
+ main = "SRTS 2003",
+ #
+ # The list below specify the CSS coordinates of the different POINTS
+ # that are used to draw soil texture classes. One points can be
+ # used by several classes :
+ # = 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 P26 P27 (submits)
+ "tt.points" = data.frame(
+ "CLAY" = c( 0.700, 0.700, 0.600, 0.600, 0.600, 0.450, 0.450, 0.450, 0.450, 0.330, 0.330, 0.330,
+ 0.330, 0.200, 0.200, 0.200, 0.200, 0.200, 0.120, 0.120, 0.050, 0.050, 0.000,
+ 0.000, 1.000, 0.000, 0.000 ),
+ #
+ "SILT" = c( 0.000, 0.300, 0.000, 0.330, 0.400, 0.000, 0.140, 0.330, 0.550, 0.000, 0.140, 0.330,
+ 0.670, 0.000, 0.140, 0.330, 0.500, 0.800, 0.000, 0.330, 0.000, 0.330, 0.330,
+ 0.500, 0.000, 0.000, 1.000 ),
+ #
+ "SAND" = c( 0.300, 0.000, 0.400, 0.070, 0.000, 0.550, 0.410, 0.220, 0.000, 0.670, 0.530, 0.340,
+ 0.000, 0.800, 0.660, 0.470, 0.300, 0.000, 0.880, 0.550, 0.950, 0.620, 0.670,
+ 0.500, 0.000, 1.000, 0.000 )
+ ), #
+ #
+ # Abreviations; Names of the texture cl; Points marking the class limits (points specified above)
+ "tt.polygons" = list(
+ "AF" = list( "name" = "argila fina", "points" = c(01,25,02 ) ),
+ "AA" = list( "name" = "argila medie", "points" = c(01,03,04,05,02 ) ),
+ "AP" = list( "name" = "argila prafoasa", "points" = c(04,08,09,05 ) ),
+ "AL" = list( "name" = "argila lutoasa", "points" = c(03,06,07,08,04 ) ),
+ "TP" = list( "name" = "lut argilo-prafos", "points" = c(08,12,13,09 ) ),
+ "TT" = list( "name" = "lut argilos mediu", "points" = c(07,11,12,08 ) ),
+ "TN" = list( "name" = "argila nisipoasa", "points" = c(06,10,11,07 ) ),
+ "LP" = list( "name" = "lut prafos", "points" = c(12,16,17,18,13 ) ),
+ "LL" = list( "name" = "lut mediu", "points" = c(11,15,16,12 ) ),
+ "LN" = list( "name" = "lut nisipo-argilos", "points" = c(10,14,15,11 ) ),
+ "SP" = list( "name" = "praf", "points" = c(17,24,27,18 ) ),
+ "SS" = list( "name" = "lut nisipos prafos", "points" = c(16,20,22,23,24,17 ) ),
+ "SG+SM+SF" = list( "name" = "lut nisipos", "points" = c(14,19,20,16,15 ) ),
+ "UG+UM+UF" = list( "name" = "nisip lutos", "points" = c(19,21,22,20 ) ),
+ "NG+NM+NF" = list( "name" = "nisip", "points" = c(21,26,23,22 ) )
+ ), #
+ #
+ # Triangle specific parameters for triangle geometry / appearance
+ # See general parameters above for detailed description of them
+ blr.clock = rep(T,3),
+ tlr.an = c(60,60,60),
+ #
+ blr.tx = c("SAND","CLAY","SILT"),
+ #
+ base.css.ps.lim = c(0,2,20,2000),
+ tri.css.ps.lim = c(0,2,20,2000),
+ #
+ unit.ps = quote(bold(mu) * bold('m')),
+ unit.tx = quote(bold('%')),
+ #
+ text.sum = 100
) #
#
# +-------------------------------------------------------------------------+
@@ -3985,7 +4047,7 @@
){ #
TT.auto.set(set.par=FALSE)
#
- require(MASS)
+ require( "MASS" )
#
nm <- c(css.names,"Z")
#
@@ -5219,7 +5281,7 @@
){ #
if( is.null( class.sys ) ){ class.sys <- TT.get("class.sys") }
#
- require("sp")
+ require( "sp" )
#
TT.data <- TT.get(class.sys)
#
Modified: pkg/soiltexture/inst/doc2/soiltexture_vignette.Rnw
===================================================================
--- pkg/soiltexture/inst/doc2/soiltexture_vignette.Rnw 2010-06-01 15:07:15 UTC (rev 21)
+++ pkg/soiltexture/inst/doc2/soiltexture_vignette.Rnw 2010-06-07 14:28:13 UTC (rev 22)
@@ -350,7 +350,9 @@
(Atterberg system\cite{MINASNY2001AJSR}\cite{RICHER2008INRA};
'International system'; ISSS\footnote{ISSS: International Society
of Soil Science. Now \href{www.iuss.org}{IUSS, International
-Union of Soil Science}}; Australia\footnote{Strangely, only a
+Union of Soil Science}. The ISSS particle size system should not
+be confused with the ISSS texture triangle (See )}; Australia\footnote{%%%
+Strangely, only a
small number of countries have adopted the so called
'international system'}\cite{MINASNY2001AJSR}; Japan%
\cite{RICHER2008INRA}), \textbf{2-50$\mu$m} (FAO\footnote{%
@@ -1163,6 +1165,93 @@
% +~~~~~~~~~~~~~~~~~~~~~~~~~~~~+
+\subsection{The ISSS soil texture classification}
+
+To display a ISSS\footnote{ISSS: International Soil Science Society.
+Now IUSS, International Union of Soil Science. The ISSS soil texture
+classification / triangle should not be confused with the ISSS
+particle size classification} texture triangle, type:
+
+
+<<echo=TRUE,fig=TRUE,include=TRUE>>=
+TT.plot( class.sys = "ISSS.TT" )
+@
+
+
+
+The ISSS soil texture classification has been built
+considering a silt - sand limit of
+\Sexpr{TT.get("ISSS.TT")[["base.css.ps.lim"]][3]}$\mu$meters.
+
+
+See the table for soil texture classes symbols:
+
+
+<<echo=FALSE,results=tex>>=
+tex.tbl <- TT.classes.tbl( class.sys = "ISSS.TT" )
+xtable(
+ x = tex.tbl[,-3], #
+ caption = "Texture classes of the ISSS system / triangle",
+ label = NULL
+) #
+@
+
+
+Many thanks to Wei Shangguan (PhD, School of geography, Beijing
+normal university) for providing the code of the ISSS triangle
+(using an article from Verheye and Ameryckx 1984\cite{VERHEYE1984PEDO}).
+
+
+
+% +~~~~~~~~~~~~~~~~~~~~~~~~~~~~+
+\subsection{The Romanian soil texture classification}
+
+To display a Romanian texture triangle, type:
+
+
+<<echo=TRUE,fig=TRUE,include=TRUE>>=
+TT.plot( class.sys = "ROM.TT" )
+@
+
+
+
+The Romanian soil texture classification has been built
+considering a silt - sand limit of
+\Sexpr{TT.get("ROM.TT")[["base.css.ps.lim"]][3]}$\mu$meters.
+
+
+See the table for soil texture classes symbols:
+
+
+<<echo=FALSE,results=tex>>=
+tex.tbl <- TT.classes.tbl( class.sys = "ROM.TT" )
+xtable(
+ x = tex.tbl[,-3], #
+ caption = "Texture classes of the Romanian system / triangle",
+ label = NULL
+) #
+@
+
+
+Many thanks to Rosca Bogdan (Romanian Academy, Iasi Branch,
+Geography team) for providing the code of the Romanian triangle.
+
+
+A right angled version of the triangle can be obtained by typing:
+
+
+<<echo=TRUE,fig=TRUE,include=TRUE>>=
+TT.plot(
+ class.sys = "ROM.TT",
+ blr.clock = c(F,T,NA),
+ tlr.an = c(45,90,45),
+ blr.tx = c("SILT","CLAY","SAND"),
+) #
+@
+
+
+
+% +~~~~~~~~~~~~~~~~~~~~~~~~~~~~+
\subsection{Soil texture triangle with a texture classes color
gradient}
@@ -2915,8 +3004,8 @@
@
-And a third example with Dutch (\texttt{lang = "nl"}) and Flemish
-(\texttt{lang = "nl"}) or, to be more exact, with the terms used
+And a 3rd example with Dutch (\texttt{lang = "nl"}) and Flemish
+(\texttt{lang = "fl"}) or, to be more exact, with the terms used
on the Dutch texture triangle and on the Flemish version of the
Belgian texture triangle.
@@ -2942,8 +3031,8 @@
@
-And finally in Swedish (\texttt{lang = "se"}) and in English, the
-default language (\texttt{lang = "en"}):
+A 4th example in Swedish (\texttt{lang = "se"}) and in Romanian
+(\texttt{lang = "ro"}):
<<echo=TRUE,fig=TRUE,include=TRUE,height=7>>=
@@ -2960,6 +3049,25 @@
# Plot the triangles with different languages:
TT.plot(
class.sys = "FR.GEPPA.TT",
+ lang = "ro"
+) #
+
+# Back to old parameters:
+par(old.par)
+@
+
+
+And finally in English, the default language (\texttt{lang = "en"}):
+
+
+<<echo=TRUE,fig=TRUE,include=TRUE,height=7>>=
+# Set a 2 by 2 plot matrix (for size):
+old.par <- par(no.readonly=T)
+par("mfcol" = c(1,2),"mfrow"=c(1,2))
+
+# Plot the triangles with different languages:
+TT.plot(
+ class.sys = "FR.GEPPA.TT",
lang = "en"
) #
@@ -2969,6 +3077,8 @@
+
+
Please report any mistakes in these translations. Please don't
hesitate to send me new translations in other languages. This
option is easily extensible.
Modified: pkg/soiltexture/inst/doc2/soiltexture_vignette.bib
===================================================================
--- pkg/soiltexture/inst/doc2/soiltexture_vignette.bib 2010-06-01 15:07:15 UTC (rev 21)
+++ pkg/soiltexture/inst/doc2/soiltexture_vignette.bib 2010-06-07 14:28:13 UTC (rev 22)
@@ -387,3 +387,14 @@
url = {http://www.stats.ox.ac.uk/pub/MASS4}
}
+ at ARTICLE{VERHEYE1984PEDO,
+ author = {W. Verheye and J. Ameryckx},
+ title = {Mineral fractions and classificaton of soil texture.},
+ journal = {Pedologie},
+ year = {1984},
+ volume = {2},
+ pages = {215-225},
+ owner = {julienm},
+ timestamp = {2010.06.07}
+}
+
Modified: pkg/soiltexture/inst/doc2/soiltexture_vignette.bib.bak
===================================================================
--- pkg/soiltexture/inst/doc2/soiltexture_vignette.bib.bak 2010-06-01 15:07:15 UTC (rev 21)
+++ pkg/soiltexture/inst/doc2/soiltexture_vignette.bib.bak 2010-06-07 14:28:13 UTC (rev 22)
@@ -1,7 +1,7 @@
% This file was created with JabRef 2.5.
% Encoding: Cp1252
- at MISC{CANSIS,
+ at MISC{CANSIS2010,
author = {Agriculture and Agri-Food Canada},
title = {Glossary -- Canadian Soil Information System},
howpublished = {Internet},
@@ -387,3 +387,14 @@
url = {http://www.stats.ox.ac.uk/pub/MASS4}
}
+ at ARTICLE{VERHEYE1984PEDO,
+ author = {W. Verheye and J. Ameryckx},
+ title = {Mineral fractions and classificaton of soil texture.},
+ journal = {Pedologie},
+ year = {1984},
+ volume = {2},
+ pages = {215-225},
+ owner = {julienm},
+ timestamp = {2010.06.07}
+}
+
Modified: pkg/soiltexture/man/TT.plot.Rd
===================================================================
--- pkg/soiltexture/man/TT.plot.Rd 2010-06-01 15:07:15 UTC (rev 21)
+++ pkg/soiltexture/man/TT.plot.Rd 2010-06-07 14:28:13 UTC (rev 22)
@@ -408,5 +408,17 @@
TT.plot( class.sys = "CA.FR.TT" ) # Canada (fr)
TT.plot( class.sys = "CA.EN.TT" ) # Canada (en)
TT.plot( class.sys = "AU.TT" ) # Australian
+TT.plot( class.sys = "ISSS.TT" ) # ISSS
+TT.plot( class.sys = "ROM.TT" ) # Romanian
-}
+# ::: Test all the languages:
+
+TT.plot( class.sys = "USDA.TT", lang = "en" ) # English, default
+TT.plot( class.sys = "USDA.TT", lang = "fr" ) # French
+TT.plot( class.sys = "USDA.TT", lang = "de" ) # German
+TT.plot( class.sys = "USDA.TT", lang = "se" ) # Spanish
+TT.plot( class.sys = "USDA.TT", lang = "it" ) # Italian
+TT.plot( class.sys = "USDA.TT", lang = "nl" ) # Dutch
+TT.plot( class.sys = "USDA.TT", lang = "fl" ) # Dutch (Belgian) / Flemmish
+TT.plot( class.sys = "USDA.TT", lang = "se" ) # Swedish
+TT.plot( class.sys = "USDA.TT", lang = "ro" ) # Romanian }
Modified: pkg/soiltexture/man/soiltexture-package.Rd
===================================================================
--- pkg/soiltexture/man/soiltexture-package.Rd 2010-06-01 15:07:15 UTC (rev 21)
+++ pkg/soiltexture/man/soiltexture-package.Rd 2010-06-07 14:28:13 UTC (rev 22)
@@ -17,7 +17,7 @@
\details{
\tabular{ll}{Package: \tab soiltexture\cr
Version: \tab 1.0\cr
-Date: \tab 2010-06-01\cr
+Date: \tab 2010-06-07\cr
Title: \tab Functions for soil texture plot, classification and transformation\cr
Author: \tab Julien MOEYS <jules_m78-soiltexture at yahoo.fr>\cr
Maintainer: \tab Julien MOEYS <jules_m78-soiltexture at yahoo.fr>\cr
Modified: pkg/soiltexture/tests/TT.plot.R
===================================================================
--- pkg/soiltexture/tests/TT.plot.R 2010-06-01 15:07:15 UTC (rev 21)
+++ pkg/soiltexture/tests/TT.plot.R 2010-06-07 14:28:13 UTC (rev 22)
@@ -65,5 +65,17 @@
TT.plot( class.sys = "CA.FR.TT" ) # Canada (fr)
TT.plot( class.sys = "CA.EN.TT" ) # Canada (en)
TT.plot( class.sys = "AU.TT" ) # Australian
+TT.plot( class.sys = "ISSS.TT" ) # ISSS
+TT.plot( class.sys = "ROM.TT" ) # Romanian
+# ::: Test all the languages:
+TT.plot( class.sys = "USDA.TT", lang = "en" ) # English, default
+TT.plot( class.sys = "USDA.TT", lang = "fr" ) # French
+TT.plot( class.sys = "USDA.TT", lang = "de" ) # German
+TT.plot( class.sys = "USDA.TT", lang = "se" ) # Spanish
+TT.plot( class.sys = "USDA.TT", lang = "it" ) # Italian
+TT.plot( class.sys = "USDA.TT", lang = "nl" ) # Dutch
+TT.plot( class.sys = "USDA.TT", lang = "fl" ) # Dutch (Belgian) / Flemmish
+TT.plot( class.sys = "USDA.TT", lang = "se" ) # Swedish
+TT.plot( class.sys = "USDA.TT", lang = "ro" ) # Romanian
Modified: pkg/soiltexture.Rcheck.zip
===================================================================
(Binary files differ)
Modified: pkg/soiltexture_1.0.tar.gz
===================================================================
(Binary files differ)
Modified: pkg/soiltexture_1.0.zip
===================================================================
(Binary files differ)
More information about the Soiltexture-commits
mailing list