Changeset 7204


Ignore:
Timestamp:
12/19/11 10:48:07 (10 years ago)
Author:
svonolfe
Message:

Refactored solution (#1610)

Location:
branches/SimulationCore
Files:
1 added
91 deleted
9 edited
6 moved

Legend:

Unmodified
Added
Removed
  • branches/SimulationCore/HeuristicLab.SimulationCore.Samples/3.3

    • Property svn:ignore
      •  

        old new  
        33bin
        44obj
         5Plugin.cs
  • branches/SimulationCore/HeuristicLab.SimulationCore.Samples/3.3/GameOfLifeSimulation.cs

    r6623 r7204  
    213213        base.Step();
    214214        UpdateResults();       
    215 
    216         Thread.Sleep(250);
    217215      }
    218216    }
  • branches/SimulationCore/HeuristicLab.SimulationCore.Samples/3.3/HeuristicLab.SimulationCore.Samples-3.3.csproj

    r6623 r7204  
    2020    <DebugType>full</DebugType>
    2121    <Optimize>false</Optimize>
    22     <OutputPath>bin\Debug\</OutputPath>
     22    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    2323    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2424    <ErrorReport>prompt</ErrorReport>
     
    104104  </PropertyGroup>
    105105  <ItemGroup>
     106    <Reference Include="Accessibility">
     107      <EmbedInteropTypes>True</EmbedInteropTypes>
     108    </Reference>
     109    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     110      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
     111      <Private>False</Private>
     112    </Reference>
     113    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     114      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     115      <Private>False</Private>
     116    </Reference>
     117    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     118      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     119      <Private>False</Private>
     120    </Reference>
     121    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     122      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     123      <Private>False</Private>
     124    </Reference>
     125    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     126      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     127      <Private>False</Private>
     128    </Reference>
     129    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     130      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     131      <Private>False</Private>
     132    </Reference>
     133    <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     134      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
     135      <Private>False</Private>
     136    </Reference>
     137    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     138      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     139      <Private>False</Private>
     140    </Reference>
     141    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     142      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     143      <Private>False</Private>
     144    </Reference>
     145    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     146      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     147      <Private>False</Private>
     148    </Reference>
     149    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     150      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     151      <Private>False</Private>
     152    </Reference>
     153    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     154      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     155      <Private>False</Private>
     156    </Reference>
    106157    <Reference Include="System" />
    107158    <Reference Include="System.Core" />
     
    115166    <Compile Include="GameOfLifeScenario.cs" />
    116167    <Compile Include="GameOfLifeSimulation.cs" />
    117     <Compile Include="HeuristicLabSimulationCoreSamplesPlugin.cs" />
     168    <Compile Include="Plugin.cs" />
    118169    <Compile Include="Properties\AssemblyInfo.cs" />
    119170    <Compile Include="SimpleScenario.cs" />
     
    121172  </ItemGroup>
    122173  <ItemGroup>
     174    <None Include="Plugin.cs.frame" />
     175    <None Include="Properties\AssemblyInfo.cs.frame" />
    123176    <None Include="HeuristicLab.snk" />
    124     <None Include="HeuristicLabSimulationCoreSamplesPlugin.cs.frame" />
    125     <None Include="Properties\AssemblyInfo.frame" />
    126   </ItemGroup>
    127   <ItemGroup>
    128     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    129       <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    130       <Name>HeuristicLab.Analysis-3.3</Name>
    131     </ProjectReference>
    132     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    133       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    134       <Name>HeuristicLab.Collections-3.3</Name>
    135     </ProjectReference>
    136     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    137       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    138       <Name>HeuristicLab.Common.Resources-3.3</Name>
    139     </ProjectReference>
    140     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    141       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    142       <Name>HeuristicLab.Common-3.3</Name>
    143     </ProjectReference>
    144     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    145       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    146       <Name>HeuristicLab.Core-3.3</Name>
    147     </ProjectReference>
    148     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    149       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    150       <Name>HeuristicLab.Data-3.3</Name>
    151     </ProjectReference>
    152     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    153       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    154       <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
    155     </ProjectReference>
    156     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    157       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    158       <Name>HeuristicLab.MainForm-3.3</Name>
    159     </ProjectReference>
    160     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    161       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    162       <Name>HeuristicLab.Optimization-3.3</Name>
    163     </ProjectReference>
    164     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    165       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    166       <Name>HeuristicLab.Parameters-3.3</Name>
    167     </ProjectReference>
    168     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    169       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    170       <Name>HeuristicLab.Persistence-3.3</Name>
    171     </ProjectReference>
    172     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    173       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    174       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    175     </ProjectReference>
     177  </ItemGroup>
     178  <ItemGroup>
    176179    <ProjectReference Include="..\..\HeuristicLab.SimulationCore\3.3\HeuristicLab.SimulationCore-3.3.csproj">
    177180      <Project>{7B1579F2-6EFC-4C48-B41C-C3292639FF5B}</Project>
    178181      <Name>HeuristicLab.SimulationCore-3.3</Name>
     182      <Private>False</Private>
    179183    </ProjectReference>
    180184  </ItemGroup>
     
    186190set Outdir=$(Outdir)
    187191
    188 call PreBuildEvent.cmd
    189 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabSimulationCoreSamplesPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabSimulationCoreSamplesPlugin.cs"</PreBuildEvent>
    190   </PropertyGroup>
    191   <PropertyGroup>
    192     <PostBuildEvent>set ProjectName=$(ProjectName)
    193 set Source=$(TargetPath)
    194 set Configuration=$(ConfigurationName)
    195 set Platform=$(PlatformName)
    196 set SolutionDir=$(SolutionDir)
    197 
    198 if exist "$(SolutionDir)CustomPostBuild.cmd" call "$(SolutionDir)CustomPostBuild.cmd"</PostBuildEvent>
     192call PreBuildEvent.cmd</PreBuildEvent>
     193  </PropertyGroup>
     194  <PropertyGroup>
     195    <PostBuildEvent>
     196    </PostBuildEvent>
    199197  </PropertyGroup>
    200198  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • branches/SimulationCore/HeuristicLab.SimulationCore.Views/3.3

    • Property svn:ignore
      •  

        old new  
        33bin
        44obj
         5Plugin.cs
  • branches/SimulationCore/HeuristicLab.SimulationCore.Views/3.3/HeuristicLab.SimulationCore.Views-3.3.csproj

    r6621 r7204  
    2020    <DebugType>full</DebugType>
    2121    <Optimize>false</Optimize>
    22     <OutputPath>bin\Debug\</OutputPath>
     22    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    2323    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2424    <ErrorReport>prompt</ErrorReport>
     
    104104  </PropertyGroup>
    105105  <ItemGroup>
     106    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     107      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     108      <Private>False</Private>
     109    </Reference>
     110    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     111      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     112      <Private>False</Private>
     113    </Reference>
     114    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     115      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     116      <Private>False</Private>
     117    </Reference>
     118    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     119      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     120      <Private>False</Private>
     121    </Reference>
     122    <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     123      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
     124      <Private>False</Private>
     125    </Reference>
     126    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     127      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     128      <Private>False</Private>
     129    </Reference>
     130    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     131      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     132      <Private>False</Private>
     133    </Reference>
     134    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     135      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     136      <Private>False</Private>
     137    </Reference>
    106138    <Reference Include="System" />
    107139    <Reference Include="System.Core" />
     
    112144  </ItemGroup>
    113145  <ItemGroup>
    114     <Compile Include="HeuristicLabSimulationCoreViewsPlugin.cs" />
     146    <Compile Include="Plugin.cs" />
    115147    <Compile Include="Properties\AssemblyInfo.cs" />
    116148  </ItemGroup>
    117149  <ItemGroup>
     150    <None Include="Plugin.cs.frame" />
     151    <None Include="Properties\AssemblyInfo.cs.frame" />
    118152    <None Include="HeuristicLab.snk" />
    119     <None Include="HeuristicLabSimulationCoreViewsPlugin.cs.frame" />
    120     <None Include="Properties\AssemblyInfo.frame" />
    121153  </ItemGroup>
    122154  <ItemGroup>
    123     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    124       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    125       <Name>HeuristicLab.Collections-3.3</Name>
    126     </ProjectReference>
    127     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    128       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    129       <Name>HeuristicLab.Common.Resources-3.3</Name>
    130     </ProjectReference>
    131     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    132       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    133       <Name>HeuristicLab.Common-3.3</Name>
    134     </ProjectReference>
    135     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    136       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    137       <Name>HeuristicLab.Core-3.3</Name>
    138     </ProjectReference>
    139     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    140       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    141       <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
    142     </ProjectReference>
    143     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    144       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    145       <Name>HeuristicLab.MainForm-3.3</Name>
    146     </ProjectReference>
    147     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    148       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    149       <Name>HeuristicLab.Persistence-3.3</Name>
    150     </ProjectReference>
    151     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    152       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    153       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    154     </ProjectReference>
    155155    <ProjectReference Include="..\..\HeuristicLab.SimulationCore\3.3\HeuristicLab.SimulationCore-3.3.csproj">
    156156      <Project>{7B1579F2-6EFC-4C48-B41C-C3292639FF5B}</Project>
    157157      <Name>HeuristicLab.SimulationCore-3.3</Name>
     158      <Private>False</Private>
    158159    </ProjectReference>
    159160  </ItemGroup>
     
    165166set Outdir=$(Outdir)
    166167
    167 call PreBuildEvent.cmd
    168 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabSimulationCoreViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabSimulationCoreViewsPlugin.cs"</PreBuildEvent>
     168call PreBuildEvent.cmd</PreBuildEvent>
    169169  </PropertyGroup>
    170170  <PropertyGroup>
    171     <PostBuildEvent>set ProjectName=$(ProjectName)
    172 set Source=$(TargetPath)
    173 set Configuration=$(ConfigurationName)
    174 set Platform=$(PlatformName)
    175 set SolutionDir=$(SolutionDir)
    176 
    177 if exist "$(SolutionDir)CustomPostBuild.cmd" call "$(SolutionDir)CustomPostBuild.cmd"</PostBuildEvent>
     171    <PostBuildEvent>
     172    </PostBuildEvent>
    178173  </PropertyGroup>
    179174  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • branches/SimulationCore/HeuristicLab.SimulationCore/3.3

    • Property svn:ignore
      •  

        old new  
        33bin
        44obj
         5Plugin.cs
  • branches/SimulationCore/HeuristicLab.SimulationCore/3.3/HeuristicLab.SimulationCore-3.3.csproj

    r6623 r7204  
    2020    <DebugType>full</DebugType>
    2121    <Optimize>false</Optimize>
    22     <OutputPath>bin\Debug\</OutputPath>
     22    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    2323    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2424    <ErrorReport>prompt</ErrorReport>
     
    104104  </PropertyGroup>
    105105  <ItemGroup>
     106    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     107      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     108      <Private>False</Private>
     109    </Reference>
     110    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     111      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     112      <Private>False</Private>
     113    </Reference>
     114    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     115      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     116      <Private>False</Private>
     117    </Reference>
     118    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     119      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     120      <Private>False</Private>
     121    </Reference>
     122    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     123      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     124      <Private>False</Private>
     125    </Reference>
     126    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     127      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     128      <Private>False</Private>
     129    </Reference>
     130    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     131      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     132      <Private>False</Private>
     133    </Reference>
    106134    <Reference Include="System" />
    107135    <Reference Include="System.Core" />
     
    115143    <Compile Include="AgentBased\AgentBasedSimulation.cs" />
    116144    <Compile Include="AgentBased\IAgent.cs" />
    117     <Compile Include="HeuristicLabSimulationCorePlugin.cs" />
    118145    <Compile Include="IScenario.cs" />
    119146    <Compile Include="ISimulation.cs" />
     147    <Compile Include="Plugin.cs" />
    120148    <Compile Include="Properties\AssemblyInfo.cs" />
    121149    <Compile Include="Scenario.cs" />
     
    123151  </ItemGroup>
    124152  <ItemGroup>
     153    <None Include="Plugin.cs.frame" />
     154    <None Include="Properties\AssemblyInfo.cs.frame" />
    125155    <None Include="HeuristicLab.snk" />
    126     <None Include="HeuristicLabSimulationCorePlugin.cs.frame" />
    127     <None Include="Properties\AssemblyInfo.frame" />
    128   </ItemGroup>
    129   <ItemGroup>
    130     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    131       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    132       <Name>HeuristicLab.Collections-3.3</Name>
    133     </ProjectReference>
    134     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    135       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    136       <Name>HeuristicLab.Common.Resources-3.3</Name>
    137     </ProjectReference>
    138     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    139       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    140       <Name>HeuristicLab.Common-3.3</Name>
    141     </ProjectReference>
    142     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    143       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    144       <Name>HeuristicLab.Core-3.3</Name>
    145     </ProjectReference>
    146     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    147       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    148       <Name>HeuristicLab.Optimization-3.3</Name>
    149     </ProjectReference>
    150     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    151       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    152       <Name>HeuristicLab.Persistence-3.3</Name>
    153     </ProjectReference>
    154     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    155       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    156       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    157     </ProjectReference>
    158156  </ItemGroup>
    159157  <ItemGroup />
     
    165163set Outdir=$(Outdir)
    166164
    167 call PreBuildEvent.cmd
    168 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabSimulationCorePlugin.cs.frame" "%25ProjectDir%25\HeuristicLabSimulationCorePlugin.cs"</PreBuildEvent>
     165call PreBuildEvent.cmd</PreBuildEvent>
    169166  </PropertyGroup>
    170167  <PropertyGroup>
    171     <PostBuildEvent>set ProjectName=$(ProjectName)
    172 set Source=$(TargetPath)
    173 set Configuration=$(ConfigurationName)
    174 set Platform=$(PlatformName)
    175 set SolutionDir=$(SolutionDir)
    176 
    177 if exist "$(SolutionDir)CustomPostBuild.cmd" call "$(SolutionDir)CustomPostBuild.cmd"</PostBuildEvent>
     168    <PostBuildEvent>
     169    </PostBuildEvent>
    178170  </PropertyGroup>
    179171  <!-- 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

    r6623 r7204  
    7777    }
    7878
    79     public override void Start() {
     79    private class RunInformation {
     80      public CancellationTokenSource CancellationToken { get; set; }
     81      public IExecutionContext ExecutionContext { get; set; }
     82    }
     83
     84    public virtual void Start(IExecutionContext executionContext) {
    8085      base.Start();
     86
     87      RunInformation runInfo = new RunInformation();
    8188      cancellationTokenSource = new CancellationTokenSource();
     89      runInfo.CancellationToken = cancellationTokenSource;
     90      runInfo.ExecutionContext = executionContext;
    8291      stopPending = false;
    83       Task task = Task.Factory.StartNew(Run, cancellationTokenSource.Token, cancellationTokenSource.Token);
     92      Task task = Task.Factory.StartNew(Run, runInfo, runInfo.CancellationToken.Token);
    8493      task.ContinueWith(t => {
    8594        try {
     
    100109        else OnPaused();
    101110      });
     111    }
     112
     113    public override void Start() {
     114      Start(null);     
    102115    }
    103116    protected override void OnStarted() {
     
    131144
    132145    private void Run(object state) {
    133       CancellationToken cancellationToken = (CancellationToken)state;
     146      RunInformation runInfo = (RunInformation)state;
    134147
    135148      OnStarted();
     
    140153      timer.Start();
    141154      try {
    142         Run(cancellationToken);
     155        foreach (IParameter parameter in Parameters) {
     156          parameter.ExecutionContext = runInfo.ExecutionContext;
     157        }
     158
     159        Run(runInfo.CancellationToken.Token);
    143160      }
    144161      finally {
     
    146163        timer.Stop();
    147164        ExecutionTime += DateTime.Now - lastUpdateTime;
     165
     166        foreach (IParameter parameter in Parameters) {
     167          parameter.ExecutionContext = null;
     168        }
    148169      }
    149170      Stop();
    150171
    151       cancellationToken.ThrowIfCancellationRequested();
     172      runInfo.CancellationToken.Token.ThrowIfCancellationRequested();
    152173    }
    153174    protected abstract void Run(CancellationToken cancellationToken);
  • branches/SimulationCore/PreBuildEvent.cmd

    r852 r7204  
    1 SubWCRev "%ProjectDir%\" "%ProjectDir%\Properties\AssemblyInfo.frame" "%ProjectDir%\Properties\AssemblyInfo.cs"
     1IF EXIST "%ProjectDir%\Properties\AssemblyInfo.cs.frame" SubWCRev "%ProjectDir%\" "%ProjectDir%\Properties\AssemblyInfo.cs.frame" "%ProjectDir%\Properties\AssemblyInfo.cs"
     2IF EXIST "%ProjectDir%\Plugin.cs.frame" SubWCRev "%ProjectDir%\" "%ProjectDir%\Plugin.cs.frame" "%ProjectDir%\Plugin.cs"
Note: See TracChangeset for help on using the changeset viewer.