Commitbec9cd6

committed

other columns

1 parenta89ff0d commitbec9cd6Copy full SHA for bec9cd6

File tree

+12

-12

lines changed

+12

-12

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ co$.label <- factor(`
`90`	`90`	`any(table(cp$peiid) > 1)`
`91`	`91`
`92`	`92`	`# merge subset component pedons into SPC`
`93`		`-site(p) <- cp[, c('peiid', 'coiid', 'representative')]`
	`93`	`+site(p) <- cp[, c('peiid', 'coiid', 'rvindicator')]`
`94`	`94`
`95`	`95`	`# look-up associated component label`
`96`	`96`	`site(p)$.comp_label <- co$.label[match(p$coiid, site(co)$coiid)]`
`@@ -100,7 +100,7 @@ site(p)$.comp_label <- co$.label[match(p$coiid, site(co)$coiid)]`
`100`	`100`	`p$.pedon_label <- p$taxonname`
`101`	`101`
`102`	`102`	`# flag RV copedon`
`103`		`-idx <- which(p$representative == 1)`
	`103`	`+idx <- which(p$rvindicator == 1)`
`104`	`104`	`p$.pedon_label[idx] <- paste0(p$.pedon_label[idx], '\|R')`
`105`	`105`
`106`	`106`	`# flag OSD copedon`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -253,9 +253,9 @@ summarize.component <- function(f.i) {`
`253`	`253`	`gen.hz.classification.table<- table(h.i$genhz,h.i$hzname)`
`254`	`254`
`255`	`255`	`# variables to summarize`
`256`		`-vars<- c('clay','sand','phfield','gravel','paragravel','cobbles','paracobbles','stones','channers','flagstones','total_frags_pct_nopf','albedo')`
	`256`	`+vars<- c('claytotest','sandtotest','phfield','gravel','paragravel','cobbles','paracobbles','stones','channers','flagstones','total_frags_pct_nopf','albedo')`
`257`	`257`	`# better names, used in final tables / figures`
`258`		`-var.names<- c('HZ','clay','sand','pH','GR','PGR','CB','PCB','ST','CN','FL','Total RF','Albedo')`
	`258`	`+var.names<- c('HZ','claytotest','sandtotest','pH','GR','PGR','CB','PCB','ST','CN','FL','Total RF','Albedo')`
`259`	`259`
`260`	`260`
`261`	`261`	`# wide -> long, inclide musym for plotting`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ plotSoilRelationGraph(m, graph.mode = 'directed', edge.arrow.size=0.5, vertex.la`
`260`	`260`	`###Texture`
`261`	`261`	```{r}
`262`	`262`	`kable(s$tt)`
`263`		`-#texture.triangle.low.rv.high(data.frame(sand=peds$sand,silt=peds$silt,clay=peds$clay), p=c(0.05, 0.5, 0.95))`
	`263`	`+#texture.triangle.low.rv.high(data.frame(sand=peds$sandtotest,silt=peds$silttotest,clay=peds$claytotest), p=c(0.05, 0.5, 0.95))`
`264`	`264`	```
`265`	`265`
`266`	`266`	`###Color`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,8 @@ inputPanel(`
`118`	`118`	`"thematic_field",`
`119`	`119`	`label = "Select horizon data to plot: ",`
`120`	`120`	`choices = c(`
`121`		`- "clay",`
`122`		`- "sand",`
	`121`	`+ "claytotest",`
	`122`	`+ "sandtotest",`
`123`	`123`	`"phfield",`
`124`	`124`	`"total_frags_pct",`
`125`	`125`	`"moist_soil_color",`
`@@ -1077,9 +1077,9 @@ if(loaded)`
`1077`	`1077`	`if (length(peds)) {`
`1078`	`1078`	`x <- na.omit(data.frame(`
`1079`	`1079`	`genhz = peds$genhz,`
`1080`		`- SAND = peds$sand,`
`1081`		`- SILT = peds$silt,`
`1082`		`- CLAY = peds$clay`
	`1080`	`+ SAND = peds$sandtotest,`
	`1081`	`+ SILT = peds$silttotest,`
	`1082`	`+ CLAY = peds$claytotest`
`1083`	`1083`	`))`
`1084`	`1084`
`1085`	`1085`	`if (nrow(x)) {`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -407,9 +407,9 @@ summarize.component <- function(f.i) {`
`407`	`407`	`gen.hz.classification.table<- table(h.i$genhz,h.i$hzname)`
`408`	`408`
`409`	`409`	`# variables to summarize`
`410`		`-vars<- c('clay','sand','phfield','gravel','paragravel','cobbles','paracobbles','stones','channers','total_frags_pct','albedo')`
	`410`	`+vars<- c('claytotest','sandtotest','phfield','gravel','paragravel','cobbles','paracobbles','stones','channers','total_frags_pct','albedo')`
`411`	`411`	`# better names, used in final tables / figures`
`412`		`-var.names<- c('HZ','clay','sand','pH','GR','PGR','CB','PCB','ST','CN','Total RF','Albedo')`
	`412`	`+var.names<- c('HZ','claytotest','sandtotest','pH','GR','PGR','CB','PCB','ST','CN','Total RF','Albedo')`
`413`	`413`
`414`	`414`
`415`	`415`	`# wide -> long, inclide musym for plotting`

Comments

(0)