Различия

Здесь показаны различия между двумя версиями данной страницы.

--- recalc:ms_tpf_realc0 [2016/05/12 12:52]
admin [Source]
+++ recalc:ms_tpf_realc0 [2016/05/12 13:41]
admin [Source]
@@ Строка 30: / Строка 30: @@
 {
 rn <- tpf.rename(wtp_data);
-clk <- tpf.omesod(rn,11,4);
+clkm <- NULL;
-return(tpf.unrename(clk,wtp_data$Name));
+for(i in 1:nrow(rn))
+{
+clk <- tpf.omesod(rn[i,],11,4);
+if (i == 1) { clkm = clk; }
+else { clkm = rbind(clkm,clk); }
+}
+return(tpf.unrename(clkm, wtp_data$Name));
 }
 recalc.ms_tpf_realc0.test <- function () {
-  src <- data.frame(Name='test',SiO2_wtp=46.920, TiO2_wtp=0.500, Al2O3_wtp=29.430,
+  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=3.610, MnO_wtp=0.180, MgO_wtp=2.280, Na2O_wtp=0.640, K2O_wtp=9.330);
+  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));
-  src = rbind(src,src)
+  result <- recalc.ms_tpf_realc0 (src[2,]);
   result <- recalc.ms_tpf_realc0 (src);
   print( result);
-  expect_equal(object = result[1,]$Si_pfu, 3.231, tolerance = 0.05);
+  expect_equal(object = result[1,]$Si_pfu, 3.231, tolerance = 0.001);
-  expect_equal(object = result[2,]$Si_pfu, 3.231, tolerance = 0.05);
+  expect_equal(object = result[2,]$Si_pfu, 3.142, tolerance = 0.001);
-  expect_equal(object = result[1,]$Al_pfu, 2.388, tolerance = 0.05);
+  expect_equal(object = result[1,]$Al_pfu, 2.388, tolerance = 0.001);
-  expect_equal(object = result[2,]$Al_pfu, 2.388, tolerance = 0.05);
+  expect_equal(object = result[2,]$Al_pfu, 2.508, tolerance = 0.001);
-  expect_equal(object = result[1,]$Al_c6_pfu, 1.619, tolerance = 0.05);
+  expect_equal(object = result[1,]$Al_c6_pfu, 1.619, tolerance = 0.001);
-  expect_equal(object = result[2,]$Al_c6_pfu, 1.619, tolerance = 0.05);
+  expect_equal(object = result[2,]$Al_c6_pfu, 1.650, tolerance = 0.001);
 }