Refactoring InteractionSphere

lmorisse · Aug 19, 2020 · 672bfeb · 672bfeb
1 parent dd206fd
commit 672bfeb
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 38 deletions.
diff --git a/SourceCode/Symu/Classes/Agents/CognitiveAgent.Murphies.cs b/SourceCode/Symu/Classes/Agents/CognitiveAgent.Murphies.cs
@@ -18,6 +18,7 @@
 using Symu.Common;
 using Symu.Messaging.Messages;
 using Symu.Repository;
+using Symu.Repository.Networks.Sphere;
 using Symu.Results.Blocker;
 using static Symu.Common.Constants;
 

diff --git a/SourceCode/Symu/Classes/Agents/CognitiveAgent.cs b/SourceCode/Symu/Classes/Agents/CognitiveAgent.cs
@@ -22,6 +22,7 @@
 using Symu.Messaging.Messages;
 using Symu.Repository;
 using Symu.Repository.Networks.Databases;
+using Symu.Repository.Networks.Sphere;
 
 #endregion
 
@@ -188,7 +189,7 @@ public IEnumerable<AgentId> GetAgentIdsForNewInteractions()
         public IEnumerable<AgentId> GetAgentIdsForInteractions(InteractionStrategy interactionStrategy)
         {
             return Environment.WhitePages.MetaNetwork.InteractionSphere
-                .GetAgentIdsForInteractions(AgentId, interactionStrategy, Cognitive.InteractionPatterns).Cast<AgentId>().ToList();
+                .GetAgentIdsForInteractions(AgentId, interactionStrategy).Cast<AgentId>().ToList();
         }
 
         /// <summary>

diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/InteractionPatterns.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/InteractionPatterns.cs
@@ -12,6 +12,7 @@
 using System;
 using Symu.Common;
 using Symu.Common.Math.ProbabilityDistributions;
+using Symu.Repository.Networks.Sphere;
 
 #endregion
 

diff --git a/SourceCode/Symu/Classes/Organization/OrganizationModels.cs b/SourceCode/Symu/Classes/Organization/OrganizationModels.cs
@@ -14,6 +14,7 @@
 using Symu.Common;
 using Symu.Engine;
 using Symu.Repository.Networks.Beliefs;
+using Symu.Repository.Networks.Sphere;
 
 #endregion
 

diff --git a/SourceCode/Symu/Repository/Networks/Knowledges/NetworkKnowledges.cs b/SourceCode/Symu/Repository/Networks/Knowledges/NetworkKnowledges.cs
@@ -13,7 +13,6 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using Symu.Classes.Agents.Models.CognitiveModels;
 using Symu.Common;
 using Symu.Common.Interfaces;
 
@@ -127,19 +126,6 @@ public void Add(IAgentId agentId, AgentExpertise expertise)
             }
         }
 
