Move SymuMetaNetwork to Symu.DNA

lmorisse · Aug 31, 2020 · 1b50290 · 1b50290
1 parent c5dae2a
commit 1b50290
Show file tree

Hide file tree

Showing 24 changed files with 68 additions and 522 deletions.
diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/ActivityModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/ActivityModel.cs
@@ -13,6 +13,7 @@
 using System.Collections.Generic;
 using Symu.Common.Interfaces.Agent;
 using Symu.Common.Interfaces.Entity;
+using Symu.DNA;
 using Symu.DNA.Activities;
 using Symu.DNA.Knowledges;
 using Symu.Repository.Entity;
@@ -40,7 +41,7 @@ public class ActivityModel
         /// <param name="agentId"></param>
         /// <param name="cognitiveArchitecture"></param>
         /// <param name="network"></param>
-        public ActivityModel(IAgentId agentId, CognitiveArchitecture cognitiveArchitecture, SymuMetaNetwork network)
+        public ActivityModel(IAgentId agentId, CognitiveArchitecture cognitiveArchitecture, MetaNetwork network)
         {
             if (cognitiveArchitecture == null)
             {

diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/BeliefsModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/BeliefsModel.cs
@@ -16,6 +16,7 @@
 using Symu.Common.Interfaces.Agent;
 using Symu.Common.Interfaces.Entity;
 using Symu.Common.Math.ProbabilityDistributions;
+using Symu.DNA;
 using Symu.DNA.Beliefs;
 using Symu.DNA.Knowledges;
 using Symu.Messaging.Templates;
@@ -51,7 +52,7 @@ public class BeliefsModel
         /// <param name="network"></param>
         /// <param name="model"></param>
         public BeliefsModel(IAgentId agentId, ModelEntity entity, CognitiveArchitecture cognitiveArchitecture,
-            SymuMetaNetwork network, RandomGenerator model)
+            MetaNetwork network, RandomGenerator model)
         {
             if (entity is null)
             {

diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/InfluenceModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/InfluenceModel.cs
@@ -15,6 +15,7 @@
 using Symu.Common.Interfaces.Agent;
 using Symu.Common.Interfaces.Entity;
 using Symu.Common.Math.ProbabilityDistributions;
+using Symu.DNA;
 using Symu.DNA.Agent;
 using Symu.Repository.Entity;
 using Symu.Repository.Networks;
@@ -57,7 +58,7 @@ public class InfluenceModel
         /// <param name="beliefsModel"></param>
         /// <param name="model"></param>
         public InfluenceModel(ModelEntity entity, CognitiveArchitecture cognitiveArchitecture,
-            SymuMetaNetwork network, BeliefsModel beliefsModel, RandomGenerator model)
+            MetaNetwork network, BeliefsModel beliefsModel, RandomGenerator model)
         {
             if (entity is null)
             {

diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/KnowledgeModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/KnowledgeModel.cs
@@ -15,6 +15,7 @@
 using Symu.Common.Interfaces.Agent;
 using Symu.Common.Interfaces.Entity;
 using Symu.Common.Math.ProbabilityDistributions;
+using Symu.DNA;
 using Symu.DNA.Knowledges;
 using Symu.Messaging.Templates;
 using Symu.Repository.Entity;
@@ -47,7 +48,7 @@ public class KnowledgeModel
         /// <param name="cognitiveArchitecture"></param>
         /// <param name="network"></param>
         public KnowledgeModel(IAgentId agentId, ModelEntity entity, CognitiveArchitecture cognitiveArchitecture,
-            SymuMetaNetwork network)
+            MetaNetwork network)
         {
             if (entity is null)
             {

diff --git a/SourceCode/Symu/Environment/SymuEnvironment.cs b/SourceCode/Symu/Environment/SymuEnvironment.cs
@@ -371,8 +371,8 @@ private void SetInteractionSphere(bool initialization)
         {
             var agentIds = WhitePages.AllCognitiveAgents().Where(x =>
                 x.Cognitive.InteractionPatterns.IsPartOfInteractionSphere &&
-                x.State == AgentState.Started).Select(x => x.AgentId).Cast<IAgentId>().ToList();
-            WhitePages.MetaNetwork.InteractionSphere.SetSphere(initialization, agentIds, WhitePages.MetaNetwork.Network);
+                x.State == AgentState.Started).Select(x => x.AgentId).ToList();
+            WhitePages.MetaNetwork.InteractionSphere.SetSphere(initialization, agentIds, WhitePages.MetaNetwork);
         }
 
         /// <summary>

diff --git a/SourceCode/Symu/Repository/Networks/Enculturation/EnculturationNetwork.cs b/SourceCode/Symu/Repository/Networks/Enculturation/EnculturationNetwork.cs
diff --git a/SourceCode/Symu/Repository/Networks/SymuMetaNetwork.cs b/SourceCode/Symu/Repository/Networks/SymuMetaNetwork.cs