Changeset 13388 for branches/ProblemRefactoring

Timestamp:

11/24/15 18:43:08 (9 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:

• HeuristicLab.Optimization.Views/3.3/CreateNewSingleEncodingDialog.Designer.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/CreateNewSingleEncodingDialog.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/CreateNewSingleEncodingDialog.resx (deleted)
• HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/MultiEncodingView.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/ProblemInstanceProviderView.Designer.cs (deleted)
• HeuristicLab.Optimization.Views/3.3/ProblemInstanceProviderView.cs (deleted)
• HeuristicLab.Optimization/3.3/BasicProblems/MultiObjectiveProblem.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.Programmable/3.3/Plugin.cs.frame (modified) (1 diff)

branches/ProblemRefactoring/HeuristicLab.Optimization.Views/3.3/CreateNewSingleEncodingDialog.Designer.cs

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CreateNewSingleEncodingDialog));
       this.label1 = new System.Windows.Forms.Label();
       this.encodingTypeComboBox = new System.Windows.Forms.ComboBox();
@@ -126 +125 @@
       this.Controls.Add(this.encodingTypeComboBox);
       this.Controls.Add(this.label1);
-      this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+      this.Icon = HeuristicLab.Common.Resources.HeuristicLab.Icon;
       this.MaximizeBox = false;
       this.MinimizeBox = false;

branches/ProblemRefactoring/HeuristicLab.Optimization.Views/3.3/CreateNewSingleEncodingDialog.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
-using HeuristicLab.Optimization;
 using HeuristicLab.PluginInfrastructure;
 
@@ -46 +45 @@
       var encodings = ApplicationManager.Manager.GetTypes(typeof(IEncoding));
       foreach (var enc in encodings) {
-        if (enc != typeof(MultiEncoding))
+        if (enc != typeof(CombinedEncoding))
           encodingTypeComboBox.Items.Add(enc);
       }

branches/ProblemRefactoring/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

@@ -142 +142 @@
       <DependentUpon>BatchRunView.cs</DependentUpon>
     </Compile>
+    <Compile Include="CreateNewSingleEncodingDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="CreateNewSingleEncodingDialog.Designer.cs">
+      <DependentUpon>CreateNewSingleEncodingDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="ISolutionSimilarityCalculatorView.cs">
       <SubType>UserControl</SubType>
@@ -153 +159 @@
     <Compile Include="ExperimentListView.Designer.cs">
       <DependentUpon>ExperimentListView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="MultiEncodingView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="MultiEncodingView.Designer.cs">
+      <DependentUpon>MultiEncodingView.cs</DependentUpon>
     </Compile>
     <Compile Include="Plugin.cs" />

branches/ProblemRefactoring/HeuristicLab.Optimization.Views/3.3/MultiEncodingView.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Optimization.Views {
-  [View("MultiEncoding View")]
-  [Content(typeof(MultiEncoding), IsDefaultView = true)]
+  [View("CombinedEncoding View")]
+  [Content(typeof(CombinedEncoding), IsDefaultView = true)]
   public sealed partial class MultiEncodingView : ParameterizedNamedItemView {
 
-    public new MultiEncoding Content {
-      get { return (MultiEncoding)base.Content; }
+    public new CombinedEncoding Content {
+      get { return (CombinedEncoding)base.Content; }
       set { base.Content = value; }
     }
@@ -49 +49 @@
     protected override void DeregisterContentEvents() {
       base.DeregisterContentEvents();
-      Content.EncodingsChanged -= ContentOnEncodingsChanged;
+      Content.Encodings.ItemsAdded -= ContentOnEncodingsChanged;
+      Content.Encodings.ItemsRemoved -= ContentOnEncodingsChanged;
     }
 
     protected override void RegisterContentEvents() {
-      Content.EncodingsChanged += ContentOnEncodingsChanged;
+      Content.Encodings.ItemsAdded += ContentOnEncodingsChanged;
+      Content.Encodings.ItemsRemoved += ContentOnEncodingsChanged;
       base.RegisterContentEvents();
     }

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/MultiObjectiveProblem.cs

@@ -63 +63 @@
     public virtual void Analyze(TSolution[] individuals, double[][] qualities, ResultCollection results, IRandom random) { }
 
-    //TODO
-    //protected override void OnOperatorsChanged() {
-    //  base.OnOperatorsChanged();
-    //  if (Encoding != null) {
-    //    PruneSingleObjectiveOperators(Encoding);
-    //    var multiEncoding = Encoding as MultiEncoding;
-    //    if (multiEncoding != null) {
-    //      foreach (var encoding in multiEncoding.Encodings.ToList()) {
-    //        PruneSingleObjectiveOperators(encoding);
-    //      }
-    //    }
-    //  }
-    //}
-
-    //private void PruneSingleObjectiveOperators(IEncoding encoding) {
-    //  if (encoding != null && encoding.Operators.Any(x => x is ISingleObjectiveOperator && !(x is IMultiObjectiveOperator)))
-    //    encoding.Operators = encoding.Operators.Where(x => !(x is ISingleObjectiveOperator) || x is IMultiObjectiveOperator).ToList();
-    //}
-
     protected override void OnEvaluatorChanged() {
       base.OnEvaluatorChanged();

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveProblem.cs

@@ -91 +91 @@
     }
 
-    //TODO
-    //protected override void OnOperatorsChanged() {
-    //  base.OnOperatorsChanged();
-    //  if (Encoding != null) {
-    //    PruneMultiObjectiveOperators(Encoding);
-    //    var multiEncoding = Encoding as MultiEncoding;
-    //    if (multiEncoding != null) {
-    //      foreach (var encoding in multiEncoding.Encodings.ToList()) {
-    //        PruneMultiObjectiveOperators(encoding);
-    //      }
-    //    }
-    //  }
-    //}
-
-    //private void PruneMultiObjectiveOperators(IEncoding<TSolution> encoding) {
-    //  if (encoding.Operators.Any(x => x is IMultiObjectiveOperator && !(x is ISingleObjectiveOperator)))
-    //    encoding.Operators = encoding.Operators.Where(x => !(x is IMultiObjectiveOperator) || x is ISingleObjectiveOperator).ToList();
-    //}
-
     protected override void OnEvaluatorChanged() {
       base.OnEvaluatorChanged();

branches/ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/Plugin.cs.frame

@@ -35 +35 @@
   [PluginDependency("HeuristicLab.Encodings.RealVectorEncoding", "3.3")]
   [PluginDependency("HeuristicLab.Encodings.PermutationEncoding", "3.3")]
-  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.3")]
+  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")]
   [PluginDependency("HeuristicLab.Encodings.LinearLinkageEncoding", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]