Changeset 9e84556 in tol

Timestamp:

Dec 30, 2009, 6:20:22 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

d9c5d1e

Parents:

bb01c80

Message:

Generalización para entornos de radio variable

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

File:

• tol_pkg/MulVarFunAprox/DesignC2.Monomial.Spheric.Grid.tol (modified) (8 diffs)

tol_pkg/MulVarFunAprox/DesignC2.Monomial.Spheric.Grid.tol

@@ -25 +25 @@
 //Auxiliar members
 //////////////////////////////////////////////////////////////////////////////
-  VMatrix _.Y.h = Rand(0,0,0,0);
   VMatrix _.Y.neighbourhood = Rand(0,0,0,0);
 
@@ -50 +49 @@
 
   //////////////////////////////////////////////////////////////////////////////
-  VMatrix get.radius(VMatrix Y.idx)
-  //////////////////////////////////////////////////////////////////////////////
-  {
-    Constant(VRows(Y.idx),1,_.radius)
-  };
-
-  //////////////////////////////////////////////////////////////////////////////
-  VMatrix closest.reference.index(VMatrix X)
-  //////////////////////////////////////////////////////////////////////////////
-  {
-    WriteLn("TRACE [closest.reference.index] 1");
-    SubRow(_.Y.neighbourhood, Col2Set(_.grid::point2index(X)))
-  };
-
-  //////////////////////////////////////////////////////////////////////////////
   Real build.reference.points(Real void)
   //////////////////////////////////////////////////////////////////////////////
@@ -70 +54 @@
     Text _MID = "[@DesignC2.Monomial.Spheric.Grid::build.reference.points] ";
     VMatrix _.Y := _.grid::_.Y;
-    VMatrix _.Y.h := Mat2VMat(_.grid::_.Y.h);
-    VMatrix _.Y.neighbourhood := _.Y.h | Group("ConcatColumns",
+    VMatrix Y.h = Mat2VMat(_.grid::_.Y.h);
+    VMatrix _.Y.neighbourhood := Y.h | Group("ConcatColumns",
     For(1,2*_.n, VMatrix(Real i)
     {
       VMatrix aux = SubCol(_.grid::_.Y.neighbourhood.index,[[i]]);
-      IfVMat(aux,aux,_.Y.h)
+      IfVMat(aux,aux,Y.h)
     }));
     Set X.class = Classify(Col2Set(_.grid::point2index(_.X)),Compare);
@@ -87 +71 @@
   //////////////////////////////////////////////////////////////////////////////
   {
-    Text _MID = "[@DesignC2.Spheric::build.stress.points] ";
+    Text _MID = "[@DesignC2.Monomial.Spheric.Grid::build.stress.points] ";
     WriteLn("TRACE "+_MID+"1");
     Real _.Z.maxNeighbour := If(prior.Z.order>=0,2,0);
@@ -133 +117 @@
     VMatrix _.Z.h := SubRow(Z.h.interior, sel.unique);
     Real _.Tz := VRows(_.Z);
-    VMatrix _.Z.Y.neighbour := 
+    VMatrix Z.Y.neighbour = 
     {
       Matrix Z.t = DifEq(1/(1-B),Rand(_.Tz,1,1,1));
@@ -147 +131 @@
       SubRow(Mat2VMat(Z.Y.idx),MatQuery::SelectMatch(Z.Y.match))
     };
-    VMatrix aux = MatQuery::SortAndCount(SubCol(_.Z.Y.neighbour,[[2]]));
+    VMatrix aux = MatQuery::SortAndCount(SubCol(Z.Y.neighbour,[[2]]));
     VMatrix _.Yt := Triplet(VMat2Mat(SubCol(aux,[[1]])) |  
                             Rand(VRows(aux),1,1,1) | 
@@ -186 +170 @@
   };
 
+  //////////////////////////////////////////////////////////////////////////////
+  VMatrix get.radius(VMatrix Y.idx)
+  //////////////////////////////////////////////////////////////////////////////
+  {
+    Constant(VRows(Y.idx),1,_.radius)
+  };
+
+  //////////////////////////////////////////////////////////////////////////////
+  VMatrix closest.reference.index(VMatrix X)
+  //////////////////////////////////////////////////////////////////////////////
+  {
+    WriteLn("TRACE [closest.reference.index] 1");
+    SubRow(_.Y.neighbourhood, Col2Set(_.grid::point2index(X)))
+  };
+
+  ////////////////////////////////////////////////////////////////////////////
+    VMatrix match.evaluable(VMatrix X)
+  ////////////////////////////////////////////////////////////////////////////
+  {
+    Real m = VRows(X);
+    Mat2VMat(_.grid::point2index(X))
+  };
+
   ///////////////////////////////////////////////////////////////////////////
-    VMatrix generate.internal.points(
-      Real m, 
-      Real force.reference.near.nodal)
+    VMatrix generate.internal.points(Real m)
   ///////////////////////////////////////////////////////////////////////////
   {
@@ -197 +202 @@
     VMatrix u = v*(VMatDat(MtMSqr(v),1,1)^-0.5);
     y+u*(Rand(0,1)*_.radius)
-  };
-
-  ////////////////////////////////////////////////////////////////////////////
-    VMatrix match.evaluable(VMatrix X)
-  ////////////////////////////////////////////////////////////////////////////
-  {
-    Real m = VRows(X);
-    Mat2VMat(_.grid::point2index(X))
-/*
-    VMatrix X.closest.index = closest.reference.index(X);
-    VMatrix X.h=SubRow(SubCol(_.Y.neighbourhood,[[1]]), 
-                       VCol2Set(X.closest.index)); 
-    VMatrix X.dif = X - SubRow(_.Y,VCol2Set(X.h));
-    VMatrix X.norm2 = RPow(X.dif,2)*Rand(_.n,1,1,1);
-    VMatrix X.tao = RPow(X.norm2,0.5)/_.radius;
-    LE(X.tao,Rand(m,1,1,1))
-*/
   }
 
+
 };