Changeset 9002d5f in tol for tol_pkg/MulVarFunAprox/DesignC2.tol

Timestamp:

Jan 6, 2010, 11:40:22 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

f1a9d95

Parents:

43068ca

Message:

Preparing for new spheric evaluation methods

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

File:

• tol_pkg/MulVarFunAprox/DesignC2.tol (modified) (7 diffs)

tol_pkg/MulVarFunAprox/DesignC2.tol

@@ -93 +93 @@
     VMatrix X.j=DifEq(1/(1-B),Rand(m,1,1,1));
     WriteLn("TRACE "+_MID+"3 X.h:\n"<<X.h);
-    Set X.h_ = For(1,_.X.maxNeighbour,VMatrix(Real i) { SubCol(X.h,[[i]]) });
+    Real numNeighbour = VColumns(X.h);
+    Set X.h_ = For(1,numNeighbour,VMatrix(Real i) { SubCol(X.h,[[i]]) });
     WriteLn("TRACE "+_MID+"3.1");
-    Set X.dif = For(1,_.X.maxNeighbour,VMatrix(Real i)
+    Set X.dif = For(1,numNeighbour,VMatrix(Real i)
     {
       Set X.h.i = VCol2Set(X.h_[i]);
@@ -105 +106 @@
     VMatrix YnCum = DifEq(1/(1-B),_.Yn);
     VMatrix YnCumB = Sub(SetCol([[0]])<<YnCum,1,1,_.H,1);
-    Matrix QX.triplet = Group("ConcatRows", For(1,_.X.maxNeighbour,Matrix(Real i)
+    Matrix QX.triplet = Group("ConcatRows", For(1,numNeighbour,Matrix(Real i)
     {
       VMatrix w.i = X.weight[i];
@@ -129 +130 @@
     Pack(Convert(Triplet(QX.triplet, m, _.N),"Cholmod.R.Sparse"))
   })};
+
 
   //////////////////////////////////////////////////////////////////////////////
@@ -146 +148 @@
     VMatrix X.j=DifEq(1/(1-B),Rand(m,1,1,1));
     WriteLn("TRACE "+_MID+"4");
-    Set X.h_ = For(1,_.X.maxNeighbour,VMatrix(Real i) { SubCol(X.h,[[i]]) });
-    Set X.dif = For(1,_.X.maxNeighbour,VMatrix(Real i)
+    Real numNeighbour = VColumns(X.h);
+    Set X.h_ = For(1,numNeighbour,VMatrix(Real i) { SubCol(X.h,[[i]]) });
+    Set X.dif = For(1,numNeighbour,VMatrix(Real i)
     {
       Set X.h.i = VCol2Set(X.h_[i]);
@@ -158 +161 @@
     VMatrix YnCum = DifEq(1/(1-B),_.Yn);
     VMatrix YnCumB = Sub(SetCol([[0]])<<YnCum,1,1,_.H,1);
-    Matrix QX.triplet = Group("ConcatRows", For(1,_.X.maxNeighbour,Matrix(Real i)
+    Matrix QX.triplet = Group("ConcatRows", For(1,numNeighbour,Matrix(Real i)
     {
       VMatrix w.i = X.weight[i];
@@ -360 +363 @@
     WriteLn("TRACE "+_MID+"6");
     VMatrix _.QtQ := MtMSqr(_.Q);
-    VMatrix _.LQ := CholeskiFactor(_.QtQ,"X",False,False);
+    VMatrix _.LQ := CholeskiFactor(_.Q,"XtX");
+/*
+    VMatrix _.LQ := CholeskiFactor(_.QtQ,"X",False,True);
     Real iter = 1;
     Real lambda = 1.e-15;
@@ -366 +371 @@
     {
       VMatrix _.QtQ := _.QtQ + Eye(_.N,_.N,0,lambda);
-      VMatrix _.LQ := CholeskiFactor(_.QtQ,"X",False,False);
+      VMatrix _.LQ := CholeskiFactor(_.QtQ,"X",False,True);
       Real lambda := lambda * 2;
       Real iter := iter+1
     });
-  //VMatrix _.LQ := CholeskiFactor(_.Q,"XtX");
+*/
     WriteLn("TRACE "+_MID+"7");
     True