Refactoring

lmorisse · May 22, 2020 · edc3140 · edc3140
1 parent 2b8f6f7
commit edc3140
Show file tree

Hide file tree

Showing 282 changed files with 4,494 additions and 1,521 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+* Refactoring Murphies by [@lmorisse]
+* Add Agent.TimeSpent by [@lmorisse]
+* Add new project example: [SymuMurphiesAndBlockers](https://github.com/lmorisse/Symu/tree/master/Symu%20examples/SymuMurphiesAndBlockers) by [@lmorisse]
+* Add new project example: [SymuMurphiesAndBlockersTests](https://github.com/lmorisse/Symu/tree/master/Symu%20examples/SymuMurphiesAndBlockersTests) by [@lmorisse]
+
 ## 0.5.0 [☰](https://github.com/lmorisse/symu/compare/v0.5.0..v0.4.0)
 * Add new models : knowledge, Beliefs, Influence by [@lmorisse]
 * Add SymuTask.SetKnowledgesBits by [@lmorisse]

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -1,5 +1,8 @@
 # Release notes
 
+## 0.6.0
+This release contains a new project example:  [SymuMurphiesAndBlockers](https://github.com/lmorisse/Symu/tree/master/Symu%20examples/SymuMurphiesAndBlockers).
+
 ## 0.5.0
 This release contains a new project example:  [SymuBeliefsAndInfluence](https://github.com/lmorisse/Symu/tree/master/Symu%20examples/SymuBeliefsAndInfluence).
 

diff --git a/Symu examples/SymuBeliefsAndInfluence/App.config b/Symu examples/SymuBeliefsAndInfluence/App.config
@@ -7,8 +7,7 @@
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a"
-                          culture="neutral" />
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
       </dependentAssembly>
       <dependentAssembly>

diff --git a/Symu examples/SymuBeliefsAndInfluence/Classes/ExampleEnvironment.cs b/Symu examples/SymuBeliefsAndInfluence/Classes/ExampleEnvironment.cs
@@ -9,14 +9,16 @@
 
 #region using directives
 
+using System;
 using System.Collections.Generic;
-using SymuEngine.Classes.Agents;
-using SymuEngine.Classes.Agents.Models.Templates;
-using SymuEngine.Classes.Task;
-using SymuEngine.Common;
-using SymuEngine.Environment;
-using SymuEngine.Messaging.Messages;
-using SymuEngine.Repository.Networks.Knowledges;
+using Symu.Classes.Agents;
+using Symu.Classes.Agents.Models.Templates;
+using Symu.Classes.Organization;
+using Symu.Classes.Task;
+using Symu.Common;
+using Symu.Environment;
+using Symu.Messaging.Messages;
+using Symu.Repository.Networks.Knowledges;
 
 #endregion
 
@@ -33,25 +35,42 @@ public class ExampleEnvironment : SymuEnvironment
         public SimpleHumanTemplate WorkerTemplate { get; } = new SimpleHumanTemplate();
         public MurphyTask Model { get; } = new MurphyTask();
 
+        public override void SetOrganization(OrganizationEntity organization)
+        {
+            if (organization == null)
+            {
+                throw new ArgumentNullException(nameof(organization));
+            }
+
+            base.SetOrganization(organization);
+
+            organization.Models.Influence.On = true;
+            organization.Models.Influence.RateOfAgentsOn = 1;
+            organization.Models.Beliefs.On = true;
+            organization.Models.Beliefs.RateOfAgentsOn = 1;
+            organization.Models.Generator = RandomGenerator.RandomUniform;
+            organization.Models.FollowGroupKnowledge = true;
+            organization.Models.FollowGroupFlexibility = true;
+            organization.Models.FollowTasks = true;
+            organization.Models.InteractionSphere.On = true;
+            organization.Models.InteractionSphere.SphereUpdateOverTime = true;
+            organization.Models.InteractionSphere.FrequencyOfSphereUpdate = TimeStepType.Monthly;
+            organization.Models.InteractionSphere.RandomlyGeneratedSphere = false;
+            // Interaction sphere setup
+            organization.Models.InteractionSphere.RelativeBeliefWeight = 0.5F;
+            organization.Models.InteractionSphere.RelativeActivityWeight = 0;
+            organization.Models.InteractionSphere.RelativeKnowledgeWeight = 0.25F;
+            organization.Models.InteractionSphere.SocialDemographicWeight = 0.25F;
+
+            SetDebug(false);
+        }
+
         public override void SetModelForAgents()
         {
             base.SetModelForAgents();
 
             #region Common
 
-            Organization.Models.Generator = RandomGenerator.RandomUniform;
-            Organization.Models.FollowGroupKnowledge = true;
-            Organization.Models.FollowGroupFlexibility = true;
-            Organization.Models.FollowTasks = true;
-            Organization.Models.InteractionSphere.On = true;
-            Organization.Models.InteractionSphere.SphereUpdateOverTime = true;
-            Organization.Models.InteractionSphere.FrequencyOfSphereUpdate = TimeStepType.Monthly;
-            Organization.Models.InteractionSphere.RandomlyGeneratedSphere = false;
-            // Interaction sphere setup
-            Organization.Models.InteractionSphere.RelativeBeliefWeight = 0.5F;
-            Organization.Models.InteractionSphere.RelativeActivityWeight = 0;
-            Organization.Models.InteractionSphere.RelativeKnowledgeWeight = 0.25F;
-            Organization.Models.InteractionSphere.SocialDemographicWeight = 0.25F;
             // KnowledgeCount are added for tasks initialization
             // Adn Beliefs are created based on knowledge
             Knowledges = new List<Knowledge>();

diff --git a/Symu examples/SymuBeliefsAndInfluence/Classes/InfluencerAgent.cs b/Symu examples/SymuBeliefsAndInfluence/Classes/InfluencerAgent.cs
@@ -10,10 +10,10 @@
 #region using directives
 
 using System;
-using SymuEngine.Classes.Agents;
-using SymuEngine.Environment;
-using SymuEngine.Messaging.Messages;
-using SymuEngine.Repository;
+using Symu.Classes.Agents;
+using Symu.Environment;
+using Symu.Messaging.Messages;
+using Symu.Repository;
 
 #endregion
 

diff --git a/Symu examples/SymuBeliefsAndInfluence/Classes/PersonAgent.cs b/Symu examples/SymuBeliefsAndInfluence/Classes/PersonAgent.cs
@@ -12,14 +12,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using SymuEngine.Classes.Agents;
-using SymuEngine.Classes.Agents.Models.Templates;
-using SymuEngine.Classes.Blockers;
-using SymuEngine.Classes.Task;
-using SymuEngine.Environment;
-using SymuEngine.Messaging.Messages;
-using SymuEngine.Repository;
-using SymuEngine.Repository.Networks.Knowledges;
+using Symu.Classes.Agents;
+using Symu.Classes.Agents.Models.Templates;
+using Symu.Classes.Blockers;
+using Symu.Classes.Task;
+using Symu.Environment;
+using Symu.Messaging.Messages;
+using Symu.Repository;
+using Symu.Repository.Networks.Knowledges;
 
 #endregion
 
@@ -43,7 +43,7 @@ public sealed class PersonAgent : Agent
 
         public override void GetNewTasks()
         {
-            var task = new SymuTask(TimeStep.Step)
+            var task = new SymuTask(TimeStep.Step, Environment.IterationResult.Blockers)
             {
                 Weight = 1
             };

diff --git a/Symu examples/SymuBeliefsAndInfluence/Home.Designer.cs b/Symu examples/SymuBeliefsAndInfluence/Home.Designer.cs
diff --git a/Symu examples/SymuBeliefsAndInfluence/Home.cs b/Symu examples/SymuBeliefsAndInfluence/Home.cs
@@ -14,12 +14,12 @@
 using System.Globalization;
 using System.Linq;
 using System.Windows.Forms;
+using Symu.Classes.Scenario;
+using Symu.Common;
+using Symu.Engine.Form;
+using Symu.Environment;
+using Symu.Repository.Networks.Beliefs;
 using SymuBeliefsAndInfluence.Classes;
-using SymuEngine.Classes.Scenario;
-using SymuEngine.Common;
-using SymuEngine.Engine.Form;
-using SymuEngine.Environment;
-using SymuEngine.Repository.Networks.Beliefs;
 using SymuTools;
 
 #endregion
@@ -41,14 +41,9 @@ private void LoadSettings()
         {
             DisplayButtons();
 
-            OrganizationEntity.Models.Influence.On = true;
-            OrganizationEntity.Models.Influence.RateOfAgentsOn = 1;
             InfluenceModelOn.Checked = OrganizationEntity.Models.Influence.On;
             InfluenceRateOfAgentsOn.Text = OrganizationEntity.Models.Influence.RateOfAgentsOn.ToString();
 
-
-            OrganizationEntity.Models.Beliefs.On = true;
-            OrganizationEntity.Models.Beliefs.RateOfAgentsOn = 1;
             BeliefsModelOn.Checked = OrganizationEntity.Models.Beliefs.On;
             BeliefsRateOfAgentsOn.Text = OrganizationEntity.Models.Beliefs.RateOfAgentsOn.ToString();
 
@@ -96,27 +91,9 @@ private void LoadSettings()
             #endregion
         }
 
-        protected override void SetUpOrganization()
+        protected override void UpdateSettings()
         {
-            TimeStepType = TimeStepType.Daily;
-        }
 
-        protected override void SetScenarii()
-        {
-            _ = new TimeStepScenario(_environment)
-            {
-                NumberOfSteps = ushort.Parse(tbSteps.Text)
-            };
-        }
-
-        protected override void OnStopped()
-        {
-            base.OnStopped();
-            DisplayButtons();
-        }
-
-        private void Button1_Click(object sender, EventArgs e)
-        {
             OrganizationEntity.Models.Influence.On = InfluenceModelOn.Checked;
             OrganizationEntity.Models.Beliefs.On = BeliefsModelOn.Checked;
 
@@ -139,6 +116,25 @@ private void Button1_Click(object sender, EventArgs e)
 
             #endregion
 
+            TimeStepType = TimeStepType.Daily;
+        }
+
+        protected override void SetScenarii()
+        {
+            _ = new TimeStepScenario(_environment)
+            {
+                NumberOfSteps = ushort.Parse(tbSteps.Text)
+            };
+        }
+
+        protected override void OnStopped()
+        {
+            base.OnStopped();
+            DisplayButtons();
+        }
+
+        private void Button1_Click(object sender, EventArgs e)
+        {
             Start(_environment);
         }
 

diff --git a/Symu examples/SymuBeliefsAndInfluence/SymuBeliefsAndInfluence.csproj b/Symu examples/SymuBeliefsAndInfluence/SymuBeliefsAndInfluence.csproj
@@ -40,11 +40,11 @@
     <Reference Include="MathNet.Numerics, Version=4.9.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\SymuBiz\Repository\Symu Source code\packages\MathNet.Numerics.4.9.1\lib\net461\MathNet.Numerics.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.3.5.0\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\SymuBiz\Repository\Symu Source code\packages\Microsoft.CodeAnalysis.Common.3.6.0\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.3.5.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\SymuBiz\Repository\Symu Source code\packages\Microsoft.CodeAnalysis.CSharp.3.6.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -114,9 +114,9 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\SymuOrg\Github\Symu source code\SymuEngine\SymuEngine.csproj">
+    <ProjectReference Include="..\..\Symu source code\SymuEngine\Symu.csproj">
       <Project>{8c8fbbf2-f8c0-4386-9287-d0954c9e2948}</Project>
-      <Name>SymuEngine</Name>
+      <Name>Symu</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\SymuOrg\Github\Symu source code\SymuTools\SymuTools.csproj">
       <Project>{28ca606e-49d3-4136-ad3f-6b46eab9be75}</Project>

diff --git a/Symu examples/SymuBeliefsAndInfluence/packages.config b/Symu examples/SymuBeliefsAndInfluence/packages.config
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
   <package id="MathNet.Numerics" version="4.9.1" targetFramework="net48" />
   <package id="Microsoft.CodeAnalysis.Analyzers" version="3.0.0" targetFramework="net48" developmentDependency="true" />
-  <package id="Microsoft.CodeAnalysis.Common" version="3.5.0" targetFramework="net48" />
-  <package id="Microsoft.CodeAnalysis.CSharp" version="3.5.0" targetFramework="net48" />
+  <package id="Microsoft.CodeAnalysis.Common" version="3.6.0" targetFramework="net48" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="3.6.0" targetFramework="net48" />
   <package id="Microsoft.CodeQuality.Analyzers" version="3.0.0" targetFramework="net48" developmentDependency="true" />
   <package id="OpenCover" version="4.7.922" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />