Changeset c81695b in tol

Timestamp:

Dec 21, 2010, 6:18:34 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

137d85f

Parents:

a666186

Message:

Refs #1042

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

File:

• tol/btol/matrix_type/matgra.cpp (modified) (3 diffs)

tol/btol/matrix_type/matgra.cpp

@@ -6801 +6801 @@
 
 
-  //--------------------------------------------------------------------
+//--------------------------------------------------------------------
   DeclareContensClass(BMat, BMatTemporary, BMatMaxColByRow);
   DefExtOpr(1, BMatMaxColByRow, "MaxColByRow", 1, 1, "Matrix",
@@ -6836 +6836 @@
   }
 }
+
 
 //--------------------------------------------------------------------
@@ -6903 +6904 @@
 
 //--------------------------------------------------------------------
+DeclareContensClass(BMat, BMatTemporary, BMatEvalMat);
+DefExtOpr(1, BMatEvalMat, "EvalMat", 2, 2, "Matrix Code",
+  "(Matrix m, Code fun)",
+  I2("Returns a matrix with the evaluations of a given Real to Real "
+     "function in each cell of specified matrix.\n"
+  "Example : \n"
+  ,
+  "Devuelve una matriz con las evaluaciones de una función dada de "
+  "Real a Real en cada celda de la matriz especificada.\n"
+  "Ejemplo : \n")+
+  "Matrix EvalMat(X, gsl_sf_log_erfc );",
+  BOperClassify::MatrixAlgebra_);
+//--------------------------------------------------------------------
+void BMatEvalMat::CalcContens()
+//--------------------------------------------------------------------
+{
+  BMat& M = Mat(Arg(1));
+  BCode&  code = Code(Arg(2));
+  int k;
+  int s = M.Data().Size();
+  BStandardOperator* opr = (BStandardOperator*)code.Operator();
+  if(!opr) 
+  {
+    Error(I2("<fun> argument of function EvalMat has no operator",
+             "El argumento <fun> de la función EvalMat no tiene operador"));
+    return;
+  }
+  if((opr->Grammar()!= GraReal()) ||
+     (opr->NumArg()!=1)||
+     (opr->GrammarForArg(1)!=GraReal())) 
+  {
+    Error(I2("<fun> argument of function EvalMat ",
+             "El argumento <fun> de la función EvalMat ")+"\n"+
+          opr->Grammar()->Name()+" "+code.Name()+opr->Arguments()+"\n"+
+          I2("should be declared as ",
+             "debería estar declarada como ")+"\n"+
+          "Real "+code.Name()+"(Real x) \n");
+    return;
+  }
+
+  contens_.Alloc(M.Rows(), M.Columns());
+  const double* x = (const double*)M.Data().Buffer();
+  double* y = (double*)contens_.GetData().GetBuffer();
+
+  BSyntaxObject* ev;
+  for(k=0; k<s; k++, x++, y++)
+  {
+    BContensDat* x_ = new BContensDat("",*x);
+    BList* args = NCons(x_);
+    ev = opr->Evaluator(args);
+    if(ev)
+    {
+      *y = Real(ev);
+      DESTROY(ev);
+    }
+  }  
+}
+
+
+//--------------------------------------------------------------------
 DeclareContensClass(BMat, BMatTemporary, BMatReplace);
 DefExtOpr(1, BMatReplace, "MatReplace", 3, 3, "Matrix Matrix Matrix",