Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/12/11 13:43:05 (13 years ago)
Author:
cneumuel
Message:

#1233

  • changed relationship between Job and HiveExperiment. There is no more HiveExperiment.RootJobId, instead there is Job.HiveExperimentId.
  • One HiveExperiment can now have multiple Experiments.
  • TreeView supports multiple root nodes
  • HiveEngine creates a HiveExperiment for each set of jobs, so jobs cannot be without an parent experiment anymore (no more loose jobs)
  • updated ExperimentManager binaries
Location:
branches/HeuristicLab.Hive-3.4/sources
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive-3.4/sources

    • Property svn:ignore
      •  

        old new  
        44PrecompiledWeb
        55CreateEventLogSources
         6WindowsFormsTestProject
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.designer.cs

    r5779 r6006  
    14241424    private global::HeuristicLab.Services.Hive.Common.DataTransfer.Command? _Command;
    14251425   
     1426    private System.Guid _HiveExperimentId;
     1427   
    14261428    private EntitySet<AssignedResource> _AssignedResources;
    14271429   
     
    14351437   
    14361438    private EntityRef<Job> _Job1;
     1439   
     1440    private EntityRef<HiveExperiment> _HiveExperiment;
    14371441   
    14381442    #region Extensibility Method Definitions
     
    14621466    partial void OnCommandChanging(global::HeuristicLab.Services.Hive.Common.DataTransfer.Command? value);
    14631467    partial void OnCommandChanged();
     1468    partial void OnHiveExperimentIdChanging(System.Guid value);
     1469    partial void OnHiveExperimentIdChanged();
    14641470    #endregion
    14651471   
     
    14721478      this._StateLogs = new EntitySet<StateLog>(new Action<StateLog>(this.attach_StateLogs), new Action<StateLog>(this.detach_StateLogs));
    14731479      this._Job1 = default(EntityRef<Job>);
     1480      this._HiveExperiment = default(EntityRef<HiveExperiment>);
    14741481      OnCreated();
    14751482    }
     
    16991706    }
    17001707   
     1708    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HiveExperimentId", DbType="UniqueIdentifier NOT NULL")]
     1709    public System.Guid HiveExperimentId
     1710    {
     1711      get
     1712      {
     1713        return this._HiveExperimentId;
     1714      }
     1715      set
     1716      {
     1717        if ((this._HiveExperimentId != value))
     1718        {
     1719          if (this._HiveExperiment.HasLoadedOrAssignedValue)
     1720          {
     1721            throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
     1722          }
     1723          this.OnHiveExperimentIdChanging(value);
     1724          this.SendPropertyChanging();
     1725          this._HiveExperimentId = value;
     1726          this.SendPropertyChanged("HiveExperimentId");
     1727          this.OnHiveExperimentIdChanged();
     1728        }
     1729      }
     1730    }
     1731   
    17011732    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Job_AssignedResource", Storage="_AssignedResources", ThisKey="JobId", OtherKey="JobId")]
    17021733    public EntitySet<AssignedResource> AssignedResources
     
    18101841          }
    18111842          this.SendPropertyChanged("ParentJob");
     1843        }
     1844      }
     1845    }
     1846   
     1847    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="HiveExperiment_Job", Storage="_HiveExperiment", ThisKey="HiveExperimentId", OtherKey="HiveExperimentId", IsForeignKey=true)]
     1848    public HiveExperiment HiveExperiment
     1849    {
     1850      get
     1851      {
     1852        return this._HiveExperiment.Entity;
     1853      }
     1854      set
     1855      {
     1856        HiveExperiment previousValue = this._HiveExperiment.Entity;
     1857        if (((previousValue != value)
     1858              || (this._HiveExperiment.HasLoadedOrAssignedValue == false)))
     1859        {
     1860          this.SendPropertyChanging();
     1861          if ((previousValue != null))
     1862          {
     1863            this._HiveExperiment.Entity = null;
     1864            previousValue.Jobs.Remove(this);
     1865          }
     1866          this._HiveExperiment.Entity = value;
     1867          if ((value != null))
     1868          {
     1869            value.Jobs.Add(this);
     1870            this._HiveExperimentId = value.HiveExperimentId;
     1871          }
     1872          else
     1873          {
     1874            this._HiveExperimentId = default(System.Guid);
     1875          }
     1876          this.SendPropertyChanged("HiveExperiment");
    18121877        }
    18131878      }
     
    21462211    private System.Guid _UserId;
    21472212   
    2148     private System.Guid _RootJobId;
    2149    
    21502213    private System.DateTime _DateCreated;
    21512214   
     
    21562219    private EntitySet<HiveExperimentPermission> _HiveExperimentPermissions;
    21572220   
    2158     private EntityRef<Job> _Job;
     2221    private EntitySet<Job> _Jobs;
    21592222   
    21602223    #region Extensibility Method Definitions
     
    21722235    partial void OnOwnerUserIdChanging(System.Guid value);
    21732236    partial void OnOwnerUserIdChanged();
    2174     partial void OnRootJobIdChanging(System.Guid value);
    2175     partial void OnRootJobIdChanged();
    21762237    partial void OnDateCreatedChanging(System.DateTime value);
    21772238    partial void OnDateCreatedChanged();
     
    21852246    {
    21862247      this._HiveExperimentPermissions = new EntitySet<HiveExperimentPermission>(new Action<HiveExperimentPermission>(this.attach_HiveExperimentPermissions), new Action<HiveExperimentPermission>(this.detach_HiveExperimentPermissions));
    2187       this._Job = default(EntityRef<Job>);
     2248      this._Jobs = new EntitySet<Job>(new Action<Job>(this.attach_Jobs), new Action<Job>(this.detach_Jobs));
    21882249      OnCreated();
    21892250    }
     
    22892350    }
    22902351   
    2291     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RootJobId", DbType="UniqueIdentifier")]
    2292     public System.Guid RootJobId
    2293     {
    2294       get
    2295       {
    2296         return this._RootJobId;
    2297       }
    2298       set
    2299       {
    2300         if ((this._RootJobId != value))
    2301         {
    2302           if (this._Job.HasLoadedOrAssignedValue)
    2303           {
    2304             throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
    2305           }
    2306           this.OnRootJobIdChanging(value);
    2307           this.SendPropertyChanging();
    2308           this._RootJobId = value;
    2309           this.SendPropertyChanged("RootJobId");
    2310           this.OnRootJobIdChanged();
    2311         }
    2312       }
    2313     }
    2314    
    23152352    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DateCreated", DbType="DateTime")]
    23162353    public System.DateTime DateCreated
     
    23862423    }
    23872424   
    2388     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Job_HiveExperiment", Storage="_Job", ThisKey="RootJobId", OtherKey="JobId", IsForeignKey=true, DeleteRule="CASCADE")]
    2389     public Job RootJob
    2390     {
    2391       get
    2392       {
    2393         return this._Job.Entity;
    2394       }
    2395       set
    2396       {
    2397         if ((this._Job.Entity != value))
    2398         {
    2399           this.SendPropertyChanging();
    2400           this._Job.Entity = value;
    2401           this.SendPropertyChanged("RootJob");
    2402         }
     2425    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="HiveExperiment_Job", Storage="_Jobs", ThisKey="HiveExperimentId", OtherKey="HiveExperimentId")]
     2426    public EntitySet<Job> Jobs
     2427    {
     2428      get
     2429      {
     2430        return this._Jobs;
     2431      }
     2432      set
     2433      {
     2434        this._Jobs.Assign(value);
    24032435      }
    24042436    }
     
    24312463   
    24322464    private void detach_HiveExperimentPermissions(HiveExperimentPermission entity)
     2465    {
     2466      this.SendPropertyChanging();
     2467      entity.HiveExperiment = null;
     2468    }
     2469   
     2470    private void attach_Jobs(Job entity)
     2471    {
     2472      this.SendPropertyChanging();
     2473      entity.HiveExperiment = this;
     2474    }
     2475   
     2476    private void detach_Jobs(Job entity)
    24332477    {
    24342478      this.SendPropertyChanging();
Note: See TracChangeset for help on using the changeset viewer.