Changeset f1a9d95 in tol for tol_pkg

Timestamp:

Jan 6, 2010, 11:49:02 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

d8d4605

Parents:

9002d5f

Message:

Removing unneeded argument X.h

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

Location:

tol_pkg/MulVarFunAprox

Files:

• DesignC2.tol (modified) (5 diffs)
• ModelC2.tol (modified) (2 diffs)

tol_pkg/MulVarFunAprox/DesignC2.tol

@@ -81 +81 @@
 
   //////////////////////////////////////////////////////////////////////////////
-    VMatrix build.obs(VMatrix X, VMatrix X.h)
+    VMatrix build.obs(VMatrix X)
   //////////////////////////////////////////////////////////////////////////////
   {
@@ -88 +88 @@
      FunRn2R::@BaseC2.Eval.Function::New(get.base(0));
     Real m = VRows(X);
+    VMatrix X.h=closest.reference.index(X);
     WriteLn("TRACE "+_MID+"1 m="<<m);
     If(!m, Rand(0,_.N,0,0), {
@@ -133 +134 @@
 
   //////////////////////////////////////////////////////////////////////////////
-    VMatrix build.obs.partial.derivative.1(VMatrix X, VMatrix X.h, Real s)
+    VMatrix build.obs.partial.derivative.1(VMatrix X, Real s)
   //////////////////////////////////////////////////////////////////////////////
   {
@@ -142 +143 @@
     Text _MID = "[@DesignC2::build.obs.partial.derivative.1] ";
     Real m = VRows(X);
+    VMatrix X.h=closest.reference.index(_.X);
     WriteLn("TRACE "+_MID+"1 m="<<m);
     If(!m, Rand(0,_.N,0,0), {
@@ -342 +344 @@
     Text _MID = "[@DesignC2::build.decomposition] ";
     WriteLn("TRACE "+_MID+"1");
-    VMatrix X.h=closest.reference.index(_.X);
-    VMatrix _.QX := build.obs(_.X, X.h);
+    VMatrix _.QX := build.obs(_.X);
     WriteLn("TRACE "+_MID+"2");
     VMatrix _.QB := build.border.prior(0);

tol_pkg/MulVarFunAprox/ModelC2.tol

@@ -137 +137 @@
     VMatrix X.1 = SubRow(X,X.1.select);
     Real m.1 = VRows(X.1);
-    VMatrix X.1.h = _.design::closest.reference.index(X.1);
-    VMatrix QX.1 = _.design::build.obs(X.1, X.1.h);
+    VMatrix QX.1 = _.design::build.obs(X.1);
     VMatrix F.1 = QX.1*_.alpha;
     Matrix triplet.1 = SetCol(X.1.select)|Rand(m.1,1,1,1)|VMat2Mat(F.1);
@@ -163 +162 @@
     VMatrix X.1 = SubRow(X,X.select);
     Real m.1 = VRows(X.1);
-    VMatrix X.1.h = _.design::closest.reference.index(X.1);
-    VMatrix QX.1 = _.design::build.obs.partial.derivative.1(X.1, X.1.h, s);
+    VMatrix QX.1 = _.design::build.obs.partial.derivative.1(X.1, s);
     VMatrix F.1 = QX.1*_.alpha;
     Matrix triplet.1 = SetCol(X.select)|Rand(m.1,1,1,1)|VMat2Mat(F.1);