Clean code

lmorisse · Oct 8, 2020 · 5e12913 · 5e12913
1 parent 015cc51
commit 5e12913
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 109 deletions.
diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/KnowledgeModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/KnowledgeModel.cs
@@ -82,10 +82,6 @@ public KnowledgeModel(IAgentId agentId, KnowledgeModelEntity entity,
 
         public bool On { get; set; }
 
-        ///// <summary>
-        /////     Get the Agent Expertise
-        ///// </summary>
-        //public EntityExpertise Expertise => _actorKnowledgeNetwork.EdgesFilteredBySource(_agentId);
         /// <summary>
         ///     Get a readonly list of the actor knowledge
         /// </summary>
@@ -103,8 +99,6 @@ public void InitializeExpertise(ushort step)
                 return;
             }
 
-            //_actorKnowledgeNetwork.Add(Expertise);
-
             foreach (var agentKnowledge in _actorKnowledgeNetwork.EdgesFilteredBySource<ActorKnowledge>(_agentId))
             {
                 InitializeActorKnowledge(agentKnowledge, !_knowledgeAndBeliefs.HasInitialKnowledge, step);

diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/ResourceTaskModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/ResourceTaskModel.cs
diff --git a/SourceCode/Symu/Classes/Organization/MainOrganization.cs b/SourceCode/Symu/Classes/Organization/MainOrganization.cs
@@ -37,7 +37,6 @@ public MainOrganization(string name)
             MetaNetwork = new GraphMetaNetwork(Models.InteractionSphere);
         }
 
-
         public string Name { get; set; }
 
         public GraphMetaNetwork MetaNetwork { get; protected set; }

diff --git a/SourceCode/Symu/Repository/Entities/Database.cs b/SourceCode/Symu/Repository/Entities/Database.cs
@@ -52,13 +52,13 @@ public Database()
         }
 
         public static Database CreateInstance(GraphMetaNetwork metaNetwork, MainOrganizationModels models, CommunicationTemplate medium,
-            byte classId)
+            IClassId classId)
         {
             return new Database(metaNetwork, models, medium, classId);
         }
 
         public Database(GraphMetaNetwork metaNetwork, MainOrganizationModels models, CommunicationTemplate medium,
-            byte classId) : base(metaNetwork, classId)
+            IClassId classId) : base(metaNetwork, classId)
         {
             if (metaNetwork is null)
             {

diff --git a/SourceCode/Symu/Repository/Entities/EmailEntity.cs b/SourceCode/Symu/Repository/Entities/EmailEntity.cs
@@ -32,7 +32,7 @@ private EmailEntity()
         }
 
         private EmailEntity(GraphMetaNetwork metaNetwork, MainOrganizationModels models) : base(metaNetwork, models,
-            new EmailTemplate(), Class)
+            new EmailTemplate(), ClassId)
         {
         }
 

diff --git a/SourceCode/Symu/Repository/Entities/WikiEntity.cs b/SourceCode/Symu/Repository/Entities/WikiEntity.cs
@@ -32,7 +32,7 @@ private WikiEntity()
         }
 
         private WikiEntity(GraphMetaNetwork metaNetwork, MainOrganizationModels models) : base(metaNetwork, models,
-            new ViaPlatformTemplate(), Class)
+            new ViaPlatformTemplate(), ClassId)
         {
         }
 

diff --git a/SourceCode/SymuTests/Repository/Entities/DatabaseTests.cs b/SourceCode/SymuTests/Repository/Entities/DatabaseTests.cs
@@ -34,7 +34,7 @@ public void Initialize()
             MainOrganization.Models.SetOn(1);
             _knowledge = new Knowledge(MainOrganization.MetaNetwork, MainOrganization.Models, "1",
                 (byte) _floats1.Length);
-            _database = new Database(MainOrganization.MetaNetwork, MainOrganization.Models, _communication, 0);
+            _database = new Database(MainOrganization.MetaNetwork, MainOrganization.Models, _communication, Database.ClassId);
             _database.CognitiveArchitecture.InternalCharacteristics.TimeToLive = 10;
             _bits1 = new Bits(_floats1, 0);
         }
@@ -132,8 +132,7 @@ public void ForgettingProcessTest1()
         public void ForgettingProcessTest2()
         {
             MainOrganization.Models.Forgetting.On = true;
-            _database = new Database(MainOrganization.MetaNetwork, MainOrganization.Models, _communication,
-                Environment.RandomLevelValue);
+            _database = new Database(MainOrganization.MetaNetwork, MainOrganization.Models, _communication, Database.ClassId);
             _database.CognitiveArchitecture.InternalCharacteristics.TimeToLive = 1;
             _database.StoreKnowledge(_knowledge.EntityId, _bits1, 1, 0);
             _database.ForgettingProcess(2);