Changeset 7cac98f in tol

Timestamp:

Dec 1, 2008, 4:31:13 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

7f5a5b4

Parents:

d29988b

Message:

Prior information is given as a log density additive function

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

File:

• tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/gibbs/_nonLinBlock.tol (modified) (6 diffs)

tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/gibbs/_nonLinBlock.tol

@@ -81 +81 @@
     0
   });
-  Code _.get.prior = If(FunctionExist("Matrix","_.filterEval::get.prior"),
-    _.filterEval::get.prior,
+  Code _.get.priorLogDens = If(FunctionExist("Real","_.filterEval::get.priorLogDens"),
+    _.filterEval::get.priorLogDens,
     Matrix (Real paramIdx) {Rand(0,1,0,0) } );
   //Names of affected parameters in linear block 
@@ -164 +164 @@
       Set bounds = _.filterEval::get.bounds(i,u);
       Code fltEv = _.filterEval::eval;
-      Code get.prior = _.get.prior;
+      Code get.priorLogDens = _.get.priorLogDens;
       Matrix Z = _.Z;
       Real x0 = bounds[1];
@@ -182 +182 @@
         Real Do PutMatDat(u,i,1,old);
         Matrix fn = VMat2Mat(si*Mat2VMat(Z-Fi*omega));
-        fn << get.prior(i)
+        fn
       };
       Real LogDens.WhiteNoise(Real x)
@@ -190 +190 @@
       //WriteLn("TRACE LogDens.WhiteNoise("+_.colNames[i]+","<<x+")="<<ld);
       //Real UpdateMaxLogLikelihood(x,ld);
-        ld
+        ld+get.priorLogDens(i)
       };
       Real LogDens.ARMA(Real x)
@@ -201 +201 @@
       //WriteLn("TRACE LogDens.ARMA("+_.colNames[i]+","<<x+")="<<ld);
       //Real UpdateMaxLogLikelihood(x,ld);
-        ld
+        ld+get.priorLogDens(i)
       };
       Real LogDens.ARIMA(Real x)
@@ -217 +217 @@
       //WriteLn("TRACE LogDens.ARIMA("+_.colNames[i]+","<<x+")="<<ld);
       //Real UpdateMaxLogLikelihood(x,ld);
-        ld
+        ld+get.priorLogDens(i)
       };
       Code LogDens = Case(