Changeset 4d2436d in tol for tol_pkg

Timestamp:

Jan 5, 2010, 7:29:40 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

65c7ea3

Parents:

528d4c9

Message:

Nuevo parámetro de configuración Real _.radius.margin

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

File:

• tol_pkg/MulVarFunAprox/DesignC2.Monomial.Spheric.MeshFree.tol (modified) (4 diffs)

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

@@ -30 +30 @@
     VMatrix X, 
     Real maxNeighbour,
-    Real stress.maxDistance_)
+    Real stress.maxDistance_,
+    Real radius.margin)
   ////////////////////////////////////////////////////////////////////////////
   {
@@ -40 +41 @@
       Real _.X.maxNeighbour = maxNeighbour+1;
       Real stress.maxDistance = stress.maxDistance_;
+      Real _.radius.margin = radius.margin;
       MatQuery::@ANN.KDTree _.ann = 
         MatQuery::@ANN.KDTree::New(VMat2Mat(X));
@@ -54 +56 @@
     VMatrix _.Y := _.X;
     Real _.H := VRows(_.Y);
-    VMatrix _.R := Mat2VMat(Sqrt(SubCol(_.ngbh::_.distance2,[[_.X.maxNeighbour]])));
+    VMatrix _.R := 
+      Mat2VMat(Sqrt(SubCol(_.ngbh::_.distance2,[[_.X.maxNeighbour]])))*
+      (1+Min(0,_.radius.margin));
     VMatrix _.Yj := Constant(_.H,1,_.X.maxNeighbour-1);
     _.H
@@ -133 +137 @@
     Real _.Tb := 0
   };
-
+/*
+  //////////////////////////////////////////////////////////////////////////////
+    Real build.base(Real void)
+  //////////////////////////////////////////////////////////////////////////////
+  {
+    Text _MID = "[@DesignC2.Monomial::build.base] ";
+    VMatrix _.Yn := 
+      Floor(Min(Rand(_.H,1,_.K0,_.K0),Max(_.Ym/min.contrast.surface,_.Ym*0+1)));
+   
+    Set Append(_.base, [[base.feasible]]);
+    Real _.base.sel := Card(_.base);
+    _.K
+  };
+*/
   ////////////////////////////////////////////////////////////////////////////
     VMatrix match.evaluable(VMatrix X)