Changeset 3f198cc in tol for tol_pkg/MulVarFunAprox/DesignC2.tol

Timestamp:

Dec 23, 2009, 2:25:56 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

f389530

Parents:

38052b37

Message:

Preparando para permitir radio variante en los entornos esféricos

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

File:

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

tol_pkg/MulVarFunAprox/DesignC2.tol

@@ -75 +75 @@
   VMatrix closest.reference.index(VMatrix X);
   VMatrix match.evaluable(VMatrix X);
-  Set get.X.weight(Set X.dif);
-  Set get.X.weight.partial.derivative.1(Set X.dif, Real s);
+  Set get.X.weight(Set X.dif, Set X.h);
+  Set get.X.weight.partial.derivative.1(Set X.dif, Set X.h, Real s);
 
   //////////////////////////////////////////////////////////////////////////////
@@ -118 +118 @@
     VMatrix X.j=DifEq(1/(1-B),Rand(m,1,1,1));
     WriteLn("TRACE "+_MID+"3");
+    Set X.h_ = For(1,_.X.maxNeighbour,VMatrix(Real i) { SubCol(X.h,[[i]]) });
     Set X.dif = For(1,_.X.maxNeighbour,VMatrix(Real i)
     {
-      Set X.h.i = VCol2Set(SubCol(X.h,[[i]]));
+      Set X.h.i = VCol2Set(X.h_[i]);
       X - SubRow(_.Y,X.h.i)
     });
     WriteLn("TRACE "+_MID+"4");
-    Set X.weight = get.X.weight(X.dif);
+    Set X.weight = get.X.weight(X.dif, X.h_);
     WriteLn("TRACE "+_MID+"5");
     VMatrix YnCum = DifEq(1/(1-B),_.Yn);
@@ -169 +170 @@
     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)
     {
-      Set X.h.i = VCol2Set(SubCol(X.h,[[i]]));
+      Set X.h.i = VCol2Set(X.h_[i]);
       X - SubRow(_.Y,X.h.i)
     });
     WriteLn("TRACE "+_MID+"5");
-    Set X.weight = get.X.weight(X.dif);
-    Set X.weight.der = get.X.weight.partial.derivative.1(X.dif,s);
+    Set X.weight = get.X.weight(X.dif, X.h_);
+    Set X.weight.der = get.X.weight.partial.derivative.1(X.dif,X.h_,s);
     WriteLn("TRACE "+_MID+"6");
     VMatrix YnCum = DifEq(1/(1-B),_.Yn);