[Rcpp-commits] r3444 - in pkg/RcppSMC: inst/include src

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

Author: edd
Date: 2012-01-22 01:21:50 +0100 (Sun, 22 Jan 2012)
New Revision: 3444

Added:
   pkg/RcppSMC/inst/include/markovchains/
   pkg/RcppSMC/inst/include/pffuncs.hh
   pkg/RcppSMC/inst/include/simfunctions.hh
Removed:
   pkg/RcppSMC/src/markovchains/
   pkg/RcppSMC/src/pffuncs.hh
   pkg/RcppSMC/src/simfunctions.hh
Log:
moving header files

Copied: pkg/RcppSMC/inst/include/pffuncs.hh (from rev 3439, pkg/RcppSMC/src/pffuncs.hh)
===================================================================
--- pkg/RcppSMC/inst/include/pffuncs.hh	                        (rev 0)
+++ pkg/RcppSMC/inst/include/pffuncs.hh	2012-01-22 00:21:50 UTC (rev 3444)
@@ -0,0 +1,28 @@
+#include "smctc.hh"
+
+class cv_state
+{
+public:
+  double x_pos, y_pos;
+  double x_vel, y_vel;
+};
+
+class cv_obs
+{
+public:
+  double x_pos, y_pos;
+};
+
+double logLikelihood(long lTime, const cv_state & X);
+
+smc::particle<cv_state> fInitialise(smc::rng *pRng);
+long fSelect(long lTime, const smc::particle<cv_state> & p, 
+	     smc::rng *pRng);
+void fMove(long lTime, smc::particle<cv_state> & pFrom, 
+	   smc::rng *pRng);
+
+extern double nu_x;
+extern double nu_y;
+extern double Delta;
+
+extern cv_obs * y; 

Copied: pkg/RcppSMC/inst/include/simfunctions.hh (from rev 3441, pkg/RcppSMC/src/simfunctions.hh)
===================================================================
--- pkg/RcppSMC/inst/include/simfunctions.hh	                        (rev 0)
+++ pkg/RcppSMC/inst/include/simfunctions.hh	2012-01-22 00:21:50 UTC (rev 3444)
@@ -0,0 +1,32 @@
+#include "smctc.hh"
+
+#include "markovchains/markovchain.h"
+
+extern long lIterates;
+extern long lNumber;
+extern long lChainLength;
+extern double dSchedule;
+extern double dThreshold;
+
+double logDensity(long lTime, const mChain<double> & X);
+
+smc::particle<mChain<double> > fInitialiseMC(smc::rng *pRng);
+long fSelect(long lTime, const smc::particle<mChain<double> > & p, smc::rng *pRng);
+void fMove1(long lTime, smc::particle<mChain<double> > & pFrom, smc::rng *pRng);
+void fMove2(long lTime, smc::particle<mChain<double> > & pFrom, smc::rng *pRng);
+int fMCMC(long lTime, smc::particle<mChain<double> > & pFrom, smc::rng *pRng);
+
+double pIntegrandPS(long lTime, const smc::particle<mChain<double> >& pPos, void* pVoid);
+double pWidthPS(long lTime, void* pVoid);
+double pIntegrandFS(const mChain<double>& dPos, void* pVoid);
+
+///The number of grid elements to either side of the current state for the single state move
+#define GRIDSIZE 12
+///The value of alpha at the specified time
+#define ALPHA(T) (double(T)*double(dSchedule) / double(lIterates))
+///The terminal version of alpha
+#define FTIME    (ALPHA(lIterates))
+///The exceedance threshold which we are interested in.
+#define THRESHOLD dThreshold
+///The number of steps in the Markov chain
+#define PATHLENGTH lChainLength

Deleted: pkg/RcppSMC/src/pffuncs.hh
===================================================================
--- pkg/RcppSMC/src/pffuncs.hh	2012-01-21 23:50:23 UTC (rev 3443)
+++ pkg/RcppSMC/src/pffuncs.hh	2012-01-22 00:21:50 UTC (rev 3444)
@@ -1,28 +0,0 @@
-#include "smctc.hh"
-
-class cv_state
-{
-public:
-  double x_pos, y_pos;
-  double x_vel, y_vel;
-};
-
-class cv_obs
-{
-public:
-  double x_pos, y_pos;
-};
-
-double logLikelihood(long lTime, const cv_state & X);
-
-smc::particle<cv_state> fInitialise(smc::rng *pRng);
-long fSelect(long lTime, const smc::particle<cv_state> & p, 
-	     smc::rng *pRng);
-void fMove(long lTime, smc::particle<cv_state> & pFrom, 
-	   smc::rng *pRng);
-
-extern double nu_x;
-extern double nu_y;
-extern double Delta;
-
-extern cv_obs * y; 

Deleted: pkg/RcppSMC/src/simfunctions.hh
===================================================================
--- pkg/RcppSMC/src/simfunctions.hh	2012-01-21 23:50:23 UTC (rev 3443)
+++ pkg/RcppSMC/src/simfunctions.hh	2012-01-22 00:21:50 UTC (rev 3444)
@@ -1,32 +0,0 @@
-#include "smctc.hh"
-
-#include "markovchains/markovchain.h"
-
-extern long lIterates;
-extern long lNumber;
-extern long lChainLength;
-extern double dSchedule;
-extern double dThreshold;
-
-double logDensity(long lTime, const mChain<double> & X);
-
-smc::particle<mChain<double> > fInitialiseMC(smc::rng *pRng);
-long fSelect(long lTime, const smc::particle<mChain<double> > & p, smc::rng *pRng);
-void fMove1(long lTime, smc::particle<mChain<double> > & pFrom, smc::rng *pRng);
-void fMove2(long lTime, smc::particle<mChain<double> > & pFrom, smc::rng *pRng);
-int fMCMC(long lTime, smc::particle<mChain<double> > & pFrom, smc::rng *pRng);
-
-double pIntegrandPS(long lTime, const smc::particle<mChain<double> >& pPos, void* pVoid);
-double pWidthPS(long lTime, void* pVoid);
-double pIntegrandFS(const mChain<double>& dPos, void* pVoid);
-
-///The number of grid elements to either side of the current state for the single state move
-#define GRIDSIZE 12
-///The value of alpha at the specified time
-#define ALPHA(T) (double(T)*double(dSchedule) / double(lIterates))
-///The terminal version of alpha
-#define FTIME    (ALPHA(lIterates))
-///The exceedance threshold which we are interested in.
-#define THRESHOLD dThreshold
-///The number of steps in the Markov chain
-#define PATHLENGTH lChainLength