Changeset a4fcb39 in tol

Timestamp:

Feb 24, 2011, 11:34:47 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

aaaf752

Parents:

eb1a00c

Message:

Fixes #1110

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3239 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/stdlib/math

Files:

• R/Rapi.tol (modified) (2 diffs)
• optim/LP/Rglpk.tol (modified) (1 diff)
• optim/QP/Rquadprog.tol (modified) (1 diff)
• stat/kde/_rkde.tol (modified) (1 diff)
• stat/models/bayesian/diagnosis/_rcoda.tol (modified) (3 diffs)

tol/stdlib/math/R/Rapi.tol

@@ -203 +203 @@
 
     Text R.out = Replace(_tmp.R.out, "%S", rndID);
+    Real OSFilRemove(R.out);
 
     Text oscmd = _R.cmd+" \""+in.R+"\" \""+R.out+"\"";
@@ -208 +209 @@
         WriteLn(_MID+"Executing :\n<"+oscmd));
     Real OSCmdWait(oscmd);
-    If (verbose,
-        WriteLn(_MID+"R output was :\n<"+ReadFile(R.out)));
-
-    // Remove remporaly results
-    
-    Set EvalSet(tmps.bbm, Real(Text bbm) {
-        Real If(bbm=="", 0, OSFilRemove(bbm))
-      });
-
-    Real OSFilRemove(in.R);
-    Real OSFilRemove(args.R);
-    Real OSFilRemove(R.out);
-    
-    // Collect results
-    Set result = EvalSet(result.names, Matrix(Text result) {
-        Text res.bbm = Replace(result, "%S", rndID);
-        Matrix matres = MatReadFile(res.bbm);
-        Real OSFilRemove(res.bbm);
-        Matrix matres
-      })
+    If(!OSFilExist(R.out),
+    {
+      WriteLn("R or a required package seems to be not instaled. Please, "
+      "follow instructions at https://www.tol-project.org/wiki/DownloadTol","E");
+      Real Stop;
+      Copy(Empty)
+    },
+    {
+      If (verbose,
+          WriteLn(_MID+"R output was :\n<"+ReadFile(R.out)));
+
+      // Remove remporaly results
+      
+      Set EvalSet(tmps.bbm, Real(Text bbm) {
+          Real If(bbm=="", 0, OSFilRemove(bbm))
+        });
+
+      Real OSFilRemove(in.R);
+      Real OSFilRemove(args.R);
+      Real OSFilRemove(R.out);
+      
+      // Collect results
+      Set result = EvalSet(result.names, Matrix(Text result) {
+          Text res.bbm = Replace(result, "%S", rndID);
+          Matrix matres = MatReadFile(res.bbm);
+          Real OSFilRemove(res.bbm);
+          Matrix matres
+        })
+    })
   }
-
 ]]
 

tol/stdlib/math/optim/LP/Rglpk.tol

@@ -184 +184 @@
       "Rglpk_solve_LP.TOL('"+_om.bbm+"','"+_rhs.bbm+"','%A')";
 
-    Set result = Rapi::RunRScript(script, args.bbm, argList, result.names,
-                                  verbose);
-    Set [[
-          Real status     = MatDat(result[1],1,1),
-          Real objval     = MatDat(result[1],1,2),
-          Matrix solution = Sub(result[1],1,3,1,Columns(result[1])-2)]]
+    Set rrs = Rapi::RunRScript(script,args.bbm,argList,result.names,verbose);
+    If(Card(rrs), 
+    {[[
+      Real status     = MatDat(result[1],1,1),
+      Real objval     = MatDat(result[1],1,2),
+      Matrix solution = Sub(result[1],1,3,1,Columns(result[1])-2)
+    ]]},
+    {
+      WriteLn("[solveLP] Cannot run R script");
+      Copy(Empty)
+    })
   };
 

tol/stdlib/math/optim/QP/Rquadprog.tol

@@ -102 +102 @@
                                  _A.bbm+"','"+_b0.bbm+"','%A')";
 
-    Set result = Rapi::RunRScript(script, args.bbm, argList, result.names,
+    Set rrs = Rapi::RunRScript(script, args.bbm, argList, result.names,
                                   verbose);
-    [[
-      Matrix solution = result[1] 
-    ]]
+    If(Card(rrs), 
+    {[[
+      Matrix solution = rrs[1] 
+    ]]},
+    {
+      WriteLn("[solveQP] Cannot run R script");
+      Copy(Empty)
+    })
+
+    
   }
 

tol/stdlib/math/stat/kde/_rkde.tol

@@ -102 +102 @@
       "Rkde_density.TOL('"+_sample.bbm+"','%A')";
 
-    Set result = Rapi::RunRScript(script, args.bbm, argList, result.names,
+    Set rrs = Rapi::RunRScript(script, args.bbm, argList, result.names,
                                   verbose);
-    result[1] | result[2]
+    If(Card(rrs), 
+    {
+      result[1] | result[2]
+    },
+    {
+      WriteLn("[density] Cannot run R script");
+      Rand(0,0,0,0)
+    })
+
+    
   }
 

tol/stdlib/math/stat/models/bayesian/diagnosis/_rcoda.tol

@@ -195 +195 @@
       <<FormatReal(eps,"%.15lg")
       <<")";
-    Rapi::RunRScript(script, args.bbm, "",
-                     result.names,
-                     verbose)[1]
+    Set rrs = Rapi::RunRScript(script, args.bbm, "",result.names,verbose);
+    If(Card(rrs), rrs[1],
+    {
+      WriteLn("[raftery.diag] Cannot run R script");
+      Rand(0,0,0,0)
+    })
   };
   
@@ -282 +285 @@
       <<FormatReal(autoburnin,  "%.0lg")
       <<")";
-    Set aux = Rapi::RunRScript(script, args.bbm, "",
+    Set rrs = Rapi::RunRScript(script, args.bbm, "",
                      result.names,
                      verbose);
-    [[
-      Matrix psrf=aux[1]; 
-      Real mpsrf = MatDat(aux[2],1,1)
-    ]]
+    If(Card(rrs), 
+    {[[
+      Matrix psrf=rrs[1]; 
+      Real mpsrf = MatDat(rrs[2],1,1)
+    ]]},
+    {
+      WriteLn("[gelman.diag] Cannot run R script");
+      Copy(Empty)
+    })
   };
     
@@ -354 +362 @@
        <<qTxt
        <<")";
-    Set Rapi::RunRScript(script, args.bbm, "", result.names, verbose)
+    Set rrs= Rapi::RunRScript(script, args.bbm, "", result.names, verbose);
+    If(Card(rrs), 
+    {
+      rrs
+    },
+    {
+      WriteLn("[summary] Cannot run R script");
+      Copy(Empty)
+    })
+
   }