Refactoring ActivityNetwork

lmorisse · Sep 1, 2020 · f8c6300 · f8c6300
1 parent b18901b
commit f8c6300
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/ActivityModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/ActivityModel.cs
@@ -13,8 +13,9 @@
 using System.Collections.Generic;
 using Symu.Common.Interfaces.Agent;
 using Symu.DNA;
-using Symu.DNA.Activities;
+using Symu.DNA.OneModeNetworks.Activity;
 using Symu.DNA.OneModeNetworks.Knowledge;
+using Symu.DNA.TwoModesNetworks.Assignment;
 
 #endregion
 
@@ -29,7 +30,7 @@ namespace Symu.Classes.Agents.Models.CognitiveModels
     public class ActivityModel
     {
         private readonly IAgentId _agentId;
-        private readonly ActivityNetwork _networkActivities;
+        private readonly AssignmentNetwork _networkActivities;
 
         /// <summary>
         ///     Initialize influence model :
@@ -51,7 +52,7 @@ public ActivityModel(IAgentId agentId, CognitiveArchitecture cognitiveArchitectu
             }
 
             _agentId = agentId;
-            _networkActivities = network.Activities;
+            _networkActivities = network.Assignment;
         }
 
         /// <summary>

diff --git a/SourceCode/Symu/Repository/Entity/Activity.cs b/SourceCode/Symu/Repository/Entity/Activity.cs
@@ -13,7 +13,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Symu.Common.Interfaces.Entity;
-using Symu.DNA.Activities;
+using Symu.DNA.OneModeNetworks.Activity;
 using Symu.DNA.OneModeNetworks.Knowledge;
 
 #endregion

diff --git a/SourceCode/Symu/Repository/Entity/AgentActivity.cs b/SourceCode/Symu/Repository/Entity/AgentActivity.cs
@@ -11,7 +11,8 @@
 
 using Symu.Common.Interfaces.Agent;
 using Symu.Common.Interfaces.Entity;
-using Symu.DNA.Activities;
+using Symu.DNA.OneModeNetworks.Activity;
+using Symu.DNA.TwoModesNetworks.Assignment;
 
 #endregion
 

diff --git a/Symu examples/SymuGroupAndInteraction/Classes/ExampleEnvironment.cs b/Symu examples/SymuGroupAndInteraction/Classes/ExampleEnvironment.cs
@@ -18,7 +18,7 @@
 using Symu.Common.Interfaces.Agent;
 using Symu.Common.Interfaces.Entity;
 using Symu.Common.Math.ProbabilityDistributions;
-using Symu.DNA.Activities;
+using Symu.DNA.OneModeNetworks.Activity;
 using Symu.Environment;
 using Symu.Repository.Entity;
 
@@ -120,16 +120,16 @@ private void SetActivity(IAgentId agentId, IReadOnlyList<IActivity> activities,
             {
                 case 0:
                     // same activity for all
-                    WhitePages.MetaNetwork.Activities.AddAgentActivity(agentId, groupId, new AgentActivity(agentId, activities[0]));
+                    WhitePages.MetaNetwork.Assignment.AddAgentActivity(agentId, groupId, new AgentActivity(agentId, activities[0]));
                     break;
                 case 1:
                     // Activity is by group
-                    WhitePages.MetaNetwork.Activities.AddAgentActivity(agentId, groupId, new AgentActivity(agentId, activities[i]));
+                    WhitePages.MetaNetwork.Assignment.AddAgentActivity(agentId, groupId, new AgentActivity(agentId, activities[i]));
                     break;
                 case 2:
                     // Activity is randomly defined for agentId
                     var index = DiscreteUniform.Sample(0, GroupsCount - 1);
-                    WhitePages.MetaNetwork.Activities.AddAgentActivity(agentId, groupId, new AgentActivity(agentId, activities[index]));
+                    WhitePages.MetaNetwork.Assignment.AddAgentActivity(agentId, groupId, new AgentActivity(agentId, activities[index]));
                     break;
             }
         }