Free cookie consent management tool by TermsFeed Policy Generator

Changeset 8962


Ignore:
Timestamp:
11/28/12 11:16:11 (12 years ago)
Author:
mkommend
Message:

#1673: Added space in view caption between the optimizer name and the view name. Renamed AlgorithmName in RunCollection to OptimizerName as suggested by ascheibe.

Location:
trunk/sources
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Algorithms.Benchmarks/3.3/BenchmarkAlgorithm.cs

    r8930 r8962  
    159159            name = value == null ? string.Empty : value;
    160160            OnNameChanged();
    161             runs.AlgorithmName = name;
     161            runs.OptimizerName = name;
    162162          }
    163163        }
    … …  
    239239      storeAlgorithmInEachRun = false;
    240240      runsCounter = 0;
    241       Runs = new RunCollection() { AlgorithmName = name };
     241      Runs = new RunCollection() { OptimizerName = name };
    242242      results = new ResultCollection();
    243243      CreateParameters();

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs

    r8836 r8962  
    4545
    4646      executionState = ExecutionState.Stopped;
    47       runs = new RunCollection { AlgorithmName = name };
     47      runs = new RunCollection { OptimizerName = name };
    4848      runsCounter = 0;
    4949
    … …  
    249249    protected override void OnNameChanged() {
    250250      base.OnNameChanged();
    251       Runs.AlgorithmName = Name;
     251      Runs.OptimizerName = Name;
    252252    }
    253253

  • trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

    r8939 r8962  
    539539    private RunCollection GetAllRunsFromJob(RefreshableJob job) {
    540540      if (job != null) {
    541         RunCollection runs = new RunCollection() { AlgorithmName = job.ItemName };
     541        RunCollection runs = new RunCollection() { OptimizerName = job.ItemName };
    542542
    543543        foreach (HiveTask subTask in job.HiveTasks) {

  • trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBoxPlotView.cs

    r8738 r8962  
    7575      Content.CollectionReset += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
    7676      Content.UpdateOfRunsInProgressChanged += new EventHandler(Content_UpdateOfRunsInProgressChanged);
    77       Content.AlgorithmNameChanged += new EventHandler(Content_AlgorithmNameChanged);
     77      Content.OptimizerNameChanged += new EventHandler(Content_AlgorithmNameChanged);
    7878      RegisterRunEvents(Content);
    7979    }
    … …  
    8686      Content.CollectionReset -= new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
    8787      Content.UpdateOfRunsInProgressChanged -= new EventHandler(Content_UpdateOfRunsInProgressChanged);
    88       Content.AlgorithmNameChanged -= new EventHandler(Content_AlgorithmNameChanged);
     88      Content.OptimizerNameChanged -= new EventHandler(Content_AlgorithmNameChanged);
    8989      DeregisterRunEvents(Content);
    9090    }
    … …  
    159159
    160160    private void UpdateCaption() {
    161       Caption = Content != null ? Content.AlgorithmName + "Box Plots" : ViewAttribute.GetViewName(GetType());
     161      Caption = Content != null ? Content.OptimizerName + " Box Plots" : ViewAttribute.GetViewName(GetType());
    162162    }
    163163

  • trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBubbleChartView.cs

    r8876 r8962  
    9393      Content.CollectionReset += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
    9494      Content.UpdateOfRunsInProgressChanged += new EventHandler(Content_UpdateOfRunsInProgressChanged);
    95       Content.AlgorithmNameChanged += new EventHandler(Content_AlgorithmNameChanged);
     95      Content.OptimizerNameChanged += new EventHandler(Content_AlgorithmNameChanged);
    9696      RegisterRunEvents(Content);
    9797    }
    … …  
    104104      Content.CollectionReset -= new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
    105105      Content.UpdateOfRunsInProgressChanged -= new EventHandler(Content_UpdateOfRunsInProgressChanged);
    106       Content.AlgorithmNameChanged -= new EventHandler(Content_AlgorithmNameChanged);
     106      Content.OptimizerNameChanged -= new EventHandler(Content_AlgorithmNameChanged);
    107107      DeregisterRunEvents(Content);
    108108    }
    … …  
    175175
    176176    private void UpdateCaption() {
    177       Caption = Content != null ? Content.AlgorithmName + "Bubble Chart" : ViewAttribute.GetViewName(GetType());
     177      Caption = Content != null ? Content.OptimizerName + " Bubble Chart" : ViewAttribute.GetViewName(GetType());
    178178    }
    179179

  • trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionDataTableView.cs

    r8925 r8962  
    6363      Content.CollectionReset += new CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
    6464      Content.UpdateOfRunsInProgressChanged += new EventHandler(Content_UpdateOfRunsInProgressChanged);
    65       Content.AlgorithmNameChanged += new EventHandler(Content_AlgorithmNameChanged);
     65      Content.OptimizerNameChanged += new EventHandler(Content_AlgorithmNameChanged);
    6666    }
    6767    protected override void DeregisterContentEvents() {
    … …  
    7070      Content.CollectionReset -= new CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
    7171      Content.UpdateOfRunsInProgressChanged -= new EventHandler(Content_UpdateOfRunsInProgressChanged);
    72       Content.AlgorithmNameChanged -= new EventHandler(Content_AlgorithmNameChanged);
     72      Content.OptimizerNameChanged -= new EventHandler(Content_AlgorithmNameChanged);
    7373      base.DeregisterContentEvents();
    7474    }
    … …  
    204204
    205205    private void UpdateCaption() {
    206       Caption = Content != null ? Content.AlgorithmName + "Data Table" : ViewAttribute.GetViewName(GetType());
     206      Caption = Content != null ? Content.OptimizerName + " Data Table" : ViewAttribute.GetViewName(GetType());
    207207    }
    208208

  • trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionTabularView.cs

    r8738 r8962  
    6565      Content.CollectionReset += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
    6666      Content.UpdateOfRunsInProgressChanged += new EventHandler(Content_UpdateOfRunsInProgressChanged);
    67       Content.AlgorithmNameChanged += new EventHandler(Content_AlgorithmNameChanged);
     67      Content.OptimizerNameChanged += new EventHandler(Content_AlgorithmNameChanged);
    6868      RegisterRunEvents(Content);
    6969    }
    … …  
    7878      Content.CollectionReset -= new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
    7979      Content.UpdateOfRunsInProgressChanged -= new EventHandler(Content_UpdateOfRunsInProgressChanged);
    80       Content.AlgorithmNameChanged -= new EventHandler(Content_AlgorithmNameChanged);
     80      Content.OptimizerNameChanged -= new EventHandler(Content_AlgorithmNameChanged);
    8181      DeregisterRunEvents(Content);
    8282    }
    … …  
    111111
    112112    private void UpdateCaption() {
    113       Caption = Content != null ? Content.AlgorithmName + "Tabular View" : ViewAttribute.GetViewName(GetType());
     113      Caption = Content != null ? Content.OptimizerName + " Tabular View" : ViewAttribute.GetViewName(GetType());
    114114    }
    115115

  • trunk/sources/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs

    r8738 r8962  
    134134      storeAlgorithmInEachRun = false;
    135135      runsCounter = 0;
    136       Runs = new RunCollection { AlgorithmName = Name };
     136      Runs = new RunCollection { OptimizerName = Name };
    137137    }
    138138    protected Algorithm(string name)
    … …  
    142142      storeAlgorithmInEachRun = false;
    143143      runsCounter = 0;
    144       Runs = new RunCollection { AlgorithmName = Name };
     144      Runs = new RunCollection { OptimizerName = Name };
    145145    }
    146146    protected Algorithm(string name, ParameterCollection parameters)
    … …  
    150150      storeAlgorithmInEachRun = false;
    151151      runsCounter = 0;
    152       Runs = new RunCollection { AlgorithmName = Name };
     152      Runs = new RunCollection { OptimizerName = Name };
    153153    }
    154154    protected Algorithm(string name, string description)
    … …  
    158158      storeAlgorithmInEachRun = false;
    159159      runsCounter = 0;
    160       Runs = new RunCollection { AlgorithmName = Name };
     160      Runs = new RunCollection { OptimizerName = Name };
    161161    }
    162162    protected Algorithm(string name, string description, ParameterCollection parameters)
    … …  
    166166      storeAlgorithmInEachRun = false;
    167167      runsCounter = 0;
    168       Runs = new RunCollection { AlgorithmName = Name };
     168      Runs = new RunCollection { OptimizerName = Name };
    169169    }
    170170    [StorableConstructor]
    … …  
    252252    protected override void OnNameChanged() {
    253253      base.OnNameChanged();
    254       Runs.AlgorithmName = Name;
     254      Runs.OptimizerName = Name;
    255255    }
    256256

  • trunk/sources/HeuristicLab.Optimization/3.3/BatchRun.cs

    r8738 r8962  
    175175      repetitions = 10;
    176176      repetitionsCounter = 0;
    177       Runs = new RunCollection { AlgorithmName = Name };
     177      Runs = new RunCollection { OptimizerName = Name };
    178178    }
    179179    public BatchRun(string name)
    … …  
    185185      repetitions = 10;
    186186      repetitionsCounter = 0;
    187       Runs = new RunCollection { AlgorithmName = Name };
     187      Runs = new RunCollection { OptimizerName = Name };
    188188    }
    189189    public BatchRun(string name, string description)
    … …  
    194194      repetitions = 10;
    195195      repetitionsCounter = 0;
    196       Runs = new RunCollection { AlgorithmName = Name };
     196      Runs = new RunCollection { OptimizerName = Name };
    197197    }
    198198    [StorableConstructor]
    … …  
    280280    protected override void OnNameChanged() {
    281281      base.OnNameChanged();
    282       runs.AlgorithmName = Name;
     282      runs.OptimizerName = Name;
    283283    }
    284284

  • trunk/sources/HeuristicLab.Optimization/3.3/Experiment.cs

    r8738 r8962  
    117117      executionTime = TimeSpan.Zero;
    118118      optimizers = new OptimizerList();
    119       Runs = new RunCollection { AlgorithmName = Name };
     119      Runs = new RunCollection { OptimizerName = Name };
    120120      Initialize();
    121121    }
    … …  
    126126      executionTime = TimeSpan.Zero;
    127127      optimizers = new OptimizerList();
    128       Runs = new RunCollection { AlgorithmName = Name };
     128      Runs = new RunCollection { OptimizerName = Name };
    129129      Initialize();
    130130    }
    … …  
    134134      executionTime = TimeSpan.Zero;
    135135      optimizers = new OptimizerList();
    136       Runs = new RunCollection { AlgorithmName = Name };
     136      Runs = new RunCollection { OptimizerName = Name };
    137137      Initialize();
    138138    }
    … …  
    232232    protected override void OnNameChanged() {
    233233      base.OnNameChanged();
    234       Runs.AlgorithmName = Name;
     234      Runs.OptimizerName = Name;
    235235    }
    236236

  • trunk/sources/HeuristicLab.Optimization/3.3/RunCollection.cs

    r8738 r8962  
    4444      : base(original, cloner) {
    4545      updateOfRunsInProgress = false;
    46       algorithmName = original.algorithmName;
     46      optimizerName = original.optimizerName;
    4747
    4848      resultNames = new List<string>(original.resultNames);
    … …  
    106106    }
    107107
    108     private string algorithmName = string.Empty;
    109     [Storable]
    110     public string AlgorithmName {
    111       get { return algorithmName; }
     108    private string optimizerName = string.Empty;
     109    [Storable]
     110    public string OptimizerName {
     111      get { return optimizerName; }
    112112      set {
    113         if (value != algorithmName && !string.IsNullOrEmpty(value)) {
    114           algorithmName = value;
    115           OnAlgorithmNameChanged();
     113        if (value != optimizerName && !string.IsNullOrEmpty(value)) {
     114          optimizerName = value;
     115          OnOptimizerNameChanged();
    116116        }
    117117      }
     118    }
     119
     120    [Storable(AllowOneWay = true)]
     121    private string AlgorithmName {
     122      set { optimizerName = value; }
    118123    }
    119124
    … …  
    137142    }
    138143
    139     public event EventHandler AlgorithmNameChanged;
    140     protected virtual void OnAlgorithmNameChanged() {
    141       var handler = AlgorithmNameChanged;
     144    public event EventHandler OptimizerNameChanged;
     145    protected virtual void OnOptimizerNameChanged() {
     146      var handler = OptimizerNameChanged;
    142147      if (handler != null) handler(this, EventArgs.Empty);
    143148    }
Note: See TracChangeset for help on using the changeset viewer.