Changeset 17312


Ignore:
Timestamp:
10/04/19 09:44:00 (11 days ago)
Author:
gkronber
Message:

#2994: merged r17220:17306 from trunk to branch

Location:
branches/2994-AutoDiffForIntervals
Files:
1 deleted
25 edited

Legend:

Unmodified
Added
Removed
  • branches/2994-AutoDiffForIntervals

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Algorithms.DataAnalysis

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Algorithms.DataAnalysis/3.4

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/GradientBoostedTreesModelSurrogate.cs

    r17209 r17312  
    2424using System.Collections.Generic;
    2525using System.Linq;
     26using HEAL.Attic;
    2627using HeuristicLab.Common;
    2728using HeuristicLab.Core;
    28 using HEAL.Attic;
    2929using HeuristicLab.Problems.DataAnalysis;
    3030
     
    3838    // don't store the actual model!
    3939    // the actual model is only recalculated when necessary
     40    private IGradientBoostedTreesModel fullModel;
    4041    private readonly Lazy<IGradientBoostedTreesModel> actualModel;
    4142    private IGradientBoostedTreesModel ActualModel {
     
    4849    private readonly uint seed;
    4950    [Storable]
    50     private ILossFunction lossFunction;
     51    private readonly ILossFunction lossFunction;
    5152    [Storable]
    52     private double r;
     53    private readonly double r;
    5354    [Storable]
    54     private double m;
     55    private readonly double m;
    5556    [Storable]
    56     private double nu;
     57    private readonly double nu;
    5758    [Storable]
    58     private int iterations;
     59    private readonly int iterations;
    5960    [Storable]
    60     private int maxSize;
     61    private readonly int maxSize;
    6162
    6263
     
    6970    [StorableConstructor]
    7071    private GradientBoostedTreesModelSurrogate(StorableConstructorFlag _) : base(_) {
    71       actualModel = new Lazy<IGradientBoostedTreesModel>(() => RecalculateModel());
     72      actualModel = CreateLazyInitFunc();
    7273    }
    7374
    7475    private GradientBoostedTreesModelSurrogate(GradientBoostedTreesModelSurrogate original, Cloner cloner)
    7576      : base(original, cloner) {
    76       IGradientBoostedTreesModel clonedModel = null;
    77       if (original.actualModel.IsValueCreated) clonedModel = cloner.Clone(original.ActualModel);
    78       actualModel = new Lazy<IGradientBoostedTreesModel>(CreateLazyInitFunc(clonedModel)); // only capture clonedModel in the closure
    79 
     77      // clone data which is necessary to rebuild the model
    8078      this.trainingProblemData = cloner.Clone(original.trainingProblemData);
    8179      this.lossFunction = cloner.Clone(original.lossFunction);
     
    8684      this.m = original.m;
    8785      this.nu = original.nu;
     86
     87      // clone full model if it has already been created
     88      if (original.fullModel != null) this.fullModel = cloner.Clone(original.fullModel);
     89      actualModel = CreateLazyInitFunc();
    8890    }
    8991
    90     private Func<IGradientBoostedTreesModel> CreateLazyInitFunc(IGradientBoostedTreesModel clonedModel) {
    91       return () => {
    92         return clonedModel ?? RecalculateModel();
    93       };
     92    private Lazy<IGradientBoostedTreesModel> CreateLazyInitFunc() {
     93      return new Lazy<IGradientBoostedTreesModel>(() => {
     94        if (fullModel == null) fullModel = RecalculateModel();
     95        return fullModel;
     96      });
    9497    }
    9598
     
    107110      this.nu = nu;
    108111
    109       actualModel = new Lazy<IGradientBoostedTreesModel>(() => RecalculateModel());
     112      actualModel = CreateLazyInitFunc();
    110113    }
    111114
    112     // wrap an actual model in a surrograte
     115    // wrap an actual model in a surrogate
    113116    public GradientBoostedTreesModelSurrogate(IGradientBoostedTreesModel model, IRegressionProblemData trainingProblemData, uint seed,
    114117      ILossFunction lossFunction, int iterations, int maxSize, double r, double m, double nu)
    115118      : this(trainingProblemData, seed, lossFunction, iterations, maxSize, r, m, nu) {
    116       actualModel = new Lazy<IGradientBoostedTreesModel>(() => model);
     119      fullModel = model;
    117120    }
    118121
     
    135138
    136139    public IEnumerable<IRegressionModel> Models {
    137       get {
    138         return ActualModel.Models;
    139       }
     140      get { return ActualModel.Models; }
    140141    }
    141142
    142143    public IEnumerable<double> Weights {
    143       get {
    144         return ActualModel.Weights;
    145       }
     144      get { return ActualModel.Weights; }
    146145    }
    147146  }
  • branches/2994-AutoDiffForIntervals/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestModelSurrogate.cs

    r17209 r17312  
    3535    #region parameters for recalculation of the model
    3636    [Storable]
    37     private int seed;
     37    private readonly int seed;
    3838    [Storable]
    39     private IDataAnalysisProblemData originalTrainingData;
     39    private readonly IDataAnalysisProblemData originalTrainingData;
    4040    [Storable]
    41     private double[] classValues;
     41    private readonly double[] classValues;
    4242    [Storable]
    43     private int nTrees;
     43    private readonly int nTrees;
    4444    [Storable]
    45     private double r;
     45    private readonly double r;
    4646    [Storable]
    47     private double m;
     47    private readonly double m;
    4848    #endregion
     49
    4950
    5051    // don't store the actual model!
    5152    // the actual model is only recalculated when necessary
     53    private IRandomForestModel fullModel = null;
    5254    private readonly Lazy<IRandomForestModel> actualModel;
     55
    5356    private IRandomForestModel ActualModel {
    5457      get { return actualModel.Value; }
     
    7477      this.m = m;
    7578
    76       actualModel = new Lazy<IRandomForestModel>(() => RecalculateModel());
     79      actualModel = CreateLazyInitFunc();
    7780    }
    7881
    79     // wrap an actual model in a surrograte
     82    // wrap an actual model in a surrogate
    8083    public RandomForestModelSurrogate(IRandomForestModel model, string targetVariable, IDataAnalysisProblemData originalTrainingData,
    81       int seed, int nTrees, double r, double m, double[] classValues = null) : this(targetVariable, originalTrainingData, seed, nTrees, r, m, classValues) {
    82       actualModel = new Lazy<IRandomForestModel>(() => model);
     84      int seed, int nTrees, double r, double m, double[] classValues = null)
     85      : this(targetVariable, originalTrainingData, seed, nTrees, r, m, classValues) {
     86      fullModel = model;
    8387    }
    8488
    8589    [StorableConstructor]
    8690    private RandomForestModelSurrogate(StorableConstructorFlag _) : base(_) {
    87       actualModel = new Lazy<IRandomForestModel>(() => RecalculateModel());
     91      actualModel = CreateLazyInitFunc();
    8892    }
    8993
    9094    private RandomForestModelSurrogate(RandomForestModelSurrogate original, Cloner cloner) : base(original, cloner) {
    91       IRandomForestModel clonedModel = null;
    92       if (original.actualModel.IsValueCreated) clonedModel = cloner.Clone(original.ActualModel);
    93       actualModel = new Lazy<IRandomForestModel>(CreateLazyInitFunc(clonedModel)); // only capture clonedModel in the closure
    94 
    9595      // clone data which is necessary to rebuild the model
    9696      this.originalTrainingData = cloner.Clone(original.originalTrainingData);
     
    100100      this.r = original.r;
    101101      this.m = original.m;
    102     }
    103102
    104     private Func<IRandomForestModel> CreateLazyInitFunc(IRandomForestModel clonedModel) {
    105       return () => {
    106         return clonedModel ?? RecalculateModel();
    107       };
     103      // clone full model if it has already been created
     104      if (original.fullModel != null) this.fullModel = cloner.Clone(original.fullModel);
     105      actualModel = CreateLazyInitFunc();
    108106    }
    109107
    110108    public override IDeepCloneable Clone(Cloner cloner) {
    111109      return new RandomForestModelSurrogate(this, cloner);
     110    }
     111
     112    private Lazy<IRandomForestModel> CreateLazyInitFunc() {
     113      return new Lazy<IRandomForestModel>(() => {
     114        if (fullModel == null) fullModel = RecalculateModel();
     115        return fullModel;
     116      });
    112117    }
    113118
  • branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectView.Designer.cs

    r16446 r17312  
    3939      this.endLabel = new System.Windows.Forms.Label();
    4040      this.indefiniteCheckBox = new System.Windows.Forms.CheckBox();
    41       this.createdTextBox = new System.Windows.Forms.TextBox();     
     41      this.createdTextBox = new System.Windows.Forms.TextBox();
    4242      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
     43      this.refreshButton = new System.Windows.Forms.Button();
    4344      this.SuspendLayout();
    4445      //
     
    6869      this.nameLabel.Name = "nameLabel";
    6970      this.nameLabel.Size = new System.Drawing.Size(38, 13);
    70       this.nameLabel.TabIndex = 0;
     71      this.nameLabel.TabIndex = 2;
    7172      this.nameLabel.Text = "Name:";
    7273      //
     
    7879      this.nameTextBox.Name = "nameTextBox";
    7980      this.nameTextBox.Size = new System.Drawing.Size(464, 20);
    80       this.nameTextBox.TabIndex = 2;
     81      this.nameTextBox.TabIndex = 3;
    8182      this.nameTextBox.TextChanged += new System.EventHandler(this.nameTextBox_TextChanged);
    8283      this.nameTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.nameTextBox_Validating);
     
    8889      this.descriptionLabel.Name = "descriptionLabel";
    8990      this.descriptionLabel.Size = new System.Drawing.Size(63, 13);
    90       this.descriptionLabel.TabIndex = 0;
     91      this.descriptionLabel.TabIndex = 4;
    9192      this.descriptionLabel.Text = "Description:";
    9293      //
     
    99100      this.descriptionTextBox.Name = "descriptionTextBox";
    100101      this.descriptionTextBox.Size = new System.Drawing.Size(464, 98);
    101       this.descriptionTextBox.TabIndex = 3;
     102      this.descriptionTextBox.TabIndex = 5;
    102103      this.descriptionTextBox.TextChanged += new System.EventHandler(this.descriptionTextBox_TextChanged);
    103104      //
    104       // ownerLabel
    105       //
    106       this.ownerLabel.AutoSize = true;
    107       this.ownerLabel.Location = new System.Drawing.Point(3, 167);
    108       this.ownerLabel.Name = "ownerLabel";
    109       this.ownerLabel.Size = new System.Drawing.Size(41, 13);
    110       this.ownerLabel.TabIndex = 0;
    111       this.ownerLabel.Text = "Owner:";
    112       //
    113105      // ownerComboBox
    114106      //
    115       //this.ownerComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    116       //      | System.Windows.Forms.AnchorStyles.Right)));
    117107      this.ownerComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    118108      this.ownerComboBox.FormattingEnabled = true;
     
    120110      this.ownerComboBox.Name = "ownerComboBox";
    121111      this.ownerComboBox.Size = new System.Drawing.Size(200, 21);
    122       this.ownerComboBox.TabIndex = 4;
     112      this.ownerComboBox.TabIndex = 7;
    123113      this.ownerComboBox.SelectedIndexChanged += new System.EventHandler(this.ownerComboBox_SelectedIndexChanged);
     114      //
     115      // ownerLabel
     116      //
     117      this.ownerLabel.AutoSize = true;
     118      this.ownerLabel.Location = new System.Drawing.Point(3, 167);
     119      this.ownerLabel.Name = "ownerLabel";
     120      this.ownerLabel.Size = new System.Drawing.Size(41, 13);
     121      this.ownerLabel.TabIndex = 6;
     122      this.ownerLabel.Text = "Owner:";
    124123      //
    125124      // createdLabel
     
    129128      this.createdLabel.Name = "createdLabel";
    130129      this.createdLabel.Size = new System.Drawing.Size(47, 13);
    131       this.createdLabel.TabIndex = 8;
     130      this.createdLabel.TabIndex = 9;
    132131      this.createdLabel.Text = "Created:";
    133132      //
     
    135134      //
    136135      this.startDateTimePicker.CustomFormat = "ddd, dd.MM.yyyy, HH:mm:ss";
    137       this.startDateTimePicker.Enabled = false;
    138136      this.startDateTimePicker.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
    139137      this.startDateTimePicker.Location = new System.Drawing.Point(72, 216);
    140138      this.startDateTimePicker.Name = "startDateTimePicker";
    141139      this.startDateTimePicker.Size = new System.Drawing.Size(200, 20);
    142       this.startDateTimePicker.TabIndex = 9;
    143       this.startDateTimePicker.ValueChanged += new System.EventHandler(this.startDateTimePicker_ValueChanged);     
     140      this.startDateTimePicker.TabIndex = 12;
     141      this.startDateTimePicker.ValueChanged += new System.EventHandler(this.startDateTimePicker_ValueChanged);
    144142      //
    145143      // startLabel
     
    149147      this.startLabel.Name = "startLabel";
    150148      this.startLabel.Size = new System.Drawing.Size(32, 13);
    151       this.startLabel.TabIndex = 10;
     149      this.startLabel.TabIndex = 11;
    152150      this.startLabel.Text = "Start:";
    153151      //
     
    155153      //
    156154      this.endDateTimePicker.CustomFormat = "ddd, dd.MM.yyyy, HH:mm:ss";
    157       this.endDateTimePicker.Enabled = false;
    158155      this.endDateTimePicker.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
    159156      this.endDateTimePicker.Location = new System.Drawing.Point(72, 243);
    160157      this.endDateTimePicker.Name = "endDateTimePicker";
    161158      this.endDateTimePicker.Size = new System.Drawing.Size(200, 20);
    162       this.endDateTimePicker.TabIndex = 11;
     159      this.endDateTimePicker.TabIndex = 14;
    163160      this.endDateTimePicker.ValueChanged += new System.EventHandler(this.endDateTimePicker_ValueChanged);
    164161      //
     
    169166      this.endLabel.Name = "endLabel";
    170167      this.endLabel.Size = new System.Drawing.Size(29, 13);
    171       this.endLabel.TabIndex = 10;
     168      this.endLabel.TabIndex = 13;
    172169      this.endLabel.Text = "End:";
    173170      //
     
    178175      this.indefiniteCheckBox.Name = "indefiniteCheckBox";
    179176      this.indefiniteCheckBox.Size = new System.Drawing.Size(69, 17);
    180       this.indefiniteCheckBox.TabIndex = 13;
     177      this.indefiniteCheckBox.TabIndex = 15;
    181178      this.indefiniteCheckBox.Text = "Indefinite";
    182179      this.indefiniteCheckBox.UseVisualStyleBackColor = true;
     
    189186      this.createdTextBox.ReadOnly = true;
    190187      this.createdTextBox.Size = new System.Drawing.Size(200, 20);
    191       this.createdTextBox.TabIndex = 14;
     188      this.createdTextBox.TabIndex = 10;
     189      //
     190      // refreshButton
     191      //
     192      this.refreshButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Refresh;
     193      this.refreshButton.Location = new System.Drawing.Point(278, 162);
     194      this.refreshButton.Name = "refreshButton";
     195      this.refreshButton.Size = new System.Drawing.Size(24, 24);
     196      this.refreshButton.TabIndex = 8;
     197      this.refreshButton.UseVisualStyleBackColor = true;
     198      this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
    192199      //
    193200      // ProjectView
     
    195202      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    196203      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     204      this.Controls.Add(this.refreshButton);
    197205      this.Controls.Add(this.createdTextBox);
    198206      this.Controls.Add(this.indefiniteCheckBox);
     
    213221      this.Size = new System.Drawing.Size(539, 271);
    214222      this.Load += new System.EventHandler(this.ProjectView_Load);
    215       this.Disposed += new System.EventHandler(this.ProjectView_Disposed);
    216223      this.ResumeLayout(false);
    217224      this.PerformLayout();
     
    235242    private System.Windows.Forms.Label endLabel;
    236243    private System.Windows.Forms.CheckBox indefiniteCheckBox;
    237     private System.Windows.Forms.TextBox createdTextBox;   
     244    private System.Windows.Forms.TextBox createdTextBox;
    238245    private System.Windows.Forms.ToolTip toolTip;
     246    private System.Windows.Forms.Button refreshButton;
    239247  }
    240248}
  • branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectView.cs

    r17209 r17312  
    2828using HeuristicLab.Core.Views;
    2929using HeuristicLab.MainForm;
     30using Tpl = System.Threading.Tasks;
    3031
    3132namespace HeuristicLab.Clients.Hive.Administrator.Views {
     
    3334  [Content(typeof(Project), IsDefaultView = true)]
    3435  public partial class ProjectView : ItemView {
    35     private readonly object locker = new object();
    36 
    3736    public new Project Content {
    3837      get { return (Project)base.Content; }
     
    5857    }
    5958
    60     protected void RegisterControlEvents() {
    61       nameTextBox.TextChanged += nameTextBox_TextChanged;
    62       nameTextBox.Validating += nameTextBox_Validating;
    63       descriptionTextBox.TextChanged += descriptionTextBox_TextChanged;
    64       ownerComboBox.SelectedIndexChanged += ownerComboBox_SelectedIndexChanged;
    65       startDateTimePicker.ValueChanged += startDateTimePicker_ValueChanged;
    66       endDateTimePicker.ValueChanged += endDateTimePicker_ValueChanged;
    67       indefiniteCheckBox.CheckedChanged += indefiniteCheckBox_CheckedChanged;
    68     }
    69 
    70     protected void DeregisterControlEvents() {
    71       nameTextBox.TextChanged -= nameTextBox_TextChanged;
    72       nameTextBox.Validating -= nameTextBox_Validating;
    73       descriptionTextBox.TextChanged -= descriptionTextBox_TextChanged;
    74       ownerComboBox.SelectedIndexChanged -= ownerComboBox_SelectedIndexChanged;
    75       startDateTimePicker.ValueChanged -= startDateTimePicker_ValueChanged;
    76       endDateTimePicker.ValueChanged -= endDateTimePicker_ValueChanged;
    77       indefiniteCheckBox.CheckedChanged -= indefiniteCheckBox_CheckedChanged;
    78     }
    79 
    8059    protected override void OnContentChanged() {
    8160      base.OnContentChanged();
    82       DeregisterControlEvents();
     61      UpdateView();
     62    }
     63
     64    private void UpdateView() {
    8365      if (Content == null) {
    8466        idTextBox.Clear();
     
    9476        nameTextBox.Text = Content.Name;
    9577        descriptionTextBox.Text = Content.Description;
    96 
    97         ownerComboBox.SelectedIndexChanged -= ownerComboBox_SelectedIndexChanged;
    98         if (AccessClient.Instance.UsersAndGroups != null) {
    99           var users = AccessClient.Instance.UsersAndGroups.OfType<LightweightUser>();
    100           if (!Content.ParentProjectId.HasValue) users = users.Where(x => x.Roles.Select(y => y.Name).Contains(HiveRoles.Administrator));
    101           var projectOwnerId = Content.OwnerUserId;
    102           ownerComboBox.DataSource = users.OrderBy(x => x.UserName).ToList();
    103           ownerComboBox.SelectedItem = users.FirstOrDefault(x => x.Id == projectOwnerId);
    104         }
    105         ownerComboBox.SelectedIndexChanged += ownerComboBox_SelectedIndexChanged;
    106 
     78        ownerComboBox.SelectedItem = AccessClient.Instance.UsersAndGroups?.OfType<LightweightUser>().SingleOrDefault(x => x.Id == Content.OwnerUserId);
    10779        createdTextBox.Text = Content.DateCreated.ToString("ddd, dd.MM.yyyy, HH:mm:ss");
    10880        startDateTimePicker.Value = Content.StartDate;
    109 
     81        endDateTimePicker.Value = Content.EndDate.GetValueOrDefault(Content.StartDate);
    11082        indefiniteCheckBox.Checked = !Content.EndDate.HasValue;
    111         if (!indefiniteCheckBox.Checked) endDateTimePicker.Value = Content.EndDate.Value;
    112         else endDateTimePicker.Value = Content.StartDate;
    113         endDateTimePicker.Enabled = !indefiniteCheckBox.Checked;
    114       }
    115       SetEnabledStateOfControls();
    116       RegisterControlEvents();
    117     }
    118 
    119     protected override void SetEnabledStateOfControls() {
    120       base.SetEnabledStateOfControls();
    121       bool enabled = Content != null && !Locked && !ReadOnly;
    122       nameTextBox.Enabled = enabled;
    123       descriptionTextBox.Enabled = enabled;
    124       ownerComboBox.Enabled = enabled;
    125       createdTextBox.Enabled = enabled;
    126       startDateTimePicker.Enabled = enabled;
    127       endDateTimePicker.Enabled = enabled && Content.EndDate.HasValue;
    128       indefiniteCheckBox.Enabled = enabled;
    129 
    130       if (Content != null) {
    131         //var parentProject = HiveAdminClient.Instance.GetAvailableProjectAncestors(Content.Id).LastOrDefault();
    132         var parentProject = HiveAdminClient.Instance.Projects.FirstOrDefault(x => x.Id == Content.ParentProjectId);
    133         if ((!IsAdmin() && (parentProject == null || parentProject.EndDate.HasValue))
    134            || (IsAdmin() && parentProject != null && parentProject.EndDate.HasValue)) {
    135           indefiniteCheckBox.Enabled = false;
    136         }
    137 
    138         if (Content.Id != Guid.Empty && !IsAdmin() && !HiveAdminClient.Instance.CheckOwnershipOfParentProject(Content, UserInformation.Instance.User.Id)) {
    139           ownerComboBox.Enabled = false;
    140           startDateTimePicker.Enabled = false;
    141           endDateTimePicker.Enabled = false;
    142           indefiniteCheckBox.Enabled = false;
    143         }
    144       }
    145     }
    146     #endregion
    147 
    148     #region Event Handlers
    149     private void Content_PropertyChanged(object sender, PropertyChangedEventArgs e) {
    150       if (InvokeRequired) Invoke((Action<object, PropertyChangedEventArgs>)Content_PropertyChanged, sender, e);
    151       else OnContentChanged();
    152     }
    153 
    154     private void AccessClient_Instance_Refreshing(object sender, EventArgs e) {
    155       if (InvokeRequired) Invoke((Action<object, EventArgs>)AccessClient_Instance_Refreshing, sender, e);
    156       else {
    157         Progress.Show(this, "Refreshing ...", ProgressMode.Indeterminate);
    158         SetEnabledStateOfControls();
    159       }
    160     }
    161 
    162     private void AccessClient_Instance_Refreshed(object sender, EventArgs e) {
    163       if (InvokeRequired) Invoke((Action<object, EventArgs>)AccessClient_Instance_Refreshed, sender, e);
    164       else {
    165         Progress.Hide(this);
    166         SetEnabledStateOfControls();
    167       }
    168     }
    169 
    170     private async void ProjectView_Load(object sender, EventArgs e) {
    171       await SecurityExceptionUtil.TryAsyncAndReportSecurityExceptions(
    172         action: () => UpdateUsers(),
    173         finallyCallback: () => {
    174           ownerComboBox.SelectedIndexChanged -= ownerComboBox_SelectedIndexChanged;
    175           var users = AccessClient.Instance.UsersAndGroups.OfType<LightweightUser>();
    176           if (Content != null && !Content.ParentProjectId.HasValue) users = users.Where(x => x.Roles.Select(y => y.Name).Contains(HiveRoles.Administrator));
    177           ownerComboBox.DataSource = users.OrderBy(x => x.UserName).ToList();
    178           ownerComboBox.SelectedIndexChanged += ownerComboBox_SelectedIndexChanged;
    179         });
    180     }
    181 
    182     private void ProjectView_Disposed(object sender, EventArgs e) {
    183       AccessClient.Instance.Refreshed -= AccessClient_Instance_Refreshed;
    184       AccessClient.Instance.Refreshing -= AccessClient_Instance_Refreshing;
    185     }
    186 
    187     private void nameTextBox_Validating(object sender, CancelEventArgs e) {
    188       if (string.IsNullOrEmpty(nameTextBox.Text)) {
    189         MessageBox.Show(
    190           "Project must have a name.",
    191           "HeuristicLab Hive Administrator",
    192           MessageBoxButtons.OK,
    193           MessageBoxIcon.Error);
    194         e.Cancel = true;
    195       }
    196     }
    197 
    198     private void nameTextBox_TextChanged(object sender, EventArgs e) {
    199       if (Content != null && Content.Name != nameTextBox.Text) {
    200         DeregisterContentEvents();
    201         Content.Name = nameTextBox.Text;
    202         RegisterContentEvents();
    203       }
    204     }
    205 
    206     private void descriptionTextBox_TextChanged(object sender, EventArgs e) {
    207       if (Content != null && Content.Description != descriptionTextBox.Text) {
    208         DeregisterContentEvents();
    209         Content.Description = descriptionTextBox.Text;
    210         RegisterContentEvents();
    211       }
    212     }
    213 
    214     private void ownerComboBox_SelectedIndexChanged(object sender, EventArgs e) {
    215       var selectedItem = (LightweightUser)ownerComboBox.SelectedItem;
    216       var selectedOwnerUserId = selectedItem != null ? selectedItem.Id : Guid.Empty;
    217       if (Content != null && Content.OwnerUserId != selectedOwnerUserId) {
    218         DeregisterContentEvents();
    219         Content.OwnerUserId = selectedOwnerUserId;
    220         RegisterContentEvents();
    221       }
    222     }
    223 
    224     private void startDateTimePicker_ValueChanged(object sender, EventArgs e) {
    225       if (Content == null) return;
    226       startDateTimePicker.ValueChanged -= startDateTimePicker_ValueChanged;
    227 
    228       if (!IsAdmin()) {
    229         var parentProject = HiveAdminClient.Instance.GetAvailableProjectAncestors(Content.Id).LastOrDefault();
    230         if (parentProject != null) {
    231           if (startDateTimePicker.Value < parentProject.StartDate)
    232             startDateTimePicker.Value = parentProject.StartDate;
    233         } else {
    234           startDateTimePicker.Value = Content.StartDate;
    235         }
    236       }
    237 
    238       if (!Content.EndDate.HasValue || startDateTimePicker.Value > Content.EndDate)
    239         endDateTimePicker.Value = startDateTimePicker.Value;
    240       if (Content.StartDate != startDateTimePicker.Value) {
    241         DeregisterContentEvents();
    242         Content.StartDate = startDateTimePicker.Value;
    243         RegisterContentEvents();
    244       }
    245 
    246       startDateTimePicker.ValueChanged += startDateTimePicker_ValueChanged;
    247     }
    248 
    249     private void endDateTimePicker_ValueChanged(object sender, EventArgs e) {
    250       if (Content == null) return;
    251       endDateTimePicker.ValueChanged -= endDateTimePicker_ValueChanged;
    252 
    253       if (!IsAdmin()) {
    254         var parentProject = HiveAdminClient.Instance.GetAvailableProjectAncestors(Content.Id).LastOrDefault();
    255         if (parentProject != null) {
    256           if (parentProject.EndDate.HasValue && endDateTimePicker.Value > parentProject.EndDate.Value) {
    257             endDateTimePicker.Value = parentProject.EndDate.Value;
    258           }
    259         } else if (Content.EndDate.HasValue) {
    260           endDateTimePicker.Value = Content.EndDate.Value;
    261         }
    262       }
    263 
    264       if (endDateTimePicker.Value < startDateTimePicker.Value)
    265         endDateTimePicker.Value = startDateTimePicker.Value;
    266       if (Content.EndDate != endDateTimePicker.Value) {
    267         DeregisterContentEvents();
    268         Content.EndDate = endDateTimePicker.Value;
    269         RegisterContentEvents();
    270       }
    271 
    272       endDateTimePicker.ValueChanged += endDateTimePicker_ValueChanged;
    273     }
    274 
    275     private void indefiniteCheckBox_CheckedChanged(object sender, EventArgs e) {
    276       if (Content == null) return;
    277 
    278       var newEndDate = indefiniteCheckBox.Checked ? (DateTime?)null : endDateTimePicker.Value;
    279       endDateTimePicker.Enabled = !indefiniteCheckBox.Checked;
    280       if (Content.EndDate != newEndDate) {
    281         DeregisterContentEvents();
    282         Content.EndDate = newEndDate;
    283         RegisterContentEvents();
    284       }
    285     }
    286     #endregion
    287 
    288     #region Helpers
     83      }
     84    }
     85
     86    private async Tpl.Task UpdateUsersAsync() {
     87      await Tpl.Task.Run(() => UpdateUsers());
     88    }
     89
    28990    private void UpdateUsers() {
     91      // deregister handler to avoid change of content's owner when data source is updated
     92      ownerComboBox.SelectedIndexChanged -= ownerComboBox_SelectedIndexChanged;
    29093      try {
    291         AccessClient.Instance.Refresh();
     94        ownerComboBox.DataSource = null;
     95        SecurityExceptionUtil.TryAndReportSecurityExceptions(AccessClient.Instance.Refresh);
     96        ownerComboBox.DataSource = AccessClient.Instance.UsersAndGroups.OfType<LightweightUser>().OrderBy(x => x.UserName).ToList();
    29297      } catch (AnonymousUserException) {
    29398        ShowHiveInformationDialog();
    294       }
    295     }
    296 
    297     private bool IsAdmin() {
    298       return HiveRoles.CheckAdminUserPermissions();
     99      } finally {
     100        ownerComboBox.SelectedIndexChanged += ownerComboBox_SelectedIndexChanged;
     101      }
    299102    }
    300103
     
    307110      }
    308111    }
     112
     113    protected override void SetEnabledStateOfControls() {
     114      base.SetEnabledStateOfControls();
     115
     116      bool enabled = Content != null && !Locked && !ReadOnly;
     117
     118      nameTextBox.Enabled = enabled;
     119      descriptionTextBox.Enabled = enabled;
     120      ownerComboBox.Enabled = enabled;
     121      refreshButton.Enabled = enabled;
     122      createdTextBox.Enabled = enabled;
     123      startDateTimePicker.Enabled = enabled;
     124      endDateTimePicker.Enabled = enabled && Content.EndDate.HasValue && Content.EndDate > Content.StartDate;
     125      indefiniteCheckBox.Enabled = enabled;
     126
     127      if (Content == null) return;
     128
     129      var parentProject = HiveAdminClient.Instance.Projects.SingleOrDefault(x => x.Id == Content.ParentProjectId);
     130      if (parentProject != null && parentProject.EndDate.HasValue)
     131        indefiniteCheckBox.Enabled = false;
     132
     133      if (Content.Id == Guid.Empty) return; // newly created project
     134      if (HiveRoles.CheckAdminUserPermissions()) return; // admins can edit any project
     135      if (HiveAdminClient.Instance.CheckOwnershipOfParentProject(Content, UserInformation.Instance.User.Id)) return; // owner can edit project
     136
     137      // project was already created and user is neither admin nor owner
     138      ownerComboBox.Enabled = false;
     139      startDateTimePicker.Enabled = false;
     140      endDateTimePicker.Enabled = false;
     141      indefiniteCheckBox.Enabled = false;
     142    }
     143    #endregion
     144
     145    #region Event Handlers
     146    private void ProjectView_Load(object sender, EventArgs e) {
     147      Locked = true;
     148      try {
     149        UpdateUsers();
     150        UpdateView();
     151      } finally {
     152        Locked = false;
     153      }
     154    }
     155
     156    private void Content_PropertyChanged(object sender, PropertyChangedEventArgs e) {
     157      UpdateView();
     158    }
     159
     160    private void nameTextBox_TextChanged(object sender, EventArgs e) {
     161      if (Content == null || Content.Name == nameTextBox.Text) return;
     162      Content.Name = nameTextBox.Text;
     163    }
     164
     165    private void nameTextBox_Validating(object sender, CancelEventArgs e) {
     166      if (!string.IsNullOrEmpty(nameTextBox.Text)) return;
     167
     168      MessageBox.Show("Project must have a name.", "HeuristicLab Hive Administrator", MessageBoxButtons.OK, MessageBoxIcon.Error);
     169      e.Cancel = true;
     170    }
     171
     172    private void descriptionTextBox_TextChanged(object sender, EventArgs e) {
     173      if (Content == null || Content.Description == descriptionTextBox.Text) return;
     174      Content.Description = descriptionTextBox.Text;
     175    }
     176
     177    private void ownerComboBox_SelectedIndexChanged(object sender, EventArgs e) {
     178      if (Content == null) return;
     179
     180      var selectedItem = (LightweightUser)ownerComboBox.SelectedItem;
     181      var selectedOwnerUserId = selectedItem != null ? selectedItem.Id : Guid.Empty;
     182      if (Content.OwnerUserId == selectedOwnerUserId) return;
     183
     184      Content.OwnerUserId = selectedOwnerUserId;
     185    }
     186
     187    private async void refreshButton_Click(object sender, EventArgs e) {
     188      Locked = true;
     189      try {
     190        await UpdateUsersAsync();
     191        UpdateView();
     192      } finally {
     193        Locked = false;
     194      }
     195    }
     196
     197    private void startDateTimePicker_ValueChanged(object sender, EventArgs e) {
     198      if (Content == null || Content.StartDate == startDateTimePicker.Value) return;
     199
     200      string errorMessage = string.Empty;
     201
     202      var parentProject = HiveAdminClient.Instance.Projects.SingleOrDefault(x => x.Id == Content.ParentProjectId);
     203      if (parentProject != null) {
     204        if (startDateTimePicker.Value < parentProject.StartDate) {
     205          errorMessage = "Project cannot start before its parent project has started.";
     206        } else if (startDateTimePicker.Value > parentProject.EndDate) {
     207          errorMessage = "Project cannot start after its parent project has ended.";
     208        }
     209      }
     210
     211      if (startDateTimePicker.Value > endDateTimePicker.Value) {
     212        errorMessage = "Project cannot start after it ends.";
     213      }
     214
     215      if (!string.IsNullOrEmpty(errorMessage)) {
     216        MessageBox.Show(errorMessage, "HeuristicLab Hive Administrator", MessageBoxButtons.OK, MessageBoxIcon.Error);
     217        startDateTimePicker.Value = Content.StartDate;
     218      }
     219
     220      Content.StartDate = startDateTimePicker.Value;
     221    }
     222
     223    private void endDateTimePicker_ValueChanged(object sender, EventArgs e) {
     224      if (Content == null || Content.EndDate == endDateTimePicker.Value || Content.StartDate == endDateTimePicker.Value) return;
     225
     226      string errorMessage = string.Empty;
     227
     228      var parentProject = HiveAdminClient.Instance.Projects.SingleOrDefault(x => x.Id == Content.ParentProjectId);
     229      if (parentProject != null) {
     230        if (endDateTimePicker.Value > parentProject.EndDate) {
     231          errorMessage = "Project cannot end after its parent project has ended.";
     232        } else if (endDateTimePicker.Value < parentProject.StartDate) {
     233          errorMessage = "Project cannot end before its parent project has started.";
     234        }
     235      }
     236
     237      if (endDateTimePicker.Value < startDateTimePicker.Value) {
     238        errorMessage = "Project cannot end after it starts.";
     239      }
     240
     241      if (!string.IsNullOrEmpty(errorMessage)) {
     242        MessageBox.Show(errorMessage, "HeuristicLab Hive Administrator", MessageBoxButtons.OK, MessageBoxIcon.Error);
     243        endDateTimePicker.Value = Content.EndDate.GetValueOrDefault(Content.StartDate);
     244      }
     245
     246      Content.EndDate = endDateTimePicker.Value;
     247    }
     248
     249    private void indefiniteCheckBox_CheckedChanged(object sender, EventArgs e) {
     250      if (Content == null) return;
     251
     252      var newEndDate = indefiniteCheckBox.Checked ? (DateTime?)null : endDateTimePicker.Value;
     253
     254      if (Content.EndDate == newEndDate) return;
     255      Content.EndDate = newEndDate;
     256
     257      endDateTimePicker.Enabled = !indefiniteCheckBox.Checked;
     258    }
     259
     260    private void AccessClient_Instance_Refreshing(object sender, EventArgs e) {
     261      if (InvokeRequired) {
     262        Invoke((Action<object, EventArgs>)AccessClient_Instance_Refreshing, sender, e);
     263        return;
     264      }
     265
     266      Progress.Show(this, "Refreshing ...", ProgressMode.Indeterminate);
     267      SetEnabledStateOfControls();
     268    }
     269
     270    private void AccessClient_Instance_Refreshed(object sender, EventArgs e) {
     271      if (InvokeRequired) {
     272        Invoke((Action<object, EventArgs>)AccessClient_Instance_Refreshed, sender, e);
     273        return;
     274      }
     275
     276      Progress.Hide(this);
     277      SetEnabledStateOfControls();
     278    }
    309279    #endregion
    310280  }
  • branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.JobManager

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs

    r17209 r17312  
    143143    protected override void OnClosed(FormClosedEventArgs e) {
    144144      if (Content != null && Content.Jobs != null) {
    145         Content.ClearHiveClient();
     145        // clear hive client only if it is not displayed by any other content view (i.e. job manager)
     146        var contentViews = MainFormManager.MainForm.Views.OfType<IContentView>()
     147          .Where(v => v.Content == Content && v != this);
     148        if (!contentViews.Any())
     149          Content.ClearHiveClient();
     150
    146151        Content = null;
    147152      }
  • branches/2994-AutoDiffForIntervals/HeuristicLab.Data

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Data/3.3

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Data/3.3/Interfaces/ITextValue.cs

    r17209 r17312  
    2020#endregion
    2121
    22 using System;
    23 using HeuristicLab.Common;
     22using HEAL.Attic;
    2423
    2524namespace HeuristicLab.Data {
    26   public interface ITextValue : IStringConvertibleValue {
    27   }
     25  [StorableType("6fe7970b-66de-4dcf-aa2b-c1aa9d7da29f")]
     26  public interface ITextValue : IStringConvertibleValue { }
    2827}
  • branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Views

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionVariableImpactsView.Designer.cs

    r17209 r17312  
    192192      this.Name = "ClassificationSolutionVariableImpactsView";
    193193      this.Size = new System.Drawing.Size(712, 365);
    194       this.VisibleChanged += new System.EventHandler(this.ClassificationSolutionVariableImpactsView_VisibleChanged);
    195194      this.ResumeLayout(false);
    196195      this.PerformLayout();
  • branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionVariableImpactsView.cs

    r17209 r17312  
    4040    private CancellationTokenSource cancellationToken = new CancellationTokenSource();
    4141    private List<Tuple<string, double>> rawVariableImpacts = new List<Tuple<string, double>>();
     42    private bool attachedToProgress = false;
    4243
    4344    public new IClassificationSolution Content {
     
    8687      }
    8788    }
    88     private void ClassificationSolutionVariableImpactsView_VisibleChanged(object sender, EventArgs e) {
     89    protected override void OnHidden(EventArgs e) {
     90      base.OnHidden(e);
    8991      cancellationToken.Cancel();
     92
     93      if (attachedToProgress) {
     94        Progress.Hide(this);
     95        attachedToProgress = false;
     96      }
    9097    }
    9198
     
    126133      variableImpactsArrayView.Caption = Content.Name + " Variable Impacts";
    127134      progress = Progress.Show(this, "Calculating variable impacts for " + Content.Name);
     135      attachedToProgress = true;
    128136      cancellationToken = new CancellationTokenSource();
    129137
     
    144152        UpdateOrdering();
    145153      } finally {
    146         Progress.Hide(this);
     154        if (attachedToProgress) {
     155          Progress.Hide(this);
     156          attachedToProgress = false;
     157        }
    147158      }
    148159    }
  • branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionVariableImpactsView.Designer.cs

    r17209 r17312  
    192192      this.Name = "RegressionSolutionVariableImpactsView";
    193193      this.Size = new System.Drawing.Size(712, 365);
    194       this.VisibleChanged += new System.EventHandler(this.RegressionSolutionVariableImpactsView_VisibleChanged);
    195194      this.ResumeLayout(false);
    196195      this.PerformLayout();
  • branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionVariableImpactsView.cs

    r17209 r17312  
    4040    private CancellationTokenSource cancellationToken = new CancellationTokenSource();
    4141    private List<Tuple<string, double>> rawVariableImpacts = new List<Tuple<string, double>>();
     42    private bool attachedToProgress = false;
    4243
    4344    public new IRegressionSolution Content {
     
    8687      }
    8788    }
    88     private void RegressionSolutionVariableImpactsView_VisibleChanged(object sender, EventArgs e) {
     89
     90    protected override void OnHidden(EventArgs e) {
     91      base.OnHidden(e);
    8992      cancellationToken.Cancel();
     93
     94      if (attachedToProgress) {
     95        Progress.Hide(this);
     96        attachedToProgress = false;
     97      }
    9098    }
    9199
     
    124132      variableImpactsArrayView.Caption = Content.Name + " Variable Impacts";
    125133      var progress = Progress.Show(this, "Calculating variable impacts for " + Content.Name);
     134      attachedToProgress = true;
    126135      cancellationToken = new CancellationTokenSource();
    127136
     
    141150        rawVariableImpacts.AddRange(impacts);
    142151        UpdateOrdering();
    143       }
    144       finally {
    145         Progress.Hide(this);
     152      } finally {
     153        if (attachedToProgress) {
     154          Progress.Hide(this);
     155          attachedToProgress = false;
     156        }
    146157      }
    147158    }
  • branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis/3.4

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval.cs

    r17209 r17312  
    226226
    227227    public static Interval CubicRoot(Interval a) {
    228       if (a.LowerBound < 0) return new Interval(double.NaN, double.NaN);
    229       return new Interval(Math.Pow(a.LowerBound, 1.0/3), Math.Pow(a.UpperBound, 1.0/3));
     228      var lower = (a.LowerBound < 0) ? -Math.Pow(-a.LowerBound, 1d / 3d) : Math.Pow(a.LowerBound, 1d / 3d);
     229      var upper = (a.UpperBound < 0) ? -Math.Pow(-a.UpperBound, 1d / 3d) : Math.Pow(a.UpperBound, 1d / 3d);
     230
     231      return new Interval(lower, upper);
     232    }
     233
     234    public static Interval Absolute(Interval a) {
     235      var absLower = Math.Abs(a.LowerBound);
     236      var absUpper = Math.Abs(a.UpperBound);
     237      return new Interval(Math.Min(absLower, absUpper), Math.Max(absLower, absUpper));
    230238    }
    231239    #endregion
  • branches/2994-AutoDiffForIntervals/HeuristicLab.Services.Access

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Services.Access/3.3/AccessService.cs

    r17209 r17312  
    581581        }
    582582      } else {
    583         MembershipUser membershipUser = Membership.CreateUser(aspUser.UserName, aspUser.UserName, aspMembership.Email);
     583        MembershipUser membershipUser = Membership.CreateUser(aspUser.UserName, Membership.GeneratePassword(32, 8), aspMembership.Email);
    584584        membershipUser.IsApproved = aspMembership.IsApproved;
    585585        membershipUser.Comment = aspMembership.Comment;
  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis-3.4/IntervalTest.cs

    r17303 r17312  
    162162    public void TestIntervalCbrtOperator() {
    163163      Assert.AreEqual<Interval>(new Interval(1, 2), Interval.CubicRoot(new Interval(1, 8)));
    164       Assert.AreEqual<Interval>(new Interval(-2, -1), Interval.CubicRoot(new Interval(-8, -1))); // XXX should be fixed for old interval calculation
     164      Assert.AreEqual<Interval>(new Interval(-2, -2), Interval.CubicRoot(new Interval(-8, -8)));
     165      Assert.AreEqual<Interval>(new Interval(-2, 2), Interval.CubicRoot(new Interval(-8, 8)));
     166      Assert.AreEqual(new Interval(2, 2), Interval.CubicRoot(new Interval(8, 8)));
     167      Assert.AreEqual(new Interval(-Math.Pow(6, 1.0 / 3), 2), Interval.CubicRoot(new Interval(-6, 8)));
     168      Assert.AreEqual(new Interval(2, 2), Interval.CubicRoot(new Interval(8, 8)));
     169      Assert.AreEqual(new Interval(-2, 0), Interval.CubicRoot(new Interval(-8, 0)));
     170    }
     171
     172    [TestMethod]
     173    [TestCategory("Problems.DataAnalysis")]
     174    [TestProperty("Time", "short")]
     175    public void TestIntervalAbsoluteOperator() {
     176      Assert.AreEqual(new Interval(2, 2), Interval.Absolute(new Interval(-2, -2)));
     177      Assert.AreEqual(new Interval(5, 5), Interval.Absolute(new Interval(5, 5)));
     178      Assert.AreEqual(new Interval(2, 8), Interval.Absolute(new Interval(2, 8)));
     179      Assert.AreEqual(new Interval(5, 14), Interval.Absolute(new Interval(-14, -5)));
     180      Assert.AreEqual(new Interval(2, 7), Interval.Absolute(new Interval(-2, 7)));
     181      Assert.AreEqual(new Interval(2, 22), Interval.Absolute(new Interval(-22, -2)));
     182      Assert.AreEqual(new Interval(6, 22), Interval.Absolute(new Interval(-22, 6)));
     183      Assert.AreEqual(new Interval(0, 0), Interval.Absolute(new Interval(0, 0)));
     184      Assert.AreEqual(new Interval(0, 2), Interval.Absolute(new Interval(-2, 0)));
     185      Assert.AreEqual(new Interval(0, 2), Interval.Absolute(new Interval(0, 2)));
    165186    }
    166187  }
Note: See TracChangeset for help on using the changeset viewer.