Changeset 1367


Ignore:
Timestamp:
03/19/09 16:11:26 (11 years ago)
Author:
kgrading
Message:

second fix (updated internal interfaces) (#529)

Location:
trunk/sources
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Hive.Client.Communication/WcfService.cs

    r1366 r1367  
    168168    /// </summary>
    169169    #region PullJob
    170     public event System.EventHandler<SendJobCompletedEventArgs> PullJobCompleted;
    171     public void PullJobAsync(Guid guid) {
     170    public event System.EventHandler<SendJobCompletedEventArgs> SendJobCompleted;
     171    public void SendJobAsync(Guid guid) {
    172172      if (ConnState == NetworkEnum.WcfConnState.Loggedin)       
    173173        proxy.SendJobAsync(guid);
     
    175175    void proxy_SendJobCompleted(object sender, SendJobCompletedEventArgs e) {
    176176      if (e.Error == null)
    177         PullJobCompleted(sender, e);
     177        SendJobCompleted(sender, e);
    178178      else
    179179        NetworkErrorHandling(e.Error);
     
    185185    /// </summary>
    186186    #region SendJobResults
    187     public event System.EventHandler<ProcessJobResultCompletedEventArgs> SendJobResultCompleted;
    188     public void SendJobResultAsync(Guid clientId, long jobId, byte[] result, double percentage, Exception exception, bool finished) {
     187    public event System.EventHandler<ProcessJobResultCompletedEventArgs> ProcessJobResultCompleted;
     188    public void ProcessJobResultAsync(Guid clientId, long jobId, byte[] result, double percentage, Exception exception, bool finished) {
    189189      if (ConnState == NetworkEnum.WcfConnState.Loggedin)
    190190        proxy.ProcessJobResultAsync(clientId, jobId, result, percentage, exception, finished);
     
    192192    private void proxy_ProcessJobResultCompleted(object sender, ProcessJobResultCompletedEventArgs e) {
    193193      if (e.Error == null)
    194         SendJobResultCompleted(sender, e);
     194        ProcessJobResultCompleted(sender, e);
    195195      else
    196196        NetworkErrorHandling(e.Error);
     
    223223    /// </summary>
    224224    #region SendJobResults
    225     public event System.EventHandler<ProcessJobResultCompletedEventArgs> SendStoredJobResultCompleted;
    226     public void SendStoredJobResultAsync(Guid clientId, long jobId, byte[] result, double percentage, Exception exception, bool finished) {
     225    public event System.EventHandler<ProcessJobResultCompletedEventArgs> ProcessStoredJobResultCompleted;
     226    public void ProcessStoredJobResultAsync(Guid clientId, long jobId, byte[] result, double percentage, Exception exception, bool finished) {
    227227      if (ConnState == NetworkEnum.WcfConnState.Loggedin)
    228228        //TODO: some sort of algo for the stored jobs
  • trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

    r1366 r1367  
    8282      wcfService = WcfService.Instance;
    8383      wcfService.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(wcfService_LoginCompleted);
    84       wcfService.PullJobCompleted += new EventHandler<SendJobCompletedEventArgs>(wcfService_PullJobCompleted);
    85       wcfService.SendJobResultCompleted += new EventHandler<ProcessJobResultCompletedEventArgs>(wcfService_SendJobResultCompleted);
     84      wcfService.SendJobCompleted += new EventHandler<SendJobCompletedEventArgs>(wcfService_PullJobCompleted);
     85      wcfService.ProcessJobResultCompleted += new EventHandler<ProcessJobResultCompletedEventArgs>(wcfService_SendJobResultCompleted);
    8686      wcfService.ConnectionRestored += new EventHandler(wcfService_ConnectionRestored);
    8787      wcfService.ServerChanged += new EventHandler(wcfService_ServerChanged);
     
    136136        //Pull a Job from the Server
    137137        case MessageContainer.MessageType.FetchJob:
    138           wcfService.PullJobAsync(ConfigManager.Instance.GetClientInfo().ClientId);
     138          wcfService.SendJobAsync(ConfigManager.Instance.GetClientInfo().ClientId);
    139139          break;         
    140140        //A Job has finished and can be sent back to the server
     
    160160
    161161      if (WcfService.Instance.ConnState == NetworkEnum.WcfConnState.Loggedin) {
    162         wcfService.SendJobResultAsync(ConfigManager.Instance.GetClientInfo().ClientId,
     162        wcfService.ProcessJobResultAsync(ConfigManager.Instance.GetClientInfo().ClientId,
    163163          jId,
    164164          sJob,
     
    179179      long jId = (long)jobId;
    180180      byte[] obj = engines[jId].GetSnapshot();
    181       wcfService.SendJobResultAsync(ConfigManager.Instance.GetClientInfo().ClientId,
     181      wcfService.ProcessJobResultAsync(ConfigManager.Instance.GetClientInfo().ClientId,
    182182        jId,
    183183        obj,
Note: See TracChangeset for help on using the changeset viewer.