Changeset a53fb9c in tol

Timestamp:

Jan 12, 2017, 11:35:17 AM (10 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

b57479d

Parents:

a52bf16

Message:

Refs #1941
Se revisan las funciones RTolSetXxx. Se añade el uso de R_concat para poder decompilarlas.
Se añade la función para crear matrices.

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

File:

• rtol/source/tolRlink.cpp (modified) (5 diffs)

rtol/source/tolRlink.cpp

@@ -195 +195 @@
 
 //----------------------------------------------------------------------------
-extern "C" DLLEXPORT(void) RTolSetReal(char **name, int *type, double *value)
+extern "C" DLLEXPORT(void) RTolSetReal(char **name, int *type, double *value, int *ok)
 //----------------------------------------------------------------------------
 {
@@ -215 +215 @@
     BList* aux = NIL;
     LstFastAppend(result, aux, so);
-  }
-}
-
-//----------------------------------------------------------------------------
-extern "C" DLLEXPORT(void) RTolSetText(char **name, char **value)
+    R_concat(&R_stack, result);    
+    *ok = 1;
+  }
+  else {
+    *ok = 0;
+  }
+}
+
+//----------------------------------------------------------------------------
+extern "C" DLLEXPORT(void) RTolSetText(char **name, char **value, int *ok)
 //----------------------------------------------------------------------------
 {
@@ -230 +235 @@
     BList* aux = NIL;
     LstFastAppend(result, aux, so);
-  }
-}
-
-//----------------------------------------------------------------------------
-extern "C" DLLEXPORT(void) RTolSetDate(char **name, int *type, double *value)
+    R_concat(&R_stack, result);    
+    *ok = 1;
+  }
+  else {
+    *ok = 0;
+  }
+}
+
+//----------------------------------------------------------------------------
+extern "C" DLLEXPORT(void) RTolSetDate(char **name, int *type, double *value, int *ok)
 //----------------------------------------------------------------------------
 {
@@ -243 +253 @@
     d.PutIndex(*value);
   } else if(*type == 2) {
+    d.PutIndex(219147); // End
+  } else if(*type == 3) {
     d.PutIndex(-115782); // Begin
-  } else if(*type == 3) {
-    d.PutIndex(219147); // End
   } else { // type 1
     d.PutIndex(-300000); // Unknown
@@ -254 +264 @@
     BList* aux = NIL;
     LstFastAppend(result, aux, so);
-  }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
+    R_concat(&R_stack, result);    
+    *ok = 1;
+  }
+  else {
+    *ok = 0;
+  }
+}
+
+//----------------------------------------------------------------------------
+extern "C" DLLEXPORT(void) RTolSetMatrix(char **name, int *rows, int *cols, 
+  bool *mask, int *type, double *value, int *ok)
+//----------------------------------------------------------------------------
+{
+  if(TOLHasBeenInitialized()==0) RInitTolKernel();
+  char* str_name = (char*)*name;
+  BMat d(*rows, *cols);
+  for (int c=0; c< (*cols); ++c) {   
+    for (int r=0; r< (*rows); ++r) {
+      int p = c * (*rows) + r;
+      if(*mask) {
+        if(type[p] == 0) {
+          d(r, c).PutValue(value[p]);
+        } else if(type[p] == 2) {
+          d(r, c).PutValue(BDat::PosInf());
+        } else if(type[p] == 3) {
+          d(r, c).PutValue(BDat::NegInf());
+        } else { // type 1
+          d(r, c).PutKnown(BUNKNOWN);
+        }
+      } else {
+        d(r, c).PutValue(value[p]);
+      }
+    }
+  }
+  BSyntaxObject * so = new BContensMat(str_name, d, "");
+  if (so) {
+    BList* result = NIL;
+    BList* aux = NIL;
+    LstFastAppend(result, aux, so);
+    R_concat(&R_stack, result);    
+    *ok = 1;
+  }
+  else {
+    *ok = 0;
+  }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+