Различия
Здесь показаны различия между двумя версиями данной страницы.
Предыдущая версия справа и слева Предыдущая версия Следующая версия | Предыдущая версия | ||
recalc:ms_tpf_realc0 [2016/05/12 12:57] admin [Source] |
recalc:ms_tpf_realc0 [2018/11/12 15:08] (текущий) |
||
---|---|---|---|
Строка 20: | Строка 20: | ||
* подробное описание | * подробное описание | ||
* <del>код</del> | * <del>код</del> | ||
- | * тест | + | * <del>тест</del> |
</WRAP> | </WRAP> | ||
Строка 29: | Строка 29: | ||
recalc.ms_tpf_realc0 <- function (wtp_data, ...) | recalc.ms_tpf_realc0 <- function (wtp_data, ...) | ||
{ | { | ||
- | rn <- tpf.rename(wtp_data); | + | return(tpf.recalc_minaral("MS",wtp_data)); |
- | clk <- tpf.omesod(rn,11,4); | + | |
- | return(tpf.unrename(clk,wtp_data$Name)); | + | |
} | } | ||
Строка 37: | Строка 35: | ||
src <- data.frame(Name='test',SiO2_wtp=c(46.920, 45.230), TiO2_wtp=c(0.500, 0.640), Al2O3_wtp=c(29.430, 30.630), | src <- data.frame(Name='test',SiO2_wtp=c(46.920, 45.230), TiO2_wtp=c(0.500, 0.640), Al2O3_wtp=c(29.430, 30.630), | ||
FeO_wtp=c(3.610, 4.220), MnO_wtp=c(0.180, 0.010), MgO_wtp=c(2.280, 1.490), CaO_wtp=c(0.0, 0.270), Na2O_wtp=c(0.640, 0.690), K2O_wtp=c(9.330,9.470)); | FeO_wtp=c(3.610, 4.220), MnO_wtp=c(0.180, 0.010), MgO_wtp=c(2.280, 1.490), CaO_wtp=c(0.0, 0.270), Na2O_wtp=c(0.640, 0.690), K2O_wtp=c(9.330,9.470)); | ||
+ | |||
+ | result <- recalc.ms_tpf_realc0 (src[2,]); | ||
| | ||
result <- recalc.ms_tpf_realc0 (src); | result <- recalc.ms_tpf_realc0 (src); | ||
- | print( result); | + | expect_equal(object = result[1,]$Si_pfu, 3.231, tolerance = 0.001); |
- | expect_equal(object = result[1,]$Si_pfu, 3.231, tolerance = 0.05); | + | expect_equal(object = result[2,]$Si_pfu, 3.142, tolerance = 0.001); |
- | expect_equal(object = result[2,]$Si_pfu, 3.231, tolerance = 0.05); | + | expect_equal(object = result[1,]$Al_pfu, 2.388, tolerance = 0.001); |
- | expect_equal(object = result[1,]$Al_pfu, 2.388, tolerance = 0.05); | + | expect_equal(object = result[2,]$Al_pfu, 2.508, tolerance = 0.001); |
- | expect_equal(object = result[2,]$Al_pfu, 2.388, tolerance = 0.05); | + | expect_equal(object = result[1,]$Al_c6_pfu, 1.619, tolerance = 0.001); |
- | expect_equal(object = result[1,]$Al_c6_pfu, 1.619, tolerance = 0.05); | + | expect_equal(object = result[2,]$Al_c6_pfu, 1.650, tolerance = 0.001); |
- | expect_equal(object = result[2,]$Al_c6_pfu, 1.619, tolerance = 0.05); | + | |
} | } | ||