Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/22/12 11:11:38 (12 years ago)
Author:
jkarder
Message:

#1331:

  • synced branch with trunk
  • added custom interface (ISimilarityBasedOperator) to mark operators that conduct similarity calculation
  • similarity calculators are now parameterized by the algorithm
  • deleted SolutionPool2TierUpdateMethod
  • deleted KnapsackMultipleGuidesPathRelinker
  • moved IImprovementOperator, IPathRelinker and ISimilarityCalculator to HeuristicLab.Optimization
  • added parameter descriptions
  • fixed plugin references
  • fixed count of EvaluatedSolutions
  • fixed check for duplicate solutions
  • minor code improvements
Location:
branches/ScatterSearch (trunk integration)
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/ScatterSearch (trunk integration)

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.designer.cs

    r6983 r8086  
    33// <auto-generated>
    44//     This code was generated by a tool.
    5 //     Runtime Version:4.0.30319.239
     5//     Runtime Version:4.0.30319.269
    66//
    77//     Changes to this file may cause incorrect behavior and will be lost if
     
    7979    partial void UpdateStatistics(Statistics instance);
    8080    partial void DeleteStatistics(Statistics instance);
     81    partial void InsertResourcePermission(ResourcePermission instance);
     82    partial void UpdateResourcePermission(ResourcePermission instance);
     83    partial void DeleteResourcePermission(ResourcePermission instance);
    8184    #endregion
    8285   
     
    236239      {
    237240        return this.GetTable<Statistics>();
     241      }
     242    }
     243   
     244    public System.Data.Linq.Table<ResourcePermission> ResourcePermissions
     245    {
     246      get
     247      {
     248        return this.GetTable<ResourcePermission>();
    238249      }
    239250    }
     
    857868    private int _HbInterval;
    858869   
     870    private System.Nullable<System.Guid> _OwnerUserId;
     871   
    859872    private EntitySet<AssignedResource> _AssignedResources;
    860873   
     
    864877   
    865878    private EntitySet<StateLog> _StateLogs;
     879   
     880    private EntitySet<ResourcePermission> _ResourcePermissions;
    866881   
    867882    private EntityRef<Resource> _ParentResource;
     
    881896    partial void OnHbIntervalChanging(int value);
    882897    partial void OnHbIntervalChanged();
     898    partial void OnOwnerUserIdChanging(System.Nullable<System.Guid> value);
     899    partial void OnOwnerUserIdChanged();
    883900    #endregion
    884901   
     
    889906      this._UptimeCalendars = new EntitySet<Downtime>(new Action<Downtime>(this.attach_UptimeCalendars), new Action<Downtime>(this.detach_UptimeCalendars));
    890907      this._StateLogs = new EntitySet<StateLog>(new Action<StateLog>(this.attach_StateLogs), new Action<StateLog>(this.detach_StateLogs));
     908      this._ResourcePermissions = new EntitySet<ResourcePermission>(new Action<ResourcePermission>(this.attach_ResourcePermissions), new Action<ResourcePermission>(this.detach_ResourcePermissions));
    891909      this._ParentResource = default(EntityRef<Resource>);
    892910      OnCreated();
     
    9971015    }
    9981016   
     1017    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerUserId", DbType="UniqueIdentifier")]
     1018    public System.Nullable<System.Guid> OwnerUserId
     1019    {
     1020      get
     1021      {
     1022        return this._OwnerUserId;
     1023      }
     1024      set
     1025      {
     1026        if ((this._OwnerUserId != value))
     1027        {
     1028          this.OnOwnerUserIdChanging(value);
     1029          this.SendPropertyChanging();
     1030          this._OwnerUserId = value;
     1031          this.SendPropertyChanged("OwnerUserId");
     1032          this.OnOwnerUserIdChanged();
     1033        }
     1034      }
     1035    }
     1036   
    9991037    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_AssignedResource", Storage="_AssignedResources", ThisKey="ResourceId", OtherKey="ResourceId")]
    10001038    public EntitySet<AssignedResource> AssignedResources
     
    10461084      {
    10471085        this._StateLogs.Assign(value);
     1086      }
     1087    }
     1088   
     1089    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_SlavePermission", Storage="_ResourcePermissions", ThisKey="ResourceId", OtherKey="ResourceId")]
     1090    public EntitySet<ResourcePermission> ResourcePermissions
     1091    {
     1092      get
     1093      {
     1094        return this._ResourcePermissions;
     1095      }
     1096      set
     1097      {
     1098        this._ResourcePermissions.Assign(value);
    10481099      }
    10491100    }
     
    11461197   
    11471198    private void detach_StateLogs(StateLog entity)
     1199    {
     1200      this.SendPropertyChanging();
     1201      entity.Resource = null;
     1202    }
     1203   
     1204    private void attach_ResourcePermissions(ResourcePermission entity)
     1205    {
     1206      this.SendPropertyChanging();
     1207      entity.Resource = this;
     1208    }
     1209   
     1210    private void detach_ResourcePermissions(ResourcePermission entity)
    11481211    {
    11491212      this.SendPropertyChanging();
     
    11781241   
    11791242    private double _CpuUtilization;
     1243   
     1244    private System.Nullable<bool> _IsDisposable;
    11801245   
    11811246    #region Extensibility Method Definitions
     
    12071272    partial void OnCpuUtilizationChanging(double value);
    12081273    partial void OnCpuUtilizationChanged();
     1274    partial void OnIsDisposableChanging(System.Nullable<bool> value);
     1275    partial void OnIsDisposableChanged();
    12091276    #endregion
    12101277   
     
    14501517          this.SendPropertyChanged("CpuUtilization");
    14511518          this.OnCpuUtilizationChanged();
     1519        }
     1520      }
     1521    }
     1522   
     1523    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsDisposable", DbType="Bit")]
     1524    public System.Nullable<bool> IsDisposable
     1525    {
     1526      get
     1527      {
     1528        return this._IsDisposable;
     1529      }
     1530      set
     1531      {
     1532        if ((this._IsDisposable != value))
     1533        {
     1534          this.OnIsDisposableChanging(value);
     1535          this.SendPropertyChanging();
     1536          this._IsDisposable = value;
     1537          this.SendPropertyChanged("IsDisposable");
     1538          this.OnIsDisposableChanged();
    14521539        }
    14531540      }
     
    41754262    }
    41764263  }
     4264 
     4265  [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ResourcePermission")]
     4266  public partial class ResourcePermission : INotifyPropertyChanging, INotifyPropertyChanged
     4267  {
     4268   
     4269    private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
     4270   
     4271    private System.Guid _ResourceId;
     4272   
     4273    private System.Guid _GrantedUserId;
     4274   
     4275    private System.Guid _GrantedByUserId;
     4276   
     4277    private EntityRef<Resource> _Resource;
     4278   
     4279    #region Extensibility Method Definitions
     4280    partial void OnLoaded();
     4281    partial void OnValidate(System.Data.Linq.ChangeAction action);
     4282    partial void OnCreated();
     4283    partial void OnResourceIdChanging(System.Guid value);
     4284    partial void OnResourceIdChanged();
     4285    partial void OnGrantedUserIdChanging(System.Guid value);
     4286    partial void OnGrantedUserIdChanged();
     4287    partial void OnGrantedByUserIdChanging(System.Guid value);
     4288    partial void OnGrantedByUserIdChanged();
     4289    #endregion
     4290   
     4291    public ResourcePermission()
     4292    {
     4293      this._Resource = default(EntityRef<Resource>);
     4294      OnCreated();
     4295    }
     4296   
     4297    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResourceId", DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true)]
     4298    public System.Guid ResourceId
     4299    {
     4300      get
     4301      {
     4302        return this._ResourceId;
     4303      }
     4304      set
     4305      {
     4306        if ((this._ResourceId != value))
     4307        {
     4308          if (this._Resource.HasLoadedOrAssignedValue)
     4309          {
     4310            throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
     4311          }
     4312          this.OnResourceIdChanging(value);
     4313          this.SendPropertyChanging();
     4314          this._ResourceId = value;
     4315          this.SendPropertyChanged("ResourceId");
     4316          this.OnResourceIdChanged();
     4317        }
     4318      }
     4319    }
     4320   
     4321    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GrantedUserId", DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true)]
     4322    public System.Guid GrantedUserId
     4323    {
     4324      get
     4325      {
     4326        return this._GrantedUserId;
     4327      }
     4328      set
     4329      {
     4330        if ((this._GrantedUserId != value))
     4331        {
     4332          this.OnGrantedUserIdChanging(value);
     4333          this.SendPropertyChanging();
     4334          this._GrantedUserId = value;
     4335          this.SendPropertyChanged("GrantedUserId");
     4336          this.OnGrantedUserIdChanged();
     4337        }
     4338      }
     4339    }
     4340   
     4341    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GrantedByUserId", DbType="UniqueIdentifier NOT NULL")]
     4342    public System.Guid GrantedByUserId
     4343    {
     4344      get
     4345      {
     4346        return this._GrantedByUserId;
     4347      }
     4348      set
     4349      {
     4350        if ((this._GrantedByUserId != value))
     4351        {
     4352          this.OnGrantedByUserIdChanging(value);
     4353          this.SendPropertyChanging();
     4354          this._GrantedByUserId = value;
     4355          this.SendPropertyChanged("GrantedByUserId");
     4356          this.OnGrantedByUserIdChanged();
     4357        }
     4358      }
     4359    }
     4360   
     4361    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_SlavePermission", Storage="_Resource", ThisKey="ResourceId", OtherKey="ResourceId", IsForeignKey=true)]
     4362    public Resource Resource
     4363    {
     4364      get
     4365      {
     4366        return this._Resource.Entity;
     4367      }
     4368      set
     4369      {
     4370        Resource previousValue = this._Resource.Entity;
     4371        if (((previousValue != value)
     4372              || (this._Resource.HasLoadedOrAssignedValue == false)))
     4373        {
     4374          this.SendPropertyChanging();
     4375          if ((previousValue != null))
     4376          {
     4377            this._Resource.Entity = null;
     4378            previousValue.ResourcePermissions.Remove(this);
     4379          }
     4380          this._Resource.Entity = value;
     4381          if ((value != null))
     4382          {
     4383            value.ResourcePermissions.Add(this);
     4384            this._ResourceId = value.ResourceId;
     4385          }
     4386          else
     4387          {
     4388            this._ResourceId = default(System.Guid);
     4389          }
     4390          this.SendPropertyChanged("Resource");
     4391        }
     4392      }
     4393    }
     4394   
     4395    public event PropertyChangingEventHandler PropertyChanging;
     4396   
     4397    public event PropertyChangedEventHandler PropertyChanged;
     4398   
     4399    protected virtual void SendPropertyChanging()
     4400    {
     4401      if ((this.PropertyChanging != null))
     4402      {
     4403        this.PropertyChanging(this, emptyChangingEventArgs);
     4404      }
     4405    }
     4406   
     4407    protected virtual void SendPropertyChanged(String propertyName)
     4408    {
     4409      if ((this.PropertyChanged != null))
     4410      {
     4411        this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
     4412      }
     4413    }
     4414  }
    41774415}
    41784416#pragma warning restore 1591
Note: See TracChangeset for help on using the changeset viewer.