[Depmix-commits] r664 - in pkg/depmixS4: . R src

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

Author: ingmarvisser
Date: 2018-08-24 09:54:16 +0200 (Fri, 24 Aug 2018)
New Revision: 664

Modified:
   pkg/depmixS4/DESCRIPTION
   pkg/depmixS4/R/allGenerics.R
   pkg/depmixS4/R/fb.R
   pkg/depmixS4/src/fb.c
   pkg/depmixS4/src/fb.h
Log:
=renamed the C-version of forwardbackward to forwardbackwardC

Modified: pkg/depmixS4/DESCRIPTION
===================================================================
--- pkg/depmixS4/DESCRIPTION	2018-08-24 07:31:47 UTC (rev 663)
+++ pkg/depmixS4/DESCRIPTION	2018-08-24 07:54:16 UTC (rev 664)
@@ -1,5 +1,5 @@
 Package: depmixS4
-Version: 1.3-5
+Version: 1.3-5-R664
 Date: 2018-08-23
 Title: Dependent Mixture Models - Hidden Markov Models of GLMs and Other Distributions in S4
 Author: Ingmar Visser <i.visser at uva.nl>, Maarten Speekenbrink <m.speekenbrink at ucl.ac.uk>

Modified: pkg/depmixS4/R/allGenerics.R
===================================================================
--- pkg/depmixS4/R/allGenerics.R	2018-08-24 07:31:47 UTC (rev 663)
+++ pkg/depmixS4/R/allGenerics.R	2018-08-24 07:54:16 UTC (rev 664)
@@ -6,13 +6,13 @@
 # 17-6-2011: added dynamic lib statement to include the C code 
 # version of forward backward routine
 
-.onLoad <- function(lib, pkg) { 
-    library.dynam("depmixS4", pkg, lib)
-}
+#.onLoad <- function(lib, pkg) { 
+#    library.dynam("depmixS4", pkg, lib)
+#}
 
-.onUnLoad <- function(libpath) {
-    library.dynam.unload("depmixS4",libpath)
-}
+#.onUnLoad <- function(libpath) {
+#    library.dynam.unload("depmixS4",libpath)
+#}
 
 utils::globalVariables(c("donlp2", "donlp2Control"))
 

Modified: pkg/depmixS4/R/fb.R
===================================================================
--- pkg/depmixS4/R/fb.R	2018-08-24 07:31:47 UTC (rev 663)
+++ pkg/depmixS4/R/fb.R	2018-08-24 07:54:16 UTC (rev 664)
@@ -48,7 +48,7 @@
 		beta <- matrix(0.0,ncol=ns,nrow=nt)
 		xi <- array(0.0,dim=c(nt,ns,ns))
 		
-		res <- .C("forwardbackward",
+		res <- .C("forwardbackwardC",
 			hom=as.integer(homogeneous),
 			ns=as.integer(ns),
 			lt=as.integer(lt),

Modified: pkg/depmixS4/src/fb.c
===================================================================
--- pkg/depmixS4/src/fb.c	2018-08-24 07:31:47 UTC (rev 663)
+++ pkg/depmixS4/src/fb.c	2018-08-24 07:54:16 UTC (rev 664)
@@ -31,7 +31,7 @@
 
 // gamma is computed as alpha*beta/sca in R (no loop needed)
 
-void forwardbackward(int *hom, int *ns, int *nc, int *nt, int *ntimes, int *bt, int *et,
+void forwardbackwardC(int *hom, int *ns, int *nc, int *nt, int *ntimes, int *bt, int *et,
 		     double *init, double *trdens, double *dens, 
 		     double *alpha, double *beta, double *sca, double *xi) {
 		

Modified: pkg/depmixS4/src/fb.h
===================================================================
--- pkg/depmixS4/src/fb.h	2018-08-24 07:31:47 UTC (rev 663)
+++ pkg/depmixS4/src/fb.h	2018-08-24 07:54:16 UTC (rev 664)
@@ -7,7 +7,7 @@
  */
 
 // compute forward and backward variables, and xi
-void forwardbackward(int *hom, int *ns, int *nc, int *nt, int *ntimes, int *bt, int *et, 
+void forwardbackwardC(int *hom, int *ns, int *nc, int *nt, int *ntimes, int *bt, int *et, 
 					 double *init, double *trdens, double *dens, 
 					 double *alpha, double *beta, double *sca, double *xi);