Changeset 6373 for branches/HeuristicLab.Hive-3.4
- Timestamp:
- 06/07/11 00:43:59 (13 years ago)
- Location:
- branches/HeuristicLab.Hive-3.4/sources
- Files:
-
- 95 added
- 8 deleted
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/HeuristicLab.Clients.Hive.Views-3.4.csproj
r6033 r6373 125 125 </ItemGroup> 126 126 <ItemGroup> 127 <Compile Include="Administration\HiveAppointment.cs" /> 128 <Compile Include="Administration\Recurrence.cs"> 129 <SubType>Form</SubType> 130 </Compile> 131 <Compile Include="Administration\Recurrence.designer.cs"> 132 <DependentUpon>Recurrence.cs</DependentUpon> 133 </Compile> 134 <Compile Include="Administration\RecurrentEvent.cs" /> 135 <Compile Include="Administration\ResourcesView.cs"> 136 <SubType>UserControl</SubType> 137 </Compile> 138 <Compile Include="Administration\ResourcesView.Designer.cs"> 139 <DependentUpon>ResourcesView.cs</DependentUpon> 140 </Compile> 141 <Compile Include="Administration\ScheduleView.cs"> 142 <SubType>UserControl</SubType> 143 </Compile> 144 <Compile Include="Administration\ScheduleView.Designer.cs"> 145 <DependentUpon>ScheduleView.cs</DependentUpon> 146 </Compile> 147 <Compile Include="Administration\SlaveView.cs"> 148 <SubType>UserControl</SubType> 149 </Compile> 150 <Compile Include="Administration\SlaveView.Designer.cs"> 151 <DependentUpon>SlaveView.cs</DependentUpon> 152 </Compile> 153 <Compile Include="Common\UpdateControl.cs"> 154 <SubType>UserControl</SubType> 155 </Compile> 156 <Compile Include="Common\UpdateControl.Designer.cs"> 157 <DependentUpon>UpdateControl.cs</DependentUpon> 158 </Compile> 159 <Compile Include="ExperimentManager\OptimizerHiveJobView.cs"> 160 <SubType>UserControl</SubType> 161 </Compile> 162 <Compile Include="ExperimentManager\OptimizerHiveJobView.designer.cs"> 163 <DependentUpon>OptimizerHiveJobView.cs</DependentUpon> 164 </Compile> 165 <Compile Include="ExperimentManager\RefreshableHiveExperimentView.cs"> 166 <SubType>UserControl</SubType> 167 </Compile> 168 <Compile Include="ExperimentManager\RefreshableHiveExperimentView.Designer.cs"> 169 <DependentUpon>RefreshableHiveExperimentView.cs</DependentUpon> 170 </Compile> 171 <Compile Include="ExperimentManager\HiveItemView.cs"> 172 <SubType>UserControl</SubType> 173 </Compile> 174 <Compile Include="ExperimentManager\HiveItemView.Designer.cs"> 127 <Compile Include="HiveJobs\ControllableHiveJobView.cs"> 128 <SubType>UserControl</SubType> 129 </Compile> 130 <Compile Include="HiveJobs\ControllableHiveJobView.designer.cs"> 131 <DependentUpon>ControllableHiveJobView.cs</DependentUpon> 132 </Compile> 133 <Compile Include="HiveItemView.cs"> 134 <SubType>UserControl</SubType> 135 </Compile> 136 <Compile Include="HiveItemView.Designer.cs"> 175 137 <DependentUpon>HiveItemView.cs</DependentUpon> 176 138 </Compile> 177 <Compile Include="ExperimentManager\StateLogListList.cs" /> 178 <Compile Include="ExperimentManager\TreeView\NewExperimentTreeNodeAction.cs" /> 179 <Compile Include="ExperimentManager\TreeView\DeleteJobTreeNodeAction.cs" /> 180 <Compile Include="ExperimentManager\TreeView\HiveJobItemTreeView.cs"> 181 <SubType>UserControl</SubType> 182 </Compile> 183 <Compile Include="ExperimentManager\TreeView\HiveJobItemTreeView.Designer.cs"> 139 <Compile Include="HiveJobs\HiveJobListView.cs"> 140 <SubType>UserControl</SubType> 141 </Compile> 142 <Compile Include="HiveJobs\HiveJobListView.designer.cs"> 143 <DependentUpon>HiveJobListView.cs</DependentUpon> 144 </Compile> 145 <Compile Include="HiveJobs\HiveJobView.cs"> 146 <SubType>UserControl</SubType> 147 </Compile> 148 <Compile Include="HiveJobs\HiveJobView.designer.cs"> 149 <DependentUpon>HiveJobView.cs</DependentUpon> 150 </Compile> 151 <Compile Include="StateLog\StateLogListList.cs" /> 152 <Compile Include="TreeView\NewExperimentTreeNodeAction.cs" /> 153 <Compile Include="TreeView\DeleteJobTreeNodeAction.cs" /> 154 <Compile Include="TreeView\HiveJobItemTreeView.cs"> 155 <SubType>UserControl</SubType> 156 </Compile> 157 <Compile Include="TreeView\HiveJobItemTreeView.Designer.cs"> 184 158 <DependentUpon>HiveJobItemTreeView.cs</DependentUpon> 185 159 </Compile> 186 <Compile Include=" ExperimentManager\TreeView\ItemTreeView.cs">187 <SubType>UserControl</SubType> 188 </Compile> 189 <Compile Include=" ExperimentManager\TreeView\ItemTreeView.designer.cs">160 <Compile Include="TreeView\ItemTreeView.cs"> 161 <SubType>UserControl</SubType> 162 </Compile> 163 <Compile Include="TreeView\ItemTreeView.designer.cs"> 190 164 <DependentUpon>ItemTreeView.cs</DependentUpon> 191 165 </Compile> 192 <Compile Include=" ExperimentManager\StateLogGanttChartListView.cs">193 <SubType>UserControl</SubType> 194 </Compile> 195 <Compile Include=" ExperimentManager\StateLogGanttChartListView.designer.cs">166 <Compile Include="StateLog\StateLogGanttChartListView.cs"> 167 <SubType>UserControl</SubType> 168 </Compile> 169 <Compile Include="StateLog\StateLogGanttChartListView.designer.cs"> 196 170 <DependentUpon>StateLogGanttChartListView.cs</DependentUpon> 197 171 </Compile> 198 <Compile Include=" ExperimentManager\GanttChart.cs">199 <SubType>UserControl</SubType> 200 </Compile> 201 <Compile Include=" ExperimentManager\GanttChart.Designer.cs">172 <Compile Include="GanttChart\GanttChart.cs"> 173 <SubType>UserControl</SubType> 174 </Compile> 175 <Compile Include="GanttChart\GanttChart.Designer.cs"> 202 176 <DependentUpon>GanttChart.cs</DependentUpon> 203 177 </Compile> 204 <Compile Include=" ExperimentManager\StateLogGanttChartView.cs">205 <SubType>UserControl</SubType> 206 </Compile> 207 <Compile Include=" ExperimentManager\StateLogGanttChartView.designer.cs">178 <Compile Include="StateLog\StateLogGanttChartView.cs"> 179 <SubType>UserControl</SubType> 180 </Compile> 181 <Compile Include="StateLog\StateLogGanttChartView.designer.cs"> 208 182 <DependentUpon>StateLogGanttChartView.cs</DependentUpon> 209 183 </Compile> 210 <Compile Include=" ExperimentManager\StateLogList.cs" />211 <Compile Include=" ExperimentManager\StateLogListView.cs">212 <SubType>UserControl</SubType> 213 </Compile> 214 <Compile Include=" ExperimentManager\StateLogListView.designer.cs">184 <Compile Include="StateLog\StateLogList.cs" /> 185 <Compile Include="StateLog\StateLogListView.cs"> 186 <SubType>UserControl</SubType> 187 </Compile> 188 <Compile Include="StateLog\StateLogListView.designer.cs"> 215 189 <DependentUpon>StateLogListView.cs</DependentUpon> 216 190 </Compile> 217 <Compile Include=" ExperimentManager\StateLogView.cs">218 <SubType>UserControl</SubType> 219 </Compile> 220 <Compile Include=" ExperimentManager\StateLogView.designer.cs">191 <Compile Include="StateLog\StateLogView.cs"> 192 <SubType>UserControl</SubType> 193 </Compile> 194 <Compile Include="StateLog\StateLogView.designer.cs"> 221 195 <DependentUpon>StateLogView.cs</DependentUpon> 222 </Compile>223 <Compile Include="ExperimentManager\HiveExperimentManagerView.cs">224 <SubType>UserControl</SubType>225 </Compile>226 <Compile Include="ExperimentManager\HiveExperimentManagerView.Designer.cs">227 <DependentUpon>HiveExperimentManagerView.cs</DependentUpon>228 196 </Compile> 229 197 <Compile Include="HiveImageLibrary.Designer.cs"> … … 238 206 </Compile> 239 207 <None Include="HeuristicLabClientsHiveViewsPlugin.cs.frame" /> 240 <Compile Include="Administration\HiveAdministrationView.cs">241 <SubType>UserControl</SubType>242 </Compile>243 <Compile Include="Administration\HiveAdministrationView.Designer.cs">244 <DependentUpon>HiveAdministrationView.cs</DependentUpon>245 </Compile>246 <Compile Include="Administration\MenuItems\AdministrationMenuItem.cs" />247 <Compile Include="ExperimentManager\HiveExperimentListView.cs">248 <SubType>UserControl</SubType>249 </Compile>250 <Compile Include="ExperimentManager\HiveExperimentListView.Designer.cs">251 <DependentUpon>HiveExperimentListView.cs</DependentUpon>252 </Compile>253 <Compile Include="ExperimentManager\HiveJobListView.cs">254 <SubType>UserControl</SubType>255 </Compile>256 <Compile Include="ExperimentManager\HiveJobListView.designer.cs">257 <DependentUpon>HiveJobListView.cs</DependentUpon>258 </Compile>259 <Compile Include="ExperimentManager\HiveJobView.cs">260 <SubType>UserControl</SubType>261 </Compile>262 <Compile Include="ExperimentManager\HiveJobView.designer.cs">263 <DependentUpon>HiveJobView.cs</DependentUpon>264 </Compile>265 <Compile Include="ExperimentManager\MenuItems\ExperimentManagerMenuItem.cs" />266 208 <Compile Include="HeuristicLabClientsHiveViewsPlugin.cs" /> 267 209 <Compile Include="Progress\ProgressView.cs"> … … 278 220 </ItemGroup> 279 221 <ItemGroup> 280 <EmbeddedResource Include="Administration\HiveAdministrationView.resx"> 281 <DependentUpon>HiveAdministrationView.cs</DependentUpon> 282 </EmbeddedResource> 283 <EmbeddedResource Include="Administration\Recurrence.resx"> 284 <DependentUpon>Recurrence.cs</DependentUpon> 285 </EmbeddedResource> 286 <EmbeddedResource Include="Administration\ResourcesView.resx"> 287 <DependentUpon>ResourcesView.cs</DependentUpon> 288 </EmbeddedResource> 289 <EmbeddedResource Include="Administration\ScheduleView.resx"> 290 <DependentUpon>ScheduleView.cs</DependentUpon> 291 </EmbeddedResource> 292 <EmbeddedResource Include="Administration\SlaveView.resx"> 293 <DependentUpon>SlaveView.cs</DependentUpon> 294 </EmbeddedResource> 295 <EmbeddedResource Include="Common\UpdateControl.resx"> 296 <DependentUpon>UpdateControl.cs</DependentUpon> 297 </EmbeddedResource> 298 <EmbeddedResource Include="ExperimentManager\OptimizerHiveJobView.resx"> 299 <DependentUpon>OptimizerHiveJobView.cs</DependentUpon> 300 </EmbeddedResource> 301 <EmbeddedResource Include="ExperimentManager\RefreshableHiveExperimentView.resx"> 302 <DependentUpon>RefreshableHiveExperimentView.cs</DependentUpon> 303 </EmbeddedResource> 304 <EmbeddedResource Include="ExperimentManager\TreeView\ItemTreeView.resx"> 222 <EmbeddedResource Include="HiveJobs\ControllableHiveJobView.resx"> 223 <DependentUpon>ControllableHiveJobView.cs</DependentUpon> 224 </EmbeddedResource> 225 <EmbeddedResource Include="HiveJobs\HiveJobView.resx"> 226 <DependentUpon>HiveJobView.cs</DependentUpon> 227 </EmbeddedResource> 228 <EmbeddedResource Include="TreeView\ItemTreeView.resx"> 305 229 <DependentUpon>ItemTreeView.cs</DependentUpon> 306 230 </EmbeddedResource> 307 <EmbeddedResource Include=" ExperimentManager\StateLogGanttChartListView.resx">231 <EmbeddedResource Include="StateLog\StateLogGanttChartListView.resx"> 308 232 <DependentUpon>StateLogGanttChartListView.cs</DependentUpon> 309 233 </EmbeddedResource> 310 <EmbeddedResource Include=" ExperimentManager\GanttChart.resx">234 <EmbeddedResource Include="GanttChart\GanttChart.resx"> 311 235 <DependentUpon>GanttChart.cs</DependentUpon> 312 236 </EmbeddedResource> 313 <EmbeddedResource Include=" ExperimentManager\StateLogGanttChartView.resx">237 <EmbeddedResource Include="StateLog\StateLogGanttChartView.resx"> 314 238 <DependentUpon>StateLogGanttChartView.cs</DependentUpon> 315 239 </EmbeddedResource> 316 <EmbeddedResource Include=" ExperimentManager\StateLogView.resx">240 <EmbeddedResource Include="StateLog\StateLogView.resx"> 317 241 <DependentUpon>StateLogView.cs</DependentUpon> 318 </EmbeddedResource>319 <EmbeddedResource Include="ExperimentManager\HiveExperimentManagerView.resx">320 <DependentUpon>HiveExperimentManagerView.cs</DependentUpon>321 <SubType>Designer</SubType>322 </EmbeddedResource>323 <EmbeddedResource Include="ExperimentManager\HiveJobView.resx">324 <DependentUpon>HiveJobView.cs</DependentUpon>325 242 </EmbeddedResource> 326 243 <EmbeddedResource Include="HiveImageLibrary.resx"> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj
r6370 r6373 112 112 </ItemGroup> 113 113 <ItemGroup> 114 <Compile Include="HiveClient.cs" /> 114 115 <Compile Include="Jobs\ItemJob.cs" /> 116 <Compile Include="RefreshableHiveExperiment.cs" /> 115 117 <Compile Include="ThreadSafeLog.cs" /> 116 118 <None Include="app_f005pc.config" /> … … 118 120 <None Include="app.config" /> 119 121 <None Include="HeuristicLabClientsHivePlugin.cs.frame" /> 120 <Compile Include="Administration\HiveAdministrationClient.cs" />121 122 <Compile Include="Exceptions\AddJobToHiveException.cs" /> 122 123 <Compile Include="Exceptions\JobResultPollingException.cs" /> 123 124 <Compile Include="Exceptions\OptimizerNotFoundException.cs" /> 124 <Compile Include="ExperimentManager\ConcurrentJobDownloader.cs" /> 125 <Compile Include="ExperimentManager\EngineHiveJob.cs" /> 126 <Compile Include="ExperimentManager\ExperimentManagerClient.cs" /> 125 <Compile Include="ConcurrentJobDownloader.cs" /> 126 <Compile Include="HiveJobs\EngineHiveJob.cs" /> 127 127 <Compile Include="Exceptions\HiveException.cs" /> 128 <Compile Include=" ExperimentManager\HiveJobDownloader.cs" />129 <Compile Include=" ExperimentManager\ConcurrentJobDownloaderException.cs" />130 <Compile Include=" ExperimentManager\TreeView\IItemTree.cs" />131 <Compile Include=" ExperimentManager\TreeView\IItemTreeAction.cs" />132 <Compile Include=" ExperimentManager\OptimizerHiveJob.cs">128 <Compile Include="HiveJobDownloader.cs" /> 129 <Compile Include="ConcurrentJobDownloaderException.cs" /> 130 <Compile Include="TreeView\IItemTree.cs" /> 131 <Compile Include="TreeView\IItemTreeAction.cs" /> 132 <Compile Include="HiveJobs\OptimizerHiveJob.cs"> 133 133 <SubType>Code</SubType> 134 134 </Compile> 135 <Compile Include="ExperimentManager\PluginClient.cs" />136 135 <Compile Include="Exceptions\ResourceNotFoundException.cs" /> 137 136 <Compile Include="IServiceLocator.cs" /> … … 139 138 <Compile Include="Jobs\OptimizerJob.cs" /> 140 139 <Compile Include="HeuristicLabClientsHivePlugin.cs" /> 141 <Compile Include=" ExperimentManager\HiveJob.cs" />142 <Compile Include=" ExperimentManager\JobResultPoller.cs" />143 <Compile Include=" PersistenceUtil.cs" />144 <Compile Include=" PluginUtil.cs" />140 <Compile Include="HiveJobs\HiveJob.cs" /> 141 <Compile Include="JobResultPoller.cs" /> 142 <Compile Include="Util\PersistenceUtil.cs" /> 143 <Compile Include="Util\PluginUtil.cs" /> 145 144 <Compile Include="Progress\IProgress.cs" /> 146 145 <Compile Include="Progress\IProgressReporter.cs" /> … … 158 157 <Compile Include="ServiceClients\HiveItem.cs" /> 159 158 <Compile Include="ServiceClients\JobData.cs" /> 160 <Compile Include="ExperimentManager\RefreshableHiveExperiment.cs" />161 159 <Compile Include="ServiceClients\Plugin.cs" /> 162 160 <Compile Include="ServiceClients\PluginData.cs" /> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Jobs/ItemJob.cs
r6372 r6373 62 62 } 63 63 64 [Storable]65 private bool collectChildJobs;66 public bool CollectChildJobs {67 get { return collectChildJobs; }68 set { collectChildJobs = value; }69 }70 71 64 #region Constructors and Cloning 72 65 public ItemJob() { } … … 77 70 : base(original, cloner) { 78 71 this.ComputeInParallel = original.ComputeInParallel; 79 this.CollectChildJobs = original.CollectChildJobs;80 72 this.Item = cloner.Clone(original.Item); 81 73 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Jobs/OptimizerJob.cs
r6372 r6373 66 66 : base(original, cloner) { 67 67 this.IndexInParentOptimizerList = original.IndexInParentOptimizerList; 68 this.CollectChildJobs = original.CollectChildJobs;69 68 } 70 69 public override IDeepCloneable Clone(Cloner cloner) { -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveItem.cs
r6372 r6373 86 86 87 87 public void Store() { 88 ExperimentManagerClient.Store(this);88 HiveClient.Store(this); 89 89 Modified = false; 90 90 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveItemCollection.cs
r6200 r6373 37 37 foreach (T item in items) { 38 38 try { 39 ExperimentManagerClient.Delete(item);39 HiveClient.Delete(item); 40 40 removed.Add(item); 41 41 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive 3.4.sln
r6371 r6373 97 97 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4", "HeuristicLab.Clients.Hive.Slave.ConsoleClient\HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4.csproj", "{464D70B8-2D91-485C-B622-22E4A4891C68}" 98 98 EndProject 99 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.HiveEngine-3.4.Tests", "HeuristicLab.HiveEngine\3.4\Tests\HeuristicLab.HiveEngine-3.4.Tests.csproj", "{87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}" 99 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.HiveEngine-3.4.ConsoleTests", "HeuristicLab.HiveEngine\3.4\Tests\HeuristicLab.HiveEngine-3.4.ConsoleTests.csproj", "{87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}" 100 EndProject 101 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.ExperimentManager-3.4", "HeuristicLab.Clients.Hive.ExperimentManager\3.4\HeuristicLab.Clients.Hive.ExperimentManager-3.4.csproj", "{DBFD7205-61AF-40EF-8776-3052DEF91CF3}" 102 EndProject 103 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Administration-3.4", "HeuristicLab.Clients.Hive.Administration\3.4\HeuristicLab.Clients.Hive.Administration-3.4.csproj", "{5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}" 100 104 EndProject 101 105 Global … … 442 446 {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Release|x86.ActiveCfg = Release|x86 443 447 {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Release|x86.Build.0 = Release|x86 448 {DBFD7205-61AF-40EF-8776-3052DEF91CF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 449 {DBFD7205-61AF-40EF-8776-3052DEF91CF3}.Debug|Any CPU.Build.0 = Debug|Any CPU 450 {DBFD7205-61AF-40EF-8776-3052DEF91CF3}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 451 {DBFD7205-61AF-40EF-8776-3052DEF91CF3}.Debug|Mixed Platforms.Build.0 = Debug|x64 452 {DBFD7205-61AF-40EF-8776-3052DEF91CF3}.Debug|x64.ActiveCfg = Debug|x64 453 {DBFD7205-61AF-40EF-8776-3052DEF91CF3}.Debug|x64.Build.0 = Debug|x64 454 {DBFD7205-61AF-40EF-8776-3052DEF91CF3}.Debug|x86.ActiveCfg = Debug|x86 455 {DBFD7205-61AF-40EF-8776-3052DEF91CF3}.Debug|x86.Build.0 = Debug|x86 456 {DBFD7205-61AF-40EF-8776-3052DEF91CF3}.Release|Any CPU.ActiveCfg = Release|Any CPU 457 {DBFD7205-61AF-40EF-8776-3052DEF91CF3}.Release|Any CPU.Build.0 = Release|Any CPU 458 {DBFD7205-61AF-40EF-8776-3052DEF91CF3}.Release|Mixed Platforms.ActiveCfg = Release|x64 459 {DBFD7205-61AF-40EF-8776-3052DEF91CF3}.Release|Mixed Platforms.Build.0 = Release|x64 460 {DBFD7205-61AF-40EF-8776-3052DEF91CF3}.Release|x64.ActiveCfg = Release|x64 461 {DBFD7205-61AF-40EF-8776-3052DEF91CF3}.Release|x64.Build.0 = Release|x64 462 {DBFD7205-61AF-40EF-8776-3052DEF91CF3}.Release|x86.ActiveCfg = Release|x86 463 {DBFD7205-61AF-40EF-8776-3052DEF91CF3}.Release|x86.Build.0 = Release|x86 464 {5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 465 {5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}.Debug|Any CPU.Build.0 = Debug|Any CPU 466 {5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 467 {5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}.Debug|Mixed Platforms.Build.0 = Debug|x64 468 {5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}.Debug|x64.ActiveCfg = Debug|x64 469 {5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}.Debug|x64.Build.0 = Debug|x64 470 {5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}.Debug|x86.ActiveCfg = Debug|x86 471 {5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}.Debug|x86.Build.0 = Debug|x86 472 {5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}.Release|Any CPU.ActiveCfg = Release|Any CPU 473 {5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}.Release|Any CPU.Build.0 = Release|Any CPU 474 {5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}.Release|Mixed Platforms.ActiveCfg = Release|x64 475 {5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}.Release|Mixed Platforms.Build.0 = Release|x64 476 {5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}.Release|x64.ActiveCfg = Release|x64 477 {5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}.Release|x64.Build.0 = Release|x64 478 {5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}.Release|x86.ActiveCfg = Release|x86 479 {5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}.Release|x86.Build.0 = Release|x86 444 480 EndGlobalSection 445 481 GlobalSection(SolutionProperties) = preSolution … … 464 500 {8D40A723-139D-40E4-8BBA-4CB309A9E4B9} = {E46F2FC8-8C15-48E5-96DB-FF2DB36BC509} 465 501 {B5EF1E5A-9F3D-40B9-B4B0-30AADF2E2CEB} = {E46F2FC8-8C15-48E5-96DB-FF2DB36BC509} 502 {DBFD7205-61AF-40EF-8776-3052DEF91CF3} = {E46F2FC8-8C15-48E5-96DB-FF2DB36BC509} 503 {5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8} = {E46F2FC8-8C15-48E5-96DB-FF2DB36BC509} 466 504 {A2061FFC-C564-4872-AA06-56B002DDEDBF} = {063D87A6-1085-49F6-A195-5D1890CBE994} 467 505 {02766ECC-D0F5-4115-9ECA-47409167B638} = {A2061FFC-C564-4872-AA06-56B002DDEDBF} -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine.Views/3.4/HeuristicLab.HiveEngine.Views-3.4.csproj
r6357 r6373 145 145 </ItemGroup> 146 146 <ItemGroup> 147 <ProjectReference Include="..\..\HeuristicLab.Clients.Hive.ExperimentManager\3.4\HeuristicLab.Clients.Hive.ExperimentManager-3.4.csproj"> 148 <Project>{DBFD7205-61AF-40EF-8776-3052DEF91CF3}</Project> 149 <Name>HeuristicLab.Clients.Hive.ExperimentManager-3.4</Name> 150 </ProjectReference> 147 151 <ProjectReference Include="..\..\HeuristicLab.Clients.Hive.Views\3.4\HeuristicLab.Clients.Hive.Views-3.4.csproj"> 148 152 <Project>{E1D6C801-892A-406A-B606-F158E36DD3C3}</Project> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine.Views/3.4/HiveEngineView.Designer.cs
r6212 r6373 1 namespace HeuristicLab.HiveEngine.Views { 1 using HeuristicLab.Clients.Hive.ExperimentManager.Views; 2 namespace HeuristicLab.HiveEngine.Views { 2 3 partial class HiveEngineView { 3 4 /// <summary> … … 32 33 this.tabControl = new System.Windows.Forms.TabControl(); 33 34 this.jobsTabPage = new System.Windows.Forms.TabPage(); 34 this.hiveExperimentListView = new H euristicLab.Clients.Hive.Views.HiveExperimentListView();35 this.hiveExperimentListView = new HiveExperimentListView(); 35 36 this.logTabPage = new System.Windows.Forms.TabPage(); 36 37 this.logView = new HeuristicLab.Core.Views.LogView(); … … 230 231 private System.Windows.Forms.CheckBox useLocalPluginsCheckBox; 231 232 private HeuristicLab.Core.Views.LogView logView; 232 private Clients.Hive.Views.HiveExperimentListView hiveExperimentListView;233 private HiveExperimentListView hiveExperimentListView; 233 234 } 234 235 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/HiveEngine.cs
r6358 r6373 288 288 random.Reset(random.Next()); 289 289 } 290 ExperimentManagerClient.StartExperiment((e) => {290 HiveClient.StartExperiment((e) => { 291 291 LogException(e); 292 292 }, refreshableHiveExperiment); … … 354 354 355 355 private void DeleteHiveExperiment(Guid hiveExperimentId) { 356 ExperimentManagerClient.TryAndRepeat(() => {356 HiveClient.TryAndRepeat(() => { 357 357 ServiceLocator.Instance.CallHiveService(s => s.DeleteHiveExperiment(hiveExperimentId)); 358 358 }, 5, string.Format("Could not delete jobs")); -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/Tests/Program.cs
r6358 r6373 42 42 #region Credentials 43 43 ServiceLocator.Instance.Username = "cneumuel"; 44 ServiceLocator.Instance.Password = " Stormlord105.";44 ServiceLocator.Instance.Password = ""; 45 45 #endregion 46 46
Note: See TracChangeset
for help on using the changeset viewer.