Refactor Symu.DNA to Symu.OrgMod

lmorisse · Oct 7, 2020 · c9df75b · c9df75b
1 parent d883bb6
commit c9df75b
Show file tree

Hide file tree

Showing 79 changed files with 133 additions and 192 deletions.
diff --git a/SourceCode/Symu/Classes/Agents/CognitiveAgent.Messaging.cs b/SourceCode/Symu/Classes/Agents/CognitiveAgent.Messaging.cs
@@ -15,9 +15,9 @@
 using Symu.Common;
 using Symu.Common.Interfaces;
 using Symu.Common.Math.ProbabilityDistributions;
-using Symu.DNA.Edges;
 using Symu.Messaging.Manager;
 using Symu.Messaging.Messages;
+using Symu.OrgMod.Edges;
 using Symu.Repository.Edges;
 
 #endregion

diff --git a/SourceCode/Symu/Classes/Agents/CognitiveAgent.Murphies.cs b/SourceCode/Symu/Classes/Agents/CognitiveAgent.Murphies.cs
@@ -17,9 +17,9 @@
 using Symu.Classes.Task;
 using Symu.Common;
 using Symu.Common.Interfaces;
-using Symu.DNA.Entities;
-using Symu.DNA.GraphNetworks.TwoModesNetworks.Sphere;
 using Symu.Messaging.Messages;
+using Symu.OrgMod.Entities;
+using Symu.OrgMod.GraphNetworks.TwoModesNetworks.Sphere;
 using Symu.Repository;
 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
@@ -17,10 +17,8 @@
 using Symu.Classes.Blockers;
 using Symu.Classes.Task.Manager;
 using Symu.Common.Interfaces;
-using Symu.DNA.Edges;
-using Symu.DNA.Entities;
-using Symu.DNA.GraphNetworks.TwoModesNetworks.Sphere;
 using Symu.Environment;
+using Symu.OrgMod.GraphNetworks.TwoModesNetworks.Sphere;
 using Symu.Repository.Edges;
 using Symu.Repository.Entities;
 

diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/ActorTaskModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/ActorTaskModel.cs
@@ -14,10 +14,10 @@
 using System.Linq;
 using Symu.Common.Interfaces;
 using Symu.DNA;
-using Symu.DNA.Edges;
-using Symu.DNA.Entities;
-using Symu.DNA.GraphNetworks;
-using Symu.DNA.GraphNetworks.TwoModesNetworks;
+using Symu.OrgMod.Edges;
+using Symu.OrgMod.Entities;
+using Symu.OrgMod.GraphNetworks;
+using Symu.OrgMod.GraphNetworks.TwoModesNetworks;
 
 #endregion
 
@@ -42,7 +42,7 @@ public class ActorTaskModel
         /// <param name="agentId"></param>
         /// <param name="cognitiveArchitecture"></param>
         /// <param name="network"></param>
