[Rsiena-commits] r145 - in pkg: RSiena RSiena/man RSiena/src/model/effects RSienaTest RSienaTest/man RSienaTest/src/model/effects
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Wed Apr 20 14:49:04 CEST 2011
Author: ripleyrm
Date: 2011-04-20 14:49:03 +0200 (Wed, 20 Apr 2011)
New Revision: 145
Modified:
pkg/RSiena/DESCRIPTION
pkg/RSiena/changeLog
pkg/RSiena/man/RSiena-package.Rd
pkg/RSiena/src/model/effects/OutTruncEffect.cpp
pkg/RSienaTest/DESCRIPTION
pkg/RSienaTest/changeLog
pkg/RSienaTest/man/RSiena-package.Rd
pkg/RSienaTest/src/model/effects/OutTruncEffect.cpp
Log:
Reformat of OutTruncEffect.cpp
Modified: pkg/RSiena/DESCRIPTION
===================================================================
--- pkg/RSiena/DESCRIPTION 2011-04-19 15:47:34 UTC (rev 144)
+++ pkg/RSiena/DESCRIPTION 2011-04-20 12:49:03 UTC (rev 145)
@@ -1,8 +1,8 @@
Package: RSiena
Type: Package
Title: Siena - Simulation Investigation for Empirical Network Analysis
-Version: 1.0.12.144
-Date: 2011-04-19
+Version: 1.0.12.145
+Date: 2011-04-20
Author: Various
Depends: R (>= 2.9.0), xtable
Imports: Matrix
Modified: pkg/RSiena/changeLog
===================================================================
--- pkg/RSiena/changeLog 2011-04-19 15:47:34 UTC (rev 144)
+++ pkg/RSiena/changeLog 2011-04-20 12:49:03 UTC (rev 145)
@@ -1,3 +1,7 @@
+2011-04-20 R-forge revision 145
+
+ * src/model/effects/outTruncEffect.cpp: reformating
+
2011-04-19 R-forge revision 144
* data/allEffects.csv, src/model/effects/AllEffects.h,
@@ -20,7 +24,8 @@
* man/s50.Rd, man/s501.Rd, man/s502.Rd, man/s503.Rd, man/s50a.Rd:
more helpful information.
- * R/initializeFRAN.r, R/maxlikec.r: added eolstyle property.
+ * R/initializeFRAN.r, R/maxlikec.r, man/summary.iwlsm.Rd:
+ added eolstyle property.
2011-03-13 R-forge revision 143 RSienaTest only
@@ -37,10 +42,12 @@
* src/model/effects/GwespBBEffect.cpp Now implements GwespAbstract class
* src/model/effects/GwespFFEffect.cpp Now implements GwespAbstract class
* src/model/effects/GwespRREffect.cpp Now implements GwespAbstract class
- * man/sienaGOF.Rd: Added primitive snow cluster support, option for robust covariance estimation
- * R/sienaGOF.r: Added primitive snow cluster support, option for robust covariance estimation
+ * man/sienaGOF.Rd: Added primitive snow cluster support,
+ option for robust covariance estimation
+ * R/sienaGOF.r: Added primitive snow cluster support,
+ option for robust covariance estimation
-2011-03-06 R-forge revision 142
+2011-03-06 R-forge revision 142 RSienaTest only
* R/sienaGOF: fixed a plotting issue with missing data
* src/model/effects/EffectFactory.cpp: added GWESP terms
Modified: pkg/RSiena/man/RSiena-package.Rd
===================================================================
--- pkg/RSiena/man/RSiena-package.Rd 2011-04-19 15:47:34 UTC (rev 144)
+++ pkg/RSiena/man/RSiena-package.Rd 2011-04-20 12:49:03 UTC (rev 145)
@@ -30,8 +30,8 @@
\tabular{ll}{
Package: \tab RSiena\cr
Type: \tab Package\cr
-Version: \tab 1.0.12.144\cr
-Date: \tab 2011-04-19\cr
+Version: \tab 1.0.12.145\cr
+Date: \tab 2011-04-20\cr
License: \tab GPL-2 \cr
LazyLoad: \tab yes\cr
}
Modified: pkg/RSiena/src/model/effects/OutTruncEffect.cpp
===================================================================
--- pkg/RSiena/src/model/effects/OutTruncEffect.cpp 2011-04-19 15:47:34 UTC (rev 144)
+++ pkg/RSiena/src/model/effects/OutTruncEffect.cpp 2011-04-20 12:49:03 UTC (rev 145)
@@ -51,15 +51,18 @@
// the new effect value would have decreased by 1 if d <= this->lc
if (d <= this->lc)
- {change = 1;}
-
+ {
+ change = 1;
+ }
}
else
{
// When introducing a new tie, the new out-degree would be d+1, and
// the new effect value would have increased by 1 if d < this->lc
if (d < this->lc)
- {change = 1;}
+ {
+ change = 1;
+ }
}
return change;
@@ -77,13 +80,15 @@
int d = this->pNetwork()->outDegree(this->ego());
if (d <= this->lc)
- {return d;}
- else
- {return this->lc;}
+ {
+ return d;
+ }
+ else
+ {
+ return this->lc;
+ }
}
-
-
/**
* Returns the statistic corresponding to this effect as part of
* the endowment function.
Modified: pkg/RSienaTest/DESCRIPTION
===================================================================
--- pkg/RSienaTest/DESCRIPTION 2011-04-19 15:47:34 UTC (rev 144)
+++ pkg/RSienaTest/DESCRIPTION 2011-04-20 12:49:03 UTC (rev 145)
@@ -1,8 +1,8 @@
Package: RSienaTest
Type: Package
Title: Siena - Simulation Investigation for Empirical Network Analysis
-Version: 1.0.12.144
-Date: 2011-04-19
+Version: 1.0.12.145
+Date: 2011-04-20
Author: Various
Depends: R (>= 2.9.0), xtable
Imports: Matrix
Modified: pkg/RSienaTest/changeLog
===================================================================
--- pkg/RSienaTest/changeLog 2011-04-19 15:47:34 UTC (rev 144)
+++ pkg/RSienaTest/changeLog 2011-04-20 12:49:03 UTC (rev 145)
@@ -1,3 +1,7 @@
+2011-04-20 R-forge revision 145
+
+ * src/model/effects/outTruncEffect.cpp: reformating
+
2011-04-19 R-forge revision 144
* data/allEffects.csv, src/model/effects/AllEffects.h,
Modified: pkg/RSienaTest/man/RSiena-package.Rd
===================================================================
--- pkg/RSienaTest/man/RSiena-package.Rd 2011-04-19 15:47:34 UTC (rev 144)
+++ pkg/RSienaTest/man/RSiena-package.Rd 2011-04-20 12:49:03 UTC (rev 145)
@@ -30,8 +30,8 @@
\tabular{ll}{
Package: \tab RSiena\cr
Type: \tab Package\cr
-Version: \tab 1.0.12.144\cr
-Date: \tab 2011-04-19\cr
+Version: \tab 1.0.12.145\cr
+Date: \tab 2011-04-20\cr
License: \tab GPL-2 \cr
LazyLoad: \tab yes\cr
}
Modified: pkg/RSienaTest/src/model/effects/OutTruncEffect.cpp
===================================================================
--- pkg/RSienaTest/src/model/effects/OutTruncEffect.cpp 2011-04-19 15:47:34 UTC (rev 144)
+++ pkg/RSienaTest/src/model/effects/OutTruncEffect.cpp 2011-04-20 12:49:03 UTC (rev 145)
@@ -51,15 +51,18 @@
// the new effect value would have decreased by 1 if d <= this->lc
if (d <= this->lc)
- {change = 1;}
-
+ {
+ change = 1;
+ }
}
else
{
// When introducing a new tie, the new out-degree would be d+1, and
// the new effect value would have increased by 1 if d < this->lc
if (d < this->lc)
- {change = 1;}
+ {
+ change = 1;
+ }
}
return change;
@@ -77,13 +80,15 @@
int d = this->pNetwork()->outDegree(this->ego());
if (d <= this->lc)
- {return d;}
- else
- {return this->lc;}
+ {
+ return d;
+ }
+ else
+ {
+ return this->lc;
+ }
}
-
-
/**
* Returns the statistic corresponding to this effect as part of
* the endowment function.
More information about the Rsiena-commits
mailing list