Changeset 4121
- Timestamp:
- 07/30/10 13:56:28 (14 years ago)
- Location:
- branches/3.3-HiveMigration/sources/HeuristicLab.Hive
- Files:
-
- 1 added
- 46 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Calendar/3.3/HeuristicLab.Calendar-3.3.csproj
r4105 r4121 62 62 <WarningLevel>4</WarningLevel> 63 63 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 64 </PropertyGroup> 65 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> 66 <PlatformTarget>x86</PlatformTarget> 67 <OutputPath>bin\Debug\</OutputPath> 68 </PropertyGroup> 69 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> 70 <PlatformTarget>x86</PlatformTarget> 71 <OutputPath>bin\x86\Release\</OutputPath> 64 72 </PropertyGroup> 65 73 <ItemGroup> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Calendar/3.3/Properties/AssemblyInfo.cs
r4111 r4121 57 57 // by using the '*' as shown below: 58 58 // [assembly: AssemblyVersion("1.0.*")] 59 [assembly: AssemblyVersion("3.3.0.41 07")]60 [assembly: AssemblyFileVersion("3.3.0.41 07")]61 [assembly: AssemblyBuildDate("2010/07/ 27 12:52:47")]59 [assembly: AssemblyVersion("3.3.0.4111")] 60 [assembly: AssemblyFileVersion("3.3.0.4111")] 61 [assembly: AssemblyBuildDate("2010/07/30 12:22:35")] -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.DataAccess.ADOHelper/3.3/HeuristicLab.DataAccess.ADOHelper-3.3.csproj
r4077 r4121 58 58 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 59 59 <DebugSymbols>true</DebugSymbols> 60 <OutputPath>bin\ x86\Debug\</OutputPath>60 <OutputPath>bin\Debug\</OutputPath> 61 61 <DefineConstants>DEBUG;TRACE</DefineConstants> 62 62 <DebugType>full</DebugType> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.DataAccess/3.3/HeuristicLab.DataAccess-3.3.csproj
r4077 r4121 58 58 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 59 59 <DebugSymbols>true</DebugSymbols> 60 <OutputPath>bin\ x86\Debug\</OutputPath>60 <OutputPath>bin\Debug\</OutputPath> 61 61 <DefineConstants>DEBUG;TRACE</DefineConstants> 62 62 <DebugType>full</DebugType> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln
r4120 r4121 16 16 {D59E852C-F205-4647-8C05-EB9ED1CF44E9} = {D59E852C-F205-4647-8C05-EB9ED1CF44E9} 17 17 {CE2DFB48-6A9C-4507-96C6-5FC40E92035C} = {CE2DFB48-6A9C-4507-96C6-5FC40E92035C} 18 {E3288D4B-7A51-499A-AC5B-019319CE51DC} = {E3288D4B-7A51-499A-AC5B-019319CE51DC} 18 19 {89F4BC52-C174-481E-9BD2-3814171020E8} = {89F4BC52-C174-481E-9BD2-3814171020E8} 19 20 {5CDACE54-5FB2-4344-A21C-963F63CB7C2B} = {5CDACE54-5FB2-4344-A21C-963F63CB7C2B} … … 28 29 {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1} = {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1} 29 30 {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11} = {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11} 31 {FD1AFEC2-7A79-45CF-9365-5195B04A2C9F} = {FD1AFEC2-7A79-45CF-9365-5195B04A2C9F} 30 32 {898B31CF-81DC-453B-AEB3-BDF83197A7EE} = {898B31CF-81DC-453B-AEB3-BDF83197A7EE} 31 33 {134F93D7-E7C8-4ECD-9923-7F63259A60D8} = {134F93D7-E7C8-4ECD-9923-7F63259A60D8} … … 83 85 EndProject 84 86 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.Security", "HeuristicLab.Security", "{3721CE4A-1148-49E1-B8DD-D9F5309AB8D9}" 85 ProjectSection(SolutionItems) = preProject86 HeuristicLab.Security.ADODataAccess\3.3\HeuristicLab.Security.ADODataAccess-3.3.csproj = HeuristicLab.Security.ADODataAccess\3.3\HeuristicLab.Security.ADODataAccess-3.3.csproj87 EndProjectSection88 87 EndProject 89 88 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.Hive", "HeuristicLab.Hive", "{84899895-AC52-4053-8A91-61753EF8E0A8}" … … 472 471 {D17A4D6A-4CAA-4470-8A19-F42463C021FD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU 473 472 {D17A4D6A-4CAA-4470-8A19-F42463C021FD}.Debug|x64.ActiveCfg = Debug|Any CPU 474 {D17A4D6A-4CAA-4470-8A19-F42463C021FD}.Debug|x86.ActiveCfg = Debug|Any CPU 473 {D17A4D6A-4CAA-4470-8A19-F42463C021FD}.Debug|x86.ActiveCfg = Debug|x86 474 {D17A4D6A-4CAA-4470-8A19-F42463C021FD}.Debug|x86.Build.0 = Debug|x86 475 475 {D17A4D6A-4CAA-4470-8A19-F42463C021FD}.Release|Any CPU.ActiveCfg = Release|Any CPU 476 476 {D17A4D6A-4CAA-4470-8A19-F42463C021FD}.Release|Any CPU.Build.0 = Release|Any CPU -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Common/3.3/HeuristicLab.Hive.Client.Common-3.3.csproj
r4107 r4121 57 57 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 58 58 <DebugSymbols>true</DebugSymbols> 59 <OutputPath>bin\ x86\Debug\</OutputPath>59 <OutputPath>bin\Debug\</OutputPath> 60 60 <DefineConstants>DEBUG;TRACE</DefineConstants> 61 61 <DebugType>full</DebugType> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Communication/3.3/HeuristicLab.Hive.Client.Communication-3.3.csproj
r4111 r4121 41 41 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 42 42 <DebugSymbols>true</DebugSymbols> 43 <OutputPath>bin\ x86\Debug\</OutputPath>43 <OutputPath>bin\Debug\</OutputPath> 44 44 <DefineConstants>DEBUG;TRACE</DefineConstants> 45 45 <DebugType>full</DebugType> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Console/3.3/HeuristicLab.Hive.Client.Console-3.3.csproj
r4107 r4121 43 43 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 44 44 <DebugSymbols>true</DebugSymbols> 45 <OutputPath>bin\ x86\Debug\</OutputPath>45 <OutputPath>bin\Debug\</OutputPath> 46 46 <DefineConstants>DEBUG;TRACE</DefineConstants> 47 47 <DebugType>full</DebugType> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Core/3.3/Heartbeat.cs
r4119 r4121 84 84 wcfService.Connect(); 85 85 } 86 if (wcfService.ConnState == NetworkEnum.WcfConnState.Connected) { 87 wcfService.LoginSync(ConfigManager.Instance.GetClientInfo()); 88 } 86 89 87 90 ClientDto info = ConfigManager.Instance.GetClientInfo(); -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Core/3.3/HeuristicLab.Hive.Client.Core-3.3.csproj
r4119 r4121 41 41 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 42 42 <DebugSymbols>true</DebugSymbols> 43 <OutputPath>bin\ x86\Debug\</OutputPath>43 <OutputPath>bin\Debug\</OutputPath> 44 44 <DefineConstants>DEBUG;TRACE</DefineConstants> 45 45 <DebugType>full</DebugType> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Core/3.3/Properties/AssemblyInfo.cs
r4120 r4121 57 57 // by using the '*' as shown below: 58 58 // [assembly: AssemblyVersion("1.0.*")] 59 [assembly: AssemblyVersion("3.3.0.41 19")]60 [assembly: AssemblyFileVersion("3.3.0.41 19")]61 [assembly: AssemblyBuildDate("2010/07/ 29 16:49:03")]59 [assembly: AssemblyVersion("3.3.0.4120")] 60 [assembly: AssemblyFileVersion("3.3.0.4120")] 61 [assembly: AssemblyBuildDate("2010/07/30 13:39:23")] -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.ExecutionEngine/3.3/HeuristicLab.Hive.Client.ExecutionEngine-3.3.csproj
r4119 r4121 41 41 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 42 42 <DebugSymbols>true</DebugSymbols> 43 <OutputPath>bin\ x86\Debug\</OutputPath>43 <OutputPath>bin\Debug\</OutputPath> 44 44 <DefineConstants>DEBUG;TRACE</DefineConstants> 45 45 <DebugType>full</DebugType> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HeuristicLab.Hive.Contracts-3.3.csproj
r4077 r4121 41 41 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 42 42 <DebugSymbols>true</DebugSymbols> 43 <OutputPath>bin\ x86\Debug\</OutputPath>43 <OutputPath>bin\Debug\</OutputPath> 44 44 <DefineConstants>DEBUG;TRACE</DefineConstants> 45 45 <DebugType>full</DebugType> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/Interfaces/IExecutionEngineFacade.cs
r4042 r4121 39 39 ResponseObject<SerializedJob> GetLastSerializedResult(Guid jobId, bool requested, bool snapshot); 40 40 [OperationContract] 41 Response AbortJob(Guid jobId); 41 Response AbortJob(Guid jobId); 42 [OperationContract] 43 ResponseObject<JobDto> GetJobById(Guid jobId); 42 44 } 43 45 } -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/Interfaces/IJobManager.cs
r4042 r4121 66 66 ResponseList<JobDto> GetJobsByProject(Guid projectId); 67 67 [OperationContract] 68 ResponseObject<JobDto> AddJobWithGroupStrings(SerializedJob job, IEnumerable<string> resources); 68 ResponseObject<JobDto> AddJobWithGroupStrings(SerializedJob job, IEnumerable<string> resources); 69 69 } 70 70 } -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Engine/3.3/HeuristicLab.Hive.Engine-3.3.csproj
r4119 r4121 56 56 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 57 57 <DebugSymbols>true</DebugSymbols> 58 <OutputPath>bin\ x86\Debug\</OutputPath>58 <OutputPath>bin\Debug\</OutputPath> 59 59 <DefineConstants>DEBUG;TRACE</DefineConstants> 60 60 <DebugType>full</DebugType> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/HeuristicLab.Hive.Experiment.Views-3.3.csproj
r4120 r4121 73 73 <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath> 74 74 </Reference> 75 <Reference Include="HeuristicLab.DataAccess-3.3, Version=3.3.0.4091, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 76 <Reference Include="HeuristicLab.Hive.Experiment.Views-3.3, Version=3.3.0.4119, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 77 <Reference Include="HeuristicLab.Hive.Server.Console-3.3"> 78 <HintPath>..\..\HeuristicLab.Hive.Server.Console\3.3\obj\Debug\HeuristicLab.Hive.Server.Console-3.3.dll</HintPath> 75 <Reference Include="HeuristicLab.DataAccess-3.3, Version=3.3.0.4091, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 76 <SpecificVersion>False</SpecificVersion> 79 77 </Reference> 80 78 <Reference Include="HeuristicLab.MainForm-3.3"> … … 93 91 <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Optimization.Views-3.3.dll</HintPath> 94 92 </Reference> 95 <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 93 <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 94 <SpecificVersion>False</SpecificVersion> 95 </Reference> 96 96 <Reference Include="HeuristicLab.PluginInfrastructure-3.3"> 97 97 <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath> … … 107 107 </ItemGroup> 108 108 <ItemGroup> 109 <Compile Include="ControlExtensions.cs" /> 109 110 <Compile Include="HeuristicLabHiveExperimentViewsPlugin.cs" /> 110 111 <Compile Include="HiveExperimentView.cs"> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/HeuristicLabHiveExperimentViewsPlugin.cs
r4116 r4121 28 28 [Plugin("HeuristicLab.Hive.Experiment.Views", "3.3")] 29 29 [PluginFile("HeuristicLab.Hive.Experiment.Views-3.3.dll", PluginFileType.Assembly)] 30 [PluginDependency("HeuristicLab.Collections", "3.3")] 30 31 [PluginDependency("HeuristicLab.Common", "3.3")] 32 [PluginDependency("HeuristicLab.Common.Resources", "3.3")] 31 33 [PluginDependency("HeuristicLab.Core", "3.3")] 32 34 [PluginDependency("HeuristicLab.Core.Views", "3.3")] 35 [PluginDependency("HeuristicLab.Data", "3.3")] 36 [PluginDependency("HeuristicLab.DataAccess", "3.3")] 37 [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")] 38 [PluginDependency("HeuristicLab.Hive.Experiment", "3.3")] 39 [PluginDependency("HeuristicLab.Hive.JobBase", "3.3")] 33 40 [PluginDependency("HeuristicLab.MainForm", "3.3")] 34 [PluginDependency("HeuristicLab.Hive.Experiment", "3.3")] 41 [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")] 42 [PluginDependency("HeuristicLab.Operators.Views", "3.3")] 43 [PluginDependency("HeuristicLab.Optimization", "3.3")] 44 [PluginDependency("HeuristicLab.Optimization.Views", "3.3")] 45 [PluginDependency("HeuristicLab.Persistence", "3.3")] 35 46 public class HeuristicLabHiveExperimentViewsPlugin : PluginBase { 36 47 -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/JobItemListView.cs
r4120 r4121 22 22 InitializeComponent(); 23 23 itemsGroupBox.Text = "Jobs"; 24 //this.ReadOnly = true;24 this.viewHost.ReadOnly = true; 25 25 } 26 26 -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/JobItemView.Designer.cs
r4120 r4121 52 52 this.dateCalculatedText = new System.Windows.Forms.TextBox(); 53 53 this.dateCalculatedLabel = new System.Windows.Forms.Label(); 54 this.jobStatusGroupBox = new System.Windows.Forms.GroupBox(); 55 this.percentageProgressBar = new System.Windows.Forms.ProgressBar(); 54 56 this.snapshotGroupBox.SuspendLayout(); 57 this.jobStatusGroupBox.SuspendLayout(); 55 58 this.SuspendLayout(); 56 59 // … … 58 61 // 59 62 this.stateLabel.AutoSize = true; 60 this.stateLabel.Location = new System.Drawing.Point( 4, 4);63 this.stateLabel.Location = new System.Drawing.Point(7, 19); 61 64 this.stateLabel.Name = "stateLabel"; 62 65 this.stateLabel.Size = new System.Drawing.Size(35, 13); … … 67 70 // 68 71 this.userIdLabel.AutoSize = true; 69 this.userIdLabel.Location = new System.Drawing.Point(4, 26);72 this.userIdLabel.Location = new System.Drawing.Point(4, 3); 70 73 this.userIdLabel.Name = "userIdLabel"; 71 74 this.userIdLabel.Size = new System.Drawing.Size(41, 13); … … 77 80 this.stateTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 78 81 | System.Windows.Forms.AnchorStyles.Right))); 79 this.stateTextBox.Location = new System.Drawing.Point(9 2, 4);82 this.stateTextBox.Location = new System.Drawing.Point(95, 19); 80 83 this.stateTextBox.Name = "stateTextBox"; 81 this.stateTextBox.Size = new System.Drawing.Size(3 19, 20);84 this.stateTextBox.Size = new System.Drawing.Size(395, 20); 82 85 this.stateTextBox.TabIndex = 2; 83 86 // … … 86 89 this.userIdTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 87 90 | System.Windows.Forms.AnchorStyles.Right))); 88 this.userIdTextBox.Location = new System.Drawing.Point(92, 26);91 this.userIdTextBox.Location = new System.Drawing.Point(92, 3); 89 92 this.userIdTextBox.Name = "userIdTextBox"; 90 this.userIdTextBox.Size = new System.Drawing.Size( 319, 20);93 this.userIdTextBox.Size = new System.Drawing.Size(411, 20); 91 94 this.userIdTextBox.TabIndex = 3; 92 95 // 93 96 // percentageTextBox 94 97 // 95 this.percentageTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 96 | System.Windows.Forms.AnchorStyles.Right))); 97 this.percentageTextBox.Location = new System.Drawing.Point(92, 48); 98 this.percentageTextBox.Location = new System.Drawing.Point(95, 41); 98 99 this.percentageTextBox.Name = "percentageTextBox"; 99 this.percentageTextBox.Size = new System.Drawing.Size( 319, 20);100 this.percentageTextBox.Size = new System.Drawing.Size(52, 20); 100 101 this.percentageTextBox.TabIndex = 4; 101 102 // … … 104 105 this.dateCreatedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 105 106 | System.Windows.Forms.AnchorStyles.Right))); 106 this.dateCreatedTextBox.Location = new System.Drawing.Point(9 2, 70);107 this.dateCreatedTextBox.Location = new System.Drawing.Point(95, 63); 107 108 this.dateCreatedTextBox.Name = "dateCreatedTextBox"; 108 this.dateCreatedTextBox.Size = new System.Drawing.Size(3 19, 20);109 this.dateCreatedTextBox.Size = new System.Drawing.Size(395, 20); 109 110 this.dateCreatedTextBox.TabIndex = 5; 110 111 // … … 113 114 this.dateFinishedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 114 115 | System.Windows.Forms.AnchorStyles.Right))); 115 this.dateFinishedTextBox.Location = new System.Drawing.Point(9 2, 114);116 this.dateFinishedTextBox.Location = new System.Drawing.Point(95, 107); 116 117 this.dateFinishedTextBox.Name = "dateFinishedTextBox"; 117 this.dateFinishedTextBox.Size = new System.Drawing.Size(3 19, 20);118 this.dateFinishedTextBox.Size = new System.Drawing.Size(395, 20); 118 119 this.dateFinishedTextBox.TabIndex = 6; 119 120 // … … 122 123 this.priorityTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 123 124 | System.Windows.Forms.AnchorStyles.Right))); 124 this.priorityTextBox.Location = new System.Drawing.Point(92, 136);125 this.priorityTextBox.Location = new System.Drawing.Point(92, 25); 125 126 this.priorityTextBox.Name = "priorityTextBox"; 126 this.priorityTextBox.Size = new System.Drawing.Size( 319, 20);127 this.priorityTextBox.Size = new System.Drawing.Size(411, 20); 127 128 this.priorityTextBox.TabIndex = 7; 128 129 // … … 131 132 this.coresNeededTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 132 133 | System.Windows.Forms.AnchorStyles.Right))); 133 this.coresNeededTextBox.Location = new System.Drawing.Point(92, 158);134 this.coresNeededTextBox.Location = new System.Drawing.Point(92, 47); 134 135 this.coresNeededTextBox.Name = "coresNeededTextBox"; 135 this.coresNeededTextBox.Size = new System.Drawing.Size( 319, 20);136 this.coresNeededTextBox.Size = new System.Drawing.Size(411, 20); 136 137 this.coresNeededTextBox.TabIndex = 8; 137 138 // … … 140 141 this.memoryNeededTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 141 142 | System.Windows.Forms.AnchorStyles.Right))); 142 this.memoryNeededTextBox.Location = new System.Drawing.Point(92, 180);143 this.memoryNeededTextBox.Location = new System.Drawing.Point(92, 69); 143 144 this.memoryNeededTextBox.Name = "memoryNeededTextBox"; 144 this.memoryNeededTextBox.Size = new System.Drawing.Size( 319, 20);145 this.memoryNeededTextBox.Size = new System.Drawing.Size(411, 20); 145 146 this.memoryNeededTextBox.TabIndex = 9; 146 147 // … … 149 150 this.pluginsNeededTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 150 151 | System.Windows.Forms.AnchorStyles.Right))); 151 this.pluginsNeededTextBox.Location = new System.Drawing.Point(92, 202);152 this.pluginsNeededTextBox.Location = new System.Drawing.Point(92, 91); 152 153 this.pluginsNeededTextBox.Name = "pluginsNeededTextBox"; 153 this.pluginsNeededTextBox.Size = new System.Drawing.Size( 319, 20);154 this.pluginsNeededTextBox.Size = new System.Drawing.Size(411, 20); 154 155 this.pluginsNeededTextBox.TabIndex = 10; 155 156 // … … 158 159 this.projectTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 159 160 | System.Windows.Forms.AnchorStyles.Right))); 160 this.projectTextBox.Location = new System.Drawing.Point(92, 224);161 this.projectTextBox.Location = new System.Drawing.Point(92, 113); 161 162 this.projectTextBox.Name = "projectTextBox"; 162 this.projectTextBox.Size = new System.Drawing.Size( 319, 20);163 this.projectTextBox.Size = new System.Drawing.Size(411, 20); 163 164 this.projectTextBox.TabIndex = 11; 164 165 // … … 166 167 // 167 168 this.percentageLabel.AutoSize = true; 168 this.percentageLabel.Location = new System.Drawing.Point( 4, 48);169 this.percentageLabel.Location = new System.Drawing.Point(7, 41); 169 170 this.percentageLabel.Name = "percentageLabel"; 170 171 this.percentageLabel.Size = new System.Drawing.Size(65, 13); … … 175 176 // 176 177 this.dateCreatedLabel.AutoSize = true; 177 this.dateCreatedLabel.Location = new System.Drawing.Point( 4, 70);178 this.dateCreatedLabel.Location = new System.Drawing.Point(7, 63); 178 179 this.dateCreatedLabel.Name = "dateCreatedLabel"; 179 180 this.dateCreatedLabel.Size = new System.Drawing.Size(70, 13); … … 184 185 // 185 186 this.dateFinishedLabel.AutoSize = true; 186 this.dateFinishedLabel.Location = new System.Drawing.Point( 4, 114);187 this.dateFinishedLabel.Location = new System.Drawing.Point(7, 107); 187 188 this.dateFinishedLabel.Name = "dateFinishedLabel"; 188 189 this.dateFinishedLabel.Size = new System.Drawing.Size(72, 13); … … 193 194 // 194 195 this.priorityLabel.AutoSize = true; 195 this.priorityLabel.Location = new System.Drawing.Point(4, 136);196 this.priorityLabel.Location = new System.Drawing.Point(4, 25); 196 197 this.priorityLabel.Name = "priorityLabel"; 197 198 this.priorityLabel.Size = new System.Drawing.Size(41, 13); … … 202 203 // 203 204 this.coresNeededLabel.AutoSize = true; 204 this.coresNeededLabel.Location = new System.Drawing.Point(4, 158);205 this.coresNeededLabel.Location = new System.Drawing.Point(4, 47); 205 206 this.coresNeededLabel.Name = "coresNeededLabel"; 206 207 this.coresNeededLabel.Size = new System.Drawing.Size(75, 13); … … 211 212 // 212 213 this.memoryNeededLabel.AutoSize = true; 213 this.memoryNeededLabel.Location = new System.Drawing.Point(4, 180);214 this.memoryNeededLabel.Location = new System.Drawing.Point(4, 69); 214 215 this.memoryNeededLabel.Name = "memoryNeededLabel"; 215 216 this.memoryNeededLabel.Size = new System.Drawing.Size(85, 13); … … 220 221 // 221 222 this.pluginsNeededLabel.AutoSize = true; 222 this.pluginsNeededLabel.Location = new System.Drawing.Point(4, 202);223 this.pluginsNeededLabel.Location = new System.Drawing.Point(4, 91); 223 224 this.pluginsNeededLabel.Name = "pluginsNeededLabel"; 224 225 this.pluginsNeededLabel.Size = new System.Drawing.Size(82, 13); … … 229 230 // 230 231 this.projectLabel.AutoSize = true; 231 this.projectLabel.Location = new System.Drawing.Point(4, 224);232 this.projectLabel.Location = new System.Drawing.Point(4, 113); 232 233 this.projectLabel.Name = "projectLabel"; 233 234 this.projectLabel.Size = new System.Drawing.Size(43, 13); … … 244 245 this.snapshotGroupBox.Controls.Add(this.snapshotTimeLabel); 245 246 this.snapshotGroupBox.Controls.Add(this.snapshotStatusLabel); 246 this.snapshotGroupBox.Location = new System.Drawing.Point(7, 2 46);247 this.snapshotGroupBox.Location = new System.Drawing.Point(7, 279); 247 248 this.snapshotGroupBox.Name = "snapshotGroupBox"; 248 this.snapshotGroupBox.Size = new System.Drawing.Size(4 04, 100);249 this.snapshotGroupBox.Size = new System.Drawing.Size(496, 100); 249 250 this.snapshotGroupBox.TabIndex = 21; 250 251 this.snapshotGroupBox.TabStop = false; … … 254 255 // 255 256 this.openSnapshotButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); 256 this.openSnapshotButton.Location = new System.Drawing.Point( 297, 67);257 this.openSnapshotButton.Location = new System.Drawing.Point(389, 67); 257 258 this.openSnapshotButton.Name = "openSnapshotButton"; 258 259 this.openSnapshotButton.Size = new System.Drawing.Size(101, 26); … … 268 269 this.snapshotTimeText.Location = new System.Drawing.Point(45, 41); 269 270 this.snapshotTimeText.Name = "snapshotTimeText"; 270 this.snapshotTimeText.Size = new System.Drawing.Size( 353, 20);271 this.snapshotTimeText.Size = new System.Drawing.Size(445, 20); 271 272 this.snapshotTimeText.TabIndex = 24; 272 273 // … … 277 278 this.snapshotStatusText.Location = new System.Drawing.Point(45, 19); 278 279 this.snapshotStatusText.Name = "snapshotStatusText"; 279 this.snapshotStatusText.Size = new System.Drawing.Size( 353, 20);280 this.snapshotStatusText.Size = new System.Drawing.Size(445, 20); 280 281 this.snapshotStatusText.TabIndex = 23; 281 282 // … … 302 303 this.dateCalculatedText.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 303 304 | System.Windows.Forms.AnchorStyles.Right))); 304 this.dateCalculatedText.Location = new System.Drawing.Point(9 2, 92);305 this.dateCalculatedText.Location = new System.Drawing.Point(95, 85); 305 306 this.dateCalculatedText.Name = "dateCalculatedText"; 306 this.dateCalculatedText.Size = new System.Drawing.Size(3 19, 20);307 this.dateCalculatedText.Size = new System.Drawing.Size(395, 20); 307 308 this.dateCalculatedText.TabIndex = 22; 308 309 // … … 310 311 // 311 312 this.dateCalculatedLabel.AutoSize = true; 312 this.dateCalculatedLabel.Location = new System.Drawing.Point( 4, 92);313 this.dateCalculatedLabel.Location = new System.Drawing.Point(7, 85); 313 314 this.dateCalculatedLabel.Name = "dateCalculatedLabel"; 314 315 this.dateCalculatedLabel.Size = new System.Drawing.Size(83, 13); … … 316 317 this.dateCalculatedLabel.Text = "DateCalculated:"; 317 318 // 319 // jobStatusGroupBox 320 // 321 this.jobStatusGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 322 | System.Windows.Forms.AnchorStyles.Right))); 323 this.jobStatusGroupBox.Controls.Add(this.percentageProgressBar); 324 this.jobStatusGroupBox.Controls.Add(this.stateTextBox); 325 this.jobStatusGroupBox.Controls.Add(this.dateCalculatedLabel); 326 this.jobStatusGroupBox.Controls.Add(this.stateLabel); 327 this.jobStatusGroupBox.Controls.Add(this.dateCalculatedText); 328 this.jobStatusGroupBox.Controls.Add(this.dateFinishedTextBox); 329 this.jobStatusGroupBox.Controls.Add(this.percentageTextBox); 330 this.jobStatusGroupBox.Controls.Add(this.dateCreatedTextBox); 331 this.jobStatusGroupBox.Controls.Add(this.percentageLabel); 332 this.jobStatusGroupBox.Controls.Add(this.dateCreatedLabel); 333 this.jobStatusGroupBox.Controls.Add(this.dateFinishedLabel); 334 this.jobStatusGroupBox.Location = new System.Drawing.Point(7, 139); 335 this.jobStatusGroupBox.Name = "jobStatusGroupBox"; 336 this.jobStatusGroupBox.Size = new System.Drawing.Size(496, 134); 337 this.jobStatusGroupBox.TabIndex = 24; 338 this.jobStatusGroupBox.TabStop = false; 339 this.jobStatusGroupBox.Text = "Job Status"; 340 // 341 // percentageProgressBar 342 // 343 this.percentageProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 344 | System.Windows.Forms.AnchorStyles.Right))); 345 this.percentageProgressBar.Location = new System.Drawing.Point(153, 41); 346 this.percentageProgressBar.Name = "percentageProgressBar"; 347 this.percentageProgressBar.Size = new System.Drawing.Size(337, 20); 348 this.percentageProgressBar.TabIndex = 25; 349 // 318 350 // JobItemView 319 351 // 320 352 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 321 353 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 322 this.Controls.Add(this.dateCalculatedLabel); 323 this.Controls.Add(this.dateCalculatedText); 354 this.Controls.Add(this.jobStatusGroupBox); 324 355 this.Controls.Add(this.snapshotGroupBox); 325 356 this.Controls.Add(this.projectLabel); … … 328 359 this.Controls.Add(this.coresNeededLabel); 329 360 this.Controls.Add(this.priorityLabel); 330 this.Controls.Add(this.dateFinishedLabel);331 this.Controls.Add(this.dateCreatedLabel);332 this.Controls.Add(this.percentageLabel);333 361 this.Controls.Add(this.projectTextBox); 334 362 this.Controls.Add(this.pluginsNeededTextBox); … … 336 364 this.Controls.Add(this.coresNeededTextBox); 337 365 this.Controls.Add(this.priorityTextBox); 338 this.Controls.Add(this.dateFinishedTextBox);339 this.Controls.Add(this.dateCreatedTextBox);340 this.Controls.Add(this.percentageTextBox);341 366 this.Controls.Add(this.userIdTextBox); 342 this.Controls.Add(this.stateTextBox);343 367 this.Controls.Add(this.userIdLabel); 344 this.Controls.Add(this.stateLabel);345 368 this.Name = "JobItemView"; 346 this.Size = new System.Drawing.Size( 414, 417);369 this.Size = new System.Drawing.Size(506, 409); 347 370 this.snapshotGroupBox.ResumeLayout(false); 348 371 this.snapshotGroupBox.PerformLayout(); 372 this.jobStatusGroupBox.ResumeLayout(false); 373 this.jobStatusGroupBox.PerformLayout(); 349 374 this.ResumeLayout(false); 350 375 this.PerformLayout(); … … 382 407 private System.Windows.Forms.TextBox dateCalculatedText; 383 408 private System.Windows.Forms.Label dateCalculatedLabel; 409 private System.Windows.Forms.GroupBox jobStatusGroupBox; 410 private System.Windows.Forms.ProgressBar percentageProgressBar; 384 411 } 385 412 } -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/JobItemView.cs
r4120 r4121 34 34 base.OnContentChanged(); 35 35 if (Content != null) { 36 Content_JobDtoChanged(this, EventArgs.Empty); 37 if (Content.LatestSnapshot != null) { 38 snapshotStatusText.InvokeIfRequired(c => c.Text = Content.LatestSnapshot.StatusMessage); 39 snapshotTimeText.InvokeIfRequired(c => { c.Text = Content.LatestSnapshotTime.ToString(); }); 40 } 41 } 42 } 43 44 protected override void RegisterContentEvents() { 45 base.RegisterContentEvents(); 46 Content.LatestSnapshotChanged += new EventHandler(Content_LatestSnapshotChanged); 47 Content.JobDtoChanged += new EventHandler(Content_JobDtoChanged); 48 } 49 50 protected override void DeregisterContentEvents() { 51 Content.LatestSnapshotChanged -= new EventHandler(Content_LatestSnapshotChanged); 52 Content.JobDtoChanged -= new EventHandler(Content_JobDtoChanged); 53 base.DeregisterContentEvents(); 54 } 55 56 void Content_JobDtoChanged(object sender, EventArgs e) { 57 if (InvokeRequired) { 58 Invoke(new EventHandler(Content_JobDtoChanged), sender, e); 59 } else { 36 60 this.stateTextBox.Text = Content.JobDto.State.ToString(); 37 61 this.userIdTextBox.Text = Content.JobDto.UserId.ToString(); 38 this.percentageTextBox.Text = Content.JobDto.Percentage.ToString(); 62 this.percentageTextBox.Text = (Content.JobDto.Percentage*100).ToString() + "%"; 63 this.percentageProgressBar.Value = Convert.ToInt32(Content.JobDto.Percentage * percentageProgressBar.Maximum); 39 64 this.dateCreatedTextBox.Text = Content.JobDto.DateCreated.ToString(); 40 65 this.dateCalculatedText.Text = Content.JobDto.DateCalculated.ToString(); … … 45 70 this.pluginsNeededTextBox.Text = string.Join(", ", Content.JobDto.PluginsNeeded.Select(x => x.Name + "-" + x.Version).ToArray()); 46 71 this.projectTextBox.Text = Content.JobDto.Project != null ? Content.JobDto.Project.Name : "-"; 72 } 73 } 74 75 void Content_LatestSnapshotChanged(object sender, EventArgs e) { 76 if (InvokeRequired) { 77 Invoke(new EventHandler(Content_LatestSnapshotChanged), sender, e); 78 } else { 47 79 if (Content.LatestSnapshot != null) { 48 80 snapshotStatusText.Text = Content.LatestSnapshot.StatusMessage; 49 81 snapshotTimeText.Text = Content.LatestSnapshotTime.ToString(); 82 } else { 83 snapshotStatusText.Text = ""; 84 snapshotTimeText.Text = ""; 50 85 } 86 SetEnabledStateOfControls(); 51 87 } 52 }53 54 protected override void RegisterContentEvents() {55 base.RegisterContentEvents();56 Content.LatestSnapshotChanged += new EventHandler(Content_LatestSnapshotChanged);57 }58 59 protected override void DeregisterContentEvents() {60 Content.LatestSnapshotChanged -= new EventHandler(Content_LatestSnapshotChanged);61 base.DeregisterContentEvents();62 }63 64 void Content_LatestSnapshotChanged(object sender, EventArgs e) {65 if (Content.LatestSnapshot != null) {66 snapshotStatusText.Text = Content.LatestSnapshot.StatusMessage;67 snapshotTimeText.Text = Content.LatestSnapshotTime.ToString();68 } else {69 snapshotStatusText.Text = "";70 snapshotTimeText.Text = "";71 }72 SetEnabledStateOfControls();73 88 } 74 89 … … 76 91 base.SetEnabledStateOfControls(); 77 92 openSnapshotButton.Enabled = Content != null && Content.LatestSnapshot != null; 93 this.stateTextBox.ReadOnly = this.ReadOnly; 94 this.userIdTextBox.ReadOnly = this.ReadOnly; 95 this.percentageTextBox.ReadOnly = this.ReadOnly; 96 this.dateCreatedTextBox.ReadOnly = this.ReadOnly; 97 this.dateCalculatedText.ReadOnly = this.ReadOnly; 98 this.dateFinishedTextBox.ReadOnly = this.ReadOnly; 99 this.priorityTextBox.ReadOnly = this.ReadOnly; 100 this.coresNeededTextBox.ReadOnly = this.ReadOnly; 101 this.memoryNeededTextBox.ReadOnly = this.ReadOnly; 102 this.pluginsNeededTextBox.ReadOnly = this.ReadOnly; 103 this.projectTextBox.ReadOnly = this.ReadOnly; 104 this.snapshotStatusText.ReadOnly = this.ReadOnly; 105 this.snapshotTimeText.ReadOnly = this.ReadOnly; 78 106 } 79 107 -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/JobItemView.resx
r4120 r4121 118 118 <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 119 119 </resheader> 120 <metadata name="stateTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">121 <value>True</value>122 </metadata>123 <metadata name="userIdTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">124 <value>True</value>125 </metadata>126 <metadata name="percentageTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">127 <value>True</value>128 </metadata>129 <metadata name="dateCreatedTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">130 <value>True</value>131 </metadata>132 <metadata name="dateFinishedTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">133 <value>True</value>134 </metadata>135 <metadata name="priorityTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">136 <value>True</value>137 </metadata>138 <metadata name="coresNeededTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">139 <value>True</value>140 </metadata>141 <metadata name="memoryNeededTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">142 <value>True</value>143 </metadata>144 <metadata name="pluginsNeededTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">145 <value>True</value>146 </metadata>147 <metadata name="projectTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">148 <value>True</value>149 </metadata>150 <metadata name="snapshotStatusText.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">151 <value>True</value>152 </metadata>153 <metadata name="dateCalculatedText.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">154 <value>True</value>155 </metadata>156 120 </root> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/Properties/AssemblyInfo.cs
r4120 r4121 55 55 // You can specify all the values or you can default the Revision and Build Numbers 56 56 // by using the '*' as shown below: 57 [assembly: AssemblyVersion("3.3.0.41 19")]58 [assembly: AssemblyFileVersion("3.3.0.41 19")]59 [assembly: AssemblyBuildDate("2010/07/ 29 16:49:22")]57 [assembly: AssemblyVersion("3.3.0.4120")] 58 [assembly: AssemblyFileVersion("3.3.0.4120")] 59 [assembly: AssemblyBuildDate("2010/07/30 13:39:18")] -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HeuristicLabHiveExperimentPlugin.cs
r4116 r4121 31 31 [Plugin("HeuristicLab.Hive.Experiment", "3.3")] 32 32 [PluginFile("HeuristicLab.Hive.Experiment-3.3.dll", PluginFileType.Assembly)] 33 [PluginDependency("HeuristicLab.Collections", "3.3")] 33 34 [PluginDependency("HeuristicLab.Common", "3.3")] 35 [PluginDependency("HeuristicLab.Common.Resources", "3.3")] 34 36 [PluginDependency("HeuristicLab.Core", "3.3")] 35 37 [PluginDependency("HeuristicLab.Core.Views", "3.3")] 38 [PluginDependency("HeuristicLab.Data", "3.3")] 39 [PluginDependency("HeuristicLab.DataAccess", "3.3")] 40 [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")] 41 [PluginDependency("HeuristicLab.Hive.JobBase", "3.3")] 36 42 [PluginDependency("HeuristicLab.Optimization", "3.3")] 37 43 [PluginDependency("HeuristicLab.Persistence", "3.3")] 38 [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")] 39 [PluginDependency("HeuristicLab.Hive.JobBase", "3.3")] 44 [PluginDependency("HeuristicLab.Tracing", "3.3")] 40 45 public class HeuristicLabHiveExperimentPlugin : PluginBase { 41 46 -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs
r4120 r4121 52 52 private const string itemName = "Hive Experiment"; 53 53 private const string itemDescription = "An experiment which contains multiple batch runs of algorithms which are executed in the Hive."; 54 private const int resultPollingIntervalMs = 1 0000;54 private const int resultPollingIntervalMs = 15000; 55 55 56 56 private object locker = new object(); … … 128 128 129 129 public override IDeepCloneable Clone(Cloner cloner) { 130 log.LogMessage("I am beeing cloned");130 LogMessage("I am beeing cloned"); 131 131 HiveExperiment clone = (HiveExperiment)base.Clone(cloner); 132 132 clone.resourceIds = this.resourceIds; … … 148 148 private void AfterDeserialization() { 149 149 InitTimer(); 150 log.LogMessage("I was deserialized.");150 LogMessage("I was deserialized."); 151 151 } 152 152 … … 224 224 ResponseObject<JobDto> response = executionEngineFacade.AddJobWithGroupStrings(serializedJob, groups); 225 225 pendingOptimizers.Add(response.Obj.Id, optimizer); 226 StartResultPollingThread(response.Obj);227 226 228 227 JobItem jobItem = new JobItem() { … … 236 235 jobItems.Add(jobItem); 237 236 238 log.LogMessage("Sent job to server (jobId: " + response.Obj.Id + ")"); 237 LogMessage("Sent job to server (jobId: " + response.Obj.Id + ")"); 238 } 239 240 // start results polling after sending sending the jobs to the server (to avoid race conflicts at the optimizers-collection) 241 foreach (JobItem jobItem in jobItems) { 242 StartResultPollingThread(jobItem.JobDto); 239 243 } 240 244 }); … … 256 260 257 261 private void ReplaceOptimizer(IOptimizer originalOptimizer, IOptimizer newOptimizer) { 258 int originalOptimizerIndex = experiment.Optimizers.IndexOf(originalOptimizer); 259 experiment.Optimizers[originalOptimizerIndex] = newOptimizer; 262 lock (locker) { 263 int originalOptimizerIndex = experiment.Optimizers.IndexOf(originalOptimizer); 264 experiment.Optimizers[originalOptimizerIndex] = newOptimizer; 265 } 260 266 } 261 267 … … 308 314 do { 309 315 Thread.Sleep(resultPollingIntervalMs); 310 lock (locker) {316 //lock (locker) { [chn] try without locking for better performance 311 317 if (stopPending) return; 312 313 ResponseObject<SerializedJob> response = executionEngineFacade.GetLastSerializedResult(job.Id, false, false); 314 log.LogMessage("Received response for job: " + response.StatusMessage + " (jobId: " + job.Id + ")"); 315 318 319 ResponseObject<JobDto> response = executionEngineFacade.GetJobById(job.Id); 320 LogMessage("Response: " + response.StatusMessage + " (jobId: " + job.Id + ")"); 321 322 if (response.Obj != null) { 323 UpdateJobItem(response.Obj); 324 } 316 325 317 326 // loop while … … 320 329 // 3. no result for the job is available yet (response.Obj==null) 321 330 // 4. the result that we get from the server is a snapshot and not the final result 322 if (response.Success && response.Obj != null && response.StatusMessage != ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE) { 323 restoredObject = XmlParser.Deserialize<IJob>(new MemoryStream(response.Obj.SerializedJobData)); 331 if (response.Success && response.Obj != null && response.Obj.State == State.Finished) { 332 ResponseObject<SerializedJob> jobResponse = executionEngineFacade.GetLastSerializedResult(job.Id, false, false); 333 restoredObject = XmlParser.Deserialize<IJob>(new MemoryStream(jobResponse.Obj.SerializedJobData)); 334 UpdateSnapshot(jobResponse); 324 335 } 325 }336 //} 326 337 } while (restoredObject == null || restoredObject.ExecutionState != Core.ExecutionState.Stopped); 327 338 328 log.LogMessage("Job finished (jobId: " + job.Id + ")");339 LogMessage("Job finished (jobId: " + job.Id + ")"); 329 340 // job retrieved... replace the existing optimizers with the finished one 330 341 IOptimizer originalOptimizer = pendingOptimizers[job.Id]; … … 340 351 } 341 352 }); 342 343 Logger.Debug("HiveEngine: Starting results-polling thread");344 353 t.Start(); 354 } 355 356 private void UpdateJobItem(JobDto jobDto) { 357 JobItem jobItem = jobItems.Single(x => x.JobDto.Id == jobDto.Id); 358 jobItem.JobDto = jobDto; 359 } 360 361 private void UpdateSnapshot(ResponseObject<SerializedJob> response) { 362 JobItem jobItem = jobItems.Single(x => x.JobDto.Id == response.Obj.JobInfo.Id); 363 jobItem.LatestSnapshot = response; 364 } 365 366 private void LogMessage(string message) { 367 // HeuristicLab.Log is not Thread-Safe, so lock every call 368 lock (locker) { 369 log.LogMessage(message); 370 } 345 371 } 346 372 … … 440 466 public event EventHandler ExecutionStateChanged; 441 467 private void OnExecutionStateChanged() { 442 log.LogMessage("ExecutionState changed to " + executionState.ToString());468 LogMessage("ExecutionState changed to " + executionState.ToString()); 443 469 EventHandler handler = ExecutionStateChanged; 444 470 if (handler != null) handler(this, EventArgs.Empty); … … 449 475 public event EventHandler Started; 450 476 private void OnStarted() { 451 log.LogMessage("Started");477 LogMessage("Started"); 452 478 timer.Start(); 453 479 EventHandler handler = Started; … … 458 484 private void OnStopped() { 459 485 timer.Stop(); 460 log.LogMessage("Stopped");486 LogMessage("Stopped"); 461 487 EventHandler handler = Stopped; 462 488 if (handler != null) handler(this, EventArgs.Empty); … … 466 492 private void OnPaused() { 467 493 timer.Stop(); 468 log.LogMessage("Paused");494 LogMessage("Paused"); 469 495 EventHandler handler = Paused; 470 496 if (handler != null) handler(this, EventArgs.Empty); … … 473 499 public event EventHandler Prepared; 474 500 protected virtual void OnPrepared() { 475 log.LogMessage("Prepared");501 LogMessage("Prepared"); 476 502 EventHandler handler = Prepared; 477 503 if (handler != null) handler(this, EventArgs.Empty); … … 486 512 public event EventHandler ExperimentChanged; 487 513 protected virtual void OnExperimentChanged() { 488 log.LogMessage("Experiment changed");514 LogMessage("Experiment changed"); 489 515 EventHandler handler = ExperimentChanged; 490 516 if (handler != null) handler(this, EventArgs.Empty); -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/JobItem.cs
r4120 r4121 7 7 using HeuristicLab.Hive.Contracts.BusinessObjects; 8 8 using HeuristicLab.Hive.Contracts; 9 using System.Drawing; 9 10 10 11 namespace HeuristicLab.Hive.Experiment { 11 12 public class JobItem : Item { 13 public override Image ItemImage { 14 get { 15 if (jobDto.State == State.Offline) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped; 16 else if (jobDto.State == State.Idle) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped; 17 else if (jobDto.State == State.Calculating) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStarted; 18 else if (jobDto.State == State.Offline) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped; 19 else return HeuristicLab.Common.Resources.VS2008ImageLibrary.Event; 20 } 21 } 22 12 23 [Storable] 13 24 private JobDto jobDto; … … 17 28 if (jobDto != value) { 18 29 jobDto = value; 30 OnJobDtoChanged(); 19 31 OnToStringChanged(); 32 OnItemImageChanged(); 20 33 } 21 34 } … … 41 54 } 42 55 56 [Storable] 57 private ILog log; 58 public ILog Log { 59 get { return log; } 60 } 61 43 62 public JobItem() { 63 log = new Log(); 44 64 } 45 65 … … 57 77 if (handler != null) handler(this, EventArgs.Empty); 58 78 } 79 80 public event EventHandler JobDtoChanged; 81 private void OnJobDtoChanged() { 82 EventHandler handler = JobDtoChanged; 83 if (handler != null) handler(this, EventArgs.Empty); 84 } 59 85 } 60 86 } -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/Properties/AssemblyInfo.cs
r4120 r4121 55 55 // You can specify all the values or you can default the Revision and Build Numbers 56 56 // by using the '*' as shown below: 57 [assembly: AssemblyVersion("3.3.0.41 19")]58 [assembly: AssemblyFileVersion("3.3.0.41 19")]59 [assembly: AssemblyBuildDate("2010/07/ 29 16:49:01")]57 [assembly: AssemblyVersion("3.3.0.4120")] 58 [assembly: AssemblyFileVersion("3.3.0.4120")] 59 [assembly: AssemblyBuildDate("2010/07/30 13:39:10")] -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.JobBase/3.3/HeuristicLab.Hive.JobBase-3.3.csproj
r4120 r4121 56 56 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 57 57 <DebugSymbols>true</DebugSymbols> 58 <OutputPath>bin\ x86\Debug\</OutputPath>58 <OutputPath>bin\Debug\</OutputPath> 59 59 <DefineConstants>DEBUG;TRACE</DefineConstants> 60 60 <DebugType>full</DebugType> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.JobBase/3.3/JobPlugin.cs
r4111 r4121 8 8 [Plugin("HeuristicLab.Hive.JobBase", "3.3")] 9 9 [PluginFile("HeuristicLab.Hive.JobBase-3.3.dll", PluginFileType.Assembly)] 10 [PluginDependency("HeuristicLab.Collections", "3.3")] 11 [PluginDependency("HeuristicLab.Common", "3.3")] 10 12 [PluginDependency("HeuristicLab.Core", "3.3")] 11 [PluginDependency("HeuristicLab.Common", "3.3")]12 13 [PluginDependency("HeuristicLab.Persistence", "3.3")] 13 14 public class JobBasePlugin: PluginBase { -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HeuristicLab.Hive.Server.Console-3.3.csproj
r4107 r4121 43 43 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 44 44 <DebugSymbols>true</DebugSymbols> 45 <OutputPath>bin\ x86\Debug\</OutputPath>45 <OutputPath>bin\Debug\</OutputPath> 46 46 <DefineConstants>DEBUG;TRACE</DefineConstants> 47 47 <DebugType>full</DebugType> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/JobDataFetcher.cs
r4120 r4121 8 8 using System.Collections; 9 9 using System.Threading; 10 using HeuristicLab.Hive.Contracts.Interfaces; 10 11 11 12 namespace HeuristicLab.Hive.Server.ServerConsole { … … 15 16 public IEnumerable<State> PollStates { 16 17 get { return pollStates; } 17 } 18 } 18 19 19 20 public event EventHandler NewDataAvailable; … … 24 25 25 26 public List<JobDto> CachedJobs { get; set; } 27 28 private IJobManager jobManager; 26 29 27 30 public double Interval { … … 36 39 } 37 40 set { 38 Console.WriteLine("Setting for " + PollStates + " changed to: " + value); 39 _nrOfEntriesOnPage = value; 41 Console.WriteLine("Setting for " + PollStates + " changed to: " + value); 42 _nrOfEntriesOnPage = value; 40 43 Thread t = new Thread(new ThreadStart(DoUpdateRun)); 41 t.Start(); 44 t.Start(); 42 45 } 43 } 46 } 44 47 public int CurrentPage { get; set; } 45 48 … … 50 53 CurrentPage = 0; 51 54 pollStates.AddRange(states); 55 jobManager = ServiceLocator.GetJobManager(); 52 56 timer = new System.Timers.Timer(); 53 57 timer.Interval = 5000; 54 timer.Elapsed += new ElapsedEventHandler(Timer_Elapsed); 58 timer.Elapsed += new ElapsedEventHandler(Timer_Elapsed); 55 59 } 56 60 … … 67 71 CurrentPage--; 68 72 DoUpdateRun(); 69 } 73 } 70 74 71 75 private void Timer_Elapsed(object sender, ElapsedEventArgs e) { … … 77 81 // todo: make access to PollStates thread-safe! 78 82 // * added lock on locker -> didn't help 79 // * made public property PollStates an IEnumerable to be immutable -> lets see 80 lock (locker) { 81 foreach (State stat in PollStates) { 82 ResponseList<JobDto> resList = ServiceLocator.GetJobManager().GetAllJobsWithFilter(stat, CurrentPage * NrOfEntriesOnPage, 83 NrOfEntriesOnPage); 84 if (resList.Success) { 85 if (resList.List.Count == 0) { 86 if (CurrentPage > 0) { 87 CurrentPage--; 88 } 89 } else { 90 CachedJobs = new List<JobDto>(); 91 CachedJobs.AddRange(resList.List); 83 // * made public property PollStates an IEnumerable to be immutable -> didn't help 84 // * using for loop 85 86 State[] pollStatesCopy = PollStates.ToArray(); 87 for (int i = 0; i < pollStatesCopy.Length; i++) { 88 ResponseList<JobDto> resList = jobManager.GetAllJobsWithFilter(pollStatesCopy[i], CurrentPage * NrOfEntriesOnPage, NrOfEntriesOnPage); 89 if (resList.Success) { 90 if (resList.List.Count == 0) { 91 if (CurrentPage > 0) { 92 CurrentPage--; 92 93 } 94 } else { 95 CachedJobs = new List<JobDto>(); 96 CachedJobs.AddRange(resList.List); 93 97 } 94 98 } 95 if (NewDataAvailable != null) 96 NewDataAvailable(this, new EventArgs()); 99 } 100 if (NewDataAvailable != null) { 101 NewDataAvailable(this, new EventArgs()); 97 102 } 98 103 } -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/DefaultScheduler.cs
r4116 r4121 26 26 public bool ExistsJobForClient(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) { 27 27 List<JobDto> allOfflineJobsForClient = 28 new List<JobDto>(DaoLocator.JobDao.FindFittingJobsForClient(State.Offline, hbData.FreeCores, hbData.FreeMemory, 29 hbData.ClientId)); 28 new List<JobDto>(DaoLocator.JobDao.FindFittingJobsForClient(State.Offline, hbData.FreeCores, hbData.FreeMemory, hbData.ClientId)); 30 29 return (allOfflineJobsForClient != null && allOfflineJobsForClient.Count > 0); 31 30 } … … 38 37 ClientDto client = DaoLocator.ClientDao.FindById(clientId); 39 38 LinkedList<JobDto> allOfflineJobsForClient = 40 new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForClient(State.Offline, client.NrOfFreeCores, 41 client.FreeMemory, client.Id)); 39 new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForClient(State.Offline, client.NrOfFreeCores, client.FreeMemory, client.Id)); 42 40 if (allOfflineJobsForClient != null && allOfflineJobsForClient.Count > 0) { 43 41 jobToCalculate = allOfflineJobsForClient.First.Value; -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ExecutionEngineFacade.cs
r4120 r4121 64 64 } 65 65 66 public ResponseObject<JobDto> GetJobById(Guid jobId) { 67 using (contextFactory.GetContext()) { 68 return jobManager.GetJobById(jobId); 69 } 70 } 71 66 72 public Response AbortJob(Guid jobId) { 67 73 using (contextFactory.GetContext()) { … … 69 75 } 70 76 } 71 72 public ResponseObject<JobDto> GetJobById(Guid jobId) {73 using (contextFactory.GetContext()) {74 return jobManager.GetJobById(jobId);75 }76 }77 77 #endregion 78 78 } -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/HeuristicLab.Hive.Server.Core-3.3.csproj
r4092 r4121 41 41 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 42 42 <DebugSymbols>true</DebugSymbols> 43 <OutputPath>bin\ x86\Debug\</OutputPath>43 <OutputPath>bin\Debug\</OutputPath> 44 44 <DefineConstants>DEBUG;TRACE</DefineConstants> 45 45 <DebugType>full</DebugType> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/JobManager.cs
r4120 r4121 135 135 } 136 136 137 /// <summary> 138 /// Returns JobDto object with Client-Object attached 139 /// </summary> 137 140 public ResponseObject<JobDto> GetJobByIdWithDetails(Guid jobId) { 138 141 ResponseObject<JobDto> job = new ResponseObject<JobDto>(); … … 354 357 355 358 #endregion 359 356 360 } 357 361 } -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Properties/AssemblyInfo.cs
r4120 r4121 55 55 // by using the '*' as shown below: 56 56 // [assembly: AssemblyVersion("1.0.*")] 57 [assembly: AssemblyVersion("3.3.0.41 19")]58 [assembly: AssemblyFileVersion("3.3.0.41 19")]59 [assembly: AssemblyBuildDate("2010/07/ 29 16:49:08")]57 [assembly: AssemblyVersion("3.3.0.4120")] 58 [assembly: AssemblyFileVersion("3.3.0.4120")] 59 [assembly: AssemblyBuildDate("2010/07/30 13:39:26")] -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.DataAccess/3.3/HeuristicLab.Hive.Server.DataAccess-3.3.csproj
r4092 r4121 43 43 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 44 44 <DebugSymbols>true</DebugSymbols> 45 <OutputPath>bin\ x86\Debug\</OutputPath>45 <OutputPath>bin\Debug\</OutputPath> 46 46 <DefineConstants>DEBUG;TRACE</DefineConstants> 47 47 <DebugType>full</DebugType> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/HeuristicLab.Hive.Server.LINQDataAccess-3.3.csproj
r4092 r4121 42 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 43 43 <DebugSymbols>true</DebugSymbols> 44 <OutputPath>bin\ x86\Debug\</OutputPath>44 <OutputPath>bin\Debug\</OutputPath> 45 45 <DefineConstants>DEBUG;TRACE</DefineConstants> 46 46 <DebugType>full</DebugType> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Scheduler/3.3/HeuristicLab.Hive.Server.Scheduler-3.3.csproj
r4091 r4121 41 41 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 42 42 <DebugSymbols>true</DebugSymbols> 43 <OutputPath>bin\ x86\Debug\</OutputPath>43 <OutputPath>bin\Debug\</OutputPath> 44 44 <DefineConstants>DEBUG;TRACE</DefineConstants> 45 45 <DebugType>full</DebugType> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/HeuristicLab.Hive.Server-3.3.csproj
r4090 r4121 43 43 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 44 44 <DebugSymbols>true</DebugSymbols> 45 <OutputPath>bin\ x86\Debug\</OutputPath>45 <OutputPath>bin\Debug\</OutputPath> 46 46 <DefineConstants>DEBUG;TRACE</DefineConstants> 47 47 <DebugType>full</DebugType> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/Properties/AssemblyInfo.cs
r4120 r4121 51 51 // Revision 52 52 // 53 [assembly: AssemblyVersion("3.3.0.41 19")]54 [assembly: AssemblyFileVersion("3.3.0.41 19")]53 [assembly: AssemblyVersion("3.3.0.4120")] 54 [assembly: AssemblyFileVersion("3.3.0.4120")] -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Security.ADODataAccess/3.3/HeuristicLab.Security.ADODataAccess-3.3.csproj
r4107 r4121 59 59 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 60 60 <DebugSymbols>true</DebugSymbols> 61 <OutputPath>bin\ x86\Debug\</OutputPath>61 <OutputPath>bin\Debug\</OutputPath> 62 62 <DefineConstants>DEBUG;TRACE</DefineConstants> 63 63 <DebugType>full</DebugType> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Security.Contracts/3.3/HeuristicLab.Security.Contracts-3.3.csproj
r4077 r4121 58 58 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 59 59 <DebugSymbols>true</DebugSymbols> 60 <OutputPath>bin\ x86\Debug\</OutputPath>60 <OutputPath>bin\Debug\</OutputPath> 61 61 <DefineConstants>DEBUG;TRACE</DefineConstants> 62 62 <DebugType>full</DebugType> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Security.Core/3.3/HeuristicLab.Security.Core-3.3.csproj
r4091 r4121 56 56 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 57 57 <DebugSymbols>true</DebugSymbols> 58 <OutputPath>bin\ x86\Debug\</OutputPath>58 <OutputPath>bin\Debug\</OutputPath> 59 59 <DefineConstants>DEBUG;TRACE</DefineConstants> 60 60 <DebugType>full</DebugType> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Security.DataAccess/3.3/HeuristicLab.Security.DataAccess-3.3.csproj
r4078 r4121 58 58 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 59 59 <DebugSymbols>true</DebugSymbols> 60 <OutputPath>bin\ x86\Debug\</OutputPath>60 <OutputPath>bin\Debug\</OutputPath> 61 61 <DefineConstants>DEBUG;TRACE</DefineConstants> 62 62 <DebugType>full</DebugType> -
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Security.Server/3.3/HeuristicLab.Security.Server-3.3.csproj
r4077 r4121 56 56 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 57 57 <DebugSymbols>true</DebugSymbols> 58 <OutputPath>bin\ x86\Debug\</OutputPath>58 <OutputPath>bin\Debug\</OutputPath> 59 59 <DefineConstants>DEBUG;TRACE</DefineConstants> 60 60 <DebugType>full</DebugType>
Note: See TracChangeset
for help on using the changeset viewer.