Changeset 7204 for branches/SimulationCore/HeuristicLab.SimulationCore

Timestamp:

12/19/11 10:48:07 (13 years ago)

Author:

svonolfe

Message:

Refactored solution (#1610)

Location:

branches/SimulationCore/HeuristicLab.SimulationCore/3.3

Files:

• . (modified) (1 prop)
• HeuristicLab.SimulationCore-3.3.csproj (modified) (5 diffs)
• Plugin.cs.frame (moved) (moved from branches/SimulationCore/HeuristicLab.SimulationCore/3.3/HeuristicLabSimulationCorePlugin.cs.frame)
• Properties/AssemblyInfo.cs.frame (moved) (moved from branches/SimulationCore/HeuristicLab.SimulationCore/3.3/Properties/AssemblyInfo.frame)
• Simulation.cs (modified) (5 diffs)

branches/SimulationCore/HeuristicLab.SimulationCore/3.3 ¶

@@ -3 +3 @@
 bin
 obj
+Plugin.cs

@@ -3 +3 @@
 bin
 obj
+Plugin.cs

branches/SimulationCore/HeuristicLab.SimulationCore/3.3/HeuristicLab.SimulationCore-3.3.csproj ¶

@@ -20 +20 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -104 +104 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -115 +143 @@
     <Compile Include="AgentBased\AgentBasedSimulation.cs" />
     <Compile Include="AgentBased\IAgent.cs" />
-    <Compile Include="HeuristicLabSimulationCorePlugin.cs" />
     <Compile Include="IScenario.cs" />
     <Compile Include="ISimulation.cs" />
+    <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Scenario.cs" />
@@ -123 +151 @@
   </ItemGroup>
   <ItemGroup>
+    <None Include="Plugin.cs.frame" />
+    <None Include="Properties\AssemblyInfo.cs.frame" />
     <None Include="HeuristicLab.snk" />
-    <None Include="HeuristicLabSimulationCorePlugin.cs.frame" />
-    <None Include="Properties\AssemblyInfo.frame" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
-      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
-      <Name>HeuristicLab.Collections-3.3</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
-      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
-      <Name>HeuristicLab.Common.Resources-3.3</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
-      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
-      <Name>HeuristicLab.Common-3.3</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
-      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
-      <Name>HeuristicLab.Core-3.3</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
-      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
-      <Name>HeuristicLab.Optimization-3.3</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
-      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
-      <Name>HeuristicLab.Persistence-3.3</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
-      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
-      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup />
@@ -165 +163 @@
 set Outdir=$(Outdir)
 
-call PreBuildEvent.cmd
-SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabSimulationCorePlugin.cs.frame" "%25ProjectDir%25\HeuristicLabSimulationCorePlugin.cs"</PreBuildEvent>
+call PreBuildEvent.cmd</PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PostBuildEvent>set ProjectName=$(ProjectName)
-set Source=$(TargetPath)
-set Configuration=$(ConfigurationName)
-set Platform=$(PlatformName)
-set SolutionDir=$(SolutionDir)
-
-if exist "$(SolutionDir)CustomPostBuild.cmd" call "$(SolutionDir)CustomPostBuild.cmd"</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/SimulationCore/HeuristicLab.SimulationCore/3.3/Simulation.cs ¶

@@ -77 +77 @@
     }
 
-    public override void Start() {
+    private class RunInformation {
+      public CancellationTokenSource CancellationToken { get; set; }
+      public IExecutionContext ExecutionContext { get; set; }
+    }
+
+    public virtual void Start(IExecutionContext executionContext) {
       base.Start();
+
+      RunInformation runInfo = new RunInformation();
       cancellationTokenSource = new CancellationTokenSource();
+      runInfo.CancellationToken = cancellationTokenSource;
+      runInfo.ExecutionContext = executionContext;
       stopPending = false;
-      Task task = Task.Factory.StartNew(Run, cancellationTokenSource.Token, cancellationTokenSource.Token);
+      Task task = Task.Factory.StartNew(Run, runInfo, runInfo.CancellationToken.Token);
       task.ContinueWith(t => {
         try {
@@ -100 +109 @@
         else OnPaused();
       });
+    }
+
+    public override void Start() {
+      Start(null);      
     }
     protected override void OnStarted() {
@@ -131 +144 @@
 
     private void Run(object state) {
-      CancellationToken cancellationToken = (CancellationToken)state;
+      RunInformation runInfo = (RunInformation)state;
 
       OnStarted();
@@ -140 +153 @@
       timer.Start();
       try {
-        Run(cancellationToken);
+        foreach (IParameter parameter in Parameters) {
+          parameter.ExecutionContext = runInfo.ExecutionContext;
+        }
+
+        Run(runInfo.CancellationToken.Token);
       }
       finally {
@@ -146 +163 @@
         timer.Stop();
         ExecutionTime += DateTime.Now - lastUpdateTime;
+
+        foreach (IParameter parameter in Parameters) {
+          parameter.ExecutionContext = null;
+        }
       }
       Stop();
 
-      cancellationToken.ThrowIfCancellationRequested();
+      runInfo.CancellationToken.Token.ThrowIfCancellationRequested();
     }
     protected abstract void Run(CancellationToken cancellationToken);

@@ -3 +3 @@
 bin
 obj
+Plugin.cs