Refactoring OneModeNetworks

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

Hide file tree

Showing 36 changed files with 56 additions and 63 deletions.
diff --git a/SourceCode/Symu/Classes/Agents/CognitiveAgent.Murphies.cs b/SourceCode/Symu/Classes/Agents/CognitiveAgent.Murphies.cs
@@ -611,7 +611,7 @@ public void CheckBlockerIncompleteBelief(SymuTask task, IId knowledgeId)
             byte mandatoryIndex = 0;
             byte requiredIndex = 0;
 
-            var belief = Environment.WhitePages.MetaNetwork.Belief.GetBelief<Belief>(knowledgeId);
+            var belief = Environment.WhitePages.MetaNetwork.Belief.Get<Belief>(knowledgeId);
             Environment.Organization.Murphies.IncompleteBelief.CheckBelief(belief, taskBits, BeliefsModel.Beliefs,
                 ref mandatoryScore, ref requiredScore,
                 ref mandatoryIndex, ref requiredIndex);
@@ -680,7 +680,7 @@ public void CheckRiskAversion(SymuTask task, IId knowledgeId)
             float mandatoryScore = 0;
             byte mandatoryIndex = 0;
 
-            var belief = Environment.WhitePages.MetaNetwork.Belief.GetBelief<Belief>(knowledgeId);
+            var belief = Environment.WhitePages.MetaNetwork.Belief.Get<Belief>(knowledgeId);
             MurphyIncompleteBelief.CheckRiskAversion(belief, taskBits, BeliefsModel.Beliefs, ref mandatoryScore,
                 ref mandatoryIndex, -Cognitive.InternalCharacteristics.RiskAversionValue());
             if (!(mandatoryScore <= -Cognitive.InternalCharacteristics.RiskAversionValue()))

diff --git a/SourceCode/Symu/Classes/Agents/CognitiveAgent.cs b/SourceCode/Symu/Classes/Agents/CognitiveAgent.cs
@@ -73,7 +73,7 @@ protected CognitiveAgent(IAgentId agentId, SymuEnvironment environment, Cognitiv
         /// <summary>
         ///     If agent has an email, get the email database of the agent
         /// </summary>
-        protected Database Email => HasEmail ? Environment.WhitePages.MetaNetwork.Resource.GetResource<Database>(AgentId.Id) : null;
+        protected Database Email => HasEmail ? Environment.WhitePages.MetaNetwork.Resource.Get<Database>(AgentId.Id) : null;
 
         /// <summary>
         ///     If agent has an email

diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/ActivityModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/ActivityModel.cs
@@ -13,8 +13,7 @@
 using System.Collections.Generic;
 using Symu.Common.Interfaces.Agent;
 using Symu.DNA;
-using Symu.DNA.OneModeNetworks.Activity;
-using Symu.DNA.OneModeNetworks.Knowledge;
+using Symu.DNA.OneModeNetworks;
 using Symu.DNA.TwoModesNetworks.Assignment;
 
 #endregion

diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/BeliefsModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/BeliefsModel.cs
@@ -16,7 +16,7 @@
 using Symu.Common.Interfaces.Entity;
 using Symu.Common.Math.ProbabilityDistributions;
 using Symu.DNA;
-using Symu.DNA.OneModeNetworks.Belief;
+using Symu.DNA.OneModeNetworks;
 using Symu.DNA.TwoModesNetworks.AgentBelief;
 using Symu.DNA.TwoModesNetworks.AgentKnowledge;
 using Symu.Messaging.Templates;
@@ -129,7 +129,7 @@ public void AddBeliefs(AgentExpertise expertise, BeliefLevel beliefLevel)
 
             foreach (var agentBelief in expertise.List.Select(agentKnowledge => new AgentBelief(agentKnowledge.KnowledgeId, beliefLevel)))
             {
-                _agentBeliefNetwork.AddBelief(_agentId, agentBelief);
+                _agentBeliefNetwork.AddAgentBelief(_agentId, agentBelief);
             }
         }
 
@@ -167,7 +167,7 @@ public AgentBelief GetAgentBelief(IId beliefId)
 
         public Belief GetBelief(IId beliefId)
         {
-            return _beliefNetwork.GetBelief<Belief>(beliefId);
+            return _beliefNetwork.Get<Belief>(beliefId);
         }
 
         /// <summary>

diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/InfluenceModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/InfluenceModel.cs
@@ -15,7 +15,7 @@
 using Symu.Common.Interfaces.Entity;
 using Symu.Common.Math.ProbabilityDistributions;
 using Symu.DNA;
-using Symu.DNA.OneModeNetworks.Agent;
+using Symu.DNA.OneModeNetworks;
 using Symu.Repository.Entity;
 
 #endregion

diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/KnowledgeModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/KnowledgeModel.cs
@@ -16,7 +16,7 @@
 using Symu.Common.Interfaces.Entity;
 using Symu.Common.Math.ProbabilityDistributions;
 using Symu.DNA;
-using Symu.DNA.OneModeNetworks.Knowledge;
+using Symu.DNA.OneModeNetworks;
 using Symu.DNA.TwoModesNetworks.AgentKnowledge;
 using Symu.Messaging.Templates;
 using Symu.Repository.Entity;
@@ -333,7 +333,7 @@ public AgentKnowledge GetAgentKnowledge(IId knowledgeId)
 
         public Knowledge GetKnowledge(IId knowledgeId)
         {
-            return _knowledgeNetwork.GetKnowledge<Knowledge>(knowledgeId);
+            return _knowledgeNetwork.Get<Knowledge>(knowledgeId);
         }
 
         #region KnowsEnough

diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/LearningModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/LearningModel.cs
@@ -18,7 +18,7 @@
 using Symu.Common.Interfaces.Entity;
 using Symu.Common.Math.ProbabilityDistributions;
 using Symu.DNA;
-using Symu.DNA.OneModeNetworks.Knowledge;
+using Symu.DNA.OneModeNetworks;
 using Symu.DNA.TwoModesNetworks.AgentKnowledge;
 using Symu.Repository.Entity;
 using static Symu.Common.Constants;
@@ -359,7 +359,7 @@ public float NextLearningByDoing()
 
             var agentKnowledge = new AgentKnowledge(knowledgeId, KnowledgeLevel.NoKnowledge, minimumKnowledge, timeToLive);
             _agentKnowledgeNetwork.Add(agentId, agentKnowledge);
-            var knowledge = _knowledgeNetwork.GetKnowledge<Knowledge>(knowledgeId);
+            var knowledge = _knowledgeNetwork.Get<Knowledge>(knowledgeId);
             agentKnowledge.InitializeKnowledge(knowledge.Length, _model, KnowledgeLevel.NoKnowledge, step);
         }
 

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

diff --git a/SourceCode/Symu/Classes/Task/SymuTask.cs b/SourceCode/Symu/Classes/Task/SymuTask.cs
@@ -18,7 +18,7 @@
 using Symu.Common;
 using Symu.Common.Interfaces.Agent;
 using Symu.Common.Interfaces.Entity;
-using Symu.DNA.OneModeNetworks.Knowledge;
+using Symu.DNA.OneModeNetworks;
 using Symu.Repository.Entity;
 using Symu.Results.Blocker;
 using static Symu.Common.Constants;

diff --git a/SourceCode/Symu/Environment/SymuEnvironment.cs b/SourceCode/Symu/Environment/SymuEnvironment.cs
@@ -432,11 +432,11 @@ public virtual void AddOrganizationKnowledges()
         /// </summary>
         public void SetKnowledges()
         {
-            WhitePages.MetaNetwork.Knowledge.AddKnowledges(Organization.Knowledges);
+            WhitePages.MetaNetwork.Knowledge.Add(Organization.Knowledges);
             foreach (var knowledge in Organization.Knowledges)
             {
                 var belief = new Belief(knowledge, knowledge.Length, Organization.Models.Generator, Organization.Models.BeliefWeightLevel);
-                WhitePages.MetaNetwork.Belief.AddBelief(belief);
+                WhitePages.MetaNetwork.Belief.Add(belief);
             }
         }
 

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

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

diff --git a/SourceCode/Symu/Repository/Entity/AgentDatabase.cs b/SourceCode/Symu/Repository/Entity/AgentDatabase.cs
@@ -12,7 +12,7 @@
 using Symu.Common.Interfaces;
 using Symu.Common.Interfaces.Agent;
 using Symu.Common.Interfaces.Entity;
-using Symu.DNA.OneModeNetworks.Resource;
+using Symu.DNA.OneModeNetworks;
 
 #endregion
 

diff --git a/SourceCode/Symu/Repository/Entity/AgentPortfolio.cs b/SourceCode/Symu/Repository/Entity/AgentPortfolio.cs
@@ -12,7 +12,7 @@
 using Symu.Common.Interfaces;
 using Symu.Common.Interfaces.Agent;
 using Symu.Common.Interfaces.Entity;
