Move Activity, AgentId, ClassId

lmorisse · Aug 24, 2020 · b993b34 · b993b34
1 parent f3b4f99
commit b993b34
Show file tree

Hide file tree

Showing 75 changed files with 108 additions and 786 deletions.
diff --git a/SourceCode/Symu/Classes/Agents/AgentEntity.cs b/SourceCode/Symu/Classes/Agents/AgentEntity.cs
@@ -10,6 +10,7 @@
 #region using directives
 
 using System;
+using Symu.Common.Interfaces.Agent;
 using Symu.Common.Interfaces.Entity;
 
 #endregion

diff --git a/SourceCode/Symu/Classes/Agents/AgentId.cs b/SourceCode/Symu/Classes/Agents/AgentId.cs
diff --git a/SourceCode/Symu/Classes/Agents/ClassId.cs b/SourceCode/Symu/Classes/Agents/ClassId.cs
diff --git a/SourceCode/Symu/Classes/Agents/CognitiveAgent.Messaging.cs b/SourceCode/Symu/Classes/Agents/CognitiveAgent.Messaging.cs
@@ -13,6 +13,7 @@
 using System.Collections.Generic;
 using Symu.Classes.Task.Manager;
 using Symu.Common;
+using Symu.Common.Interfaces.Agent;
 using Symu.Common.Math.ProbabilityDistributions;
 using Symu.Messaging.Manager;
 using Symu.Messaging.Messages;

diff --git a/SourceCode/Symu/Classes/Agents/CognitiveAgent.cs b/SourceCode/Symu/Classes/Agents/CognitiveAgent.cs
@@ -16,6 +16,7 @@
 using Symu.Classes.Agents.Models.CognitiveTemplates;
 using Symu.Classes.Blockers;
 using Symu.Classes.Task.Manager;
+using Symu.Common.Interfaces.Agent;
 using Symu.Environment;
 using Symu.Messaging.Messages;
 using Symu.Repository;

diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/ActivityModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/ActivityModel.cs
@@ -11,9 +11,11 @@
 
 using System;
 using System.Collections.Generic;
+using Symu.Common.Interfaces.Agent;
+using Symu.Common.Interfaces.Entity;
+using Symu.DNA.Activities;
 using Symu.Repository.Entity;
 using Symu.Repository.Networks;
-using Symu.Repository.Networks.Activities;
 using Symu.Repository.Networks.Knowledges;
 
 #endregion
