Changeset 5344 for branches/OKB (trunk integration)

Timestamp:

01/21/11 03:53:10 (14 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

Location:

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3

Files:

• EmptyAlgorithm.cs (added)
• EmptyEvaluator.cs (added)
• EmptyMultiObjectiveEvaluator.cs (added)
• EmptyMultiObjectiveProblem.cs (added)
• EmptyProblem.cs (added)
• EmptySingleObjectiveEvaluator.cs (added)
• EmptySingleObjectiveProblem.cs (added)
• EmptySolutionCreator.cs (added)
• HeuristicLab.Clients.OKB-3.3.csproj (modified) (5 diffs)
• HeuristicLabClientsOKBPlugin.cs.frame (modified) (1 diff)
• MultiObjectiveOKBProblem.cs (added)
• OKBAlgorithm.cs (added)
• OKBProblem.cs (modified) (8 diffs)
• SingleObjectiveOKBProblem.cs (modified) (2 diffs)
• Views/OKBAlgorithmView.Designer.cs (added)
• Views/OKBAlgorithmView.cs (added)
• Views/OKBProblemView.Designer.cs (modified) (4 diffs)
• Views/OKBProblemView.cs (modified) (1 diff)

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/HeuristicLab.Clients.OKB-3.3.csproj

@@ -66 +66 @@
       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Operators-3.3">
+      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.Optimization-3.3">
       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
@@ -74 +77 @@
     <Reference Include="HeuristicLab.Optimizer-3.3">
       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimizer-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Parameters-3.3.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.Persistence-3.3">
@@ -94 +100 @@
   <ItemGroup>
     <Compile Include="AdministratorMenuItem.cs" />
+    <Compile Include="EmptyAlgorithm.cs" />
+    <Compile Include="OKBAlgorithm.cs" />
+    <Compile Include="MultiObjectiveOKBProblem.cs" />
+    <Compile Include="EmptyMultiObjectiveProblem.cs" />
+    <Compile Include="EmptyEvaluator.cs" />
+    <Compile Include="EmptyProblem.cs" />
+    <Compile Include="EmptyMultiObjectiveEvaluator.cs" />
+    <Compile Include="EmptySolutionCreator.cs" />
+    <Compile Include="EmptySingleObjectiveEvaluator.cs" />
+    <Compile Include="EmptySingleObjectiveProblem.cs" />
     <Compile Include="SingleObjectiveOKBProblem.cs" />
     <Compile Include="OKBProblem.cs" />
@@ -184 +200 @@
       <DependentUpon>AlgorithmParameterView.cs</DependentUpon>
     </Compile>
+    <Compile Include="Views\OKBAlgorithmView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Views\OKBAlgorithmView.Designer.cs">
+      <DependentUpon>OKBAlgorithmView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Views\OKBProblemView.cs">
       <SubType>UserControl</SubType>
@@ -390 +412 @@
     <None Include="HeuristicLab.snk" />
     <None Include="HeuristicLabClientsOKBPlugin.cs.frame" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\OKBProblemView.resx">
-      <DependentUpon>OKBProblemView.cs</DependentUpon>
-    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/HeuristicLabClientsOKBPlugin.cs.frame

@@ -37 +37 @@
   [PluginDependency("HeuristicLab.MainForm", "3.3")]
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
+  [PluginDependency("HeuristicLab.Operators", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
   [PluginDependency("HeuristicLab.Optimizer", "3.3")]
+  [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
   public class HeuristicLabClientsOKBPlugin : PluginBase {

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/OKBProblem.cs

@@ -24 +24 @@
 using System.Drawing;
 using System.IO;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -32 +31 @@
 
 namespace HeuristicLab.Clients.OKB {
-  [Item("OKB Problem", "Represents a problem which is stored in the OKB.")]
+  [Item("OKB Problem", "A base class for problems which are stored in the OKB.")]
   [StorableClass]
-  public class OKBProblem : Item, IProblem, IStorableContent {
-    public string Filename { get; set; }
-
-    public override Image ItemImage {
-      get { return Problem == null ? HeuristicLab.Common.Resources.VSImageLibrary.Type : Problem.ItemImage; }
-    }
-
-    public string Name {
-      get { return Problem == null ? ItemName : Problem.Name; }
-      set { throw new NotSupportedException("Name cannot be changed."); }
-    }
-    public string Description {
-      get { return Problem == null ? ItemDescription : Problem.Description; }
-      set { throw new NotSupportedException("Description cannot be changed."); }
-    }
-    public bool CanChangeName {
-      get { return false; }
-    }
-    public bool CanChangeDescription {
-      get { return false; }
-    }
-
-    public IKeyedItemCollection<string, IParameter> Parameters {
-      get { return Problem == null ? null : Problem.Parameters; }
-    }
-
+  public abstract class OKBProblem : Item, IProblem {
     public virtual Type ProblemType {
       get { return typeof(IProblem); }
@@ -71 +45 @@
       get { return problem; }
       private set {
-        if (value == null) throw new ArgumentNullException("Problem");
+        if (value == null) throw new ArgumentNullException("Problem", "Problem cannot be null.");
         if (value != problem) {
           CancelEventArgs<string> e = new CancelEventArgs<string>(value.Name);
@@ -94 +68 @@
     }
 
+    public override Image ItemImage {
+      get { return Problem.ItemImage; }
+    }
+
+    public string Name {
+      get { return Problem.Name; }
+      set { throw new NotSupportedException("Name cannot be changed."); }
+    }
+    public string Description {
+      get { return Problem.Description; }
+      set { throw new NotSupportedException("Description cannot be changed."); }
+    }
+    public bool CanChangeName {
+      get { return false; }
+    }
+    public bool CanChangeDescription {
+      get { return false; }
+    }
+
+    public IKeyedItemCollection<string, IParameter> Parameters {
+      get { return Problem.Parameters; }
+    }
+
     public IParameter SolutionCreatorParameter {
-      get { return Problem == null ? null : Problem.SolutionCreatorParameter; }
+      get { return Problem.SolutionCreatorParameter; }
     }
     public ISolutionCreator SolutionCreator {
-      get { return Problem == null ? null : Problem.SolutionCreator; }
+      get { return Problem.SolutionCreator; }
     }
     public IParameter EvaluatorParameter {
-      get { return Problem == null ? null : Problem.EvaluatorParameter; }
+      get { return Problem.EvaluatorParameter; }
     }
     public IEvaluator Evaluator {
-      get { return Problem == null ? null : Problem.Evaluator; }
+      get { return Problem.Evaluator; }
     }
     public IEnumerable<IOperator> Operators {
-      get { return Problem == null ? Enumerable.Empty<IOperator>() : Problem.Operators; }
+      get { return Problem.Operators; }
     }
 
@@ -118 +115 @@
     [Storable(Name = "Problem")]
     private IProblem StorableProblem {
-      get { return Problem; }
-      set { Problem = value; }
+      get { return problem; }
+      set {
+        problem = value;
+        RegisterProblemEvents();
+      }
     }
     #endregion
@@ -129 +129 @@
       problemId = original.problemId;
       problem = cloner.Clone(original.problem);
-    }
-    protected OKBProblem()
+      RegisterProblemEvents();
+    }
+    protected OKBProblem(IProblem initialProblem)
       : base() {
+      if (initialProblem == null) throw new ArgumentNullException("initialProblem", "Initial problem cannot be null.");
       problemId = -1;
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new OKBProblem(this, cloner);
+      problem = initialProblem;
+      RegisterProblemEvents();
     }
 
@@ -154 +154 @@
 
     public void CollectParameterValues(IDictionary<string, IItem> values) {
-      if (Problem != null) Problem.CollectParameterValues(values);
+      Problem.CollectParameterValues(values);
     }
 
     #region Events
+    public event EventHandler ProblemChanged;
+    protected virtual void OnProblemChanged() {
+      EventHandler handler = ProblemChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
     public event EventHandler<CancelEventArgs<string>> NameChanging;
     protected virtual void OnNameChanging(CancelEventArgs<string> e) {
@@ -171 +176 @@
     protected virtual void OnDescriptionChanged() {
       var handler = DescriptionChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-    public event EventHandler ProblemChanged;
-    protected virtual void OnProblemChanged() {
-      EventHandler handler = ProblemChanged;
       if (handler != null) handler(this, EventArgs.Empty);
     }

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/SingleObjectiveOKBProblem.cs

@@ -38 +38 @@
     }
     public IParameter BestKnownQualityParameter {
-      get { return Problem == null ? null : Problem.BestKnownQualityParameter; }
+      get { return Problem.BestKnownQualityParameter; }
+    }
+    public IParameter MaximizationParameter {
+      get { return Problem.MaximizationParameter; }
     }
     public new ISingleObjectiveEvaluator Evaluator {
-      get { return Problem == null ? null : Problem.Evaluator; }
-    }
-    public IParameter MaximizationParameter {
-      get { return Problem == null ? null : Problem.MaximizationParameter; }
+      get { return Problem.Evaluator; }
     }
 
@@ -50 +50 @@
     private SingleObjectiveOKBProblem(bool deserializing) : base(deserializing) { }
     private SingleObjectiveOKBProblem(SingleObjectiveOKBProblem original, Cloner cloner) : base(original, cloner) { }
-    public SingleObjectiveOKBProblem() : base() { }
+    public SingleObjectiveOKBProblem() : base(new EmptySingleObjectiveProblem("No problem selected. Please choose a single-objective problem instance from the OKB.")) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/OKBProblemView.Designer.cs

@@ -59 +59 @@
       this.problemLabel.Name = "problemLabel";
       this.problemLabel.Size = new System.Drawing.Size(48, 13);
-      this.problemLabel.TabIndex = 7;
+      this.problemLabel.TabIndex = 0;
       this.problemLabel.Text = "&Problem:";
       // 
@@ -71 +71 @@
       this.problemComboBox.Name = "problemComboBox";
       this.problemComboBox.Size = new System.Drawing.Size(551, 21);
-      this.problemComboBox.TabIndex = 8;
+      this.problemComboBox.TabIndex = 1;
       this.problemComboBox.SelectedValueChanged += new System.EventHandler(this.problemComboBox_SelectedValueChanged);
       // 
@@ -80 +80 @@
       this.refreshButton.Name = "refreshButton";
       this.refreshButton.Size = new System.Drawing.Size(24, 24);
-      this.refreshButton.TabIndex = 4;
+      this.refreshButton.TabIndex = 2;
       this.toolTip.SetToolTip(this.refreshButton, "Refresh Problems");
       this.refreshButton.UseVisualStyleBackColor = true;
@@ -97 +97 @@
       this.viewHost.ReadOnly = false;
       this.viewHost.Size = new System.Drawing.Size(638, 422);
-      this.viewHost.TabIndex = 9;
+      this.viewHost.TabIndex = 3;
       this.viewHost.ViewsLabelVisible = true;
       this.viewHost.ViewType = null;

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/OKBProblemView.cs

@@ -122 +122 @@
     private void problemComboBox_SelectedValueChanged(object sender, System.EventArgs e) {
       Problem problem = problemComboBox.SelectedValue as Problem;
-      if ((problem != null) && (Content != null)) Content.Load(problem.Id);
+      if ((problem != null) && (Content != null)) {
+        Content.Load(problem.Id);
+        if (Content.ProblemId != problem.Id)  // reset selected item if load was not successful
+          problemComboBox.SelectedItem = OKBClient.Instance.Problems.FirstOrDefault(x => x.Id == Content.ProblemId);
+      }
     }
     #endregion