Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/28/10 14:52:56 (14 years ago)
Author:
cneumuel
Message:
  • moved db-context into datalayer
  • businesslayer only defines the transaction-scope
  • removed contextfactory
  • implemented convert-methods
  • made naming in db and domainobjects more consistent
  • changed wcf-service to be http-only (for now)

(#1233)

Location:
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3
Files:
1 added
11 edited

Legend:

Unmodified
Added
Removed

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

    r4629 r4649  
    3030  public class HiveExperiment : NamedHiveItem {
    3131    [DataMember]
    32     public string ResourceIds { get; set; }
    33     [DataMember]
    3432    public Guid UserId { get; set; }
    3533    [DataMember]
    … …  
    3735
    3836    public override string ToString() {
    39       return base.ToString() + "Name: " + Name + ", Description: " + Description + ", ResourceIds: " + ResourceIds;
     37      return base.ToString() + "Name: " + Name + ", Description: " + Description;
    4038    }
    4139   
    4240    public override IDeepCloneable Clone(Cloner cloner) {
    4341      var clone = (HiveExperiment)base.Clone(cloner);
    44       clone.ResourceIds = this.ResourceIds;
    4542      clone.RootJobId = this.RootJobId;
    4643      clone.UserId = this.UserId;

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

    r4629 r4649  
    88namespace HeuristicLab.Services.Hive.Common.DataTransfer {
    99  [DataContract]
    10   public abstract class HiveItem : IDeepCloneable {
     10  [Serializable]
     11  public abstract class HiveItem : HiveItemBase {
    1112    [DataMember]
    1213    public Guid Id { get; set; }
    1314
    1415    public virtual IDeepCloneable Clone(Cloner cloner) {
    15       HiveItem clone = (HiveItem)Activator.CreateInstance(this.GetType(), true);
    16       cloner.RegisterClonedObject(this, clone);
     16      HiveItem clone = (HiveItem)base.Clone(cloner);
    1717      clone.Id = this.Id;
    1818      return clone;
    1919    }
    20 
    21     public object Clone() {
    22       return Clone(new Cloner());
    23     }
    2420  }
    2521}

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

    r4629 r4649  
    2727
    2828namespace HeuristicLab.Services.Hive.Common.DataTransfer {
    29 
    3029  [DataContract]
    3130  [Serializable]
    … …  
    4039    public int MemoryNeeded { get; set; }
    4140    [DataMember]
    42     public List<Guid> PluginsNeededIds { get; set; }
    43     [DataMember]
    44     public List<Guid> AssignedResourceIds { get; set; }
    45     [DataMember]
    46     public Guid ProjectId { get; set; }
     41    public Guid? ProjectId { get; set; }
    4742
    4843    public override string ToString() {
    49       return base.ToString() + "State: " + State + ", [SlaveId : " + SlaveId + " ] , DateCreated: " + DateCreated + ", DateCalculated: " + DateCalculated +
    50         "Priority: " + Priority + ", CoresNeeded: " + CoresNeeded + "AssignedResources: " + AssignedResourceIds;
     44      return base.ToString() + "State: " + JobState + ", [SlaveId : " + SlaveId + " ] , DateCreated: " + DateCreated + ", DateCalculated: " + DateCalculated +
     45        "Priority: " + Priority + ", CoresNeeded: " + CoresNeeded;
    5146    }
    5247
    5348    public Job() {
    54       PluginsNeededIds = new List<Guid>();
    55       AssignedResourceIds = new List<Guid>();
    5649    }
    5750
    … …  
    6255      clone.CoresNeeded = this.CoresNeeded;
    6356      clone.MemoryNeeded = this.MemoryNeeded;
    64       clone.PluginsNeededIds = new List<Guid>(this.PluginsNeededIds);
    65       clone.AssignedResourceIds = new List<Guid>(this.AssignedResourceIds);
    6657      clone.ProjectId = this.ProjectId;
    6758      return clone;

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

    r4629 r4649  
    2828  [DataContract]
    2929  [Serializable]
    30   public class JobData : HiveItem {
     30  public class JobData : HiveItemBase {
    3131    [DataMember]
    3232    public Guid JobId { get; set; }

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

    r4615 r4649  
    2323namespace HeuristicLab.Services.Hive.Common.DataTransfer {
    2424  public enum JobState {
    25     /// <summary>
    26     /// Job is actively calculated on a Slave
     25        /// <summary>
     26    /// A job is offline as long as he is not yet submitted to the hive
    2727    /// </summary>
    28     Calculating,
     28    Offline,
    2929
    3030    /// <summary>
    … …  
    3333    Waiting,
    3434
     35        /// <summary>
     36    /// The job is paused and waits on the server to be sent back to a Slave when all of its child jobs are Finished.
     37    /// </summary>
     38    WaitingForChildJobs,
     39
     40    /// <summary>
     41    /// Job is actively calculated on a Slave
     42    /// </summary>
     43    Calculating,
     44   
    3545    /// <summary>
    3646    /// Job as finished and is ready to be collected by the Client
    … …  
    4656    /// Job as been aborted due to an error. Results are ready to be collected
    4757    /// </summary>
    48     Failed,
    49 
    50     /// <summary>
    51     /// The job is paused and waits on the server to be sent back to a Slave when all of its child jobs are Finished.
    52     /// </summary>
    53     WaitForChildJobs
     58    Failed
    5459  };
    5560
    … …  
    6772    public static bool IsWaiting(this JobState jobState) {
    6873      return jobState == JobState.Waiting ||
    69         jobState == JobState.WaitForChildJobs;
     74        jobState == JobState.WaitingForChildJobs;
    7075    }
    7176

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

    r4629 r4649  
    2929  public class LightweightJob : HiveItem {
    3030    [DataMember]
    31     public Guid SlaveId { get; set; }
     31    public Guid? SlaveId { get; set; }
    3232    [DataMember]
    33     public JobState State { get; set; }
     33    public JobState JobState { get; set; }
    3434    [DataMember]
    35     public TimeSpan ExecutionTime { get; set; }
     35    public TimeSpan? ExecutionTime { get; set; }
    3636    [DataMember]
    3737    public String Exception { get; set; }
    … …  
    4545    public Guid? ParentJobId { get; set; }
    4646
    47     public LightweightJob() { }
     47    public LightweightJob() {
     48      JobState = DataTransfer.JobState.Offline;
     49    }
    4850
    4951    public LightweightJob(Job job) {
    5052      this.SlaveId = job.SlaveId;
    51       this.State = job.State;
     53      this.JobState = job.JobState;
    5254      this.ExecutionTime = job.ExecutionTime;
    5355      this.Exception = job.Exception;
    … …  
    6163      var clone = (LightweightJob)base.Clone(cloner);
    6264      clone.SlaveId = this.SlaveId;
    63       clone.State = this.State;
     65      clone.JobState = this.JobState;
    6466      clone.ExecutionTime = this.ExecutionTime;
    6567      clone.Exception = this.Exception;

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

    r4629 r4649  
    3333    public int? FreeCores { get; set; }
    3434    [DataMember]
    35     public int? CpuSpeedPerCore { get; set; }
     35    public int? CpuSpeed { get; set; }
    3636    [DataMember]
    3737    public int? Memory { get; set; }
    … …  
    3939    public int? FreeMemory { get; set; }
    4040    [DataMember]
    41     public SlaveState State { get; set; }
     41    public SlaveState SlaveState { get; set; }
    4242    [DataMember]
    43     public CalendarState CalendarSyncStatus { get; set; }
     43    public CalendarState CalendarSyncState { get; set; }
    4444    [DataMember]
    45     public Guid SlaveConfigId { get; set; }
     45    public Guid? SlaveConfigId { get; set; }
    4646    [DataMember]
    4747    public bool IsAllowedToCalculate { get; set; }
    4848
     49    public Slave() {
     50      SlaveState = DataTransfer.SlaveState.Idle;
     51    }
     52
    4953    public override string ToString() {
    50       return base.ToString() + ", NrOfCores: " + Cores + ", NrOfFreeCores " + FreeCores + ", State: " + State;
     54      return base.ToString() + ", NrOfCores: " + Cores + ", NrOfFreeCores " + FreeCores + ", State: " + SlaveState;
    5155    }
    5256
    … …  
    5559      clone.Cores = this.Cores;
    5660      clone.FreeCores = this.FreeCores;
    57       clone.CpuSpeedPerCore = this.CpuSpeedPerCore;
     61      clone.CpuSpeed = this.CpuSpeed;
    5862      clone.Memory = this.Memory;
    5963      clone.FreeMemory = this.FreeMemory;
    60       clone.State = this.State;
    61       clone.CalendarSyncStatus = this.CalendarSyncStatus;
     64      clone.SlaveState = this.SlaveState;
     65      clone.CalendarSyncState = this.CalendarSyncState;
    6266      clone.SlaveConfigId = this.SlaveConfigId;
    6367      clone.IsAllowedToCalculate = this.IsAllowedToCalculate;

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

    r4629 r4649  
    3030  public class SlaveGroup : Resource {
    3131    [DataMember]
    32     public List<Guid> ResourcesIds { get; set; }
     32    public List<Guid> ChildResourcesIds { get; set; }
     33    [DataMember]
     34    public List<Guid> ParentResourcesIds { get; set; }
    3335
    3436    public SlaveGroup() {
    35       ResourcesIds = new List<Guid>();
     37      ChildResourcesIds = new List<Guid>();
    3638    }
    3739
    3840    public override IDeepCloneable Clone(Cloner cloner) {
    3941      var clone = (SlaveGroup)base.Clone(cloner);
    40       clone.ResourcesIds = new List<Guid>(this.ResourcesIds);
     42      clone.ChildResourcesIds = new List<Guid>(this.ChildResourcesIds);
     43      clone.ParentResourcesIds = new List<Guid>(this.ParentResourcesIds);
    4144      return clone;
    4245    }

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

    r4598 r4649  
    2121
    2222using System;
     23using HeuristicLab.Common;
    2324
    2425namespace HeuristicLab.Services.Hive.Common {
    … …  
    3435
    3536    public void Dispose() {
    36       if (OnDisposing != null)
    37         OnDisposing(this, new EventArgs());
     37      if (Disposing != null)
     38        Disposing(this, new EventArgs<T>(obj));
    3839    }
    3940
    40     public event EventHandler OnDisposing;
     41    public event EventHandler<EventArgs<T>> Disposing;
    4142  }
    4243}

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

    r4629 r4649  
    6767    <Compile Include="DataTransfer\HiveExperiment.cs" />
    6868    <Compile Include="DataTransfer\HiveItem.cs" />
     69    <Compile Include="DataTransfer\HiveItemBase.cs" />
    6970    <Compile Include="DataTransfer\HivePluginData.cs" />
    7071    <Compile Include="DataTransfer\HivePlugin.cs" />

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/ServiceContracts/IHiveService.cs

    r4629 r4649  
    156156    #region Slave Methods
    157157    [OperationContract]
     158    Guid AddSlave(Slave slave);
     159
     160    [OperationContract]
    158161    Guid AddSlaveGroup(SlaveGroup slaveGroup);
    159162
Note: See TracChangeset for help on using the changeset viewer.