Changeset 4629 for branches/HeuristicLab.Hive/sources
- Timestamp:
- 10/20/10 15:05:55 (14 years ago)
- Location:
- branches/HeuristicLab.Hive/sources
- Files:
-
- 49 added
- 40 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive.Slave.Views/3.3
- Property svn:ignore
-
old new 1 1 bin 2 2 obj 3 *.user
-
- Property svn:ignore
-
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive.Slave.Views/3.3/HeuristicLab.Clients.Hive.Slave.Views-3.3.csproj
r4593 r4629 31 31 <WarningLevel>4</WarningLevel> 32 32 </PropertyGroup> 33 <PropertyGroup> 34 <SignAssembly>true</SignAssembly> 35 </PropertyGroup> 36 <PropertyGroup> 37 <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile> 38 </PropertyGroup> 33 39 <ItemGroup> 34 40 <Reference Include="HeuristicLab.Common-3.3"> … … 56 62 <Compile Include="Properties\AssemblyInfo.cs" /> 57 63 </ItemGroup> 64 <ItemGroup> 65 <None Include="HeuristicLab.snk" /> 66 </ItemGroup> 58 67 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 59 68 <PropertyGroup> -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive.Slave/3.3
- Property svn:ignore
-
old new 1 1 bin 2 2 obj 3 *.user
-
- Property svn:ignore
-
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive.Slave/3.3/HeuristicLab.Clients.Hive.Slave-3.3.csproj
r4593 r4629 31 31 <WarningLevel>4</WarningLevel> 32 32 </PropertyGroup> 33 <PropertyGroup> 34 <SignAssembly>true</SignAssembly> 35 </PropertyGroup> 36 <PropertyGroup> 37 <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile> 38 </PropertyGroup> 33 39 <ItemGroup> 34 40 <Reference Include="HeuristicLab.Common-3.3"> … … 55 61 <Compile Include="Properties\AssemblyInfo.cs" /> 56 62 </ItemGroup> 63 <ItemGroup> 64 <None Include="HeuristicLab.snk" /> 65 </ItemGroup> 57 66 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 58 67 <PropertyGroup> -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive.Views/3.3
- Property svn:ignore
-
old new 1 1 bin 2 2 obj 3 *.user
-
- Property svn:ignore
-
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive.Views/3.3/HeuristicLab.Clients.Hive.Views-3.3.csproj
r4593 r4629 31 31 <WarningLevel>4</WarningLevel> 32 32 </PropertyGroup> 33 <PropertyGroup> 34 <SignAssembly>true</SignAssembly> 35 </PropertyGroup> 36 <PropertyGroup> 37 <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile> 38 </PropertyGroup> 33 39 <ItemGroup> 34 40 <Reference Include="HeuristicLab.Common-3.3"> … … 55 61 <Compile Include="Properties\AssemblyInfo.cs" /> 56 62 </ItemGroup> 63 <ItemGroup> 64 <None Include="HeuristicLab.snk" /> 65 </ItemGroup> 57 66 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 58 67 <PropertyGroup> -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3
- Property svn:ignore
-
old new 2 2 obj 3 3 obj 4 *.user
-
- Property svn:ignore
-
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj
r4593 r4629 31 31 <WarningLevel>4</WarningLevel> 32 32 </PropertyGroup> 33 <PropertyGroup> 34 <SignAssembly>true</SignAssembly> 35 </PropertyGroup> 36 <PropertyGroup> 37 <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile> 38 </PropertyGroup> 33 39 <ItemGroup> 40 <Reference Include="HeuristicLab.Clients.Common-3.3"> 41 <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Clients.Common-3.3.dll</HintPath> 42 </Reference> 43 <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 34 44 <Reference Include="HeuristicLab.Common-3.3"> 35 45 <HintPath>..\..\..\..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath> 36 46 </Reference> 47 <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.2.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 37 48 <Reference Include="HeuristicLab.Core-3.3"> 38 49 <HintPath>..\..\..\..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath> 50 </Reference> 51 <Reference Include="HeuristicLab.Data-3.3"> 52 <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath> 53 </Reference> 54 <Reference Include="HeuristicLab.Optimization-3.3"> 55 <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath> 39 56 </Reference> 40 57 <Reference Include="HeuristicLab.Persistence-3.3"> … … 44 61 <HintPath>..\..\..\..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath> 45 62 </Reference> 63 <Reference Include="HeuristicLab.Tracing-3.3, Version=3.2.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 46 64 <Reference Include="System" /> 47 65 <Reference Include="System.Core" /> 66 <Reference Include="System.Drawing" /> 67 <Reference Include="System.Runtime.Serialization" /> 68 <Reference Include="System.ServiceModel" /> 48 69 <Reference Include="System.Xml.Linq" /> 49 70 <Reference Include="System.Data.DataSetExtensions" /> … … 52 73 </ItemGroup> 53 74 <ItemGroup> 75 <Compile Include="Exceptions\AddJobToHiveException.cs" /> 76 <Compile Include="Exceptions\JobResultPollingException.cs" /> 77 <Compile Include="Exceptions\OptimizerNotFoundException.cs" /> 78 <Compile Include="HiveExperiment\HiveExperimentList.cs" /> 79 <Compile Include="HiveExperiment\HiveJobList.cs" /> 80 <Compile Include="Jobs\JobList.cs" /> 81 <Compile Include="Jobs\OptimizerJob.cs" /> 54 82 <Compile Include="HeuristicLabClientsHivePlugin.cs" /> 83 <Compile Include="HiveExperiment\HiveClient.cs" /> 84 <Compile Include="HiveExperiment\HiveJob.cs" /> 85 <Compile Include="HiveExperiment\HiveExperiment.cs" /> 86 <Compile Include="HiveExperiment\JobResultPoller.cs" /> 87 <Compile Include="Progress\IProgress.cs" /> 88 <Compile Include="Progress\IProgressReporter.cs" /> 89 <Compile Include="Progress\Progress.cs" /> 55 90 <Compile Include="Properties\AssemblyInfo.cs" /> 91 <Compile Include="PersistenceUtil.cs" /> 92 <Compile Include="ServiceClients\ServiceClientFactory.cs" /> 93 <Compile Include="ServiceClients\ServiceClientFactoryException.cs" /> 94 <Compile Include="ServiceLocator.cs" /> 95 <Compile Include="Properties\Settings.Designer.cs"> 96 <AutoGen>True</AutoGen> 97 <DesignTimeSharedInput>True</DesignTimeSharedInput> 98 <DependentUpon>Settings.settings</DependentUpon> 99 </Compile> 100 <None Include="app.config" /> 101 <None Include="HeuristicLab.snk" /> 102 <None Include="ServiceClients\GenerateServiceClients.cmd" /> 103 <None Include="Properties\Settings.settings"> 104 <Generator>SettingsSingleFileGenerator</Generator> 105 <LastGenOutput>Settings.Designer.cs</LastGenOutput> 106 </None> 107 </ItemGroup> 108 <ItemGroup> 109 <Folder Include="Administration\" /> 110 <Folder Include="Slave\" /> 111 </ItemGroup> 112 <ItemGroup> 113 <ProjectReference Include="..\..\HeuristicLab.Hive\3.3\HeuristicLab.Hive-3.3.csproj"> 114 <Project>{F98A1740-9AC9-4D36-A582-6A2D0D06978D}</Project> 115 <Name>HeuristicLab.Hive-3.3</Name> 116 </ProjectReference> 117 <ProjectReference Include="..\..\HeuristicLab.Services.Hive.Common\3.3\HeuristicLab.Services.Hive.Common-3.3.csproj"> 118 <Project>{14424A16-48D4-445E-80BF-DDF617548BBB}</Project> 119 <Name>HeuristicLab.Services.Hive.Common-3.3</Name> 120 </ProjectReference> 56 121 </ItemGroup> 57 122 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Hive.sln
r4615 r4629 3 3 # Visual Studio 2010 4 4 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive-3.3", "HeuristicLab.Hive\3.3\HeuristicLab.Hive-3.3.csproj", "{F98A1740-9AC9-4D36-A582-6A2D0D06978D}" 5 ProjectSection(ProjectDependencies) = postProject6 {E1D6C801-892A-406A-B606-F158E36DD3C3} = {E1D6C801-892A-406A-B606-F158E36DD3C3}7 {EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC} = {EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC}8 {14424A16-48D4-445E-80BF-DDF617548BBB} = {14424A16-48D4-445E-80BF-DDF617548BBB}9 {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE} = {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}10 {989FE92B-484E-41EE-87E2-6A24AF0381D8} = {989FE92B-484E-41EE-87E2-6A24AF0381D8}11 {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8} = {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}12 {B5EF1E5A-9F3D-40B9-B4B0-30AADF2E2CEB} = {B5EF1E5A-9F3D-40B9-B4B0-30AADF2E2CEB}13 EndProjectSection14 5 EndProject 15 6 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave-3.3", "HeuristicLab.Clients.Hive.Slave\3.3\HeuristicLab.Clients.Hive.Slave-3.3.csproj", "{989FE92B-484E-41EE-87E2-6A24AF0381D8}" 16 7 EndProject 17 8 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Hive.Common-3.3", "HeuristicLab.Services.Hive.Common\3.3\HeuristicLab.Services.Hive.Common-3.3.csproj", "{14424A16-48D4-445E-80BF-DDF617548BBB}" 18 EndProject19 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Hive-3.3", "HeuristicLab.Services.Hive.Server\3.3\HeuristicLab.Services.Hive-3.3.csproj", "{CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}"20 9 EndProject 21 10 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Hive.DataAccess-3.3", "HeuristicLab.Services.Hive.DataAccess\3.3\HeuristicLab.Services.Hive.DataAccess-3.3.csproj", "{EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC}" … … 35 24 EndProject 36 25 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave.Views-3.3", "HeuristicLab.Clients.Hive.Slave.Views\3.3\HeuristicLab.Clients.Hive.Slave.Views-3.3.csproj", "{8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}" 26 EndProject 27 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Hive-3.3", "HeuristicLab.Services.Hive\3.3\HeuristicLab.Services.Hive-3.3.csproj", "{CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}" 37 28 EndProject 38 29 Global … … 54 45 {14424A16-48D4-445E-80BF-DDF617548BBB}.Release|Any CPU.ActiveCfg = Release|Any CPU 55 46 {14424A16-48D4-445E-80BF-DDF617548BBB}.Release|Any CPU.Build.0 = Release|Any CPU 56 {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU57 {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}.Debug|Any CPU.Build.0 = Debug|Any CPU58 {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}.Release|Any CPU.ActiveCfg = Release|Any CPU59 {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}.Release|Any CPU.Build.0 = Release|Any CPU60 47 {EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 61 48 {EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC}.Debug|Any CPU.Build.0 = Debug|Any CPU … … 74 61 {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Release|Any CPU.ActiveCfg = Release|Any CPU 75 62 {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Release|Any CPU.Build.0 = Release|Any CPU 63 {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 64 {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}.Debug|Any CPU.Build.0 = Debug|Any CPU 65 {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}.Release|Any CPU.ActiveCfg = Release|Any CPU 66 {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}.Release|Any CPU.Build.0 = Release|Any CPU 76 67 EndGlobalSection 77 68 GlobalSection(SolutionProperties) = preSolution -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Hive/3.3
- Property svn:ignore
-
old new 1 1 bin 2 2 obj 3 *.user
-
- Property svn:ignore
-
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Hive/3.3/HeuristicLab.Hive-3.3.csproj
r4615 r4629 32 32 <WarningLevel>4</WarningLevel> 33 33 </PropertyGroup> 34 <PropertyGroup> 35 <SignAssembly>true</SignAssembly> 36 </PropertyGroup> 37 <PropertyGroup> 38 <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile> 39 </PropertyGroup> 34 40 <ItemGroup> 35 41 <Reference Include="HeuristicLab.Common-3.3"> … … 57 63 <Compile Include="Properties\AssemblyInfo.cs" /> 58 64 </ItemGroup> 65 <ItemGroup> 66 <None Include="HeuristicLab.snk" /> 67 </ItemGroup> 59 68 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 60 69 <PropertyGroup> 61 70 <PostBuildEvent>set ProjectName=$(ProjectName) 62 71 set TargetPath=$(TargetPath) 72 set TargetDir=$(TargetDir) 63 73 set SolutionDir=$(SolutionDir) 64 call $(SolutionDir)/ MergeConfigs.cmd65 call $(SolutionDir)/ CopyAssembly.cmd</PostBuildEvent>74 call $(SolutionDir)/CopyAssembly.cmd 75 call $(SolutionDir)/MergeConfigs.cmd</PostBuildEvent> 66 76 </PropertyGroup> 67 77 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3
- Property svn:ignore
-
old new 1 1 bin 2 2 obj 3 *.user
-
- Property svn:ignore
-
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/Appointment.cs
r4593 r4629 22 22 using System; 23 23 using System.Runtime.Serialization; 24 using HeuristicLab.Common; 24 25 25 26 namespace HeuristicLab.Services.Hive.Common.DataTransfer { … … 38 39 [DataMember] 39 40 public Guid ResourceId { get; set; } 41 42 public override IDeepCloneable Clone(Cloner cloner) { 43 Appointment clone = (Appointment)base.Clone(cloner); 44 clone.AllDayEvent = this.AllDayEvent; 45 clone.EndDate = this.EndDate; 46 clone.Recurring = this.Recurring; 47 clone.RecurringId = this.RecurringId; 48 clone.ResourceId = this.ResourceId; 49 clone.StartDate = this.StartDate; 50 return clone; 51 } 40 52 } 41 53 } -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HeartBeat.cs
r4593 r4629 27 27 28 28 [DataContract] 29 public class Heart Beat {29 public class Heartbeat { 30 30 [DataMember] 31 31 public Guid SlaveId { get; set; } -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HiveExperiment.cs
r4593 r4629 39 39 return base.ToString() + "Name: " + Name + ", Description: " + Description + ", ResourceIds: " + ResourceIds; 40 40 } 41 42 public HiveExperiment() { 41 42 public override IDeepCloneable Clone(Cloner cloner) { 43 var clone = (HiveExperiment)base.Clone(cloner); 44 clone.ResourceIds = this.ResourceIds; 45 clone.RootJobId = this.RootJobId; 46 clone.UserId = this.UserId; 47 return clone; 43 48 } 44 49 } -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HiveItem.cs
r4593 r4629 4 4 using System.Text; 5 5 using System.Runtime.Serialization; 6 using HeuristicLab.Common; 6 7 7 8 namespace HeuristicLab.Services.Hive.Common.DataTransfer { 8 9 [DataContract] 9 public abstract class HiveItem {10 public abstract class HiveItem : IDeepCloneable { 10 11 [DataMember] 11 12 public Guid Id { get; set; } 13 14 public virtual IDeepCloneable Clone(Cloner cloner) { 15 HiveItem clone = (HiveItem)Activator.CreateInstance(this.GetType(), true); 16 cloner.RegisterClonedObject(this, clone); 17 clone.Id = this.Id; 18 return clone; 19 } 20 21 public object Clone() { 22 return Clone(new Cloner()); 23 } 12 24 } 13 25 } -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HivePlugin.cs
r4593 r4629 24 24 using System.Linq; 25 25 using System.Runtime.Serialization; 26 using HeuristicLab.Common; 26 27 27 28 namespace HeuristicLab.Services.Hive.Common.DataTransfer { … … 32 33 public Version Version { get; set; } 33 34 [DataMember] 34 public Boolean Update { get; set; } 35 public bool Update { get; set; } 36 37 public override IDeepCloneable Clone(Cloner cloner) { 38 var clone = (HivePlugin)base.Clone(cloner); 39 clone.Version = this.Version; 40 clone.Update = this.Update; 41 return clone; 42 } 35 43 } 36 44 } -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HivePluginData.cs
r4598 r4629 22 22 using System; 23 23 using System.Runtime.Serialization; 24 using HeuristicLab.Common; 24 25 25 26 namespace HeuristicLab.Services.Hive.Common.DataTransfer { … … 34 35 Name = name; 35 36 } 37 38 public override IDeepCloneable Clone(Cloner cloner) { 39 var clone = (HivePluginData)base.Clone(cloner); 40 if (this.Data != null) clone.Data = new byte[this.Data.Length]; Array.Copy(this.Data, clone.Data, this.Data.Length); 41 return clone; 42 } 36 43 } 37 44 } -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/Job.cs
r4615 r4629 55 55 AssignedResourceIds = new List<Guid>(); 56 56 } 57 58 public override IDeepCloneable Clone(Cloner cloner) { 59 var clone = (Job)base.Clone(cloner); 60 clone.UserId = this.UserId; 61 clone.Priority = this.Priority; 62 clone.CoresNeeded = this.CoresNeeded; 63 clone.MemoryNeeded = this.MemoryNeeded; 64 clone.PluginsNeededIds = new List<Guid>(this.PluginsNeededIds); 65 clone.AssignedResourceIds = new List<Guid>(this.AssignedResourceIds); 66 clone.ProjectId = this.ProjectId; 67 return clone; 68 } 57 69 } 58 70 } -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/JobData.cs
r4598 r4629 23 23 using System.IO; 24 24 using System.Runtime.Serialization; 25 using HeuristicLab.Common; 25 26 26 27 namespace HeuristicLab.Services.Hive.Common.DataTransfer { … … 32 33 [DataMember] 33 34 public byte[] Data { get; set; } 35 36 public override IDeepCloneable Clone(Cloner cloner) { 37 var clone = (JobData)base.Clone(cloner); 38 if (this.Data != null) clone.Data = new byte[this.Data.Length]; Array.Copy(this.Data, clone.Data, this.Data.Length); 39 return clone; 40 } 34 41 } 35 42 } -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/LightweightJob.cs
r4598 r4629 22 22 using System; 23 23 using System.Runtime.Serialization; 24 using HeuristicLab.Common; 24 25 25 26 namespace HeuristicLab.Services.Hive.Common.DataTransfer { … … 56 57 this.ParentJobId = job.ParentJobId; 57 58 } 59 60 public override IDeepCloneable Clone(Cloner cloner) { 61 var clone = (LightweightJob)base.Clone(cloner); 62 clone.SlaveId = this.SlaveId; 63 clone.State = this.State; 64 clone.ExecutionTime = this.ExecutionTime; 65 clone.Exception = this.Exception; 66 clone.DateCreated = this.DateCreated; 67 clone.DateCalculated = this.DateCalculated; 68 clone.DateFinished = this.DateFinished; 69 clone.ParentJobId = this.ParentJobId; 70 return clone; 71 } 58 72 } 59 73 } -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/NamedHiveItem.cs
r4593 r4629 4 4 using System.Text; 5 5 using System.Runtime.Serialization; 6 using HeuristicLab.Common; 6 7 7 8 namespace HeuristicLab.Services.Hive.Common.DataTransfer { … … 12 13 [DataMember] 13 14 public string Description { get; set; } 15 16 public override IDeepCloneable Clone(Cloner cloner) { 17 var clone = (NamedHiveItem)base.Clone(cloner); 18 clone.Name = this.Name; 19 clone.Description = this.Description; 20 return clone; 21 } 14 22 } 15 23 } -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/Slave.cs
r4593 r4629 29 29 public class Slave : Resource { 30 30 [DataMember] 31 public int? NrOfCores { get; set; }31 public int? Cores { get; set; } 32 32 [DataMember] 33 public int? NrOfFreeCores { get; set; }33 public int? FreeCores { get; set; } 34 34 [DataMember] 35 35 public int? CpuSpeedPerCore { get; set; } … … 39 39 public int? FreeMemory { get; set; } 40 40 [DataMember] 41 public DateTime? Login { get; set; }42 [DataMember]43 41 public SlaveState State { get; set; } 44 42 [DataMember] 45 43 public CalendarState CalendarSyncStatus { get; set; } 46 44 [DataMember] 47 public SlaveConfig Config{ get; set; }45 public Guid SlaveConfigId { get; set; } 48 46 [DataMember] 49 47 public bool IsAllowedToCalculate { get; set; } 50 48 51 49 public override string ToString() { 52 return base.ToString() + ", NrOfCores: " + NrOfCores + ", NrOfFreeCores " + NrOfFreeCores + ", Login: " + Login + ", State: " + State; 50 return base.ToString() + ", NrOfCores: " + Cores + ", NrOfFreeCores " + FreeCores + ", State: " + State; 51 } 52 53 public override IDeepCloneable Clone(Cloner cloner) { 54 var clone = (Slave)base.Clone(cloner); 55 clone.Cores = this.Cores; 56 clone.FreeCores = this.FreeCores; 57 clone.CpuSpeedPerCore = this.CpuSpeedPerCore; 58 clone.Memory = this.Memory; 59 clone.FreeMemory = this.FreeMemory; 60 clone.State = this.State; 61 clone.CalendarSyncStatus = this.CalendarSyncStatus; 62 clone.SlaveConfigId = this.SlaveConfigId; 63 clone.IsAllowedToCalculate = this.IsAllowedToCalculate; 64 return clone; 53 65 } 54 66 } -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/SlaveConfig.cs
r4593 r4629 32 32 [DataMember] 33 33 public int? HeartBeatIntervall { get; set; } 34 35 public override IDeepCloneable Clone(Cloner cloner) { 36 var clone = (SlaveConfig)base.Clone(cloner); 37 clone.UpDownTimeCalendar = this.UpDownTimeCalendar; 38 clone.HeartBeatIntervall = this.HeartBeatIntervall; 39 return clone; 40 } 34 41 } 35 42 } -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/SlaveGroup.cs
r4593 r4629 23 23 using System.Linq; 24 24 using System.Runtime.Serialization; 25 using System; 26 using HeuristicLab.Common; 25 27 26 28 namespace HeuristicLab.Services.Hive.Common.DataTransfer { … … 28 30 public class SlaveGroup : Resource { 29 31 [DataMember] 30 public List< Resource> Resources { get; set; }32 public List<Guid> ResourcesIds { get; set; } 31 33 32 34 public SlaveGroup() { 33 Resources = new List<Resource>(); 35 ResourcesIds = new List<Guid>(); 36 } 37 38 public override IDeepCloneable Clone(Cloner cloner) { 39 var clone = (SlaveGroup)base.Clone(cloner); 40 clone.ResourcesIds = new List<Guid>(this.ResourcesIds); 41 return clone; 34 42 } 35 43 } -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/SlaveState.cs
r4593 r4629 23 23 namespace HeuristicLab.Services.Hive.Common.DataTransfer { 24 24 public enum SlaveState { 25 NullState,26 25 Idle, 27 26 Calculating, -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/UpTimeStatistics.cs
r4593 r4629 22 22 using System; 23 23 using System.Runtime.Serialization; 24 using HeuristicLab.Common; 24 25 25 26 namespace HeuristicLab.Services.Hive.Common.DataTransfer { … … 27 28 public class UpTimeStatistics : HiveItem { 28 29 [DataMember] 29 public Slave Slave{ get; set; }30 public Guid SlaveId { get; set; } 30 31 [DataMember] 31 32 public DateTime Login { get; set; } 32 33 [DataMember] 33 34 public DateTime Logout { get; set; } 35 36 public override IDeepCloneable Clone(Cloner cloner) { 37 var clone = (UpTimeStatistics)base.Clone(cloner); 38 clone.SlaveId = this.SlaveId; 39 clone.Login = this.Login; 40 clone.Logout = this.Logout; 41 return clone; 42 } 34 43 } 35 44 } -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/HeuristicLab.Services.Hive.Common-3.3.csproj
r4598 r4629 30 30 <ErrorReport>prompt</ErrorReport> 31 31 <WarningLevel>4</WarningLevel> 32 </PropertyGroup> 33 <PropertyGroup> 34 <SignAssembly>true</SignAssembly> 35 </PropertyGroup> 36 <PropertyGroup> 37 <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile> 32 38 </PropertyGroup> 33 39 <ItemGroup> … … 81 87 <Compile Include="ServiceContracts\IHiveService.cs" /> 82 88 </ItemGroup> 89 <ItemGroup> 90 <None Include="HeuristicLab.snk" /> 91 </ItemGroup> 83 92 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 84 93 <PropertyGroup> -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/MessageContainer.cs
r4615 r4629 43 43 JobFailed, 44 44 UptimeLimitDisconnect, 45 FetchOrForceFetchCalendar,45 UpdateCalendar, 46 46 AddChildJob, 47 47 PauseJob, -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/ServiceContracts/IHiveService.cs
r4615 r4629 6 6 using System.IO; 7 7 using HeuristicLab.Services.Hive.Common.DataTransfer; 8 using System.Net.Security; 8 9 9 10 namespace HeuristicLab.Services.Hive.Common.ServiceContracts { 11 12 [ServiceContract(ProtectionLevel = ProtectionLevel.EncryptAndSign)] 10 13 public interface IHiveService { 11 14 12 // todo: Rename:13 // Result is ambiguous; sometimes it refers to a serialized job which has finished, sometimes it is the current state of the job14 15 #region Job Methods 15 16 [OperationContract] … … 81 82 82 83 #region HiveExperiment Methods 84 [OperationContract] 85 HiveExperiment GetHiveExperiment(Guid id); 86 83 87 /// <summary> 84 88 /// Returns all experiments for the current user … … 86 90 [OperationContract] 87 91 IEnumerable<HiveExperiment> GetHiveExperiments(); 92 93 [OperationContract] 94 Guid AddHiveExperiment(HiveExperiment hiveExperimentDto); 88 95 89 96 [OperationContract] … … 113 120 /// </summary> 114 121 /// <returns></returns> 115 [OperationContract]116 void Login();117 /// <summary>118 /// This method registers the slave and marks it as online119 /// </summary>120 [OperationContract]121 void Login(Slave slave);122 [OperationContract]123 void Logout(Guid clientId);122 //[OperationContract] 123 //void Login(); 124 ///// <summary> 125 ///// This method registers the slave and marks it as online 126 ///// </summary> 127 //[OperationContract] 128 //void Login(Slave slave); 129 //[OperationContract] 130 //void Logout(Guid clientId); 124 131 #endregion 125 132 126 133 #region Heartbeat Methods 127 134 [OperationContract] 128 List<MessageContainer> ProcessHeart Beat(HeartBeat heartbeat);135 List<MessageContainer> ProcessHeartbeat(Heartbeat heartbeat); 129 136 #endregion 130 137 … … 138 145 #region Calendar Methods 139 146 [OperationContract] 140 IEnumerable<Appointment> GetCalendar(Guid clientId);147 IEnumerable<Appointment> GetCalendar(Guid slaveId); 141 148 [OperationContract] 142 149 void SetCalendarStatus(Guid clientId, CalendarState state); … … 171 178 [OperationContract] 172 179 void RemoveResourceFromGroup(Guid slaveGroupId, Guid resourceId); 180 181 [OperationContract] 182 void UpdateSlave(Slave slave); 173 183 #endregion 174 184 -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3
- Property svn:ignore
-
old new 1 1 bin 2 2 obj 3 *.user
-
- Property svn:ignore
-
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/ContextFactory.cs
r4598 r4629 75 75 transactions.Add(threadId, transaction); 76 76 } 77 return context;77 return disposableContext; 78 78 } 79 79 } … … 96 96 lock (locker) { 97 97 int threadId = Thread.CurrentThread.ManagedThreadId; 98 contexts[threadId]. Dispose();98 contexts[threadId].Obj.Dispose(); 99 99 contexts.Remove(threadId); 100 100 // context gets disposed implicitly, when it is used as IDisposable -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/HeuristicLab.Services.Hive.DataAccess-3.3.csproj
r4615 r4629 30 30 <ErrorReport>prompt</ErrorReport> 31 31 <WarningLevel>4</WarningLevel> 32 </PropertyGroup> 33 <PropertyGroup> 34 <SignAssembly>true</SignAssembly> 35 </PropertyGroup> 36 <PropertyGroup> 37 <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile> 32 38 </PropertyGroup> 33 39 <ItemGroup> … … 75 81 <DependentUpon>Settings.settings</DependentUpon> 76 82 </Compile> 83 <Compile Include="Tools\CreateHiveDatabaseApplication.cs" /> 77 84 </ItemGroup> 78 85 <ItemGroup> … … 83 90 <SubType>Designer</SubType> 84 91 </None> 92 <None Include="HeuristicLab.snk" /> 85 93 <None Include="HiveDataContext.dbml"> 86 94 <Generator>MSLinqToSQLGenerator</Generator> … … 104 112 </ProjectReference> 105 113 </ItemGroup> 114 <ItemGroup> 115 <Content Include="Tools\cleanHiveDatabase.sql" /> 116 <Content Include="Tools\prepareHiveDatabase.sql" /> 117 </ItemGroup> 106 118 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 107 119 <PropertyGroup> -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDao.cs
r4615 r4629 58 58 orderby ar.Job.Priority descending 59 59 select Convert.ToDto(ar.Job); 60 return query.ToArray(); 60 return query; 61 } 62 63 public IEnumerable<DT.Job> GetAvailableJobs(DT.Slave slave) { 64 var query = from j in db.Jobs 65 where j.JobState == JobState.Waiting && j.CoresNeeded <= slave.FreeCores && j.MemoryNeeded <= slave.FreeMemory 66 orderby j.Priority descending 67 select Convert.ToDto(j); 68 return query.Union(GetAvailableParentJobs(slave.Id)).OrderByDescending(x => x.Priority).ToArray(); 61 69 } 62 70 #endregion … … 217 225 public bool IsUserAuthorizedForJobs(Guid userId, params Guid[] jobIds) { 218 226 var userIds = from job in db.Jobs // this needs to be fast! 219 where jobIds.Contains(job.JobId)220 select job.UserId;227 where jobIds.Contains(job.JobId) 228 select job.UserId; 221 229 return userIds.All(x => x == userId); 222 230 } -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/Interfaces/IHiveDao.cs
r4615 r4629 15 15 void UpdateJob(DT.Job dto); 16 16 void DeleteJob(Guid id); 17 IEnumerable<DT.Job> GetAvailable ParentJobs(Guid slaveId);17 IEnumerable<DT.Job> GetAvailableJobs(DT.Slave slave); 18 18 #endregion 19 19 -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/MergeConfigs.cmd
r4615 r4629 1 copy "%SolutionDir%HeuristicLab.Hive-3.3.dll.config" "%TargetPath%" 2 echo HeuristicLab.Hive-3.3.dll.config copied 1 copy "%SolutionDir%HeuristicLab.Hive-3.3.dll.config" "%TargetDir%" 3 2 4 %SolutionDir%ConfigMerger "%SolutionDir%HeuristicLab.Services.Hive\3.3\app.config" "%Target Path%HeuristicLab.Hive-3.3.dll.config"5 %SolutionDir%ConfigMerger "%SolutionDir%HeuristicLab.Services.Hive.DataAccess\3.3\app.config" "%Target Path%HeuristicLab.Hive-3.3.dll.config"3 %SolutionDir%ConfigMerger "%SolutionDir%HeuristicLab.Services.Hive\3.3\app.config" "%TargetDir%HeuristicLab.Hive-3.3.dll.config" 4 %SolutionDir%ConfigMerger "%SolutionDir%HeuristicLab.Services.Hive.DataAccess\3.3\app.config" "%TargetDir%HeuristicLab.Hive-3.3.dll.config" 6 5 7 copy "%SolutionDir%HeuristicLab-3.3.dll.config" "%TargetPath%" 8 echo HeuristicLab-3.3.dll.config copied 6 copy "%SolutionDir%HeuristicLab 3.3.exe.config" "%TargetDir%" 9 7 10 %SolutionDir%ConfigMerger "HeuristicLab.Hive-3.3.dll.config" "HeuristicLab 3.3.exe.config" 8 %SolutionDir%ConfigMerger "%SolutionDir%HeuristicLab.Hive-3.3.dll.config" "HeuristicLab 3.3.exe.config" 9 10 copy "HeuristicLab 3.3.exe.config" "%target%" -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Calendar/3.3/Properties/AssemblyInfo.cs
r4598 r4629 58 58 // [assembly: AssemblyVersion("1.0.*")] 59 59 [assembly: AssemblyVersion("3.3.0.0")] 60 [assembly: AssemblyFileVersion("3.3.0.45 60")]60 [assembly: AssemblyFileVersion("3.3.0.4598")] -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln
r4425 r4629 81 81 EndProject 82 82 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Slave.ExecutionEngine-3.3", "HeuristicLab.Hive.Slave.ExecutionEngine\3.3\HeuristicLab.Hive.Slave.ExecutionEngine-3.3.csproj", "{1605256A-1CB3-44AB-AAFF-577093EE5789}" 83 EndProject 84 Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "HiveWeb", "..\..\..\..\..\Web\HiveWeb\", "{F8E2A0BB-5B04-49EE-88CE-F0DF12474221}" 85 ProjectSection(WebsiteProperties) = preProject 86 TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0" 87 Debug.AspNetCompiler.VirtualPath = "/HiveWeb" 88 Debug.AspNetCompiler.PhysicalPath = "..\..\..\..\..\Web\HiveWeb\" 89 Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\HiveWeb\" 90 Debug.AspNetCompiler.Updateable = "true" 91 Debug.AspNetCompiler.ForceOverwrite = "true" 92 Debug.AspNetCompiler.FixedNames = "false" 93 Debug.AspNetCompiler.Debug = "True" 94 Release.AspNetCompiler.VirtualPath = "/HiveWeb" 95 Release.AspNetCompiler.PhysicalPath = "..\..\..\..\..\Web\HiveWeb\" 96 Release.AspNetCompiler.TargetPath = "PrecompiledWeb\HiveWeb\" 97 Release.AspNetCompiler.Updateable = "true" 98 Release.AspNetCompiler.ForceOverwrite = "true" 99 Release.AspNetCompiler.FixedNames = "false" 100 Release.AspNetCompiler.Debug = "False" 101 VWDPort = "2681" 102 EndProjectSection 83 103 EndProject 84 104 Global … … 372 392 {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x86.ActiveCfg = Release|x86 373 393 {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x86.Build.0 = Release|x86 394 {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 395 {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|Any CPU.Build.0 = Debug|Any CPU 396 {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU 397 {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU 398 {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|x64.ActiveCfg = Debug|Any CPU 399 {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|x86.ActiveCfg = Debug|Any CPU 400 {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|Any CPU.ActiveCfg = Debug|Any CPU 401 {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|Any CPU.Build.0 = Debug|Any CPU 402 {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU 403 {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|Mixed Platforms.Build.0 = Debug|Any CPU 404 {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|x64.ActiveCfg = Debug|Any CPU 405 {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|x86.ActiveCfg = Debug|Any CPU 374 406 EndGlobalSection 375 407 GlobalSection(SolutionProperties) = preSolution -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/HeuristicLab.Hive.Server.Core-3.3.csproj
r4560 r4629 192 192 call PreBuildEvent.cmd</PreBuildEvent> 193 193 </PropertyGroup> 194 <PropertyGroup> 195 <PostBuildEvent> 196 </PostBuildEvent> 197 </PropertyGroup> 194 198 </Project> -
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/app.config
r4423 r4629 63 63 64 64 <system.serviceModel> 65 66 65 <diagnostics> 67 66 <messageLogging logEntireMessage="true" logMalformedMessages="true" … … 141 140 </service> 142 141 </services> 143 144 142 </system.serviceModel> 145 143
Note: See TracChangeset
for help on using the changeset viewer.