Changeset 6039
- Timestamp:
- 04/22/11 10:58:01 (13 years ago)
- Location:
- branches/HeuristicLab.Hive-3.4/sources
- Files:
-
- 9 edited
-
HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/Program.cs (modified) (1 diff)
-
HeuristicLab.Clients.Hive.Slave.Tests/SlaveCommListener.cs (modified) (1 diff)
-
HeuristicLab.Clients.Hive.Slave/3.4/Core.cs (modified) (3 diffs)
-
HeuristicLab.Clients.Hive.Slave/3.4/app.config (modified) (2 diffs)
-
HeuristicLab.Clients.Hive/3.4/app_services.config (modified) (1 diff)
-
HeuristicLab.HiveEngine.Test/HeuristicLab.HiveEngine.Test.csproj (modified) (1 diff)
-
HeuristicLab.HiveEngine.Test/Program.cs (modified) (1 diff)
-
HeuristicLab.HiveEngine/3.4/HeuristicLab.HiveEngine-3.4.csproj (modified) (2 diffs)
-
HeuristicLab.HiveEngine/3.4/HiveEngine.cs (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/Program.cs
r5599 r6039 44 44 45 45 Console.WriteLine("Press a key to quit"); 46 Console.Read Key();46 Console.ReadLine(); 47 47 listener.Close(); 48 48 core.Shutdown(); -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Tests/SlaveCommListener.cs
r6033 r6039 56 56 57 57 public void Close() { 58 if (pipeFactory.State != CommunicationState.Closed && pipeFactory.State != CommunicationState.Closing) { 58 if (pipeFactory.State != CommunicationState.Closed && 59 pipeFactory.State != CommunicationState.Closing && 60 pipeFactory.State != CommunicationState.Faulted) { 59 61 pipeProxy.Unsubscribe(); 62 } 63 try { 60 64 pipeFactory.Close(); 65 } 66 catch (Exception) { 67 pipeFactory.Abort(); 61 68 } 62 69 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs
r6008 r6039 166 166 SlaveStatusInfo.JobsFetched++; 167 167 job = wcfService.UpdateJobState(job.Id, JobState.Calculating, null); 168 if (job == null) throw new JobNotFoundException(jobId); 168 169 StartJobInAppDomain(job, jobData); 169 170 }, container.JobId) … … 429 430 } 430 431 432 private static object locker = new object(); 433 431 434 /// <summary> 432 435 /// A new Job from the wcfService has been received and will be started within a AppDomain. … … 435 438 clientCom.LogMessage("Received new job with id " + myJob.Id); 436 439 clientCom.StatusChanged(ConfigManager.Instance.GetStatusForClientConsole()); 437 if (engines.ContainsKey(myJob.Id)) 438 throw new Exception("Job with key " + myJob.Id + " already exists"); 439 440 String pluginDir = Path.Combine(PluginCache.Instance.PluginTempBaseDir, myJob.Id.ToString()); 441 bool pluginsPrepared = false; 442 string configFileName = string.Empty; 443 444 try { 445 PluginCache.Instance.PreparePlugins(myJob, out configFileName); 446 clientCom.LogMessage("Plugins fetched for job " + myJob.Id); 447 pluginsPrepared = true; 448 } 449 catch (Exception exception) { 450 clientCom.LogMessage(string.Format("Copying plugins for job {0} failed: {1}", myJob.Id, exception)); 451 lock (engines) { 452 if (jobs.ContainsKey(myJob.Id)) { 453 jobs.Remove(myJob.Id); 454 } 455 } 456 } 457 458 if (pluginsPrepared) { 440 441 lock (locker) { 442 if (engines.ContainsKey(myJob.Id)) 443 throw new Exception("Job with key " + myJob.Id + " already exists"); 444 445 String pluginDir = Path.Combine(PluginCache.Instance.PluginTempBaseDir, myJob.Id.ToString()); 446 bool pluginsPrepared = false; 447 string configFileName = string.Empty; 448 459 449 try { 460 AppDomain appDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitSandbox(myJob.Id.ToString(), pluginDir, Path.Combine(pluginDir, configFileName)); 461 appDomain.UnhandledException += new UnhandledExceptionEventHandler(AppDomain_UnhandledException); 450 PluginCache.Instance.PreparePlugins(myJob, out configFileName); 451 clientCom.LogMessage("Plugins fetched for job " + myJob.Id); 452 pluginsPrepared = true; 453 } 454 catch (Exception exception) { 455 clientCom.LogMessage(string.Format("Copying plugins for job {0} failed: {1}", myJob.Id, exception)); 462 456 lock (engines) { 463 appDomains.Add(myJob.Id, appDomain); 464 clientCom.LogMessage("Creating AppDomain"); 465 Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName); 466 clientCom.LogMessage("Created AppDomain"); 467 engine.JobId = myJob.Id; 468 engine.Core = this; 469 clientCom.LogMessage("Starting Engine for job " + myJob.Id); 470 engines.Add(myJob.Id, engine); 471 engine.Start(jobData.Data); 472 } 473 } 474 catch (Exception exception) { 475 clientCom.LogMessage("Creating the Appdomain and loading the job failed for job " + myJob.Id); 476 clientCom.LogMessage("Error thrown is: " + exception.ToString()); 477 KillAppDomain(myJob.Id); 457 if (jobs.ContainsKey(myJob.Id)) { 458 jobs.Remove(myJob.Id); 459 } 460 } 461 } 462 463 if (pluginsPrepared) { 464 try { 465 AppDomain appDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitSandbox(myJob.Id.ToString(), pluginDir, Path.Combine(pluginDir, configFileName)); 466 appDomain.UnhandledException += new UnhandledExceptionEventHandler(AppDomain_UnhandledException); 467 lock (engines) { 468 appDomains.Add(myJob.Id, appDomain); 469 clientCom.LogMessage("Creating AppDomain"); 470 Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName); 471 clientCom.LogMessage("Created AppDomain"); 472 engine.JobId = myJob.Id; 473 engine.Core = this; 474 clientCom.LogMessage("Starting Engine for job " + myJob.Id); 475 engines.Add(myJob.Id, engine); 476 engine.Start(jobData.Data); 477 } 478 } 479 catch (Exception exception) { 480 clientCom.LogMessage("Creating the Appdomain and loading the job failed for job " + myJob.Id); 481 clientCom.LogMessage("Error thrown is: " + exception.ToString()); 482 KillAppDomain(myJob.Id); 483 } 478 484 } 479 485 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/app.config
r5402 r6039 17 17 <bindings> 18 18 <wsHttpBinding> 19 <binding name="wsHttpBinding" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00: 01:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">20 <readerQuotas maxDepth="32" maxStringContentLength=" 8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>19 <binding name="wsHttpBinding" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:10:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false"> 20 <readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384"/> 21 21 <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/> 22 22 <security mode="Message"> … … 28 28 </bindings> 29 29 <services> 30 <service name="HeuristicLab.Clients.Hive.Slave .SlaveCommunicationService">31 <endpoint address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.Slave .ServiceContracts.ISlaveCommunication"/>30 <service name="HeuristicLab.Clients.Hive.SlaveCore.SlaveCommunicationService"> 31 <endpoint address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/> 32 32 </service> 33 33 </services> 34 34 <client> 35 <endpoint address="http://localhost/Hive-3.4/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding" contract="HeuristicLab.Services.Hive.Common.ServiceContracts.IHiveService" name="wsHttpBinding_IHiveService"> 35 <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/> 36 <endpoint address="http://services.heuristiclab.com/Hive-3.4/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService"> 36 37 <identity> 37 <certificate encodedValue="AwAAAAEAAAAUAAAA fEKvcVixnJay+q4hCPFuO0JL5TQgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMTAxOTEwNTMxNVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXwC5TGcAffd/0oAWHtm0s6YXVXEgXgb1AYmBkkkhkKIFJG/e/Z0KSYbJepmSJD44W3oOAVm+x1DAsZxU79HahDYgWCuHLMm1TLpwSmYOQ0kV3pGHWHhiWV7h7oGLds/eqZ2EOpaNGryfEPnrA4VmxY91vV5/2BTeVSWG6F8lRKQIDAQABo0kwRzBFBgNVHQEEPjA8gBAR7kBnMRHO5gzThEqda0wWoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQADgYEAoPwEG4QTDXhlxERNDfsZmM2IhEpV42ppz1kEah2oYKDa/ElIMVtvqLv6flVtg18ENN/mEJWiHZ3NyP3qr2Pip+sh+/2WBiSbOaukES/CM7OJn9kJCImH7M/xqM8pxqY8IfgM6iBVrVj9uHqj3j2BBck+cYY8fKyh3CFifMIp6ac="/>38 <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/> 38 39 </identity> 39 40 </endpoint> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/app_services.config
r6008 r6039 1 1 <?xml version="1.0"?> 2 2 <configuration> 3 <system.serviceModel> 4 <bindings> 5 <wsHttpBinding> 6 <binding name="wsHttpBinding" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:10:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false"> 7 <readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384"/> 8 <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/> 9 <security mode="Message"> 10 <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/> 11 <message clientCredentialType="UserName" negotiateServiceCredential="true" algorithmSuite="Default"/> 12 </security> 13 </binding> 14 </wsHttpBinding> 15 </bindings> 16 <client> 17 <endpoint address="http://services.heuristiclab.com/Hive-3.4/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService"> 18 <identity> 19 <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/> 20 </identity> 21 </endpoint> 22 </client> 23 </system.serviceModel> 24 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration> 3 <system.serviceModel> 4 <bindings> 5 <wsHttpBinding> 6 <binding name="wsHttpBinding" 7 closeTimeout="00:01:00" 8 openTimeout="00:01:00" 9 receiveTimeout="00:10:00" 10 sendTimeout="00:10:00" 11 bypassProxyOnLocal="false" 12 transactionFlow="false" 13 hostNameComparisonMode="StrongWildcard" 14 maxBufferPoolSize="2147483647" 15 maxReceivedMessageSize="2147483647" 16 messageEncoding="Text" 17 textEncoding="utf-8" 18 useDefaultWebProxy="true" 19 allowCookies="false"> 20 21 <readerQuotas maxDepth="2147483647" 22 maxStringContentLength="2147483647" 23 maxArrayLength="2147483647" 24 maxBytesPerRead="2147483647" 25 maxNameTableCharCount="2147483647"/> 26 <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/> 27 <security mode="Message"> 28 <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/> 29 <message clientCredentialType="UserName" negotiateServiceCredential="true" algorithmSuite="Default"/> 30 </security> 31 </binding> 32 </wsHttpBinding> 33 </bindings> 34 <client> 35 <endpoint address="http://services.heuristiclab.com/Hive-3.4/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService"> 36 <identity> 37 <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/> 38 </identity> 39 </endpoint> 40 </client> 41 </system.serviceModel> 42 <startup> 43 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/> 44 </startup> 45 </configuration> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine.Test/HeuristicLab.HiveEngine.Test.csproj
r6033 r6039 67 67 <ItemGroup> 68 68 <Reference Include="HeuristicLab.Algorithms.GeneticAlgorithm-3.3"> 69 <HintPath> ..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Algorithms.GeneticAlgorithm-3.3.dll</HintPath>69 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Algorithms.GeneticAlgorithm-3.3.dll</HintPath> 70 70 </Reference> 71 71 <Reference Include="HeuristicLab.Collections-3.3"> 72 <HintPath> ..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>72 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath> 73 73 </Reference> 74 74 <Reference Include="HeuristicLab.Common-3.3"> 75 <HintPath> ..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>75 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath> 76 76 </Reference> 77 77 <Reference Include="HeuristicLab.Common.Resources-3.3"> 78 <HintPath> ..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>78 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath> 79 79 </Reference> 80 80 <Reference Include="HeuristicLab.Core-3.3"> 81 <HintPath> ..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>81 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath> 82 82 </Reference> 83 83 <Reference Include="HeuristicLab.Data-3.3"> 84 <HintPath> ..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>84 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath> 85 85 </Reference> 86 86 <Reference Include="HeuristicLab.Operators-3.3"> 87 <HintPath> ..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>87 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath> 88 88 </Reference> 89 89 <Reference Include="HeuristicLab.Optimization-3.3"> 90 <HintPath> ..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>90 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath> 91 91 </Reference> 92 92 <Reference Include="HeuristicLab.Persistence-3.3"> 93 <HintPath> ..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>93 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath> 94 94 </Reference> 95 95 <Reference Include="HeuristicLab.PluginInfrastructure-3.3"> 96 <HintPath> ..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>96 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath> 97 97 </Reference> 98 98 <Reference Include="HeuristicLab.Problems.TestFunctions-3.3"> 99 <HintPath> ..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.TestFunctions-3.3.dll</HintPath>99 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.TestFunctions-3.3.dll</HintPath> 100 100 </Reference> 101 101 <Reference Include="HeuristicLab.SequentialEngine-3.3"> 102 <HintPath> ..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.SequentialEngine-3.3.dll</HintPath>102 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.SequentialEngine-3.3.dll</HintPath> 103 103 </Reference> 104 104 <Reference Include="System" /> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine.Test/Program.cs
r6033 r6039 54 54 ga.MaximumGenerations.Value = 3; 55 55 56 //var plugins = new List<IPluginDescription>(); 57 //IEnumerable<Type> types; 58 //PersistenceUtil.Serialize(ga, out types); 59 //PluginUtil.CollectDeclaringPlugins(plugins, types); 60 61 56 62 ga.Start(); 57 63 -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/HeuristicLab.HiveEngine-3.4.csproj
r6006 r6039 103 103 <ItemGroup> 104 104 <Reference Include="HeuristicLab.Clients.Common-3.3"> 105 <HintPath>..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Clients.Common-3.3.dll</HintPath> 106 </Reference> 107 <Reference Include="HeuristicLab.Clients.Hive.Views-3.4"> 108 <HintPath>..\..\HeuristicLab.Clients.Hive.Views\3.4\obj\Debug\HeuristicLab.Clients.Hive.Views-3.4.dll</HintPath> 105 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Clients.Common-3.3.dll</HintPath> 109 106 </Reference> 110 107 <Reference Include="HeuristicLab.Collections-3.3"> 111 <HintPath> ..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>108 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath> 112 109 </Reference> 113 110 <Reference Include="HeuristicLab.Common-3.3"> 114 <HintPath> ..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>111 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath> 115 112 </Reference> 116 113 <Reference Include="HeuristicLab.Common.Resources-3.3"> 117 <HintPath> ..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>114 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath> 118 115 </Reference> 119 116 <Reference Include="HeuristicLab.Core-3.3"> 120 <HintPath> ..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>117 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath> 121 118 </Reference> 122 119 <Reference Include="HeuristicLab.Core.Views-3.3"> 123 <HintPath> ..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core.Views-3.3.dll</HintPath>120 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Core.Views-3.3.dll</HintPath> 124 121 </Reference> 125 122 <Reference Include="HeuristicLab.MainForm-3.3"> 126 <HintPath> ..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>123 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath> 127 124 </Reference> 128 125 <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3"> 129 <HintPath> ..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>126 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath> 130 127 </Reference> 131 128 <Reference Include="HeuristicLab.Optimization.Views-3.3"> 132 <HintPath> ..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization.Views-3.3.dll</HintPath>129 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization.Views-3.3.dll</HintPath> 133 130 </Reference> 134 131 <Reference Include="HeuristicLab.Persistence-3.3"> 135 <HintPath> ..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>132 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath> 136 133 </Reference> 137 134 <Reference Include="HeuristicLab.PluginInfrastructure-3.3"> 138 <HintPath> ..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>135 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath> 139 136 </Reference> 140 137 <Reference Include="HeuristicLab.Random-3.3"> 141 <HintPath> ..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Random-3.3.dll</HintPath>138 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Random-3.3.dll</HintPath> 142 139 </Reference> 143 140 <Reference Include="HeuristicLab.SequentialEngine-3.3"> 144 <HintPath> ..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.SequentialEngine-3.3.dll</HintPath>141 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.SequentialEngine-3.3.dll</HintPath> 145 142 </Reference> 146 143 <Reference Include="System" /> … … 172 169 <ItemGroup /> 173 170 <ItemGroup> 171 <ProjectReference Include="..\..\HeuristicLab.Clients.Hive.Views\3.4\HeuristicLab.Clients.Hive.Views-3.4.csproj"> 172 <Project>{E1D6C801-892A-406A-B606-F158E36DD3C3}</Project> 173 <Name>HeuristicLab.Clients.Hive.Views-3.4</Name> 174 </ProjectReference> 174 175 <ProjectReference Include="..\..\HeuristicLab.Clients.Hive\3.4\HeuristicLab.Clients.Hive-3.4.csproj"> 175 176 <Project>{B5EF1E5A-9F3D-40B9-B4B0-30AADF2E2CEB}</Project> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/HiveEngine.cs
r6033 r6039 380 380 } 381 381 var neededPlugins = new List<IPluginDescription>(); 382 PluginUtil.CollectDeclaringPlugins(neededPlugins, usedTypes); 382 383 bool useAllLocalPlugins = true; 384 if (useAllLocalPlugins) { 385 // use all plugins 386 neededPlugins.AddRange(ApplicationManager.Manager.Plugins); 387 } else { 388 // use only 389 PluginUtil.CollectDeclaringPlugins(neededPlugins, usedTypes); 390 } 383 391 384 392 job.CoresNeeded = 1; 385 job.PluginsNeededIds = ServiceLocator.Instance.CallHiveService(s => PluginUtil.GetPluginDependencies(s, this.OnlinePlugins, this.AlreadyUploadedPlugins, neededPlugins, false));393 job.PluginsNeededIds = ServiceLocator.Instance.CallHiveService(s => PluginUtil.GetPluginDependencies(s, this.OnlinePlugins, this.AlreadyUploadedPlugins, neededPlugins, useLocalPlugins)); 386 394 job.Priority = priority; 387 395 job.HiveExperimentId = hiveExperimentId;
Note: See TracChangeset
for help on using the changeset viewer.
