Changeset eddd23a in tol for tol_pkg/FunRn2R/BaseC2.LinComb.tol

Timestamp:

Nov 30, 2009, 1:54:17 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

4cbe84c

Parents:

ea3d3da

Message:

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

File:

• tol_pkg/FunRn2R/BaseC2.LinComb.tol (modified) (6 diffs)

tol_pkg/FunRn2R/BaseC2.LinComb.tol

@@ -5 +5 @@
 //////////////////////////////////////////////////////////////////////////////
 
+//////////////////////////////////////////////////////////////////////////////
 Text _.autodoc.member.BaseC2.LinComb = "Defines a new base B2 of "
-"order K2 as a linear combination B2=V*B1 of functions of a previous base "
+"order K2 as a linear combination B2=B1*V of functions of a previous base "
 "B1 of order K1>=K2. The matrix of change V must have rank K2 to ensure "
 "linear independence.";
-
-//////////////////////////////////////////////////////////////////////////////
 Class @BaseC2.LinComb : @BaseC2.Cache
 //////////////////////////////////////////////////////////////////////////////
@@ -19 +18 @@
   ////////////////////////////////////////////////////////////////////////////
   Static Text _.autodoc.member.New = "Creates an instance B2 of "
-  "@BaseC2.LinComb as B2 = V*B1";
+  "@BaseC2.LinComb as B2 = B1*V";
   Static @BaseC2.LinComb New(@BaseC2 B1, VMatrix V)
   ////////////////////////////////////////////////////////////////////////////
   {
-    Real n = (B1[1])::_.n;
+    Real n = B1::_.n;
     
-    @BaseC2.Concat aux = [[
+    @BaseC2.LinComb aux = [[
       Real _.n = B1::_.n;
-      Real _.K = VRows(V);
-      Set _.base = base; 
+      Real _.K = VColumns(V);
+      @BaseC2 _.base = base; 
       VMatrix _.V = V
   ]]};
@@ -52 +51 @@
     Set Pu.svd = SVD(VMat2Mat(Pu));
 
-    Matrix Pu.eigenvalue = RPow(Tra(SubDiag(Pu.svd[2],0)),2);
+    Matrix Pu.eigenvalue = RPow(Tra(SubDiag(Pu.svd[2],0)),1);
     Matrix Pu.eigenvalueCum = 
     {
@@ -58 +57 @@
        aux*(1/MatSum(Pu.eigenvalue))
     };
-    VMatrix ratio = Rand(K1,1,informationRatio,informationRatio);
+    Matrix ratio = Rand(K1,1,informationRatio,informationRatio);
     Real K.new = MatSum(LE(Pu.eigenvalueCum,ratio));
     VMatrix V = Mat2VMat(SubCol(Pu.svd[3],Range(1,K.new,1)));
@@ -68 +67 @@
   ////////////////////////////////////////////////////////////////////////////
   { 
-    Real _.base::upgrade.cache.v(order);
-    VMatrix If(order>=0, { _.function.r := 
-      _V*_.base::function.m(X)
+    Real _.base::upgrade.cache(X,order);
+    VMatrix If(order>=0, { _.function := 
+      _.base::function.m(X)*_.V
     });
     Set If(order>=1, { _.partial.derivative.1 := 
       For(1, _.n, VMatrix(Real i)
-      { _V*_.base::partial.derivative.1.m(X,i) })
+      { 
+        _.base::partial.derivative.1.m(X,i)*_.V 
+      })
     });
     Set If(order>=2, { _.partial.derivative.2 := 
@@ -81 +82 @@
         For(1, i, VMatrix(Real j)
         { 
-          _V*_.base::partial.derivative.2.m(X,i,j) 
+          _.base::partial.derivative.2.m(X,i,j)*_.V 
         })
       })