Changeset 13388


Ignore:
Timestamp:
11/24/15 18:43:08 (4 years ago)
Author:
abeham
Message:

#2521:

  • Readded excluded views
  • Removed ProblemInstanceProviderView which was not referenced in the project file
  • Fixed plugin dependency
Location:
branches/ProblemRefactoring
Files:
3 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • branches/ProblemRefactoring/HeuristicLab.Optimization.Views/3.3/CreateNewSingleEncodingDialog.Designer.cs

    r11963 r13388  
    4545    /// </summary>
    4646    private void InitializeComponent() {
    47       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CreateNewSingleEncodingDialog));
    4847      this.label1 = new System.Windows.Forms.Label();
    4948      this.encodingTypeComboBox = new System.Windows.Forms.ComboBox();
     
    126125      this.Controls.Add(this.encodingTypeComboBox);
    127126      this.Controls.Add(this.label1);
    128       this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
     127      this.Icon = HeuristicLab.Common.Resources.HeuristicLab.Icon;
    129128      this.MaximizeBox = false;
    130129      this.MinimizeBox = false;
  • branches/ProblemRefactoring/HeuristicLab.Optimization.Views/3.3/CreateNewSingleEncodingDialog.cs

    r11963 r13388  
    2323using System.Collections.Generic;
    2424using System.Windows.Forms;
    25 using HeuristicLab.Optimization;
    2625using HeuristicLab.PluginInfrastructure;
    2726
     
    4645      var encodings = ApplicationManager.Manager.GetTypes(typeof(IEncoding));
    4746      foreach (var enc in encodings) {
    48         if (enc != typeof(MultiEncoding))
     47        if (enc != typeof(CombinedEncoding))
    4948          encodingTypeComboBox.Items.Add(enc);
    5049      }
  • branches/ProblemRefactoring/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r13336 r13388  
    142142      <DependentUpon>BatchRunView.cs</DependentUpon>
    143143    </Compile>
     144    <Compile Include="CreateNewSingleEncodingDialog.cs">
     145      <SubType>Form</SubType>
     146    </Compile>
     147    <Compile Include="CreateNewSingleEncodingDialog.Designer.cs">
     148      <DependentUpon>CreateNewSingleEncodingDialog.cs</DependentUpon>
     149    </Compile>
    144150    <Compile Include="ISolutionSimilarityCalculatorView.cs">
    145151      <SubType>UserControl</SubType>
     
    153159    <Compile Include="ExperimentListView.Designer.cs">
    154160      <DependentUpon>ExperimentListView.cs</DependentUpon>
     161    </Compile>
     162    <Compile Include="MultiEncodingView.cs">
     163      <SubType>UserControl</SubType>
     164    </Compile>
     165    <Compile Include="MultiEncodingView.Designer.cs">
     166      <DependentUpon>MultiEncodingView.cs</DependentUpon>
    155167    </Compile>
    156168    <Compile Include="Plugin.cs" />
  • branches/ProblemRefactoring/HeuristicLab.Optimization.Views/3.3/MultiEncodingView.cs

    r11963 r13388  
    3030
    3131namespace HeuristicLab.Optimization.Views {
    32   [View("MultiEncoding View")]
    33   [Content(typeof(MultiEncoding), IsDefaultView = true)]
     32  [View("CombinedEncoding View")]
     33  [Content(typeof(CombinedEncoding), IsDefaultView = true)]
    3434  public sealed partial class MultiEncodingView : ParameterizedNamedItemView {
    3535
    36     public new MultiEncoding Content {
    37       get { return (MultiEncoding)base.Content; }
     36    public new CombinedEncoding Content {
     37      get { return (CombinedEncoding)base.Content; }
    3838      set { base.Content = value; }
    3939    }
     
    4949    protected override void DeregisterContentEvents() {
    5050      base.DeregisterContentEvents();
    51       Content.EncodingsChanged -= ContentOnEncodingsChanged;
     51      Content.Encodings.ItemsAdded -= ContentOnEncodingsChanged;
     52      Content.Encodings.ItemsRemoved -= ContentOnEncodingsChanged;
    5253    }
    5354
    5455    protected override void RegisterContentEvents() {
    55       Content.EncodingsChanged += ContentOnEncodingsChanged;
     56      Content.Encodings.ItemsAdded += ContentOnEncodingsChanged;
     57      Content.Encodings.ItemsRemoved += ContentOnEncodingsChanged;
    5658      base.RegisterContentEvents();
    5759    }
  • branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/MultiObjectiveProblem.cs

    r13361 r13388  
    6363    public virtual void Analyze(TSolution[] individuals, double[][] qualities, ResultCollection results, IRandom random) { }
    6464
    65     //TODO
    66     //protected override void OnOperatorsChanged() {
    67     //  base.OnOperatorsChanged();
    68     //  if (Encoding != null) {
    69     //    PruneSingleObjectiveOperators(Encoding);
    70     //    var multiEncoding = Encoding as MultiEncoding;
    71     //    if (multiEncoding != null) {
    72     //      foreach (var encoding in multiEncoding.Encodings.ToList()) {
    73     //        PruneSingleObjectiveOperators(encoding);
    74     //      }
    75     //    }
    76     //  }
    77     //}
    78 
    79     //private void PruneSingleObjectiveOperators(IEncoding encoding) {
    80     //  if (encoding != null && encoding.Operators.Any(x => x is ISingleObjectiveOperator && !(x is IMultiObjectiveOperator)))
    81     //    encoding.Operators = encoding.Operators.Where(x => !(x is ISingleObjectiveOperator) || x is IMultiObjectiveOperator).ToList();
    82     //}
    83 
    8465    protected override void OnEvaluatorChanged() {
    8566      base.OnEvaluatorChanged();
  • branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveProblem.cs

    r13361 r13388  
    9191    }
    9292
    93     //TODO
    94     //protected override void OnOperatorsChanged() {
    95     //  base.OnOperatorsChanged();
    96     //  if (Encoding != null) {
    97     //    PruneMultiObjectiveOperators(Encoding);
    98     //    var multiEncoding = Encoding as MultiEncoding;
    99     //    if (multiEncoding != null) {
    100     //      foreach (var encoding in multiEncoding.Encodings.ToList()) {
    101     //        PruneMultiObjectiveOperators(encoding);
    102     //      }
    103     //    }
    104     //  }
    105     //}
    106 
    107     //private void PruneMultiObjectiveOperators(IEncoding<TSolution> encoding) {
    108     //  if (encoding.Operators.Any(x => x is IMultiObjectiveOperator && !(x is ISingleObjectiveOperator)))
    109     //    encoding.Operators = encoding.Operators.Where(x => !(x is IMultiObjectiveOperator) || x is ISingleObjectiveOperator).ToList();
    110     //}
    111 
    11293    protected override void OnEvaluatorChanged() {
    11394      base.OnEvaluatorChanged();
  • branches/ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/Plugin.cs.frame

    r13385 r13388  
    3535  [PluginDependency("HeuristicLab.Encodings.RealVectorEncoding", "3.3")]
    3636  [PluginDependency("HeuristicLab.Encodings.PermutationEncoding", "3.3")]
    37   [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.3")]
     37  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")]
    3838  [PluginDependency("HeuristicLab.Encodings.LinearLinkageEncoding", "3.3")]
    3939  [PluginDependency("HeuristicLab.Optimization", "3.3")]
Note: See TracChangeset for help on using the changeset viewer.