[Pomp-commits] r1036 - pkg/pompExamples/src

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

Author: kingaa
Date: 2014-12-24 21:15:53 +0100 (Wed, 24 Dec 2014)
New Revision: 1036

Modified:
   pkg/pompExamples/src/budmoth.c
   pkg/pompExamples/src/parus.c
Log:
- change included files in these examples

Modified: pkg/pompExamples/src/budmoth.c
===================================================================
--- pkg/pompExamples/src/budmoth.c	2014-12-24 18:26:52 UTC (rev 1035)
+++ pkg/pompExamples/src/budmoth.c	2014-12-24 20:15:53 UTC (rev 1036)
@@ -3,15 +3,8 @@
 #include <R.h>
 #include <Rmath.h>
 #include <Rdefines.h>
+#include <pomp.h>
 
-static inline double expit (double x) {
-  return 1.0/(1.0 + exp(-x));
-}
-
-static inline double logit (double x) {
-  return log(x/(1-x));
-}
-
 #define ALPHA      (p[parindex[0]])
 #define SIGALPHA   (p[parindex[1]])
 #define GAM        (p[parindex[2]])

Modified: pkg/pompExamples/src/parus.c
===================================================================
--- pkg/pompExamples/src/parus.c	2014-12-24 18:26:52 UTC (rev 1035)
+++ pkg/pompExamples/src/parus.c	2014-12-24 20:15:53 UTC (rev 1036)
@@ -1,9 +1,8 @@
 // dear emacs, please treat this as -*- C++ -*-
 
 #include <Rmath.h>
+#include <pomp.h>
 
-#include "pomp.h"
-
 #define R       (p[parindex[0]]) // growth rate
 #define K       (p[parindex[1]]) // carrying capacity
 #define SIGMA   (p[parindex[2]]) // process noise level