-        public void Add(IAgentId agentId, ushort knowledgeId, KnowledgeLevel level,
-            InternalCharacteristics internalCharacteristics)
-        {
-            if (internalCharacteristics == null)
-            {
-                throw new ArgumentNullException(nameof(internalCharacteristics));
-            }
-
-            AddAgentId(agentId);
-            AddKnowledge(agentId, knowledgeId, level, internalCharacteristics.MinimumRemainingKnowledge,
-                internalCharacteristics.TimeToLive);
-        }
-
         public void Add(IAgentId agentId, ushort knowledgeId, KnowledgeLevel level, float minimumKnowledge,
             short timeToLive)
         {

diff --git a/SourceCode/Symu/Repository/Networks/Sphere/DerivedParameter.cs b/SourceCode/Symu/Repository/Networks/Sphere/DerivedParameter.cs
@@ -10,7 +10,6 @@
 #region using directives
 
 using System;
-using Symu.Classes.Organization;
 
 #endregion
 

diff --git a/...ses/Organization/InteracionSphereModel.cs → .../Networks/Sphere/InteracionSphereModel.cs b/...ses/Organization/InteracionSphereModel.cs → .../Networks/Sphere/InteracionSphereModel.cs
@@ -15,7 +15,7 @@
 
 #endregion
 
-namespace Symu.Classes.Organization
+namespace Symu.Repository.Networks.Sphere
 {
     /// <summary>
     ///     Model for interaction sphere settings

diff --git a/SourceCode/Symu/Repository/Networks/Sphere/InteractionMatrix.cs b/SourceCode/Symu/Repository/Networks/Sphere/InteractionMatrix.cs
@@ -10,7 +10,6 @@
 #region using directives
 
 using System;
-using Symu.Classes.Agents.Models.CognitiveModels;
 using Symu.Common;
 using Symu.Common.Math;
 

diff --git a/SourceCode/Symu/Repository/Networks/Sphere/InteractionSphere.cs b/SourceCode/Symu/Repository/Networks/Sphere/InteractionSphere.cs
@@ -12,9 +12,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-
-using Symu.Classes.Agents.Models.CognitiveModels;
-using Symu.Classes.Organization;
 using Symu.Common;
 using Symu.Common.Interfaces;
 using Symu.Common.Math.ProbabilityDistributions;
@@ -89,7 +86,7 @@ public void SetSphere(bool initialization, List<IAgentId> agentIds, MetaNetwork
         }
 
         /// <summary>
-        ///     Clone sphere randomly based on InteractionPatterns
+        ///     Clone sphere randomly
         /// </summary>
         /// <param name="agentIds"></param>
         public void SetSphereRandomly(IReadOnlyList<IAgentId> agentIds)
@@ -122,7 +119,7 @@ public void SetSphereRandomly(IReadOnlyList<IAgentId> agentIds)
         }
 
         /// <summary>
-        ///     Update sphere randomly based on InteractionPatterns with new agent
+        ///     Update sphere randomly with new agent
         /// </summary>
         /// <param name="agentIds"></param>
         /// <param name="network"></param>
@@ -358,17 +355,11 @@ public static float SetSocialProximity(IAgentId agentId1, IAgentId agentId2, Net
         ///     Filtered with interactionStrategy and limit with number of new interactions
         /// </summary>
         /// <param name="agentId"></param>
-        /// <param name="interactionStrategy">can come from InteractionPatterns, but passed in parameter for unit test</param>
-        /// <param name="interactionPatterns"></param>
+        /// <param name="interactionStrategy"></param>
         /// <returns></returns>
         public IEnumerable<IAgentId> GetAgentIdsForInteractions(IAgentId agentId,
-            InteractionStrategy interactionStrategy,
-            InteractionPatterns interactionPatterns)
+            InteractionStrategy interactionStrategy)
         {
-            if (interactionPatterns is null)
-            {
-                throw new ArgumentNullException(nameof(interactionPatterns));
-            }
 
             if (!_model.On || _agentIndex is null || !_agentIndex.ContainsKey(agentId))
             {
@@ -481,7 +472,7 @@ public static float SetSocialProximity(IAgentId agentId1, IAgentId agentId2, Net
         ///     Filtered with interactionStrategy and limit with number of new interactions
         /// </summary>
         /// <param name="agentId"></param>
-        /// <param name="interactionStrategy">can come from InteractionPatterns, but passed in parameter for unit test</param>
+        /// <param name="interactionStrategy"></param>
         /// <returns></returns>
         public IEnumerable<IAgentId> GetAgentIdsForNewInteractions(IAgentId agentId,
             InteractionStrategy interactionStrategy)

diff --git a/...ls/CognitiveModels/InteractionStrategy.cs → ...ry/Networks/Sphere/InteractionStrategy.cs b/...ls/CognitiveModels/InteractionStrategy.cs → ...ry/Networks/Sphere/InteractionStrategy.cs
@@ -7,7 +7,7 @@
 
 #endregion
 
-namespace Symu.Classes.Agents.Models.CognitiveModels
+namespace Symu.Repository.Networks.Sphere
 {
     /// <summary>
     ///     Enum the different interaction strategy used in InteractionPatterns

diff --git a/SourceCode/SymuTests/Classes/Agents/Models/CognitiveModels/InteractionPatternsTests.cs b/SourceCode/SymuTests/Classes/Agents/Models/CognitiveModels/InteractionPatternsTests.cs
@@ -12,6 +12,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Symu.Classes.Agents.Models.CognitiveModels;
 using Symu.Common;
+using Symu.Repository.Networks.Sphere;
 
 #endregion
 

diff --git a/SourceCode/SymuTests/Repository/Networks/Sphere/InteractionSphereTests.cs b/SourceCode/SymuTests/Repository/Networks/Sphere/InteractionSphereTests.cs
@@ -66,8 +66,7 @@ public void Initialize()
         public void GeAgentIdsForInteractionsTest()
         {
             InteractionSphere.SetSphere(true, _iAgents, _network);
-            Assert.AreEqual(0, InteractionSphere.GetAgentIdsForInteractions(_agentId1, InteractionStrategy.Homophily,
-                new InteractionPatterns()).Count());
+            Assert.AreEqual(0, InteractionSphere.GetAgentIdsForInteractions(_agentId1, InteractionStrategy.Homophily).Count());
         }
 
         /// <summary>

diff --git a/SourceCode/SymuTests/Results/Organization/organizationFlexibilityTests.cs b/SourceCode/SymuTests/Results/Organization/organizationFlexibilityTests.cs
@@ -17,6 +17,7 @@
 using Symu.Classes.Organization;
 using Symu.Common;
 using Symu.Common.Interfaces;
+using Symu.Repository.Networks.Sphere;
 using Symu.Results.Organization;
 using SymuTests.Helpers;
 

diff --git a/Symu examples/SymuGroupAndInteraction/Classes/ExampleEnvironment.cs b/Symu examples/SymuGroupAndInteraction/Classes/ExampleEnvironment.cs
@@ -92,18 +92,21 @@ private void SetKnowledge(CognitiveAgent actor, IReadOnlyList<Knowledge> knowled
                 case 0:
                     // same Knowledge for all
                     WhitePages.MetaNetwork.Knowledge.Add(actor.AgentId, knowledges[0].Id, KnowledgeLevel,
-                        actor.Cognitive.InternalCharacteristics);
+                        actor.Cognitive.InternalCharacteristics.MinimumRemainingKnowledge,
+                        actor.Cognitive.InternalCharacteristics.TimeToLive);
                     break;
                 case 1:
                     // Knowledge is by group
                     WhitePages.MetaNetwork.Knowledge.Add(actor.AgentId, knowledges[i].Id, KnowledgeLevel,
-                        actor.Cognitive.InternalCharacteristics);
+                        actor.Cognitive.InternalCharacteristics.MinimumRemainingKnowledge,
+                        actor.Cognitive.InternalCharacteristics.TimeToLive);
                     break;
                 case 2:
                     // Knowledge is randomly defined for agentId
                     var index = DiscreteUniform.Sample(0, GroupsCount - 1);
                     WhitePages.MetaNetwork.Knowledge.Add(actor.AgentId, knowledges[index].Id, KnowledgeLevel,
-                        actor.Cognitive.InternalCharacteristics);
+                        actor.Cognitive.InternalCharacteristics.MinimumRemainingKnowledge,
+                        actor.Cognitive.InternalCharacteristics.TimeToLive);
                     break;
             }
         }

diff --git a/Symu examples/SymuGroupAndInteraction/Home.cs b/Symu examples/SymuGroupAndInteraction/Home.cs
@@ -20,6 +20,7 @@
 using Symu.Environment;
 using Symu.Forms;
 using Symu.Repository.Networks.Knowledges;
+using Symu.Repository.Networks.Sphere;
 using SymuGroupAndInteraction.Classes;
 
 #endregion

diff --git a/Symu examples/SymuGroupAndInteractionTests/IntegrationTests.cs b/Symu examples/SymuGroupAndInteractionTests/IntegrationTests.cs
@@ -16,6 +16,7 @@
 using Symu.Classes.Scenario;
 using Symu.Engine;
 using Symu.Repository.Networks.Knowledges;
+using Symu.Repository.Networks.Sphere;
 using SymuGroupAndInteraction.Classes;
 
 #endregion