Changeset 0dd5bc2a in tol

Timestamp:

Dec 9, 2009, 8:53:28 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

0fc887a

Parents:

8210abe

Message:

Adding integration methods

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

Location:

tol_pkg/FunRn2R

Files:

• BaseC2.Monomial.tol (modified) (1 diff)
• BaseC2.tol (modified) (4 diffs)

tol_pkg/FunRn2R/BaseC2.Monomial.tol

@@ -125 +125 @@
       })
     })
+  };
+  ////////////////////////////////////////////////////////////////////////////
+  Static Text _.autodoc.member._build.partial.integrate.1.v = 
+  "Evaluates the first partial integration of k-th basic function for an "
+  "array of points given as the rows of a matrix";
+  VMatrix _build.partial.integrate.1.v(Real k, VMatrix X, Real i)
+  ////////////////////////////////////////////////////////////////////////////
+  {
+  //WriteLn("TRACE @BaseC2.Monomial::_build.partial.integrate.1.v");
+    Real d = _.degComb[k][i];
+    VMatrix aux = (RPow(SubCol(X,[[i]]),d+1)/(d+1));
+    If(!Card(_.range.der.1[i]),aux,aux $*
+    BinGroup("$*", EvalSet(_.range.der.1[i], VMatrix rd1(Real h)
+    {
+      RPow(SubCol(X,[[h]]),_.degComb[k][h])
+    })))
   }
 

tol_pkg/FunRn2R/BaseC2.tol

@@ -49 +49 @@
     SubCol( _build.partial.derivative.2.m(X,i,j),[[k]])
   };
+  //Evaluates the partial integration of k-th basic function for an  
+  //array of points given as the rows of a matrix 
+  VMatrix _build.partial.integrate.1.v(Real k, VMatrix X, Real i)
+  {
+  //WriteLn("TRACE @BaseC2::_build.partial.derivative.1.v");
+    SubCol( _build.partial.integrate.1.m(X,i),[[k]])
+  };
 
   //Evaluates all basic functions, one in each returned column, for an 
@@ -82 +89 @@
     }))
   };
+  //Evaluates the first partial integration of all basic functions, one in 
+  //each returned column, for an  array of points given as the rows of a 
+  //matrix 
+  VMatrix _build.partial.integrate.1.m(VMatrix X, Real i)
+  {
+  //WriteLn("TRACE @BaseC2::_build.partial.derivative.1.m");
+    Group("ConcatColumns", For(1,_.K,VMatrix(Real k)
+    {
+      _build.partial.integrate.1.v(k, X, i)
+    }))
+  };
   //Some bases are more efficient using cache
   Real _build.cache(VMatrix X, Real order) { False };
@@ -110 +128 @@
     _build.partial.derivative.2.v(k, X, i, j) 
   };
+  //Evaluates the first partial integration of k-th basic function for an  
+  //array of points given as the rows of a matrix 
+  VMatrix partial.integrate.1.v(Real k, VMatrix X, Real i)
+  { 
+  //WriteLn("TRACE @BaseC2::partial.derivative.1.v");
+    _build.partial.integrate.1.v(k, X, i) 
+  };
 
   //Evaluates all basic functions, one in each returned column, for an 
@@ -135 +160 @@
   };
 
+  //Evaluates the first partial integration of all basic functions, one in 
+  //each returned column, for an  array of points given as the rows of a 
+  //matrix 
+  VMatrix partial.integrate.1.m(VMatrix X, Real i)
+  {
+  //WriteLn("TRACE @BaseC2::partial.derivative.1.m");
+    _build.partial.integrate.1.m(X, i) 
+  };
   //Some bases are more efficient using cache
   Real upgrade.cache(VMatrix X, Real order) 
   { _build.cache(X,order) }
-
-
 };
-