Changeset 68d1346 in tol

Timestamp:

Dec 23, 2009, 12:28:18 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

1245a8b

Parents:

fa86b43

Message:

El número de parámetros puede ser distinto en cada punto de referencia

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

File:

• tol_pkg/MulVarFunAprox/DesignC2.Monomial.tol (modified) (2 diffs)

tol_pkg/MulVarFunAprox/DesignC2.Monomial.tol

@@ -28 +28 @@
     Text _MID = "[@DesignC2.Monomial::build.base] ";
     Real max.K = Min(_.K0, Floor(_.M/(_.H*min.contrast.surface)));
-    
-    WriteLn("TRACE "+_MID+"1.1 K0="<<_.K0);
-    WriteLn("TRACE "+_MID+"1.2 M="<<_.M);
-    WriteLn("TRACE "+_MID+"1.3 H="<<_.H);
-    WriteLn("TRACE "+_MID+"1.4 SC="<<min.contrast.surface);
-    WriteLn("TRACE "+_MID+"1.5 max.K="<<max.K);
     FunRn2R::@BaseC2 base.feasible = If(use.compact.base,
     {
-      FunRn2R::@BaseC2.LinComb::Compact.K(_.base[1],max.K)
+      FunRn2R::@BaseC2.LinComb::Compact.K(_.base[1],_.K0)
     },
     {
+      WriteLn("TRACE "+_MID+"1.1 K0="<<_.K0);
+      WriteLn("TRACE "+_MID+"1.2 M="<<_.M);
+      WriteLn("TRACE "+_MID+"1.3 H="<<_.H);
+      WriteLn("TRACE "+_MID+"1.4 SC="<<min.contrast.surface);
+      WriteLn("TRACE "+_MID+"1.5 max.K="<<max.K);
       Real deg = 
       {
@@ -57 +56 @@
     });
     Real _.K := base.feasible::_.K;
+    VMatrix _.Yn := If(use.compact.base,
+    {
+      Floor(Min(Rand(_.H,1,_.K,_.K),Max(_.Ym/min.contrast.surface,_.Ym*0+1)))
+    },
+    {
+      Rand(_.H,1,_.K,_.K)
+    }); 
     Set Append(_.base, [[base.feasible]]);
     Real _.base.sel := Card(_.base);