-using Symu.DNA.OneModeNetworks.Resource;
+using Symu.DNA.OneModeNetworks;
 
 #endregion
 

diff --git a/SourceCode/Symu/Repository/Entity/AgentResource.cs b/SourceCode/Symu/Repository/Entity/AgentResource.cs
@@ -13,7 +13,7 @@
 using Symu.Common.Interfaces;
 using Symu.Common.Interfaces.Agent;
 using Symu.Common.Interfaces.Entity;
-using Symu.DNA.OneModeNetworks.Resource;
+using Symu.DNA.OneModeNetworks;
 using Symu.DNA.TwoModesNetworks.AgentResource;
 
 #endregion

diff --git a/SourceCode/Symu/Repository/Entity/Belief.cs b/SourceCode/Symu/Repository/Entity/Belief.cs
@@ -14,8 +14,7 @@
 using Symu.Common.Classes;
 using Symu.Common.Interfaces.Entity;
 using Symu.Common.Math.ProbabilityDistributions;
-using Symu.DNA.OneModeNetworks.Belief;
-using Symu.DNA.OneModeNetworks.Knowledge;
+using Symu.DNA.OneModeNetworks;
 
 #endregion
 

diff --git a/SourceCode/Symu/Repository/Entity/Database.cs b/SourceCode/Symu/Repository/Entity/Database.cs
@@ -18,8 +18,7 @@
 using Symu.Common.Interfaces.Agent;
 using Symu.Common.Interfaces.Entity;
 using Symu.DNA;
-using Symu.DNA.OneModeNetworks.Knowledge;
-using Symu.DNA.OneModeNetworks.Resource;
+using Symu.DNA.OneModeNetworks;
 using Symu.DNA.TwoModesNetworks.AgentKnowledge;
 
 #endregion

diff --git a/SourceCode/Symu/Repository/Entity/Email.cs b/SourceCode/Symu/Repository/Entity/Email.cs
@@ -13,7 +13,6 @@
 using Symu.Classes.Organization;
 using Symu.Common.Interfaces.Entity;
 using Symu.DNA;
-using Symu.DNA.OneModeNetworks.Knowledge;
 using Symu.Messaging.Templates;
 
 #endregion

diff --git a/SourceCode/Symu/Repository/Entity/Knowledge.cs b/SourceCode/Symu/Repository/Entity/Knowledge.cs
@@ -12,7 +12,7 @@
 using System;
 using Symu.Common.Interfaces.Entity;
 using Symu.Common.Math.ProbabilityDistributions;
-using Symu.DNA.OneModeNetworks.Knowledge;
+using Symu.DNA.OneModeNetworks;
 
 #endregion
 

diff --git a/SourceCode/Symu/Repository/Entity/ResourceUsage.cs b/SourceCode/Symu/Repository/Entity/ResourceUsage.cs
@@ -8,7 +8,7 @@
 #endregion
 
 using System;
-using Symu.DNA.OneModeNetworks.Resource;
+using Symu.DNA.OneModeNetworks;
 
 namespace Symu.Repository.Entity
 {

diff --git a/SourceCode/Symu/Repository/Entity/SymuEvent.cs b/SourceCode/Symu/Repository/Entity/SymuEvent.cs
@@ -14,7 +14,7 @@
 #region using directives
 
 using System;
-using Symu.DNA.OneModeNetworks.Event;
+using Symu.DNA.OneModeNetworks;
 
 #endregion
 

diff --git a/SourceCode/Symu/Repository/Entity/Wiki.cs b/SourceCode/Symu/Repository/Entity/Wiki.cs
@@ -13,7 +13,6 @@
 using Symu.Classes.Organization;
 using Symu.Common.Interfaces.Entity;
 using Symu.DNA;
-using Symu.DNA.OneModeNetworks.Knowledge;
 using Symu.Messaging.Templates;
 
 #endregion

diff --git a/SourceCode/Symu/Repository/WhitePages.cs b/SourceCode/Symu/Repository/WhitePages.cs
@@ -18,7 +18,7 @@
 using Symu.Common.Interfaces.Agent;
 using Symu.Common.Interfaces.Entity;
 using Symu.DNA;
-using Symu.DNA.OneModeNetworks.Agent;
+using Symu.DNA.OneModeNetworks;
 
 #endregion
 
@@ -172,7 +172,7 @@ public ReactiveAgent GetAgent(IAgentId agentId)
         /// <returns></returns>
         public IEnumerable<IAgentId> AllAgentIds()
         {
-            return MetaNetwork.Agent.GetKeys();
+            return MetaNetwork.Agent.GetIds();
         }
 
         /// <summary>
@@ -181,7 +181,7 @@ public IEnumerable<IAgentId> AllAgentIds()
         /// <returns></returns>
         public IEnumerable<ReactiveAgent> AllAgents()
         {
-            return MetaNetwork.Agent.GetValues().Cast<ReactiveAgent>();
+            return MetaNetwork.Agent.Gets().Cast<ReactiveAgent>();
         }
 
         /// <summary>
@@ -190,7 +190,7 @@ public IEnumerable<ReactiveAgent> AllAgents()
         /// <returns></returns>
         public IEnumerable<CognitiveAgent> AllCognitiveAgents()
         {
-            return MetaNetwork.Agent.GetValues().OfType<CognitiveAgent>();
+            return MetaNetwork.Agent.Gets().OfType<CognitiveAgent>();
         }
 
         /// <summary>
@@ -308,7 +308,7 @@ public ushort FilteredStoppedAgentsByClassIdCount(IClassId classId)
 
         public IAgentId GetAgentId(IId componentId)
         {
-            return MetaNetwork.Agent.GetAgentId(componentId);
+            return MetaNetwork.Agent.GetId(componentId);
         }
     }
 }