-        public ActorTaskModel(IAgentId agentId, CognitiveArchitecture cognitiveArchitecture, MetaNetwork network)
+        public ActorTaskModel(IAgentId agentId, CognitiveArchitecture cognitiveArchitecture, GraphMetaNetwork network)
         {
             if (cognitiveArchitecture == null)
             {

diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/BeliefsModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/BeliefsModel.cs
@@ -20,11 +20,10 @@
 
 using Symu.Common.Math.ProbabilityDistributions;
 using Symu.DNA;
-using Symu.DNA.Edges;
-using Symu.DNA.Entities;
-using Symu.DNA.GraphNetworks;
-using Symu.DNA.GraphNetworks.TwoModesNetworks;
 using Symu.Messaging.Templates;
+using Symu.OrgMod.Edges;
+using Symu.OrgMod.GraphNetworks;
+using Symu.OrgMod.GraphNetworks.TwoModesNetworks;
 using Symu.Repository.Edges;
 using Symu.Repository.Entities;
 using static Symu.Common.Constants;
@@ -60,7 +59,7 @@ public class BeliefsModel
         /// <param name="network"></param>
         /// <param name="model"></param>
         public BeliefsModel(IAgentId agentId, BeliefModelEntity entity, CognitiveArchitecture cognitiveArchitecture,
-            MetaNetwork network, RandomGenerator model)
+            GraphMetaNetwork network, RandomGenerator model)
         {
             if (network == null)
             {

diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/ForgettingModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/ForgettingModel.cs
@@ -18,9 +18,8 @@
 using Symu.Common.Classes;
 using Symu.Common.Interfaces;
 using Symu.Common.Math.ProbabilityDistributions;
-using Symu.DNA.Edges;
-using Symu.DNA.GraphNetworks;
-using Symu.DNA.GraphNetworks.TwoModesNetworks;
+using Symu.OrgMod.Edges;
+using Symu.OrgMod.GraphNetworks.TwoModesNetworks;
 using Symu.Repository.Edges;
 using Symu.Repository.Entities;
 using static Symu.Common.Constants;

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

diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/KnowledgeModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/KnowledgeModel.cs
@@ -18,11 +18,10 @@
 
 using Symu.Common.Math.ProbabilityDistributions;
 using Symu.DNA;
-using Symu.DNA.Edges;
-using Symu.DNA.Entities;
-using Symu.DNA.GraphNetworks;
-using Symu.DNA.GraphNetworks.TwoModesNetworks;
 using Symu.Messaging.Templates;
+using Symu.OrgMod.Edges;
+using Symu.OrgMod.GraphNetworks;
+using Symu.OrgMod.GraphNetworks.TwoModesNetworks;
 using Symu.Repository.Edges;
 using Symu.Repository.Entities;
 using static Symu.Common.Constants;
@@ -57,7 +56,7 @@ public class KnowledgeModel
         /// <param name="network"></param>
         /// <param name="model"></param>
         public KnowledgeModel(IAgentId agentId, KnowledgeModelEntity entity, CognitiveArchitecture cognitiveArchitecture,
-            MetaNetwork network, RandomGenerator model)
+            GraphMetaNetwork network, RandomGenerator model)
         {
             if (entity is null)
             {

diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/LearningModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/LearningModel.cs
@@ -18,10 +18,9 @@
 
 using Symu.Common.Math.ProbabilityDistributions;
 using Symu.DNA;
-using Symu.DNA.Edges;
-using Symu.DNA.Entities;
-using Symu.DNA.GraphNetworks;
-using Symu.DNA.GraphNetworks.TwoModesNetworks;
+using Symu.OrgMod.Edges;
+using Symu.OrgMod.GraphNetworks;
+using Symu.OrgMod.GraphNetworks.TwoModesNetworks;
 using Symu.Repository.Edges;
 using Symu.Repository.Entities;
 using static Symu.Common.Constants;

diff --git a/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/ResourceTaskModel.cs b/SourceCode/Symu/Classes/Agents/Models/CognitiveModels/ResourceTaskModel.cs
@@ -15,10 +15,10 @@
 using Symu.Common.Interfaces;
 
 using Symu.DNA;
-using Symu.DNA.Edges;
-using Symu.DNA.Entities;
-using Symu.DNA.GraphNetworks;
-using Symu.DNA.GraphNetworks.TwoModesNetworks;
+using Symu.OrgMod.Edges;
+using Symu.OrgMod.Entities;
+using Symu.OrgMod.GraphNetworks;
+using Symu.OrgMod.GraphNetworks.TwoModesNetworks;
 
 #endregion
 
@@ -42,7 +42,7 @@ public class ResourceTaskModel
         /// </summary>
         /// <param name="resourceId"></param>
         /// <param name="network"></param>
-        public ResourceTaskModel(IAgentId resourceId, MetaNetwork network)
+        public ResourceTaskModel(IAgentId resourceId, GraphMetaNetwork network)
         {
             if (network == null)
             {

diff --git a/SourceCode/Symu/Classes/Murphies/MurphyIncompleteBelief.cs b/SourceCode/Symu/Classes/Murphies/MurphyIncompleteBelief.cs
@@ -11,8 +11,6 @@
 
 using System;
 using Symu.Classes.Task;
-using Symu.DNA.Edges;
-using Symu.DNA.GraphNetworks.TwoModesNetworks;
 using Symu.Repository.Edges;
 using Symu.Repository.Entities;
 using ActorBelief = Symu.Repository.Edges.ActorBelief;

diff --git a/SourceCode/Symu/Classes/Organization/Organization.cs b/SourceCode/Symu/Classes/Organization/Organization.cs
@@ -16,11 +16,9 @@
 using Symu.Classes.Agents.Models.CognitiveTemplates;
 using Symu.Classes.Murphies;
 using Symu.Common.Interfaces;
-
-using Symu.DNA.Entities;
-using Symu.DNA.GraphNetworks;
-using Symu.DNA.GraphNetworks.TwoModesNetworks.Sphere;
 using Symu.Messaging.Templates;
+using Symu.OrgMod.Entities;
+using Symu.OrgMod.GraphNetworks;
 using Symu.Repository;
 using Symu.Repository.Edges;
 using Symu.Repository.Entities;
@@ -42,12 +40,12 @@ public class Organization //: Entity
         public Organization(string name) //: base(new MetaNetwork(), Class, name)
         {
             Name = name;
-            MetaNetwork = new MetaNetwork(Models.InteractionSphere);
+            MetaNetwork = new GraphMetaNetwork(Models.InteractionSphere);
         }
 
         public string Name { get; set; }
 
-        public MetaNetwork MetaNetwork { get; protected set; }
+        public GraphMetaNetwork MetaNetwork { get; protected set; }
 
         /// <summary>
         ///     List of the models used by the organizationEntity

diff --git a/SourceCode/Symu/Classes/Organization/OrganizationModels.cs b/SourceCode/Symu/Classes/Organization/OrganizationModels.cs
@@ -13,8 +13,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using Symu.Common.Classes;
-using Symu.DNA.GraphNetworks.TwoModesNetworks.Sphere;
 using Symu.Engine;
+using Symu.OrgMod.GraphNetworks.TwoModesNetworks.Sphere;
 using Symu.Repository.Entities;
 
 #endregion

diff --git a/SourceCode/Symu/Classes/Task/SymuTask.cs b/SourceCode/Symu/Classes/Task/SymuTask.cs
@@ -17,8 +17,7 @@
 using Symu.Classes.Task.Manager;
 using Symu.Common;
 using Symu.Common.Interfaces;
-
-using Symu.DNA.Entities;
+using Symu.OrgMod.Entities;
 using Symu.Repository.Edges;
 using Symu.Repository.Entities;
 using Symu.Results.Blocker;

diff --git a/SourceCode/Symu/Engine/SymuEngine.cs b/SourceCode/Symu/Engine/SymuEngine.cs
@@ -16,7 +16,6 @@
 using Symu.Classes.Scenario;
 using Symu.Common;
 using Symu.Common.Interfaces;
-using Symu.DNA.MatrixNetworks;
 using Symu.Environment;
 using Symu.Repository.Edges;
 using Symu.Repository.Entities;

diff --git a/SourceCode/Symu/Environment/SymuEnvironment.cs b/SourceCode/Symu/Environment/SymuEnvironment.cs
@@ -19,11 +19,11 @@
 using Symu.Common;
 using Symu.Common.Classes;
 using Symu.Common.Interfaces;
-using Symu.DNA.Edges;
-using Symu.DNA.Entities;
 using Symu.Engine;
 using Symu.Messaging.Messages;
 using Symu.Messaging.Tracker;
+using Symu.OrgMod.Edges;
+using Symu.OrgMod.Entities;
 using Symu.Repository;
 using Symu.Repository.Edges;
 using Symu.Repository.Entities;

diff --git a/SourceCode/Symu/Repository/Edges/ActorBelief.cs b/SourceCode/Symu/Repository/Edges/ActorBelief.cs
@@ -14,7 +14,7 @@
 using Symu.Common.Classes;
 using Symu.Common.Interfaces;
 using Symu.Common.Math.ProbabilityDistributions;
-using Symu.DNA.Edges;
+using Symu.OrgMod.Edges;
 using Symu.Repository.Entities;
 using static Symu.Common.Constants;
 
@@ -27,7 +27,7 @@ namespace Symu.Repository.Edges
     ///     KnowledgeId, KnowledgeLevel, KnowledgeBits
     /// </summary>
     /// <example>Dev Java, test, project management, sociology, ...</example>
-    public class ActorBelief : DNA.Edges.ActorBelief//IActorBelief
+    public class ActorBelief : OrgMod.Edges.ActorBelief//IActorBelief
     {
         //todo RangeMin/Max should be at the Network level in the generic TwoModesNetwork - id. ActorKnowledge
         /// <summary>

diff --git a/SourceCode/Symu/Repository/Edges/ActorKnowledge.cs b/SourceCode/Symu/Repository/Edges/ActorKnowledge.cs
@@ -13,7 +13,7 @@
 using Symu.Common.Interfaces;
 
 using Symu.Common.Math.ProbabilityDistributions;
-using Symu.DNA.Edges;
+using Symu.OrgMod.Edges;
 using Symu.Repository.Entities;
 
 namespace Symu.Repository.Edges

diff --git a/SourceCode/Symu/Repository/Edges/ActorPortfolio.cs b/SourceCode/Symu/Repository/Edges/ActorPortfolio.cs
@@ -10,8 +10,8 @@
 #region using directives
 
 using Symu.Common.Interfaces;
-using Symu.DNA.Edges;
-using Symu.DNA.Entities;
+using Symu.OrgMod.Edges;
+using Symu.OrgMod.Entities;
 
 #endregion
 

diff --git a/SourceCode/Symu/Repository/Entities/Belief.cs b/SourceCode/Symu/Repository/Entities/Belief.cs
@@ -13,8 +13,8 @@
 using Symu.Common.Classes;
 using Symu.Common.Interfaces;
 using Symu.Common.Math.ProbabilityDistributions;
-using Symu.DNA.Entities;
-using Symu.DNA.GraphNetworks;
+using Symu.OrgMod.Entities;
+using Symu.OrgMod.GraphNetworks;
 
 #endregion
 
@@ -37,18 +37,18 @@ public class Belief : BeliefEntity//IBelief
         private const int RangeMax = 1;
         public Belief(){}
 
-        public Belief(MetaNetwork metaNetwork, byte length, RandomGenerator model,
+        public Belief(GraphMetaNetwork metaNetwork, byte length, RandomGenerator model,
             BeliefWeightLevel beliefWeightLevel) :base(metaNetwork)
         {
             Length = length;
             InitializeWeights(model, length, beliefWeightLevel);
         }
-        public Belief(MetaNetwork metaNetwork, byte length, RandomGenerator model,
+        public Belief(GraphMetaNetwork metaNetwork, byte length, RandomGenerator model,
             BeliefWeightLevel beliefWeightLevel, string name) : this(metaNetwork, length, model, beliefWeightLevel)
         {
             Name = name;
         }
-        public Belief(MetaNetwork metaNetwork, IKnowledge knowledge, byte length, RandomGenerator model,
+        public Belief(GraphMetaNetwork metaNetwork, IKnowledge knowledge, byte length, RandomGenerator model,
             BeliefWeightLevel beliefWeightLevel): this(metaNetwork, length, model, beliefWeightLevel)
         {
             if (knowledge == null)

diff --git a/SourceCode/Symu/Repository/Entities/CyclicalEvent.cs b/SourceCode/Symu/Repository/Entities/CyclicalEvent.cs
@@ -9,8 +9,8 @@
 
 
 using Symu.Common.Interfaces;
-using Symu.DNA.Entities;
-using Symu.DNA.GraphNetworks;
+using Symu.OrgMod.Entities;
+using Symu.OrgMod.GraphNetworks;
 
 namespace Symu.Repository.Entities
 {
@@ -26,7 +26,7 @@ public override bool Trigger(ushort step)
             return step % EveryStep == 0;
         }
         public CyclicalEvent(){}
-        public CyclicalEvent(MetaNetwork metaNetwork) : base(metaNetwork)
+        public CyclicalEvent(GraphMetaNetwork metaNetwork) : base(metaNetwork)
         {
         }
         /// <summary>Creates a new object that is a copy of the current instance, with the same EntityId.</summary>

diff --git a/SourceCode/Symu/Repository/Entities/Database.cs b/SourceCode/Symu/Repository/Entities/Database.cs
@@ -14,11 +14,9 @@
 using Symu.Classes.Agents.Models.CognitiveModels;
 using Symu.Classes.Organization;
 using Symu.Common.Interfaces;
-
-using Symu.DNA.Edges;
-using Symu.DNA.Entities;
-using Symu.DNA.GraphNetworks;
 using Symu.Messaging.Templates;
+using Symu.OrgMod.Entities;
+using Symu.OrgMod.GraphNetworks;
 using ActorKnowledge = Symu.Repository.Edges.ActorKnowledge;
 
 #endregion
@@ -50,7 +48,7 @@ public Database()
         {
             CognitiveArchitecture= new CognitiveArchitecture();
         }
-        public Database(MetaNetwork metaNetwork, OrganizationModels models, CommunicationTemplate medium, byte classId): base(metaNetwork, classId)
+        public Database(GraphMetaNetwork metaNetwork, OrganizationModels models, CommunicationTemplate medium, byte classId): base(metaNetwork, classId)
         {
             if (metaNetwork is null)
             {

diff --git a/SourceCode/Symu/Repository/Entities/EmailEntity.cs b/SourceCode/Symu/Repository/Entities/EmailEntity.cs
@@ -12,8 +12,8 @@
 using System;
 using Symu.Classes.Organization;
 using Symu.Common.Interfaces;
-using Symu.DNA.GraphNetworks;
 using Symu.Messaging.Templates;
+using Symu.OrgMod.GraphNetworks;
 
 #endregion
 
@@ -27,13 +27,13 @@ public class EmailEntity : Database
     {
         public const byte Class = SymuYellowPages.Email;
         public static IClassId ClassId => new ClassId(Class); 
-        public static EmailEntity CreateInstance(MetaNetwork metaNetwork, OrganizationModels models)
+        public static EmailEntity CreateInstance(GraphMetaNetwork metaNetwork, OrganizationModels models)
         {
             return new EmailEntity(metaNetwork, models);
         }
         private EmailEntity() { }
 
-        private EmailEntity(MetaNetwork metaNetwork, OrganizationModels models) : base(metaNetwork, models, new EmailTemplate(), Class)
+        private EmailEntity(GraphMetaNetwork metaNetwork, OrganizationModels models) : base(metaNetwork, models, new EmailTemplate(), Class)
         {
         }
         /// <summary>Creates a new object that is a copy of the current instance, with the same EntityId.</summary>