Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit17e61d4

Browse files
committed
cleanup
1 parent6bdc34e commit17e61d4

File tree

11 files changed

+14
-14
lines changed

11 files changed

+14
-14
lines changed

‎R/SoilTaxonomyLevels.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SoilTaxonomyLevels <- function(level = c("order", "suborder", "greatgroup", "sub
2222

2323
level<- match.arg(level, c("order","suborder","greatgroup","subgroup"))
2424
ST_unique_list<-NULL
25-
load(system.file("data/ST_unique_list.rda",package="SoilTaxonomy")[1])
25+
load(system.file("data","ST_unique_list.rda",package="SoilTaxonomy")[1])
2626

2727
res<-factor(ST_unique_list[[level]],levels=ST_unique_list[[level]],ordered=ordered)
2828

‎R/diagnostic-features.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ get_ST_features <- function(group = NULL,
3434
multiline_sep="\n",
3535
multiline_col="criteria") {
3636
ST_features<-NULL
37-
load(system.file("data/ST_features.rda",package="SoilTaxonomy")[1])
37+
load(system.file("data","ST_features.rda",package="SoilTaxonomy")[1])
3838

3939
.data_filter(
4040
.data=ST_features,

‎R/explainST.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ explainST <- function(x, format = c('text', 'html'), viewer = TRUE) {
4141
if (!is.na(x.lvl)&&x.lvl=="order") {
4242
# handle input of full order name e.g. "aridisols"
4343
ST_formative_elements<-NULL
44-
load(system.file("data/ST_formative_elements.rda",package="SoilTaxonomy")[1])
44+
load(system.file("data","ST_formative_elements.rda",package="SoilTaxonomy")[1])
4545

4646
y<-ST_formative_elements[["order"]]
4747
idx<- which(x==y$order)

‎R/family-classes.R‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ parse_family <- function(family, column_metadata = TRUE, flat = TRUE) {
2828
ST_unique_list<-NULL
2929

3030
# load local copy of taxon code lookup table
31-
load(system.file("data/ST_unique_list.rda",package="SoilTaxonomy")[1])
31+
load(system.file("data","ST_unique_list.rda",package="SoilTaxonomy")[1])
3232

3333
lut<- do.call('c',ST_unique_list)
3434

@@ -83,11 +83,11 @@ parse_family <- function(family, column_metadata = TRUE, flat = TRUE) {
8383
return(res[,0,drop=FALSE])
8484
}else {
8585
# soilDB::get_NASIS_metadata() # 2.7.3+
86-
load(system.file("data/metadata.rda",package="soilDB")[1])
86+
load(system.file("data","metadata.rda",package="soilDB")[1])
8787
}
8888

8989
ST_family_classes<-NULL
90-
load(system.file("data/ST_family_classes.rda",package="SoilTaxonomy")[1])
90+
load(system.file("data","ST_family_classes.rda",package="SoilTaxonomy")[1])
9191

9292
# lookup classes in KST definitions
9393
kst_lookup<- lapply(res$classes_split,function(x) {
@@ -242,7 +242,7 @@ get_ST_family_classes <- function(classname = NULL,
242242
multiline_col="criteria") {
243243

244244
ST_family_classes<-NULL
245-
load(system.file("data/ST_family_classes.rda",package="SoilTaxonomy")[1])
245+
load(system.file("data","ST_family_classes.rda",package="SoilTaxonomy")[1])
246246

247247
.data_filter(
248248
.data=ST_family_classes,

‎R/formative-elements.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ get_ST_formative_elements <- function(level = c("order", "suborder", "greatgroup
187187
.get_ST_formative_elements<-function() {
188188
if (!exists("ST_formative_elements",envir=SoilTaxonomy.env)) {
189189
ST_formative_elements<-NULL
190-
load(system.file("data/ST_formative_elements.rda",package="SoilTaxonomy")[1])
190+
load(system.file("data","ST_formative_elements.rda",package="SoilTaxonomy")[1])
191191
assign("ST_formative_elements",ST_formative_elements,envir=SoilTaxonomy.env)
192192
}else {
193193
ST_formative_elements<- get("ST_formative_elements",SoilTaxonomy.env)

‎R/getLastChildTaxon.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ getLastChildTaxon <- function(level = c("order","suborder","greatgroup")) {
1919

2020
level.idx<- match(level,lvls)
2121
ST_unique_list<-NULL
22-
load(system.file("data/ST_unique_list.rda",package="SoilTaxonomy")[1])
22+
load(system.file("data","ST_unique_list.rda",package="SoilTaxonomy")[1])
2323

2424
suborders<- taxon_to_taxon_code(ST_unique_list[[level]])
2525
ggposition<- relative_taxon_code_position(taxon_to_taxon_code(ST_unique_list[[lvls[level.idx+1]]]))

‎R/getTaxonSMR.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ getTaxonSMR <- function(taxon = NULL, code = NULL, as.is = FALSE, droplevels = F
3838
out<-factor(out,levels= SoilMoistureRegimeLevels(as.is=TRUE),ordered=ordered)
3939

4040
if (droplevels) {
41-
return(droplevels(res))
41+
return(droplevels(out))
4242
}
4343
}
4444

‎R/higherTaxaCodes.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ relative_taxon_code_position <- function(code) {
238238
}
239239

240240
ST_higher_taxa_codes_12th<-NULL
241-
load(system.file("data/ST_higher_taxa_codes_12th.rda",package="SoilTaxonomy")[1])
241+
load(system.file("data","ST_higher_taxa_codes_12th.rda",package="SoilTaxonomy")[1])
242242

243243
# for efficiency the lowercase taxon names are calculated only if needed
244244
# the ST_higher_taxa_codes loading function does this

‎R/higherTaxaLevels.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ code_to_level <- function(code) {
8383
level_to_taxon<-function(level= c("order","suborder","greatgroup","subgroup")) {
8484
ST_unique_list<-NULL
8585

86-
load(system.file("data/ST_unique_list.rda",package="SoilTaxonomy")[1])
86+
load(system.file("data","ST_unique_list.rda",package="SoilTaxonomy")[1])
8787

8888
level<- match.arg(level, names(ST_unique_list),several.ok=TRUE)
8989

‎R/isValidST.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ isValidST <- function(needle, level = c('order', 'suborder', 'greatgroup', 'subg
2121
ST_unique_list<-NULL
2222

2323
# load local copy of unique taxa
24-
load(system.file("data/ST_unique_list.rda",package="SoilTaxonomy")[1])
24+
load(system.file("data","ST_unique_list.rda",package="SoilTaxonomy")[1])
2525

2626
# load required elements
2727
haystack<-ST_unique_list[[level]]

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp