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

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

Author: ingmarvisser
Date: 2018-08-23 16:46:45 +0200 (Thu, 23 Aug 2018)
New Revision: 662

Modified:
   pkg/depmixS4/DESCRIPTION
   pkg/depmixS4/NAMESPACE
   pkg/depmixS4/R/allGenerics.R
   pkg/depmixS4/src/fb.c
Log:
=changed loading of compiled code

Modified: pkg/depmixS4/DESCRIPTION
===================================================================
--- pkg/depmixS4/DESCRIPTION	2018-08-23 12:38:20 UTC (rev 661)
+++ pkg/depmixS4/DESCRIPTION	2018-08-23 14:46:45 UTC (rev 662)
@@ -1,13 +1,14 @@
-Package: depmixS4
-Version: 1.3-5
-Date: 2018-07-25
-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>
-Maintainer: Ingmar Visser <i.visser at uva.nl>
-Depends: R (>= 3.5.0), nnet, MASS, Rsolnp
-Imports: stats, stats4, methods
-Suggests: gamlss, gamlss.dist, Rdonlp2
-Additional_repositories: http://R-Forge.R-project.org
-Description: Fits latent (hidden) Markov models on mixed categorical and continuous (time series) data, otherwise known as dependent mixture models.
-License: GPL (>=2)
-URL: http://depmix.r-forge.r-project.org/
+Package: depmixS4
+Version: 1.3-5
+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>
+Maintainer: Ingmar Visser <i.visser at uva.nl>
+Depends: R (>= 3.5.0), nnet, MASS, Rsolnp
+Imports: stats, stats4, methods
+Suggests: gamlss, gamlss.dist, Rdonlp2
+Additional_repositories: http://R-Forge.R-project.org
+Description: Fits latent (hidden) Markov models on mixed categorical and continuous (time series) data, otherwise known as dependent mixture models.
+License: GPL (>=2)
+URL: http://depmix.r-forge.r-project.org/
+RoxygenNote: 6.1.0

Modified: pkg/depmixS4/NAMESPACE
===================================================================
--- pkg/depmixS4/NAMESPACE	2018-08-23 12:38:20 UTC (rev 661)
+++ pkg/depmixS4/NAMESPACE	2018-08-23 14:46:45 UTC (rev 662)
@@ -66,3 +66,5 @@
 	logLik,
 	getmodel
 )
+
+useDynLib(depmixS4, .registration = TRUE)
\ No newline at end of file

Modified: pkg/depmixS4/R/allGenerics.R
===================================================================
--- pkg/depmixS4/R/allGenerics.R	2018-08-23 12:38:20 UTC (rev 661)
+++ pkg/depmixS4/R/allGenerics.R	2018-08-23 14:46:45 UTC (rev 662)
@@ -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/src/fb.c
===================================================================
--- pkg/depmixS4/src/fb.c	2018-08-23 12:38:20 UTC (rev 661)
+++ pkg/depmixS4/src/fb.c	2018-08-23 14:46:45 UTC (rev 662)
@@ -1,4 +1,4 @@
-#include "fb.h"
+//#include "fb.h"
 
 // extern "C" {