Changeset 6d9639b in tol

Timestamp:

May 12, 2010, 3:11:38 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

f1fd2aa

Parents:

62815b1

Message:

Prefijando métodos con BysVecLinReg:: para poder hacer herencia externa

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

File:

• tol_pkg/BysVecLinReg/tools.tol (modified) (3 diffs)

tol_pkg/BysVecLinReg/tools.tol

@@ -2 +2 @@
 //////////////////////////////////////////////////////////////////////////////
 // FILE   : tools.tol
-// PURPOSE: Defines Class BysVecLinReg::@Multivariate
+// PURPOSE: Defines generic functions used in BysVecLinReg
 //////////////////////////////////////////////////////////////////////////////
 
@@ -30 +30 @@
 //////////////////////////////////////////////////////////////////////////////
 {
-  MatDat(VMat2Triplet(vmatrix2vec(Triplet([[ [[i,j,1]] ]],r,c))),1,1)
+  MatDat(VMat2Triplet(BysVecLinReg::vmatrix2vec(Triplet([[ [[i,j,1]] ]],r,c))),1,1)
 };
 
@@ -72 +72 @@
   VMatrix C2 = Constant(1,r,1) * (C $* C);
   //Builds pivoting order of columns of diagonal of C*C'
-  Matrix p = ColumnPivots(VMat2Mat(C2));
+  Matrix piv = ColumnPivots(VMat2Mat(C2));
   //Select p.1 as gaussian components of x as (n-r) last pivoted columns
-  Set p.1 = MatSet(Sub(p,1,r+1,1,n-r))[1];
+  Set p.1 = MatSet(Sub(piv,1,r+1,1,n-r))[1];
   //Select p.2 as dependent components of x as first r pivoted columns
-  Set p.2 = MatSet(Sub(p,1,1,  1,r  ))[1];
+  Set p.2 = MatSet(Sub(piv,1,1,  1,r  ))[1];
   //Draw e.1 as standard independent normal 
   VMatrix e.1 = Gaussian(n-r,1,0,1);