@@ -63,7 +65,7 @@ public ActivityModel(AgentId agentId, CognitiveArchitecture cognitiveArchitectur
         ///     Add a list of activities an agent can perform
         /// </summary>
         /// <param name="activities"></param>
-        public void AddActivities(IEnumerable<Activity> activities)
+        public void AddActivities(IEnumerable<IActivity> activities)
         {
             _networkActivities.AddActivities(activities, _agentId);
         }
@@ -73,17 +75,7 @@ public void AddActivities(IEnumerable<Activity> activities)
         /// </summary>
         public IEnumerable<IActivity> GetGroupActivities(AgentId groupId)
         {
-            return _networkActivities.GetAgentActivities(_agentId, groupId);
-        }
-
-        /// <summary>
-        ///     Add all the groupId's activities to the AgentId, filtered by the agentId's knowledges
-        /// </summary>
-        /// <param name="activities"></param>
-        /// <param name="groupId"></param>
-        public void AddActivities(AgentId groupId, IEnumerable<IActivity> activities)
-        {
-            _networkActivities.AddActivities(_agentId, groupId, activities);
+            return _networkActivities.GetActivities(_agentId, groupId);
         }
 
         /// <summary>

diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/BeliefsModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/BeliefsModel.cs
@@ -11,6 +11,7 @@
 
 using System;
 using System.Linq;
+using Symu.Common.Interfaces.Agent;
 using Symu.Common.Interfaces.Entity;
 using Symu.Common.Math.ProbabilityDistributions;
 using Symu.Messaging.Templates;

diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/InfluenceModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/InfluenceModel.cs
@@ -10,6 +10,7 @@
 #region using directives
 
 using System;
+using Symu.Common.Interfaces.Agent;
 using Symu.Common.Interfaces.Entity;
 using Symu.Common.Math.ProbabilityDistributions;
 using Symu.Repository.Networks;
@@ -37,11 +38,11 @@ public class InfluenceModel
         ///     Initialize influence model :
         ///     update networkInfluences
         /// </summary>
-        /// <param name="agentAgentId"></param>
+        /// <param name="agentId"></param>
         /// <param name="entity"></param>
         /// <param name="internalCharacteristics"></param>
         /// <param name="network"></param>
-        public InfluenceModel(AgentId agentAgentId, ModelEntity entity, InternalCharacteristics internalCharacteristics,
+        public InfluenceModel(AgentId agentId, ModelEntity entity, InternalCharacteristics internalCharacteristics,
             MetaNetwork network)
         {
             if (entity is null)
@@ -65,19 +66,19 @@ public class InfluenceModel
                 return;
             }
 
-            _agentId = agentAgentId;
+            _agentId = agentId;
             _networkInfluences = network.Influences;
             _networkBeliefs = network.Beliefs;
 
             if (internalCharacteristics.CanInfluenceOrBeInfluence && On)
             {
-                _networkInfluences.Add(agentAgentId,
+                _networkInfluences.Add(agentId,
                     NextInfluenceability(internalCharacteristics),
                     NextInfluentialness(internalCharacteristics));
             }
             else
             {
-                _networkInfluences.Add(agentAgentId, 0, 0);
+                _networkInfluences.Add(agentId, 0, 0);
             }
         }
 

diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/KnowledgeModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/KnowledgeModel.cs
@@ -11,6 +11,7 @@
 
 using System;
 using System.Linq;
+using Symu.Common.Interfaces.Agent;
 using Symu.Common.Interfaces.Entity;
 using Symu.Common.Math.ProbabilityDistributions;
 using Symu.Messaging.Templates;

diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/LearningModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/LearningModel.cs
@@ -13,6 +13,7 @@
 using System.Linq;
 using Symu.Classes.Organization;
 using Symu.Common;
+using Symu.Common.Interfaces.Agent;
 using Symu.Common.Interfaces.Entity;
 using Symu.Common.Math.ProbabilityDistributions;
 using Symu.Repository.Networks.Knowledges;

diff --git a/SourceCode/Symu/Classes/Agents/ReactiveAgent.Messaging.cs b/SourceCode/Symu/Classes/Agents/ReactiveAgent.Messaging.cs
@@ -13,6 +13,7 @@
 using System.Collections.Generic;
 using Symu.Classes.Task.Manager;
 using Symu.Common;
+using Symu.Common.Interfaces.Agent;
 using Symu.Messaging.Manager;
 using Symu.Messaging.Messages;
 

diff --git a/SourceCode/Symu/Classes/Agents/ReactiveAgent.cs b/SourceCode/Symu/Classes/Agents/ReactiveAgent.cs
@@ -11,6 +11,7 @@
 
 using System;
 using Symu.Common;
+using Symu.Common.Interfaces.Agent;
 using Symu.Environment;
 using Symu.Messaging.Manager;
 using Symu.Messaging.Messages;

diff --git a/SourceCode/Symu/Classes/Agents/SplitStep.cs b/SourceCode/Symu/Classes/Agents/SplitStep.cs
@@ -10,6 +10,7 @@
 #region using directives
 
 using System;
+using Symu.Common.Interfaces.Agent;
 using Symu.Environment;
 using Symu.Messaging.Messages;
 using Symu.Repository;

diff --git a/SourceCode/Symu/Classes/Scenario/SimulationScenario.cs b/SourceCode/Symu/Classes/Scenario/SimulationScenario.cs
@@ -12,6 +12,7 @@
 using System;
 using Symu.Classes.Agents;
 using Symu.Classes.Agents.Models.CognitiveTemplates;
+using Symu.Common.Interfaces.Agent;
 using Symu.Environment;
 
 #endregion

diff --git a/SourceCode/Symu/Classes/Task/MurphyTask.cs b/SourceCode/Symu/Classes/Task/MurphyTask.cs
@@ -11,6 +11,7 @@
 
 using System;
 using Symu.Classes.Murphies;
+using Symu.Common.Interfaces.Entity;
 using Symu.Common.Math.ProbabilityDistributions;
 using Symu.Repository.Networks.Knowledges;
 using static Symu.Common.Constants;

diff --git a/SourceCode/Symu/Classes/Task/SymuTask.cs b/SourceCode/Symu/Classes/Task/SymuTask.cs
@@ -16,6 +16,7 @@
 using Symu.Classes.Blockers;
 using Symu.Classes.Task.Manager;
 using Symu.Common;
+using Symu.Common.Interfaces.Agent;
 using Symu.Common.Interfaces.Entity;
 using Symu.Repository.Networks.Knowledges;
 using Symu.Results.Blocker;

diff --git a/SourceCode/Symu/Engine/SymuEngine.cs b/SourceCode/Symu/Engine/SymuEngine.cs
@@ -15,6 +15,7 @@
 using Symu.Classes.Agents;
 using Symu.Classes.Scenario;
 using Symu.Common;
+using Symu.Common.Interfaces.Agent;
 using Symu.Environment;
 using Symu.Environment.Events;
 using Symu.Results;

diff --git a/SourceCode/Symu/Messaging/Manager/MessageProcessor.cs b/SourceCode/Symu/Messaging/Manager/MessageProcessor.cs
@@ -26,14 +26,12 @@ namespace Symu.Messaging.Manager
     public sealed class MessageProcessor : IDisposable
     {
         private readonly Func<MessageProcessor, Task> _body;
-        private readonly CancellationToken _cancellationToken;
         private readonly MessagesManager _messagesManager;
         private bool _started;
 
         public MessageProcessor(Func<MessageProcessor, Task> body)
         {
             _body = body;
-            _cancellationToken = Task.Factory.CancellationToken;
             _messagesManager = new MessagesManager();
             _started = false;
         }
@@ -93,7 +91,7 @@ public void Start()
                     var exceptionDispatchInfo = ExceptionDispatchInfo.Capture(exception);
                     exceptionDispatchInfo.Throw();
                 }
-            }, _cancellationToken);
+            }, Task.Factory.CancellationToken);
         }
 
         #region Post / receive message

