Различия
Здесь показаны различия между двумя версиями данной страницы.
| Предыдущая версия справа и слева Предыдущая версия Следующая версия | Предыдущая версия | ||
|
recalc:ms_tindle [2016/05/12 11:10] admin |
recalc:ms_tindle [2018/11/12 15:08] (текущий) |
||
|---|---|---|---|
| Строка 2: | Строка 2: | ||
| Recalculation to 22 ox with F,Cl correction. Li2O and H2O not calculated. | Recalculation to 22 ox with F,Cl correction. Li2O and H2O not calculated. | ||
| - | |||
| - | Warinig! Li_pfu calculation test error! | ||
| === Details === | === Details === | ||
| Строка 42: | Строка 40: | ||
| step1_data <- rowApply(`/`, data, step1_coeff); | step1_data <- rowApply(`/`, data, step1_coeff); | ||
| - | return(step1_data); | ||
| step1_sum <- rowSums(step1_data); | step1_sum <- rowSums(step1_data); | ||
| Строка 71: | Строка 68: | ||
| step3_data$Li_pfu <- Li_ve; | step3_data$Li_pfu <- Li_ve; | ||
| - | return(step3_data[,c('Name',pfu_names,'Al_c4_pfu','Al_c6_pfu', 'Li_pfu')]); | + | step3_data$OH_pfu = 4-(step3_data$Cl_pfu+step3_data$F_pfu) |
| + | |||
| + | return(step3_data[,c('Name',pfu_names,'Al_c4_pfu','Al_c6_pfu', 'Li_pfu', 'OH_pfu')]); | ||
| } | } | ||
| Строка 80: | Строка 79: | ||
| result <- recalc.ms_tindle (src); | result <- recalc.ms_tindle (src); | ||
| - | print(result); | + | |
| - | expect_equal(object = result$Al_c4_pfu,2.781, tolerance = 0.05); | + | expect_equal(object = result$Al_c4_pfu,2.761, tolerance = 0.05); |
| - | expect_equal(object = result$Al_c6_pfu,0.732, tolerance = 0.05); | + | expect_equal(object = result$Al_c6_pfu,0.766, tolerance = 0.05); |
| - | expect_equal(object = result$Li_pfu,0.17, tolerance = 0.05); | + | expect_equal(object = result$Li_pfu,0.0, tolerance = 0.05); |
| - | expect_equal(object = result$Mg_pfu,2.115, tolerance = 0.05); | + | expect_equal(object = result$Mg_pfu,2.123, tolerance = 0.05); |
| expect_equal(object = result$OH_pfu,3.982, tolerance = 0.05); | expect_equal(object = result$OH_pfu,3.982, tolerance = 0.05); | ||
| } | } | ||
| </Code> | </Code> | ||