Различия
Здесь показаны различия между двумя версиями данной страницы.
| Предыдущая версия справа и слева Предыдущая версия Следующая версия | Предыдущая версия | ||
|
recalc:ol_nm [2017/03/06 23:13] admin [Source] |
recalc:ol_nm [2018/11/12 15:08] (текущий) |
||
|---|---|---|---|
| Строка 71: | Строка 71: | ||
| fecharge <- ifelse(8-charge>0,8-charge,0); | fecharge <- ifelse(8-charge>0,8-charge,0); | ||
| pfu_units$Fe_p3_pfu <- ifelse(pfu_units$Fe_p3_pfu > 0, pfu_units$Fe_p3_pfu, fecharge); | pfu_units$Fe_p3_pfu <- ifelse(pfu_units$Fe_p3_pfu > 0, pfu_units$Fe_p3_pfu, fecharge); | ||
| - | pfu_units$Fe_p2_pfu <- ifelse(pfu_units$Fe_p3_pfu > 0, pfu_units$Fe_p2_pfu, norm_cations$Fe_p2_pfu - fecharge); | + | pfu_units$Fe_p2_pfu <- ifelse(norm_cations$Fe_p3_pfu > 0, pfu_units$Fe_p2_pfu, norm_cations$Fe_p2_pfu - pfu_units$Fe_p3_pfu); |
| endcharge <- 4*(pfu_units$Si_pfu+pfu_units$Ti_pfu)+ | endcharge <- 4*(pfu_units$Si_pfu+pfu_units$Ti_pfu)+ | ||
| Строка 86: | Строка 86: | ||
| recalc.ol_nm.test <- function () { | recalc.ol_nm.test <- function () { | ||
| - | test <- data.frame(Name=c("Sp1","Sp2"), SiO2_wtp=c(38.48,38.48), TiO2_wtp=c(0.1, 0.1), Al2O3_wtp=c(0.13,0.13), FeO_wtp=c(20.99, 20.99), Fe2O3_wtp=c(0, 0), MnO_wtp=c(0.33, 0.33), MgO_wtp=c(40.45, 40.45), CaO_wtp=c(0.02, 0.02)); | + | test <- data.frame(Name=c("Sp1","Sp2"), SiO2_wtp=c(38.48,38.48), TiO2_wtp=c(0.1, 0.1), Al2O3_wtp=c(0.13,0.13), FeO_wtp=c(20.99, 20.99), Fe2O3_wtp=c(0, 1), MnO_wtp=c(0.33, 0.33), MgO_wtp=c(40.45, 40.45), CaO_wtp=c(0.02, 0.02)); |
| - | result <- recalc.sp_nm(test); | + | result <- recalc.ol_nm(test); |
| - | expect_equal(object = result[1,]$Fe_p2_pfu, 0.432, tolerance = 0.001); | + | expect_equal(object = result[1,]$Fe_p2_pfu, 0.432, tolerance = 0.005); |
| - | expect_equal(object = result[2,]$Ti_pfu, 0.988, tolerance = 0.001); | + | expect_equal(object = result[2,]$Si_pfu, 0.984, tolerance = 0.005); |
| } | } | ||
| </Code> | </Code> | ||