diff --git a/SourceCode/Symu/Messaging/Messages/Message.cs b/SourceCode/Symu/Messaging/Messages/Message.cs
@@ -11,6 +11,7 @@
 
 using System;
 using Symu.Classes.Agents;
+using Symu.Common.Interfaces.Agent;
 
 #endregion
 

diff --git a/SourceCode/Symu/Messaging/Subscription/MessageSubscription.cs b/SourceCode/Symu/Messaging/Subscription/MessageSubscription.cs
@@ -10,6 +10,7 @@
 #region using directives
 
 using Symu.Classes.Agents;
+using Symu.Common.Interfaces.Agent;
 
 #endregion
 

diff --git a/SourceCode/Symu/Messaging/Subscription/MessageSubscriptions.cs b/SourceCode/Symu/Messaging/Subscription/MessageSubscriptions.cs
@@ -12,6 +12,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Symu.Classes.Agents;
+using Symu.Common.Interfaces.Agent;
 
 #endregion
 

diff --git a/SourceCode/Symu/Messaging/Tracker/MessagesTracker.cs b/SourceCode/Symu/Messaging/Tracker/MessagesTracker.cs
@@ -12,6 +12,7 @@
 using System;
 using System.Collections.Generic;
 using Symu.Classes.Agents;
+using Symu.Common.Interfaces.Agent;
 using Symu.Messaging.Delayed;
 using Symu.Messaging.Messages;
 using Symu.Results.Messaging;