[Pomp-commits] r791 - in branches/mif2: . src

[noreply at r-forge.r-project.org]

Author: kingaa
Date: 2013-01-07 20:57:07 +0100 (Mon, 07 Jan 2013)
New Revision: 791

Modified:
   branches/mif2/DESCRIPTION
   branches/mif2/NAMESPACE
   branches/mif2/src/sir.c
Log:
- updates preparatory to merging


Modified: branches/mif2/DESCRIPTION
===================================================================
--- branches/mif2/DESCRIPTION	2013-01-07 16:18:08 UTC (rev 790)
+++ branches/mif2/DESCRIPTION	2013-01-07 19:57:07 UTC (rev 791)
@@ -12,7 +12,7 @@
 LazyLoad: true
 LazyData: false
 BuildVignettes: no
-Collate: aaa.R version.R eulermultinom.R plugins.R 
+Collate: aaa.R authors.R version.R eulermultinom.R plugins.R 
 	 parmat.R slice-design.R profile-design.R sobol.R bsplines.R sannbox.R
 	 pomp-fun.R pomp.R pomp-methods.R rmeasure-pomp.R rprocess-pomp.R init-state-pomp.R 
 	 dmeasure-pomp.R dprocess-pomp.R skeleton-pomp.R simulate-pomp.R trajectory-pomp.R plot-pomp.R 

Modified: branches/mif2/NAMESPACE
===================================================================
--- branches/mif2/NAMESPACE	2013-01-07 16:18:08 UTC (rev 790)
+++ branches/mif2/NAMESPACE	2013-01-07 19:57:07 UTC (rev 791)
@@ -51,6 +51,7 @@
               dprocess,rprocess,rmeasure,dmeasure,init.state,skeleton,
               data.array,obs,partrans,coef,"coef<-",time,"time<-",timezero,"timezero<-",
               simulate,pfilter,
+              eff.sample.size,cond.logLik,
               particles,mif,continue,states,trajectory,
               pred.mean,pred.var,filter.mean,conv.rec,
               bsmc,

Modified: branches/mif2/src/sir.c
===================================================================
--- branches/mif2/src/sir.c	2013-01-07 16:18:08 UTC (rev 790)
+++ branches/mif2/src/sir.c	2013-01-07 19:57:07 UTC (rev 791)
@@ -4,14 +4,6 @@
 
 #include "pomp.h"
 
-static double expit (double x) {
-  return 1.0/(1.0 + exp(-x));
-}
-
-static double logit (double x) {
-  return log(x/(1-x));
-}
-
 // static double term_time (double t, double b0, double b1) 
 // {
 //   static double correction = 0.4958904;