Различия

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

--- sensors:p:grt_pl_qtz_and_aranovich_podlesskii_1980 [2016/10/21 15:07]
admin
+++ sensors:p:grt_pl_qtz_and_aranovich_podlesskii_1980 [2018/11/12 15:08] (текущий)
@@ Строка 9: / Строка 9: @@
 ^ Article |  |
 ^ Collibration |  |
-^ Presition |  |
+^ Precision |  |
 ^ Ranges |  |
 ^ Renew sensors |  |
@@ Строка 31: / Строка 31: @@
 source("utilities_tpf.r");
-sensors.p.grt_pl_qtz_and_aranovich_podlesskii_1980 <- function(Grt, Pl, Qtz, And, Temp, ...){
-T <- Temp;
+sensors.p.grt_pl_qtz_and_aranovich_podlesskii_1980 <- function(Grt, Pl, Temp, ...){
+    T <- Temp;
     Pl <- tpf.recalc_minaral("PL",Pl);
     Grt <- tpf.recalc_minaral("GRT",Grt);
+    print(Pl);
+    print(Grt);
     X <- Grt$Ca_pfu / (Grt$Mg_pfu + Grt$Ca_pfu + Grt$Mn_pfu + Grt$Fe_p2_pfu + Grt$Fe_p3_pfu);
-    warning(X);
+    print(X);
     Y <- Grt$Mg_pfu / (Grt$Mg_pfu + Grt$Ca_pfu + Grt$Mn_pfu + Grt$Fe_p2_pfu + Grt$Fe_p3_pfu);
-    warning(Y);
+    print(Y);
     Z <- (Grt$Fe_p2_pfu + Grt$Fe_p3_pfu + Grt$Mn_pfu) / (Grt$Mg_pfu + Grt$Ca_pfu + Grt$Mn_pfu + Grt$Fe_p2_pfu + Grt$Fe_p3_pfu);
-    warning(Z);
+    print(Z);
     N <- Pl$Ca_pfu / (Pl$Ca_pfu + Pl$Na_pfu);
     TT <- T + 273;
@@ Строка 50: / Строка 54: @@
 sensors.p.grt_pl_qtz_and_aranovich_podlesskii_1980.args <- function(){
     ars <- list();
-    ars$minerals <- c("Grt", "Pl", "Qtz", "And");
+    ars$minerals <- c("Grt", "Pl");
     ars$ranges <- c("Temp");
     return(ars);
 }
-#sensors.p.grt_pl_qtz_and_aranovich_podlesskii_1980.test <- function(){
+sensors.p.grt_pl_qtz_and_aranovich_podlesskii_1980.test <- function(){
-#
-#}
+  Grt <- data.frame(Name='Grt',SiO2_wtp=37.980,Al2O3_wtp=21.270,FeO_wtp=29.930, MnO_wtp=1.060, MgO_wtp=4.090, CaO_wtp=6.770);
+  Pl <- data.frame(Name='Pl',Na2O_wtp=5.650, Al2O3_wtp=28.710, SiO2_wtp=55.400, CaO_wtp=10.240);
+  result <- sensors.p.grt_pl_qtz_and_aranovich_podlesskii_1980(Grt, Pl, Temp=500);
+  print(result);
+}
 </Code>
 {{tag> tpf Pl Grt }}