Различия
Здесь показаны различия между двумя версиями данной страницы.
| Предыдущая версия справа и слева Предыдущая версия Следующая версия | Предыдущая версия | ||
|
classifydiag:cpx_ca_mg_fe [2019/09/11 12:29] f0ma |
classifydiag:cpx_ca_mg_fe [2019/09/11 13:15] (текущий) f0ma |
||
|---|---|---|---|
| Строка 31: | Строка 31: | ||
| { | { | ||
| ds <- selectNames(recalc.cpx_4cat_norm(wtp_data), | ds <- selectNames(recalc.cpx_4cat_norm(wtp_data), | ||
| - | c('Name','Ca_pfu','Mg_pfu','Fe_pfu','Fe_p2_pfu','Fe_p3_pfu','Na_pfu')); | + | c('Name','Ca_pfu','Mg_pfu','Mn_pfu','Fe_pfu','Fe_p2_pfu','Fe_p3_pfu','Na_pfu')); |
| marks <- data.frame(Label=c('Diopside','Hedenbergite','Augite','Pigeonite','Clinoenstotite','Clinoferrosilite'), | marks <- data.frame(Label=c('Diopside','Hedenbergite','Augite','Pigeonite','Clinoenstotite','Clinoferrosilite'), | ||
| Строка 37: | Строка 37: | ||
| Y=c(0.55,0.55,0.33,0.12,0.03,0.03), | Y=c(0.55,0.55,0.33,0.12,0.03,0.03), | ||
| Z=c(0.12,0.48,0.33,0.44,0.18,0.78)); | Z=c(0.12,0.48,0.33,0.44,0.18,0.78)); | ||
| + | |||
| + | lines <- data.frame(X1 = c(0.50, 0.55, 0.80, 0.95, 0.25, 0.475), | ||
| + | Y1 = c(0.50, 0.45, 0.20, 0.05, 0.50, 0.05), | ||
| + | Z1 = c(0.00, 0.00, 0.00, 0.00, 0.25, 0.475), | ||
| + | X2 = c(0.00, 0.00, 0.00, 0.00, 0.275, 0.50), | ||
| + | Y2 = c(0.50, 0.45, 0.20, 0.05, 0.45, 0.00), | ||
| + | Z2 = c(0.50, 0.55, 0.80, 0.95, 0.275, 0.50)); | ||
| pts <- data.frame (Name = ds$Name, | pts <- data.frame (Name = ds$Name, | ||
| X = ds$Mg_pfu, | X = ds$Mg_pfu, | ||
| Y = ds$Ca_pfu, | Y = ds$Ca_pfu, | ||
| - | Z = ds$Fe_pfu); | + | Z = ds$Fe_pfu + ds$Mn_pfu); |
| labels <- c("En", "Wo", "Fs"); | labels <- c("En", "Wo", "Fs"); | ||
| Строка 51: | Строка 58: | ||
| ret$marks <- marks; | ret$marks <- marks; | ||
| ret$labels <- labels; | ret$labels <- labels; | ||
| + | ret$lines <- lines; | ||
| return (ret); | return (ret); | ||