Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/20/10 15:05:55 (14 years ago)
Author:
cneumuel
Message:
  • worked on new hive structure
  • created IIS hostable website for hive (old structure)

(#1233)

Location:
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3

    • Property svn:ignore

      •  

        old new  
        11bin
        22obj
         3*.user

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/Appointment.cs

    r4593 r4629  
    2222using System;
    2323using System.Runtime.Serialization;
     24using HeuristicLab.Common;
    2425
    2526namespace HeuristicLab.Services.Hive.Common.DataTransfer {
    … …  
    3839    [DataMember]
    3940    public Guid ResourceId { get; set; }
     41
     42    public override IDeepCloneable Clone(Cloner cloner) {
     43      Appointment clone = (Appointment)base.Clone(cloner);
     44      clone.AllDayEvent = this.AllDayEvent;
     45      clone.EndDate = this.EndDate;
     46      clone.Recurring = this.Recurring;
     47      clone.RecurringId = this.RecurringId;
     48      clone.ResourceId = this.ResourceId;
     49      clone.StartDate = this.StartDate;
     50      return clone;
     51    }
    4052  }
    4153}

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HeartBeat.cs

    r4593 r4629  
    2727
    2828  [DataContract]
    29   public class HeartBeat {
     29  public class Heartbeat {
    3030    [DataMember]
    3131    public Guid SlaveId { get; set; }

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HiveExperiment.cs

    r4593 r4629  
    3939      return base.ToString() + "Name: " + Name + ", Description: " + Description + ", ResourceIds: " + ResourceIds;
    4040    }
    41 
    42     public HiveExperiment() {
     41   
     42    public override IDeepCloneable Clone(Cloner cloner) {
     43      var clone = (HiveExperiment)base.Clone(cloner);
     44      clone.ResourceIds = this.ResourceIds;
     45      clone.RootJobId = this.RootJobId;
     46      clone.UserId = this.UserId;
     47      return clone;
    4348    }
    4449  }

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HiveItem.cs

    r4593 r4629  
    44using System.Text;
    55using System.Runtime.Serialization;
     6using HeuristicLab.Common;
    67
    78namespace HeuristicLab.Services.Hive.Common.DataTransfer {
    89  [DataContract]
    9   public abstract class HiveItem {
     10  public abstract class HiveItem : IDeepCloneable {
    1011    [DataMember]
    1112    public Guid Id { get; set; }
     13
     14    public virtual IDeepCloneable Clone(Cloner cloner) {
     15      HiveItem clone = (HiveItem)Activator.CreateInstance(this.GetType(), true);
     16      cloner.RegisterClonedObject(this, clone);
     17      clone.Id = this.Id;
     18      return clone;
     19    }
     20
     21    public object Clone() {
     22      return Clone(new Cloner());
     23    }
    1224  }
    1325}

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HivePlugin.cs

    r4593 r4629  
    2424using System.Linq;
    2525using System.Runtime.Serialization;
     26using HeuristicLab.Common;
    2627
    2728namespace HeuristicLab.Services.Hive.Common.DataTransfer {
    … …  
    3233    public Version Version { get; set; }
    3334    [DataMember]
    34     public Boolean Update { get; set; }
     35    public bool Update { get; set; }
     36
     37    public override IDeepCloneable Clone(Cloner cloner) {
     38      var clone = (HivePlugin)base.Clone(cloner);
     39      clone.Version = this.Version;
     40      clone.Update = this.Update;
     41      return clone;
     42    }
    3543  }
    3644}

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HivePluginData.cs

    r4598 r4629  
    2222using System;
    2323using System.Runtime.Serialization;
     24using HeuristicLab.Common;
    2425
    2526namespace HeuristicLab.Services.Hive.Common.DataTransfer {
    … …  
    3435      Name = name;
    3536    }
     37
     38    public override IDeepCloneable Clone(Cloner cloner) {
     39      var clone = (HivePluginData)base.Clone(cloner);
     40      if (this.Data != null) clone.Data = new byte[this.Data.Length]; Array.Copy(this.Data, clone.Data, this.Data.Length);
     41      return clone;
     42    }
    3643  }
    3744}

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/Job.cs

    r4615 r4629  
    5555      AssignedResourceIds = new List<Guid>();
    5656    }
     57
     58    public override IDeepCloneable Clone(Cloner cloner) {
     59      var clone = (Job)base.Clone(cloner);
     60      clone.UserId = this.UserId;
     61      clone.Priority = this.Priority;
     62      clone.CoresNeeded = this.CoresNeeded;
     63      clone.MemoryNeeded = this.MemoryNeeded;
     64      clone.PluginsNeededIds = new List<Guid>(this.PluginsNeededIds);
     65      clone.AssignedResourceIds = new List<Guid>(this.AssignedResourceIds);
     66      clone.ProjectId = this.ProjectId;
     67      return clone;
     68    }
    5769  }
    5870}

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/JobData.cs

    r4598 r4629  
    2323using System.IO;
    2424using System.Runtime.Serialization;
     25using HeuristicLab.Common;
    2526
    2627namespace HeuristicLab.Services.Hive.Common.DataTransfer {
    … …  
    3233    [DataMember]
    3334    public byte[] Data { get; set; }
     35
     36    public override IDeepCloneable Clone(Cloner cloner) {
     37      var clone = (JobData)base.Clone(cloner);
     38      if (this.Data != null) clone.Data = new byte[this.Data.Length]; Array.Copy(this.Data, clone.Data, this.Data.Length);
     39      return clone;
     40    }
    3441  }
    3542}

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/LightweightJob.cs

    r4598 r4629  
    2222using System;
    2323using System.Runtime.Serialization;
     24using HeuristicLab.Common;
    2425
    2526namespace HeuristicLab.Services.Hive.Common.DataTransfer {
    … …  
    5657      this.ParentJobId = job.ParentJobId;
    5758    }
     59
     60    public override IDeepCloneable Clone(Cloner cloner) {
     61      var clone = (LightweightJob)base.Clone(cloner);
     62      clone.SlaveId = this.SlaveId;
     63      clone.State = this.State;
     64      clone.ExecutionTime = this.ExecutionTime;
     65      clone.Exception = this.Exception;
     66      clone.DateCreated = this.DateCreated;
     67      clone.DateCalculated = this.DateCalculated;
     68      clone.DateFinished = this.DateFinished;
     69      clone.ParentJobId = this.ParentJobId;
     70      return clone;
     71    }
    5872  }
    5973}

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/NamedHiveItem.cs

    r4593 r4629  
    44using System.Text;
    55using System.Runtime.Serialization;
     6using HeuristicLab.Common;
    67
    78namespace HeuristicLab.Services.Hive.Common.DataTransfer {
    … …  
    1213    [DataMember]
    1314    public string Description { get; set; }
     15
     16    public override IDeepCloneable Clone(Cloner cloner) {
     17      var clone = (NamedHiveItem)base.Clone(cloner);
     18      clone.Name = this.Name;
     19      clone.Description = this.Description;
     20      return clone;
     21    }
    1422  }
    1523}

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/Slave.cs

    r4593 r4629  
    2929  public class Slave : Resource {
    3030    [DataMember]
    31     public int? NrOfCores { get; set; }
     31    public int? Cores { get; set; }
    3232    [DataMember]
    33     public int? NrOfFreeCores { get; set; }
     33    public int? FreeCores { get; set; }
    3434    [DataMember]
    3535    public int? CpuSpeedPerCore { get; set; }
    … …  
    3939    public int? FreeMemory { get; set; }
    4040    [DataMember]
    41     public DateTime? Login { get; set; }
    42     [DataMember]
    4341    public SlaveState State { get; set; }
    4442    [DataMember]
    4543    public CalendarState CalendarSyncStatus { get; set; }
    4644    [DataMember]
    47     public SlaveConfig Config { get; set; }
     45    public Guid SlaveConfigId { get; set; }
    4846    [DataMember]
    4947    public bool IsAllowedToCalculate { get; set; }
    5048
    5149    public override string ToString() {
    52       return base.ToString() + ", NrOfCores: " + NrOfCores + ", NrOfFreeCores " + NrOfFreeCores + ", Login: " + Login + ", State: " + State;
     50      return base.ToString() + ", NrOfCores: " + Cores + ", NrOfFreeCores " + FreeCores + ", State: " + State;
     51    }
     52
     53    public override IDeepCloneable Clone(Cloner cloner) {
     54      var clone = (Slave)base.Clone(cloner);
     55      clone.Cores = this.Cores;
     56      clone.FreeCores = this.FreeCores;
     57      clone.CpuSpeedPerCore = this.CpuSpeedPerCore;
     58      clone.Memory = this.Memory;
     59      clone.FreeMemory = this.FreeMemory;
     60      clone.State = this.State;
     61      clone.CalendarSyncStatus = this.CalendarSyncStatus;
     62      clone.SlaveConfigId = this.SlaveConfigId;
     63      clone.IsAllowedToCalculate = this.IsAllowedToCalculate;
     64      return clone;
    5365    }
    5466  }

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/SlaveConfig.cs

    r4593 r4629  
    3232    [DataMember]
    3333    public int? HeartBeatIntervall { get; set; }
     34
     35    public override IDeepCloneable Clone(Cloner cloner) {
     36      var clone = (SlaveConfig)base.Clone(cloner);
     37      clone.UpDownTimeCalendar = this.UpDownTimeCalendar;
     38      clone.HeartBeatIntervall = this.HeartBeatIntervall;
     39      return clone;
     40    }
    3441  }
    3542}

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/SlaveGroup.cs

    r4593 r4629  
    2323using System.Linq;
    2424using System.Runtime.Serialization;
     25using System;
     26using HeuristicLab.Common;
    2527
    2628namespace HeuristicLab.Services.Hive.Common.DataTransfer {
    … …  
    2830  public class SlaveGroup : Resource {
    2931    [DataMember]
    30     public List<Resource> Resources { get; set; }
     32    public List<Guid> ResourcesIds { get; set; }
    3133
    3234    public SlaveGroup() {
    33       Resources = new List<Resource>();
     35      ResourcesIds = new List<Guid>();
     36    }
     37
     38    public override IDeepCloneable Clone(Cloner cloner) {
     39      var clone = (SlaveGroup)base.Clone(cloner);
     40      clone.ResourcesIds = new List<Guid>(this.ResourcesIds);
     41      return clone;
    3442    }
    3543  }

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/SlaveState.cs

    r4593 r4629  
    2323namespace HeuristicLab.Services.Hive.Common.DataTransfer {
    2424  public enum SlaveState {
    25     NullState,
    2625    Idle,
    2726    Calculating,

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/UpTimeStatistics.cs

    r4593 r4629  
    2222using System;
    2323using System.Runtime.Serialization;
     24using HeuristicLab.Common;
    2425
    2526namespace HeuristicLab.Services.Hive.Common.DataTransfer {
    … …  
    2728  public class UpTimeStatistics : HiveItem {
    2829    [DataMember]
    29     public Slave Slave { get; set; }
     30    public Guid SlaveId { get; set; }
    3031    [DataMember]
    3132    public DateTime Login { get; set; }
    3233    [DataMember]
    3334    public DateTime Logout { get; set; }
     35
     36    public override IDeepCloneable Clone(Cloner cloner) {
     37      var clone = (UpTimeStatistics)base.Clone(cloner);
     38      clone.SlaveId = this.SlaveId;
     39      clone.Login = this.Login;
     40      clone.Logout = this.Logout;
     41      return clone;
     42    }
    3443  }
    3544}
Note: See TracChangeset for help on using the changeset viewer.