[Rsiena-commits] r299 - in pkg/RSienaTest: . src/network

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

Author: fschoenen
Date: 2016-08-30 15:53:31 +0200 (Tue, 30 Aug 2016)
New Revision: 299

Modified:
   pkg/RSienaTest/ChangeLog
   pkg/RSienaTest/DESCRIPTION
   pkg/RSienaTest/src/network/Simmelian.cpp
   pkg/RSienaTest/src/network/Simmelian.h
Log:
network/Simmelian: cleaned dependencies


Modified: pkg/RSienaTest/ChangeLog
===================================================================
--- pkg/RSienaTest/ChangeLog	2016-08-29 08:41:14 UTC (rev 298)
+++ pkg/RSienaTest/ChangeLog	2016-08-30 13:53:31 UTC (rev 299)
@@ -1,3 +1,11 @@
+2016-08-30 R-Forge Revision 299
+Changes RSienaTest:
+   * network/Simmelian: Cleaned dependencies.
+
+2016-08-28 R-Forge Revision 297
+Changes in RSiena:
+   * buildsystem: added Makefile and src/sources.list
+
 2016-08-17 R-Forge Revision 296
 Changes in RSiena and RSienaTest:
    * Warning if includeEffects is used with parameter initialValue.

Modified: pkg/RSienaTest/DESCRIPTION
===================================================================
--- pkg/RSienaTest/DESCRIPTION	2016-08-29 08:41:14 UTC (rev 298)
+++ pkg/RSienaTest/DESCRIPTION	2016-08-30 13:53:31 UTC (rev 299)
@@ -1,8 +1,8 @@
 Package: RSienaTest
 Type: Package
 Title: Siena - Simulation Investigation for Empirical Network Analysis
-Version: 1.1-296
-Date: 2016-08-17
+Version: 1.1-299
+Date: 2016-08-30
 Author: Ruth Ripley, Krists Boitmanis, Tom A.B. Snijders, Felix Schoenenberger
 Depends: R (>= 2.15.0), utils
 Imports: Matrix, tcltk, lattice, parallel, MASS, RUnit, methods

Modified: pkg/RSienaTest/src/network/Simmelian.cpp
===================================================================
--- pkg/RSienaTest/src/network/Simmelian.cpp	2016-08-29 08:41:14 UTC (rev 298)
+++ pkg/RSienaTest/src/network/Simmelian.cpp	2016-08-30 13:53:31 UTC (rev 299)
@@ -4,12 +4,12 @@
  *****************************************************************************/
 #include "Simmelian.h"
 
-#include "Eigen/Types.h"
 #include "logger/Logger.h"
 #include "network/IncidentTieIterator.h"
 #include "network/OneModeNetwork.h"
 #include "network/TieIterator.h"
 
+#include <algorithm> // sort
 #include <vector>
 
 namespace siena {

Modified: pkg/RSienaTest/src/network/Simmelian.h
===================================================================
--- pkg/RSienaTest/src/network/Simmelian.h	2016-08-29 08:41:14 UTC (rev 298)
+++ pkg/RSienaTest/src/network/Simmelian.h	2016-08-30 13:53:31 UTC (rev 299)
@@ -7,8 +7,6 @@
 #ifndef SIMMELIAN_TIE_ITERATOR_H_
 #define SIMMELIAN_TIE_ITERATOR_H_
 
-#include <Eigen/Dense>
-
 namespace siena {
 
 	// forward declarations