[Rsiena-commits] r305 - in pkg/RSienaTest: . src src/model src/model/effects
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu Oct 20 17:24:32 CEST 2016
Author: fschoenen
Date: 2016-10-20 17:24:31 +0200 (Thu, 20 Oct 2016)
New Revision: 305
Modified:
pkg/RSienaTest/ChangeLog
pkg/RSienaTest/src/model/StatisticCalculator.cpp
pkg/RSienaTest/src/model/effects/AverageSimmelianAlterEffect.cpp
pkg/RSienaTest/src/model/effects/BehaviorEffect.cpp
pkg/RSienaTest/src/model/effects/BehaviorEffect.h
pkg/RSienaTest/src/model/effects/CovariateDependentNetworkEffect.cpp
pkg/RSienaTest/src/model/effects/CovariateSimmelianAlterEffect.cpp
pkg/RSienaTest/src/model/effects/NetworkDependentBehaviorEffect.cpp
pkg/RSienaTest/src/model/effects/NetworkDependentBehaviorEffect.h
pkg/RSienaTest/src/model/effects/SimmelianEffect.cpp
pkg/RSienaTest/src/sources.list
Log:
GMM: initialize BehaviorEffect with simulated state
Modified: pkg/RSienaTest/ChangeLog
===================================================================
--- pkg/RSienaTest/ChangeLog 2016-10-14 17:35:19 UTC (rev 304)
+++ pkg/RSienaTest/ChangeLog 2016-10-20 15:24:31 UTC (rev 305)
@@ -1,3 +1,9 @@
+2016-10-20 R-Forge Revision 305
+Changes in RSienaTest:
+ * BehaviorEffect, NetworkDependentBehaviorEffect, StatisticCalculator:
+ initialize() with simulated state for GMM.
+ * Other effects: Fix [-Wreorder] warings.
+
2016-10-14 R-Forge Revision 304
Changes in RSiena and RSienaTest (George Vega Yon):
* tests/parallel.R: Changing makeForkCluster to makeCluster.
Modified: pkg/RSienaTest/src/model/StatisticCalculator.cpp
===================================================================
--- pkg/RSienaTest/src/model/StatisticCalculator.cpp 2016-10-14 17:35:19 UTC (rev 304)
+++ pkg/RSienaTest/src/model/StatisticCalculator.cpp 2016-10-20 15:24:31 UTC (rev 305)
@@ -405,9 +405,10 @@
NetworkEffect * pEffect = (NetworkEffect *) factory.createEffect(pInfo);
// Initialize the effect to work with our data and state of variables.
-// pEffect->initialize(this->lpData, this->lpPredictorState, this->lperiod, &cache);
+// pEffect->initialize(this->lpData, this->lpPredictorState,
+// this->lperiod, &cache);
pEffect->initialize(this->lpData, this->lpPredictorState, this->lpState,
- this->lperiod, &cache);
+ this->lperiod, &cache);
this->lstatistics[pInfo] = pEffect->evaluationStatistic();
delete pEffect;
@@ -443,8 +444,10 @@
BehaviorEffect * pEffect = (BehaviorEffect *) factory.createEffect(
pInfo);
// Initialize the effect to work with our data and state of variables.
- pEffect->initialize(this->lpData, this->lpPredictorState, this->lperiod,
- &cache);
+// pEffect->initialize(this->lpData, this->lpPredictorState,
+// this->lperiod, &cache);
+ pEffect->initialize(this->lpData, this->lpPredictorState, this->lpState,
+ this->lperiod, &cache);
if (this->lneedActorStatistics) {
pair<double, double *> p = pEffect->evaluationStatistic(
currentValues, this->lneedActorStatistics);
@@ -460,7 +463,9 @@
this->lstaticChangeContributions.insert(make_pair(pInfo, egosMap));
for (int e = 0; e < pBehaviorData->n(); e++) {
cache.initialize(e);
- pEffect->initialize(this->lpData, this->lpPredictorState,
+// pEffect->initialize(this->lpData, this->lpPredictorState,
+// this->lperiod, &cache);
+ pEffect->initialize(this->lpData, this->lpPredictorState, this->lpState,
this->lperiod, &cache);
double * contributions = new double[choices];
this->lstaticChangeContributions.at(pInfo).at(e) =
Modified: pkg/RSienaTest/src/model/effects/AverageSimmelianAlterEffect.cpp
===================================================================
--- pkg/RSienaTest/src/model/effects/AverageSimmelianAlterEffect.cpp 2016-10-14 17:35:19 UTC (rev 304)
+++ pkg/RSienaTest/src/model/effects/AverageSimmelianAlterEffect.cpp 2016-10-20 15:24:31 UTC (rev 305)
@@ -24,9 +24,9 @@
* Constructor.
*/
AverageSimmelianAlterEffect::AverageSimmelianAlterEffect(
- const EffectInfo * pEffectInfo, bool divide) :
- pSimmelian(0), //
- NetworkDependentBehaviorEffect(pEffectInfo)
+ const EffectInfo * pEffectInfo, bool divide) :
+ NetworkDependentBehaviorEffect(pEffectInfo), //
+ pSimmelian(0)
{
this->ldivide = divide;
// Indicates whether there will be division by the outdegree of ego
Modified: pkg/RSienaTest/src/model/effects/BehaviorEffect.cpp
===================================================================
--- pkg/RSienaTest/src/model/effects/BehaviorEffect.cpp 2016-10-14 17:35:19 UTC (rev 304)
+++ pkg/RSienaTest/src/model/effects/BehaviorEffect.cpp 2016-10-20 15:24:31 UTC (rev 305)
@@ -61,6 +61,11 @@
this->lvalues = pState->behaviorValues(name);
}
+void BehaviorEffect::initialize(const Data *pData,
+ State *pState, State *pSimulatedState, int period, Cache *pCache)
+{
+ initialize(pData, pState, period, pCache);
+}
/**
* Returns the number of actors of the behavior variable associated with this
Modified: pkg/RSienaTest/src/model/effects/BehaviorEffect.h
===================================================================
--- pkg/RSienaTest/src/model/effects/BehaviorEffect.h 2016-10-14 17:35:19 UTC (rev 304)
+++ pkg/RSienaTest/src/model/effects/BehaviorEffect.h 2016-10-20 15:24:31 UTC (rev 305)
@@ -41,6 +41,8 @@
State * pState,
int period,
Cache * pCache);
+ virtual void initialize(const Data *pData, State *pState,
+ State *pSimulatedState, int period, Cache *pCache);
virtual void preprocessEgo(int ego);
Modified: pkg/RSienaTest/src/model/effects/CovariateDependentNetworkEffect.cpp
===================================================================
--- pkg/RSienaTest/src/model/effects/CovariateDependentNetworkEffect.cpp 2016-10-14 17:35:19 UTC (rev 304)
+++ pkg/RSienaTest/src/model/effects/CovariateDependentNetworkEffect.cpp 2016-10-20 15:24:31 UTC (rev 305)
@@ -43,8 +43,8 @@
*
* @param pEffectInfo The effect info.
* @param simulatedState If `true` the value(), missing() and similarity()
- * functions uses the simulated state, if any or the value at the end of
- * the period.
+ * functions uses the simulated state, if any or the value at the end
+ * of the period.
*/
CovariateDependentNetworkEffect::CovariateDependentNetworkEffect(
const EffectInfo * pEffectInfo, bool simulatedState) :
@@ -116,7 +116,7 @@
throw logic_error(
"Covariate or dependent behavior variable '" + name + "' expected.");
}
- }
+}
/**
* Returns the covariate value for the given actor.
Modified: pkg/RSienaTest/src/model/effects/CovariateSimmelianAlterEffect.cpp
===================================================================
--- pkg/RSienaTest/src/model/effects/CovariateSimmelianAlterEffect.cpp 2016-10-14 17:35:19 UTC (rev 304)
+++ pkg/RSienaTest/src/model/effects/CovariateSimmelianAlterEffect.cpp 2016-10-20 15:24:31 UTC (rev 305)
@@ -23,8 +23,9 @@
CovariateSimmelianAlterEffect::CovariateSimmelianAlterEffect(
const EffectInfo* pEffectInfo):
- pSimmelian(0), //
- CovariateDependentNetworkEffect(pEffectInfo) {
+ CovariateDependentNetworkEffect(pEffectInfo), //
+ pSimmelian(0)
+{
}
CovariateSimmelianAlterEffect::~CovariateSimmelianAlterEffect() {
Modified: pkg/RSienaTest/src/model/effects/NetworkDependentBehaviorEffect.cpp
===================================================================
--- pkg/RSienaTest/src/model/effects/NetworkDependentBehaviorEffect.cpp 2016-10-14 17:35:19 UTC (rev 304)
+++ pkg/RSienaTest/src/model/effects/NetworkDependentBehaviorEffect.cpp 2016-10-20 15:24:31 UTC (rev 305)
@@ -31,13 +31,31 @@
* @param[in] pEffectInfo the descriptor object of the effect
*/
NetworkDependentBehaviorEffect::NetworkDependentBehaviorEffect(
- const EffectInfo * pEffectInfo) : BehaviorEffect(pEffectInfo)
+ const EffectInfo * pEffectInfo) :
+ BehaviorEffect(pEffectInfo), //
+ lSimulatedOffset(0), //
+ ltotalAlterValues(0), //
+ ltotalInAlterValues(0)
{
- this->ltotalAlterValues = 0;
- this->ltotalInAlterValues = 0;
}
/**
+ * Constructor.
+ * @param[in] pEffectInfo the descriptor object of the effect
+ * @param simulatedState If `true` the value(), missing() and similarity()
+ * functions uses the simulated state, if any or the value at the end
+ * of the period.
+ */
+NetworkDependentBehaviorEffect::NetworkDependentBehaviorEffect(
+ const EffectInfo * pEffectInfo, bool simulatedState) :
+ BehaviorEffect(pEffectInfo), //
+ lSimulatedOffset(simulatedState ? 1 : 0), //
+ ltotalAlterValues(0), //
+ ltotalInAlterValues(0)
+{
+}
+
+/**
* Deallocates this effect object;
*/
NetworkDependentBehaviorEffect::~NetworkDependentBehaviorEffect()
@@ -63,18 +81,37 @@
this->lpNetwork = pState->pNetwork(networkName);
- if (!this->lpNetwork)
- {
+ if (!this->lpNetwork) {
throw logic_error("Network '" + networkName + "' expected.");
}
- if (this->ltotalAlterValues)
- {
- delete [] this->ltotalAlterValues;
+
+ // clear old value arrays
+ if (this->ltotalAlterValues) delete [] this->ltotalAlterValues;
+ if (this->ltotalInAlterValues) delete [] this->ltotalInAlterValues;
+ // create new value arrays
+ this->ltotalAlterValues = new double[this->lpNetwork->n()];
+ this->ltotalInAlterValues = new double[this->lpNetwork->m()];
+}
+
+void NetworkDependentBehaviorEffect::initialize(const Data *pData,
+ State *pState, State *pSimulatedState, int period, Cache *pCache)
+{
+ BehaviorEffect::initialize(pData, pState, period, pCache);
+
+ // Select network state.
+ string networkName = this->pEffectInfo()->interactionName1();
+ if (lSimulatedOffset == 1) {
+ this->lpNetwork = pSimulatedState->pNetwork(networkName);
+ } else {
+ this->lpNetwork = pState->pNetwork(networkName);
}
- if (this->ltotalInAlterValues)
- {
- delete [] this->ltotalInAlterValues;
- }
+ if (!this->lpNetwork) throw logic_error(
+ "Network '" + networkName + "' expected.");
+
+ // clear old value arrays
+ if (this->ltotalAlterValues) delete [] this->ltotalAlterValues;
+ if (this->ltotalInAlterValues) delete [] this->ltotalInAlterValues;
+ // create new value arrays
this->ltotalAlterValues = new double[this->lpNetwork->n()];
this->ltotalInAlterValues = new double[this->lpNetwork->m()];
}
@@ -104,7 +141,7 @@
void NetworkDependentBehaviorEffect::preprocessEgo(int ego)
{
// set up the covariate based on current values of the network and behavior
- const Network * pNetwork = this->pNetwork();
+ const Network* pNetwork = this->pNetwork();
for (int i = 0; i < pNetwork->n(); i++)
{
@@ -118,9 +155,7 @@
int j = iter.actor();
this->ltotalAlterValues[i] += this->centeredValue(j);
// Rprintf("%d %f %d %d %d %d\n",
-// j,
-// this->centeredValue(j),
-// this->period(),
+// j, this->centeredValue(j), this->period(),
}
}
else
Modified: pkg/RSienaTest/src/model/effects/NetworkDependentBehaviorEffect.h
===================================================================
--- pkg/RSienaTest/src/model/effects/NetworkDependentBehaviorEffect.h 2016-10-14 17:35:19 UTC (rev 304)
+++ pkg/RSienaTest/src/model/effects/NetworkDependentBehaviorEffect.h 2016-10-20 15:24:31 UTC (rev 305)
@@ -36,12 +36,15 @@
{
public:
NetworkDependentBehaviorEffect(const EffectInfo * pEffectInfo);
+ NetworkDependentBehaviorEffect(const EffectInfo * pEffectInfo, const bool simulated);
virtual ~NetworkDependentBehaviorEffect();
virtual void initialize(const Data * pData,
State * pState,
int period,
Cache * pCache);
+ virtual void initialize(const Data *pData,
+ State *pState, State *pSimulatedState, int period, Cache *pCache);
protected:
inline const Network * pNetwork() const;
@@ -50,6 +53,11 @@
virtual void preprocessEgo(int ego);
private:
+ //! If `1` value(), missing() and similarity() returns the simulated value
+ //! (if the covariate is a behavior) or the observed value at the end of the
+ //! period.
+ const int lSimulatedOffset;
+
// The network this effect is interacting with
const Network * lpNetwork;
// total out- and in-alter values
Modified: pkg/RSienaTest/src/model/effects/SimmelianEffect.cpp
===================================================================
--- pkg/RSienaTest/src/model/effects/SimmelianEffect.cpp 2016-10-14 17:35:19 UTC (rev 304)
+++ pkg/RSienaTest/src/model/effects/SimmelianEffect.cpp 2016-10-20 15:24:31 UTC (rev 305)
@@ -24,8 +24,9 @@
SimmelianEffect::SimmelianEffect(
const EffectInfo* pEffectInfo):
- pSimmelian(0), //
- NetworkEffect(pEffectInfo) {
+ NetworkEffect(pEffectInfo), //
+ pSimmelian(0)
+{
}
SimmelianEffect::~SimmelianEffect() {
Modified: pkg/RSienaTest/src/sources.list
===================================================================
--- pkg/RSienaTest/src/sources.list 2016-10-14 17:35:19 UTC (rev 304)
+++ pkg/RSienaTest/src/sources.list 2016-10-20 15:24:31 UTC (rev 305)
@@ -1 +1 @@
-RInterface.cpp RUtil.cpp siena07internals.cpp siena07models.cpp siena07setup.cpp siena07utilities.cpp data/ChangingDyadicCovariate.cpp data/ConstantDyadicCovariate.cpp data/OneModeNetworkLongitudinalData.cpp data/DyadicCovariateValueIterator.cpp data/LongitudinalData.cpp data/NetworkLongitudinalData.cpp data/ExogenousEvent.cpp data/Covariate.cpp data/DyadicCovariate.cpp data/BehaviorLongitudinalData.cpp data/ChangingCovariate.cpp data/Data.cpp data/NetworkConstraint.cpp data/ActorSet.cpp data/ConstantCovariate.cpp Eigen/RLegacy.cpp estimator/components/PeriodWiseScoreCollector.cpp estimator/components/TimesCollector.cpp estimator/components/StatisticCollector.cpp estimator/components/ScoreCollector.cpp estimator/components/NSimCollector.cpp estimator/components/ParameterSum.cpp estimator/components/PeriodWiseStatisticsCollector.cpp estimator/listener/EstimatorListener.cpp estimator/update/autocorrelation/MinMaxACStopCondition.cpp estimator/update/autocorrelation/AutoCorrelator.cpp estimator/update/autocorrelation/MaxACStopCondition.cpp estimator/update/step/GMMDiagonalStep.cpp estimator/update/step/normalization/StepNormalization.cpp estimator/update/step/normalization/SDStepNormalization.cpp estimator/update/step/GMMFullStep.cpp estimator/update/step/UpdateStep.cpp estimator/update/StopCondition.cpp estimator/update/UpdateController.cpp estimator/Controller.cpp estimator/GMMEstimator.cpp estimator/derivative/FiniteDifference.cpp estimator/derivative/Differentiation.cpp estimator/derivative/DifferentiationController.cpp estimator/derivative/ScoreDeviation.cpp estimator/derivative/MLDifferentiation.cpp estimator/test/StaticController.cpp estimator/SienaFit.cpp logger/Priority.cpp logger/formatter/MPIAwareFormatter.cpp logger/LogEntry.cpp logger/appender/FileAppender.cpp logger/appender/AppenderPool.cpp model/ml/BehaviorChange.cpp model/ml/Chain.cpp model/ml/NetworkChange.cpp model/ml/MiniStep.cpp model/ml/Option.cpp model/ml/MLSimulation.cpp model/variables/DiffusionEffectValueTable.cpp model/variables/EffectValueTable.cpp model/variables/BehaviorVariable.cpp model/variables/NetworkVariable.cpp model/variables/DependentVariable.cpp model/EpochSimulation.cpp model/effects/OutOutDegreeAssortativityEffect.cpp model/effects/ReciprocatedSimilarityEffect.cpp model/effects/AverageInAlterEffect.cpp model/effects/NetworkEffect.cpp model/effects/EffectFactory.cpp model/effects/DyadicCovariateDependentNetworkEffect.cpp model/effects/InteractionCovariateEffect.cpp model/effects/ReciprocalDegreeBehaviorEffect.cpp model/effects/OutdegreeActivityEffect.cpp model/effects/TransitiveTriadsEffect.cpp model/effects/RecipdegreePopularityEffect.cpp model/effects/SimilarityEffect.cpp model/effects/IsolateNetEffect.cpp model/effects/DenseTriadsBehaviorEffect.cpp model/effects/AverageAlterInDist2Effect.cpp model/effects/AverageAlterEffect.cpp model/effects/TruncatedOutdegreeEffect.cpp model/effects/DyadicCovariateAndNetworkBehaviorEffect.cpp model/effects/OutdegreeActivitySqrtEffect.cpp model/effects/CovariateSimmelianAlterEffect.cpp model/effects/LinearShapeEffect.cpp model/effects/Effect.cpp model/effects/SimmelianEffect.cpp model/effects/InStructuralEquivalenceEffect.cpp model/effects/IsolateEffect.cpp model/effects/HomCovariateActivityEffect.cpp model/effects/NetworkDependentBehaviorEffect.cpp model/effects/BetweennessEffect.cpp model/effects/CovariateIndirectTiesEffect.cpp model/effects/QuadraticShapeEffect.cpp model/effects/SameCovariateActivityEffect.cpp model/effects/IndegreeEffect.cpp model/effects/AltersInDist2CovariateAverageEffect.cpp model/effects/AverageAlterDist2Effect.cpp model/effects/DyadicCovariateAvAltEffect.cpp model/effects/PopularityAlterEffect.cpp model/effects/WXXClosureEffect.cpp model/effects/AltersCovariateAvSimEffect.cpp model/effects/XWXClosureEffect.cpp model/effects/IndegreePopularityEffect.cpp model/effects/AltersCovariateAvAltEffect.cpp model/effects/CovariateDiffEgoEffect.cpp model/effects/InverseSquaredOutdegreeEffect.cpp model/effects/InverseOutdegreeEffect.cpp model/effects/CovariateAndNetworkBehaviorEffect.cpp model/effects/CovariateAlterEffect.cpp model/effects/SimilarityTransitiveTripletsEffect.cpp model/effects/SameCovariateTransitiveTripletsEffect.cpp model/effects/AlterCovariateActivityEffect.cpp model/effects/IndegreeActivityEffect.cpp model/effects/HomCovariateTransitiveTripletsEffect.cpp model/effects/HigherCovariateEffect.cpp model/effects/SimilarityWEffect.cpp model/effects/SameCovariateEffect.cpp model/effects/AltersDist2CovariateAverageEffect.cpp model/effects/DistanceTwoEffect.cpp model/effects/DoubleInPopEffect.cpp model/effects/DoubleRecDegreeBehaviorEffect.cpp model/effects/OutdegreePopularityEffect.cpp model/effects/generic/ProductFunction.cpp model/effects/generic/InTieFunction.cpp model/effects/generic/CovariateDegreeFunction.cpp model/effects/generic/SameCovariateInStarFunction.cpp model/effects/generic/DifferentCovariateInStarFunction.cpp model/effects/generic/EqualCovariatePredicate.cpp model/effects/generic/HomCovariateMixedTwoPathFunction.cpp model/effects/generic/CovariateDistance2SimilarityNetworkFunction.cpp model/effects/generic/SameCovariateTwoPathFunction.cpp model/effects/generic/OutStarFunction.cpp model/effects/generic/InDegreeFunction.cpp model/effects/generic/EgoInDegreeFunction.cpp model/effects/generic/OutTieFunction.cpp model/effects/generic/CovariateDistance2InAlterNetworkFunction.cpp model/effects/generic/DifferenceFunction.cpp model/effects/generic/MixedOutStarFunction.cpp model/effects/generic/CovariateDistance2EgoAltSimNetworkFunction.cpp model/effects/generic/CovariateMixedNetworkAlterFunction.cpp model/effects/generic/InJaccardFunction.cpp model/effects/generic/CovariateDistance2AlterNetworkFunction.cpp model/effects/generic/OutActDistance2Function.cpp model/effects/generic/TwoPathFunction.cpp model/effects/generic/GenericNetworkEffect.cpp model/effects/generic/MissingCovariatePredicate.cpp model/effects/generic/CovariatePredicate.cpp model/effects/generic/IntAlterFunction.cpp model/effects/generic/SameCovariateInTiesFunction.cpp model/effects/generic/BetweennessFunction.cpp model/effects/generic/EgoOutDegreeFunction.cpp model/effects/generic/OutJaccardFunction.cpp model/effects/generic/SameCovariateOutStarFunction.cpp model/effects/generic/DifferentCovariateOutStarFunction.cpp model/effects/generic/SumFunction.cpp model/effects/generic/ReciprocatedTwoPathFunction.cpp model/effects/generic/ConditionalFunction.cpp model/effects/generic/MixedThreeCyclesFunction.cpp model/effects/generic/CovariateDistance2NetworkFunction.cpp model/effects/generic/AlterFunction.cpp model/effects/generic/IntSqrtFunction.cpp model/effects/generic/MixedNetworkAlterFunction.cpp model/effects/generic/MixedInStarFunction.cpp model/effects/generic/OutDegreeFunction.cpp model/effects/generic/SameCovariateMixedTwoPathFunction.cpp model/effects/generic/InStarsTimesDegreesFunction.cpp model/effects/generic/ConstantFunction.cpp model/effects/generic/MixedTwoPathFunction.cpp model/effects/generic/ReverseTwoPathFunction.cpp model/effects/generic/AlterPredicate.cpp model/effects/generic/CovariateNetworkAlterFunction.cpp model/effects/generic/GwespFunction.cpp model/effects/generic/NetworkAlterFunction.cpp model/effects/generic/DoubleOutActFunction.cpp model/effects/generic/OneModeNetworkAlterFunction.cpp model/effects/generic/InStarFunction.cpp model/effects/TransitiveMediatedTripletsEffect.cpp model/effects/TransitiveTiesEffect.cpp model/effects/ReciprocityEffect.cpp model/effects/MaxAlterEffect.cpp model/effects/DenseTriadsSimilarityEffect.cpp model/effects/RecipdegreeActivityEffect.cpp model/effects/TransitiveTripletsEffect.cpp model/effects/OutdegreeEffect.cpp model/effects/CovariateEgoSquaredEffect.cpp model/effects/CovariateDependentNetworkEffect.cpp model/effects/WWXClosureEffect.cpp model/effects/CovariateDependentBehaviorEffect.cpp model/effects/OutInDegreeAssortativityEffect.cpp model/effects/DyadicCovariateReciprocityEffect.cpp model/effects/AntiIsolateEffect.cpp model/effects/NetworkInteractionEffect.cpp model/effects/InInDegreeAssortativityEffect.cpp model/effects/AltersCovariateAverageEffect.cpp model/effects/DyadicCovariateMainEffect.cpp model/effects/FourCyclesEffect.cpp model/effects/SameCovariateFourCyclesEffect.cpp model/effects/AverageSimmelianAlterEffect.cpp model/effects/CovariateEgoAlterEffect.cpp model/effects/InIsolateDegreeEffect.cpp model/effects/ThreeCyclesEffect.cpp model/effects/TwoNetworkDependentBehaviorEffect.cpp model/effects/BalanceEffect.cpp model/effects/CovariateEgoEffect.cpp model/effects/DenseTriadsEffect.cpp model/effects/JumpCovariateTransitiveTripletsEffect.cpp model/effects/AverageReciprocatedAlterEffect.cpp model/effects/DoubleDegreeBehaviorEffect.cpp model/effects/StructuralRateEffect.cpp model/effects/BehaviorInteractionEffect.cpp model/effects/TransitiveReciprocatedTriplets2Effect.cpp model/effects/CovariateSimilarityEffect.cpp model/effects/InAltersCovariateAverageEffect.cpp model/effects/BehaviorEffect.cpp model/effects/MixedNetworkEffect.cpp model/effects/TransitiveReciprocatedTripletsEffect.cpp model/effects/DiffusionRateEffect.cpp model/effects/IsolatePopEffect.cpp model/effects/DensityEffect.cpp model/effects/InOutDegreeAssortativityEffect.cpp model/effects/CovariateDiffEffect.cpp model/effects/DoubleOutActEffect.cpp model/effects/MainCovariateEffect.cpp model/effects/AltersCovariateTotSimEffect.cpp model/EffectInfo.cpp model/State.cpp model/filters/PermittedChangeFilter.cpp model/filters/LowerFilter.cpp model/filters/DisjointFilter.cpp model/filters/NetworkDependentFilter.cpp model/filters/HigherFilter.cpp model/filters/AtLeastOneFilter.cpp model/Function.cpp model/Model.cpp model/StatisticCalculator.cpp model/tables/EgocentricConfigurationTable.cpp model/tables/NetworkCache.cpp model/tables/ConfigurationTable.cpp model/tables/MixedConfigurationTable.cpp model/tables/Cache.cpp model/tables/BetweennessTable.cpp model/tables/TwoPathTable.cpp model/tables/TwoNetworkCache.cpp model/tables/CriticalInStarTable.cpp model/tables/MixedTwoPathTable.cpp model/tables/MixedEgocentricConfigurationTable.cpp model/SimulationActorSet.cpp model/settings/PrimarySetting.cpp model/settings/Setting.cpp model/settings/MeetingSetting.cpp model/settings/SettingsFactory.cpp model/settings/GeneralSetting.cpp model/settings/ComposableSetting.cpp model/settings/DyadicSetting.cpp model/settings/UniversalSetting.cpp model/settings/SettingInfo.cpp network/NetworkUtils.cpp network/CommonNeighborIterator.cpp network/layers/DistanceTwoLayer.cpp network/Network.cpp network/iterators/GeneralTieIterator.cpp network/iterators/AdvUnionTieIterator.cpp network/Simmelian.cpp network/OneModeNetwork.cpp network/IncidentTieIterator.cpp network/TieIterator.cpp sim/Simulation.cpp sim/modificator/ResultModificator.cpp sim/modificator/MeanStatisticsCalculator.cpp sim/modificator/DolbyModificator.cpp sim/listener/ResultListener.cpp sim/listener/Result.cpp sim/mpi/MPICommunicator.cpp sim/mpi/MPIStatisticsSimulation.cpp sim/StatisticsSimulation.cpp sim/MetropolisHastingsSimulation.cpp utils/debugging/StopWatch.cpp utils/debugging/ApproxSize.cpp utils/Utils.cpp utils/NamedObject.cpp utils/Random.cpp utils/SqrtTable.cpp
\ No newline at end of file
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/rsiena -r 305
More information about the Rsiena-commits
mailing list