Changeset fd471ab in tol

Timestamp:

May 11, 2010, 1:26:54 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

412906e

Parents:

12b1cd7

Message:

refs #902
multivariant is changed to multivariate

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

Location:

tol_pkg/BysVecLinReg/test

Files:

• gen_multivariant_linear_regression.tol (modified) (1 diff)
• test_0001/test.tol (modified) (3 diffs)
• test_0002/test.tol (added)

tol_pkg/BysVecLinReg/test/gen_multivariant_linear_regression.tol

@@ -2 +2 @@
 //////////////////////////////////////////////////////////////////////////////
 // FILE : gen_multivariant_linear_regression.tol
-// PURPOSE : generates a random multivariant linear regression model
+// PURPOSE : generates a random multivariate linear regression model
 //////////////////////////////////////////////////////////////////////////////
 

tol_pkg/BysVecLinReg/test/test_0001/test.tol

@@ -8 +8 @@
 Text link_ = "";
 Text summary_ = 
-"test_0001 multivariant linear model with known covariance matrix" ;
+"test_0001 multivariate linear model with known covariance matrix" ;
 
 Real numErr0 = Copy(NError);
@@ -14 +14 @@
 #Embed "../gen_multivariant_linear_regression.tol";
 
-BysVecLinReg::@Multivariant MV = { BysVecLinReg::@Multivariant::New(
-  Text desc = summary_,
-  Set outputNames = For(1,d,Text(Real i) { "Output_"<<i }),
-  Set inputNames = For(1,d,Text(Real i) { "Input_"<<i }),
-  Y,X
-)};
 
+BysVecLinReg::@Multivariate MV = [[
+  Text _.desc = "Modelo lineal multivariante para ventas de Fanta en Turquía",
+  Set _.outputNames = For(1,d,Text(Real i) { "Output_"<<i }),
+  Set _.inputNames = For(1,m,Text(Real i) { "Input_"<<i })
+]];
+
+Real MV::set.outputInput(Y,X);
 Real MV::change.V(V);
 
@@ -38 +39 @@
 
 VMatrix vec.A_ = Tra(Constant(1,sampleLength,1/sampleLength)*mcmc);
-VMatrix vec.A = BysVecLinReg::@Multivariant::vmatrix2vec(A);
+VMatrix vec.A = BysVecLinReg::@Multivariate::vmatrix2vec(A);
 VMatrix cmp.A = vec.A | vec.A_;
 
-VMatrix A_ = BysVecLinReg::@Multivariant::vec2vmatrix(vec.A_,A);
+VMatrix A_ = BysVecLinReg::@Multivariate::vec2vmatrix(vec.A_,A);
 VMatrix E_ = Y - A_*X;
 VMatrix E01_ = CholeskiSolve(V.L,E_,"PtLLtP");
-VMatrix cmpE01 = BysVecLinReg::@Multivariant::vmatrix2vec(E01) |
-                 BysVecLinReg::@Multivariant::vmatrix2vec(E01_); 
+VMatrix cmpE01 = BysVecLinReg::@Multivariate::vmatrix2vec(E01) |
+                 BysVecLinReg::@Multivariate::vmatrix2vec(E01_); 
 
 Real stdErr  = VMatAvr(E01 ^2);