diff --git a/SourceCode/SymuTests/Classes/Agents/CognitiveAgentTests.cs b/SourceCode/SymuTests/Classes/Agents/CognitiveAgentTests.cs
@@ -74,12 +74,12 @@ public void Initialize()
 
             var expertise = new AgentExpertise();
             _knowledges.Add(_knowledge);
-            _environment.WhitePages.MetaNetwork.Knowledge.AddKnowledge(_knowledge);
+            _environment.WhitePages.MetaNetwork.Knowledge.Add(_knowledge);
             var belief = new Belief(_knowledge, _knowledge.Length, _environment.Organization.Models.Generator, _environment.Organization.Models.BeliefWeightLevel);
-            _environment.WhitePages.MetaNetwork.Belief.AddBelief(belief);
-            _environment.WhitePages.MetaNetwork.Knowledge.AddKnowledge(_knowledge2);
+            _environment.WhitePages.MetaNetwork.Belief.Add(belief);
+            _environment.WhitePages.MetaNetwork.Knowledge.Add(_knowledge2);
             var belief2 = new Belief(_knowledge2, _knowledge2.Length, _environment.Organization.Models.Generator, _environment.Organization.Models.BeliefWeightLevel);
-            _environment.WhitePages.MetaNetwork.Belief.AddBelief(belief2);
+            _environment.WhitePages.MetaNetwork.Belief.Add(belief2);
             _agentKnowledge = new AgentKnowledge(_knowledge.Id, new float[] {1}, 0, -1, 0);
             expertise.Add(_agentKnowledge);
             _environment.WhitePages.MetaNetwork.AgentKnowledge.Add(_agent.AgentId, expertise);
