[Rsiena-commits] r139 - in pkg: RSiena RSiena/man RSiena/src/model/ml RSiena/src/model/variables RSienaTest RSienaTest/doc RSienaTest/man RSienaTest/src/model/ml RSienaTest/src/model/variables
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu Feb 24 00:48:16 CET 2011
Author: ripleyrm
Date: 2011-02-24 00:48:16 +0100 (Thu, 24 Feb 2011)
New Revision: 139
Modified:
pkg/RSiena/DESCRIPTION
pkg/RSiena/changeLog
pkg/RSiena/man/RSiena-package.Rd
pkg/RSiena/src/model/ml/MLSimulation.cpp
pkg/RSiena/src/model/variables/NetworkVariable.cpp
pkg/RSienaTest/DESCRIPTION
pkg/RSienaTest/changeLog
pkg/RSienaTest/doc/s_man400.tex
pkg/RSienaTest/man/RSiena-package.Rd
pkg/RSienaTest/src/model/ml/MLSimulation.cpp
pkg/RSienaTest/src/model/variables/NetworkVariable.cpp
Log:
Fix for bipartite networks and ML
Modified: pkg/RSiena/DESCRIPTION
===================================================================
--- pkg/RSiena/DESCRIPTION 2011-02-22 01:31:03 UTC (rev 138)
+++ pkg/RSiena/DESCRIPTION 2011-02-23 23:48:16 UTC (rev 139)
@@ -1,8 +1,8 @@
Package: RSiena
Type: Package
Title: Siena - Simulation Investigation for Empirical Network Analysis
-Version: 1.0.12.137
-Date: 2011-02-21
+Version: 1.0.12.139
+Date: 2011-02-23
Author: Various
Depends: R (>= 2.9.0), xtable
Imports: Matrix
Modified: pkg/RSiena/changeLog
===================================================================
--- pkg/RSiena/changeLog 2011-02-22 01:31:03 UTC (rev 138)
+++ pkg/RSiena/changeLog 2011-02-23 23:48:16 UTC (rev 139)
@@ -1,3 +1,30 @@
+2011-02-23 R-forge revision 139
+
+ * src/model/ml/MLsimulation.cpp,
+ src/model/variables/NetworkVariable.cpp: ML for bipartite
+ networks.
+
+2011-02-22 R-forge revision 138
+
+ Change version number on RSiena to 137
+
+2011-02-22 R-forge revision 137
+
+ * Changes to RSienaTest Only
+ * DESCRIPTION: removed dependency on snopgof (for now!) and add
+ -ed dependency for MASS, sna, vioplot for sienaGOF.
+ * R/sienaTimeTest.r: added functionality for behavioral dummies
+ but they will not work until behavioral interaction effects
+ are supported.
+ * R/sienaGOF.r: removed dependency on snopgof (runs standalone)
+ and a number of smaller features like being able to run a
+ joint test across all waves or break them out, having control
+ over the centrality measure (mean, median, etc.), and not
+ requiring that the auxiliary statistics are non-collinear
+ (this is where MASS's ginv comes in). I also moved the
+ relevant functionality from snopgof directly into the code.
+ * man/sienaGOF.Rd: Changes to reflect the above
+
2011-02-21 R-forge revision 136
* R/initializeFRAN.r: fix bug in bipartite networks: diagonals
@@ -2,2 +29,3 @@
were being zeroed.
+ * R/siena01.r: correct test for maximum degree in display
Modified: pkg/RSiena/man/RSiena-package.Rd
===================================================================
--- pkg/RSiena/man/RSiena-package.Rd 2011-02-22 01:31:03 UTC (rev 138)
+++ pkg/RSiena/man/RSiena-package.Rd 2011-02-23 23:48:16 UTC (rev 139)
@@ -30,8 +30,8 @@
\tabular{ll}{
Package: \tab RSiena\cr
Type: \tab Package\cr
-Version: \tab 1.0.12.136\cr
-Date: \tab 2011-02-21\cr
+Version: \tab 1.0.12.139cr
+Date: \tab 2011-02-23\cr
License: \tab GPL-2 \cr
LazyLoad: \tab yes\cr
}
Modified: pkg/RSiena/src/model/ml/MLSimulation.cpp
===================================================================
--- pkg/RSiena/src/model/ml/MLSimulation.cpp 2011-02-22 01:31:03 UTC (rev 138)
+++ pkg/RSiena/src/model/ml/MLSimulation.cpp 2011-02-23 23:48:16 UTC (rev 139)
@@ -614,6 +614,8 @@
int i = this->chooseActor(pVariable);
BehaviorVariable * pBehaviorVariable =
dynamic_cast<BehaviorVariable *>(pVariable);
+ NetworkVariable * pNetworkVariable =
+ dynamic_cast<NetworkVariable *>(pVariable);
if (!pVariable->pActorSet()->active(i) ||
(pBehaviorVariable && pBehaviorVariable->structural(i)))
{
@@ -632,11 +634,23 @@
}
else
{
- pNewMiniStep =
- new NetworkChange(
- dynamic_cast<NetworkLongitudinalData *>(pVariable->pData()),
- i,
- i);
+ if (pNetworkVariable->oneModeNetwork())
+ {
+ pNewMiniStep =
+ new NetworkChange(
+ dynamic_cast<NetworkLongitudinalData *>(pVariable->pData()),
+ i,
+ i);
+ }
+ else
+ {
+ pNewMiniStep =
+ new NetworkChange(
+ dynamic_cast<NetworkLongitudinalData *>(pVariable->pData()),
+ i,
+ pVariable->m());
+
+ }
}
double rr = 1 / this->totalRate();
Modified: pkg/RSiena/src/model/variables/NetworkVariable.cpp
===================================================================
--- pkg/RSiena/src/model/variables/NetworkVariable.cpp 2011-02-22 01:31:03 UTC (rev 138)
+++ pkg/RSiena/src/model/variables/NetworkVariable.cpp 2011-02-23 23:48:16 UTC (rev 139)
@@ -1709,7 +1709,8 @@
{
const NetworkChange * pNetworkChange =
dynamic_cast<const NetworkChange *>(pMiniStep);
- return this->lpData->structural(pNetworkChange->ego(),
+ return !pMiniStep->diagonal() &&
+ this->lpData->structural(pNetworkChange->ego(),
pNetworkChange->alter(),
this->period());
}
Modified: pkg/RSienaTest/DESCRIPTION
===================================================================
--- pkg/RSienaTest/DESCRIPTION 2011-02-22 01:31:03 UTC (rev 138)
+++ pkg/RSienaTest/DESCRIPTION 2011-02-23 23:48:16 UTC (rev 139)
@@ -1,8 +1,8 @@
Package: RSienaTest
Type: Package
Title: Siena - Simulation Investigation for Empirical Network Analysis
-Version: 1.0.12.137
-Date: 2012-02-21
+Version: 1.0.12.139
+Date: 2012-02-23
Author: Various
Depends: R (>= 2.9.0), xtable
Imports: Matrix
Modified: pkg/RSienaTest/changeLog
===================================================================
--- pkg/RSienaTest/changeLog 2011-02-22 01:31:03 UTC (rev 138)
+++ pkg/RSienaTest/changeLog 2011-02-23 23:48:16 UTC (rev 139)
@@ -1,3 +1,13 @@
+2011-02-23 R-forge revision 139
+
+ * src/model/ml/MLsimulation.cpp,
+ src/model/variables/NetworkVariable.cpp: ML for bipartite
+ networks.
+
+2011-02-22 R-forge revision 138
+
+ Change version number on RSiena to 137
+
2011-02-22 R-forge revision 137
* Changes to RSienaTest Only
Modified: pkg/RSienaTest/doc/s_man400.tex
===================================================================
--- pkg/RSienaTest/doc/s_man400.tex 2011-02-22 01:31:03 UTC (rev 138)
+++ pkg/RSienaTest/doc/s_man400.tex 2011-02-23 23:48:16 UTC (rev 139)
@@ -7142,7 +7142,8 @@
$s^{\rm beh}_{i\vit}(x) = z_{i} v_{i}\,$;\\
here too, the other dependent behavioral variables are centered so that they
have overall mean 0;
-\item \emph{alter's covariate average } effect on behavior $z$ \texttt{(avAlt)},\\
+\item \emph{alter's covariate average } effect on behavior $z$
+ \texttt{(AltsAvAlt)},\\
defined as the product of $i$'s behavior $z_i$ and
$i$'s alters' covariate-average $\breve v_i$ as defined
in (\ref{alt_av}),\\
@@ -8285,6 +8286,9 @@
(Programmers should consult the changeLog file on CRAN or in the R-forge
repository.)
\begin{itemize}
+\item 2011-02-24 R-forge revision 139: fixes for bipartite networks with
+ ML. ML is still incomplete, and will not work correctly with missing data or
+ endowment effects.
\item 2011-02-22 R-forge revision 137: (RSienaTest only)
Additional work on the goodness of fit functionality (see ?sienaGOF)
\item 2011-02-21 R-forge revision 136:
Modified: pkg/RSienaTest/man/RSiena-package.Rd
===================================================================
--- pkg/RSienaTest/man/RSiena-package.Rd 2011-02-22 01:31:03 UTC (rev 138)
+++ pkg/RSienaTest/man/RSiena-package.Rd 2011-02-23 23:48:16 UTC (rev 139)
@@ -30,8 +30,8 @@
\tabular{ll}{
Package: \tab RSiena\cr
Type: \tab Package\cr
-Version: \tab 1.0.12.136\cr
-Date: \tab 2011-02-21\cr
+Version: \tab 1.0.12.139\cr
+Date: \tab 2011-02-23\cr
License: \tab GPL-2 \cr
LazyLoad: \tab yes\cr
}
Modified: pkg/RSienaTest/src/model/ml/MLSimulation.cpp
===================================================================
--- pkg/RSienaTest/src/model/ml/MLSimulation.cpp 2011-02-22 01:31:03 UTC (rev 138)
+++ pkg/RSienaTest/src/model/ml/MLSimulation.cpp 2011-02-23 23:48:16 UTC (rev 139)
@@ -614,6 +614,8 @@
int i = this->chooseActor(pVariable);
BehaviorVariable * pBehaviorVariable =
dynamic_cast<BehaviorVariable *>(pVariable);
+ NetworkVariable * pNetworkVariable =
+ dynamic_cast<NetworkVariable *>(pVariable);
if (!pVariable->pActorSet()->active(i) ||
(pBehaviorVariable && pBehaviorVariable->structural(i)))
{
@@ -632,11 +634,23 @@
}
else
{
- pNewMiniStep =
- new NetworkChange(
- dynamic_cast<NetworkLongitudinalData *>(pVariable->pData()),
- i,
- i);
+ if (pNetworkVariable->oneModeNetwork())
+ {
+ pNewMiniStep =
+ new NetworkChange(
+ dynamic_cast<NetworkLongitudinalData *>(pVariable->pData()),
+ i,
+ i);
+ }
+ else
+ {
+ pNewMiniStep =
+ new NetworkChange(
+ dynamic_cast<NetworkLongitudinalData *>(pVariable->pData()),
+ i,
+ pVariable->m());
+
+ }
}
double rr = 1 / this->totalRate();
Modified: pkg/RSienaTest/src/model/variables/NetworkVariable.cpp
===================================================================
--- pkg/RSienaTest/src/model/variables/NetworkVariable.cpp 2011-02-22 01:31:03 UTC (rev 138)
+++ pkg/RSienaTest/src/model/variables/NetworkVariable.cpp 2011-02-23 23:48:16 UTC (rev 139)
@@ -1709,7 +1709,8 @@
{
const NetworkChange * pNetworkChange =
dynamic_cast<const NetworkChange *>(pMiniStep);
- return this->lpData->structural(pNetworkChange->ego(),
+ return !pMiniStep->diagonal() &&
+ this->lpData->structural(pNetworkChange->ego(),
pNetworkChange->alter(),
this->period());
}
More information about the Rsiena-commits
mailing list