@@ -265,7 +265,7 @@ private Belief SetBeliefs()
         {
             _agent.Cognitive.KnowledgeAndBeliefs.HasBelief = true;
             var belief = new Belief(1, "1", 1, RandomGenerator.RandomBinary, BeliefWeightLevel.RandomWeight);
-            _environment.WhitePages.MetaNetwork.Belief.AddBelief(belief);
+            _environment.WhitePages.MetaNetwork.Belief.Add(belief);
             _agent.BeliefsModel.AddBelief(belief.Id, BeliefLevel.NeitherAgreeNorDisagree);
             _agent.BeliefsModel.InitializeBeliefs(true);
             _agent.InfluenceModel.Influentialness = 1;
@@ -278,7 +278,7 @@ private void SetExpertise(KnowledgeBits bit0S)
             _agent.Cognitive.KnowledgeAndBeliefs.HasKnowledge = true;
             // Knowledge
             var knowledge = new Knowledge(1, "1", 1);
-            _environment.WhitePages.MetaNetwork.Knowledge.AddKnowledge(knowledge);
+            _environment.WhitePages.MetaNetwork.Knowledge.Add(knowledge);
             var agentExpertise = new AgentExpertise();
             var agentKnowledge = new AgentKnowledge(knowledge.Id, bit0S);
             agentExpertise.Add(agentKnowledge);

diff --git a/SourceCode/SymuTests/Classes/Agents/Models/CognitiveModels/BeliefsModelTests.cs b/SourceCode/SymuTests/Classes/Agents/Models/CognitiveModels/BeliefsModelTests.cs
@@ -59,7 +59,7 @@ public void Initialize()
             _beliefBitsNonNeutral = _belief.InitializeBits(models.Generator, BeliefLevel.NeitherAgreeNorDisagree);
             _beliefBitsNeutral = _belief.InitializeBits(models.Generator, BeliefLevel.NoBelief);
 
-            _network.Belief.AddBelief(_belief);
+            _network.Belief.Add(_belief);
             _agentBelief = new AgentBelief(_belief.Id, BeliefLevel.NeitherAgreeNorDisagree);
             _network.AgentBelief.Add(_agentId, _agentBelief);
 

diff --git a/SourceCode/SymuTests/Classes/Agents/Models/CognitiveModels/ForgettingModelTests.cs b/SourceCode/SymuTests/Classes/Agents/Models/CognitiveModels/ForgettingModelTests.cs
@@ -17,7 +17,6 @@
 using Symu.Common.Interfaces.Agent;
 using Symu.Common.Interfaces.Entity;
 using Symu.DNA;
-using Symu.DNA.OneModeNetworks.Knowledge;
 using Symu.DNA.TwoModesNetworks.AgentKnowledge;
 using Symu.Repository.Entity;
 

diff --git a/SourceCode/SymuTests/Classes/Agents/Models/CognitiveModels/InfluenceModelTests.cs b/SourceCode/SymuTests/Classes/Agents/Models/CognitiveModels/InfluenceModelTests.cs
@@ -49,7 +49,7 @@ public void LearnByDoingTest()
         {
             _influenceModel.On = false;
             var belief = new Belief(1, "1", 1, RandomGenerator.RandomUniform, BeliefWeightLevel.RandomWeight);
-            _network.Belief.AddBelief(belief);
+            _network.Belief.Add(belief);
             _influenceModel.ReinforcementByDoing(belief.Id, 0, BeliefLevel.NoBelief);
             Assert.IsFalse(_network.AgentBelief.Exists(_agentId, belief.Id));
         }
@@ -65,7 +65,7 @@ public void LearnByDoingTest1()
             _influenceModel = new InfluenceModel(_models.Influence, _cognitiveArchitecture, _network, _beliefsModel, _models.Generator);
 
             var belief = new Belief(1, "1", 1, RandomGenerator.RandomUniform, BeliefWeightLevel.RandomWeight);
-            _network.Belief.AddBelief(belief);
+            _network.Belief.Add(belief);
             Assert.IsFalse(_network.AgentBelief.Exists(_agentId, belief.Id));
             _influenceModel.ReinforcementByDoing(belief.Id, 0, BeliefLevel.NoBelief);
             //BeInfluenced new belief
@@ -82,7 +82,7 @@ public void LearnByDoingTest2()
         {
             _influenceModel.On = true;
             var belief = new Belief(1, "1", 1, RandomGenerator.RandomUniform, BeliefWeightLevel.RandomWeight);
-            _network.Belief.AddBelief(belief);
+            _network.Belief.Add(belief);
             _influenceModel.ReinforcementByDoing(belief.Id, 0, BeliefLevel.NoBelief);
             Assert.IsFalse(_network.AgentBelief.Exists(_agentId, belief.Id));
         }

diff --git a/SourceCode/SymuTests/Classes/Agents/Models/CognitiveModels/KnowledgeModelTests.cs b/SourceCode/SymuTests/Classes/Agents/Models/CognitiveModels/KnowledgeModelTests.cs
@@ -66,7 +66,7 @@ public void Initialize()
             _knowledgeModel = new KnowledgeModel(_agentId, modelEntity, _cognitiveArchitecture, _network, RandomGenerator.RandomBinary);
             _expertise = _knowledgeModel.Expertise;
             _knowledge = new Knowledge(1, "1", 1);
-            _network.Knowledge.AddKnowledge(_knowledge);
+            _network.Knowledge.Add(_knowledge);
             _network.AgentKnowledge.Add(_agentId, _expertise);
             _taskBits.SetMandatory(new byte[] {0});
             _taskBits.SetRequired(new byte[] {0});
@@ -136,7 +136,7 @@ public void InitializeAgentKnowledgeTest()
         public void InitializeExpertiseTest1()
         {
             _cognitiveArchitecture.KnowledgeAndBeliefs.HasInitialKnowledge = true;
-            _network.Knowledge.AddKnowledge(_knowledge);
+            _network.Knowledge.Add(_knowledge);
             var agentKnowledge = new AgentKnowledge(_knowledge.Id, new float[] {0}, 0, -1, 0);
             _expertise.Add(agentKnowledge);
             _knowledgeModel.AddExpertise(_expertise);