Changeset 5811 for branches/QAP/HeuristicLab.Optimization

Timestamp:

03/23/11 09:28:34 (14 years ago)

Author:

abeham

Message:

#1330

• Adapted QAP to new problem base class structure
• Fixed a bug in a view
• Merged changes from Optimization plugin into branch

Location:

branches/QAP/HeuristicLab.Optimization/3.3

Files:

• . (modified) (2 props)
• Algorithm.cs (modified) (2 diffs)
• HeuristicLab.Optimization-3.3.csproj (modified) (5 diffs)
• HeuristicOptimizationAlgorithm.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/HeuristicOptimizationAlgorithm.cs)
• HeuristicOptimizationEngineAlgorithm.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/HeuristicOptimizationEngineAlgorithm.cs)
• HeuristicOptimizationProblem.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/HeuristicOptimizationProblem.cs)
• Interfaces/IHeuristicOptimizationProblem.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/IHeuristicOptimizationProblem.cs)
• Interfaces/IMultiObjectiveHeuristicOptimizationProblem.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/IMultiObjectiveHeuristicOptimizationProblem.cs)
• Interfaces/IMultiObjectiveProblem.cs (deleted)
• Interfaces/IProblem.cs (modified) (1 diff)
• Interfaces/ISingleObjectiveHeuristicOptimizationProblem.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveHeuristicOptimizationProblem.cs)
• Interfaces/ISingleObjectiveProblem.cs (deleted)
• MultiObjectiveHeuristicOptimizationProblem.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/MultiObjectiveHeuristicOptimizationProblem.cs)
• MultiObjectiveProblem.cs (deleted)
• Problem.cs (modified) (6 diffs)
• SingleObjectiveHeuristicOptimizationProblem.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/SingleObjectiveHeuristicOptimizationProblem.cs) (3 diffs)
• SingleObjectiveProblem.cs (deleted)
• UserDefinedProblem.cs (modified) (6 diffs)

branches/QAP/HeuristicLab.Optimization/3.3

@@ -3 +3 @@
 obj
 *.user
+*.vs10x

@@ -3 +3 @@
 obj
 *.user
+*.vs10x

branches/QAP/HeuristicLab.Optimization/3.3/Algorithm.cs

@@ -224 +224 @@
     public virtual void CollectResultValues(IDictionary<string, IItem> values) {
       values.Add("Execution Time", new TimeSpanValue(ExecutionTime));
-      foreach (IResult result in Results)
-        values.Add(result.Name, result.Value);
+      CollectResultsRecursively("", Results, values);
+    }
+
+    private void CollectResultsRecursively(string path, ResultCollection results, IDictionary<string, IItem> values) {
+      foreach (IResult result in results) {
+        values.Add(path + result.Name, result.Value);
+        ResultCollection childCollection = result.Value as ResultCollection;
+        if (childCollection != null) {
+          CollectResultsRecursively(path + result.Name + ".", childCollection, values);
+        }
+      }
     }
 
@@ -283 +292 @@
 
     protected virtual void DeregisterProblemEvents() {
-      problem.SolutionCreatorChanged -= new EventHandler(Problem_SolutionCreatorChanged);
-      problem.EvaluatorChanged -= new EventHandler(Problem_EvaluatorChanged);
       problem.OperatorsChanged -= new EventHandler(Problem_OperatorsChanged);
       problem.Reset -= new EventHandler(Problem_Reset);
     }
     protected virtual void RegisterProblemEvents() {
-      problem.SolutionCreatorChanged += new EventHandler(Problem_SolutionCreatorChanged);
-      problem.EvaluatorChanged += new EventHandler(Problem_EvaluatorChanged);
       problem.OperatorsChanged += new EventHandler(Problem_OperatorsChanged);
       problem.Reset += new EventHandler(Problem_Reset);
     }
-    protected virtual void Problem_SolutionCreatorChanged(object sender, EventArgs e) { }
-    protected virtual void Problem_EvaluatorChanged(object sender, EventArgs e) { }
     protected virtual void Problem_OperatorsChanged(object sender, EventArgs e) { }
     protected virtual void Problem_Reset(object sender, EventArgs e) {

branches/QAP/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -142 +142 @@
     <Compile Include="BatchRun.cs" />
     <Compile Include="Interfaces\IDiscreteDoubleMatrixModifier.cs" />
+    <Compile Include="HeuristicOptimizationEngineAlgorithm.cs" />
     <Compile Include="Interfaces\IGlobalParticleUpdater.cs" />
     <Compile Include="Interfaces\ILocalImprovementOperator.cs" />
     <Compile Include="Interfaces\ILocalParticleUpdater.cs" />
+    <Compile Include="HeuristicOptimizationAlgorithm.cs" />
+    <Compile Include="MultiObjectiveHeuristicOptimizationProblem.cs" />
+    <Compile Include="HeuristicOptimizationProblem.cs" />
+    <Compile Include="SingleObjectiveHeuristicOptimizationProblem.cs" />
+    <Compile Include="Interfaces\IHeuristicOptimizationProblem.cs" />
     <Compile Include="Interfaces\IMultiAnalyzer.cs" />
     <Compile Include="Interfaces\IIterationBasedOperator.cs" />
@@ -152 +158 @@
     <Compile Include="Interfaces\ITopologyInitializer.cs" />
     <Compile Include="Interfaces\ITopologyUpdater.cs" />
-    <Compile Include="MultiObjectiveProblem.cs" />
+    <Compile Include="Interfaces\IMultiObjectiveHeuristicOptimizationProblem.cs" />
+    <Compile Include="Interfaces\ISingleObjectiveHeuristicOptimizationProblem.cs" />
     <Compile Include="Problem.cs" />
     <Compile Include="RunCollectionConstraints\RunCollectionComparisonConstraint.cs" />
@@ -188 +195 @@
     <Compile Include="Interfaces\IReducer.cs" />
     <Compile Include="Interfaces\ISelector.cs" />
-    <Compile Include="Interfaces\IMultiObjectiveProblem.cs" />
     <Compile Include="Interfaces\IMultiObjectiveEvaluator.cs" />
     <Compile Include="Interfaces\IAlgorithm.cs" />
@@ -196 +202 @@
     <Compile Include="Interfaces\IProblem.cs" />
     <Compile Include="Interfaces\ISingleObjectiveEvaluator.cs" />
-    <Compile Include="Interfaces\ISingleObjectiveProblem.cs" />
     <Compile Include="Interfaces\ISolutionCreator.cs" />
     <Compile Include="Interfaces\IStochasticOperator.cs" />
@@ -202 +207 @@
     <Compile Include="Interfaces\ITabuMaker.cs" />
     <Compile Include="Result.cs" />
-    <Compile Include="SingleObjectiveProblem.cs" />
     <Compile Include="UserDefinedAlgorithm.cs" />
     <Compile Include="EngineAlgorithm.cs" />

branches/QAP/HeuristicLab.Optimization/3.3/Interfaces/IProblem.cs

@@ -29 +29 @@
   /// </summary>
   public interface IProblem : IParameterizedNamedItem {
-    IParameter SolutionCreatorParameter { get; }
-    ISolutionCreator SolutionCreator { get; }
-    IParameter EvaluatorParameter { get; }
-    IEvaluator Evaluator { get; }
     IEnumerable<IOperator> Operators { get; }
 
-    event EventHandler SolutionCreatorChanged;
-    event EventHandler EvaluatorChanged;
     event EventHandler OperatorsChanged;
     event EventHandler Reset;

branches/QAP/HeuristicLab.Optimization/3.3/Problem.cs

@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -32 +31 @@
   [Item("Problem", "Represents the base class for a problem.")]
   [StorableClass]
-  public abstract class Problem<T, U> : ParameterizedNamedItem, IProblem
-    where T : class,IEvaluator
-    where U : class,ISolutionCreator {
-    private const string EvaluatorParameterName = "Evaluator";
-    private const string SolutionCreateParameterName = "SolutionCreator";
-
+  public abstract class Problem : ParameterizedNamedItem, IProblem {
     public override Image ItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Type; }
@@ -44 +38 @@
     [StorableConstructor]
     protected Problem(bool deserializing) : base(deserializing) { }
-    protected Problem(Problem<T, U> original, Cloner cloner)
+    protected Problem(Problem original, Cloner cloner)
       : base(original, cloner) {
       operators = cloner.Clone(original.operators);
@@ -53 +47 @@
       : base() {
       operators = new OperatorCollection();
-      Parameters.Add(new ValueParameter<T>(EvaluatorParameterName, "The operator used to evaluate a solution."));
-      Parameters.Add(new ValueParameter<U>(SolutionCreateParameterName, "The operator to create a solution."));
       RegisterEventHandlers();
     }
@@ -67 +59 @@
       Operators.ItemsRemoved += new CollectionItemsChangedEventHandler<IOperator>(Operators_Changed);
       Operators.CollectionReset += new CollectionItemsChangedEventHandler<IOperator>(Operators_Changed);
-
-      EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);
-      SolutionCreatorParameter.ValueChanged += new EventHandler(SolutionCreatorParameter_ValueChanged);
     }
 
@@ -83 +72 @@
     }
     IEnumerable<IOperator> IProblem.Operators { get { return operators; } }
-
-    public T Evaluator {
-      get { return EvaluatorParameter.Value; }
-      protected set { EvaluatorParameter.Value = value; }
-    }
-    public ValueParameter<T> EvaluatorParameter {
-      get { return (ValueParameter<T>)Parameters[EvaluatorParameterName]; }
-    }
-    IEvaluator IProblem.Evaluator { get { return Evaluator; } }
-    IParameter IProblem.EvaluatorParameter { get { return EvaluatorParameter; } }
-
-    public U SolutionCreator {
-      get { return SolutionCreatorParameter.Value; }
-      protected set { SolutionCreatorParameter.Value = value; }
-    }
-    public ValueParameter<U> SolutionCreatorParameter {
-      get { return (ValueParameter<U>)Parameters[SolutionCreateParameterName]; }
-    }
-    ISolutionCreator IProblem.SolutionCreator { get { return SolutionCreator; } }
-    IParameter IProblem.SolutionCreatorParameter { get { return SolutionCreatorParameter; } }
     #endregion
 
     #region events
-    private void EvaluatorParameter_ValueChanged(object sender, EventArgs e) {
-      OnEvaluatorChanged();
-    }
-    public event EventHandler EvaluatorChanged;
-    protected virtual void OnEvaluatorChanged() {
-      EventHandler handler = EvaluatorChanged;
-      if (handler != null)
-        handler(this, EventArgs.Empty);
-    }
-
-    private void SolutionCreatorParameter_ValueChanged(object sender, EventArgs e) {
-      OnSolutionCreatorChanged();
-    }
-    public event EventHandler SolutionCreatorChanged;
-    protected virtual void OnSolutionCreatorChanged() {
-      EventHandler handler = SolutionCreatorChanged;
-      if (handler != null)
-        handler(this, EventArgs.Empty);
-    }
-
     private void Operators_Changed(object sender, EventArgs e) {
       OnOperatorsChanged();

branches/QAP/HeuristicLab.Optimization/3.3/SingleObjectiveHeuristicOptimizationProblem.cs

@@ -41 +41 @@
       : base() {
       Parameters.Add(new ValueParameter<BoolValue>(MaximizationParameterName, "Set to false if the problem should be minimized.", new BoolValue()));
-      Parameters.Add(new ValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem.", new DoubleValue()));
+      Parameters.Add(new OptionalValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem.", new DoubleValue()));
     }
 
@@ -47 +47 @@
       : base(evaluator, solutionCreator) {
       Parameters.Add(new ValueParameter<BoolValue>(MaximizationParameterName, "Set to false if the problem should be minimized.", new BoolValue()));
-      Parameters.Add(new ValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem.", new DoubleValue()));
+      Parameters.Add(new OptionalValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem.", new DoubleValue()));
     }
 
-    public ValueParameter<BoolValue> MaximizationParameter {
-      get { return (ValueParameter<BoolValue>)Parameters[MaximizationParameterName]; }
+    [StorableHook(HookType.AfterDeserialization)]
+    protected virtual void AfterDeserialization() {
+      // BackwardsCompatibility3.3
+      #region Backwards compatible code (remove with 3.4)
+      if (BestKnownQualityParameter is ValueParameter<DoubleValue>) {
+        Parameters.Remove(BestKnownQualityParameterName);
+        Parameters.Add(new OptionalValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem."));
+      }
+      #endregion
+    }
+    public IValueParameter<BoolValue> MaximizationParameter {
+      get { return (IValueParameter<BoolValue>)Parameters[MaximizationParameterName]; }
     }
     IParameter ISingleObjectiveHeuristicOptimizationProblem.MaximizationParameter {
@@ -61 +71 @@
     }
 
-    public ValueParameter<DoubleValue> BestKnownQualityParameter {
-      get { return (ValueParameter<DoubleValue>)Parameters[BestKnownQualityParameterName]; }
+    public IValueParameter<DoubleValue> BestKnownQualityParameter {
+      get { return (IValueParameter<DoubleValue>)Parameters[BestKnownQualityParameterName]; }
     }
     IParameter ISingleObjectiveHeuristicOptimizationProblem.BestKnownQualityParameter {

branches/QAP/HeuristicLab.Optimization/3.3/UserDefinedProblem.cs

@@ -40 +40 @@
   [Creatable("Problems")]
   [StorableClass]
-  public sealed class UserDefinedProblem : ParameterizedNamedItem, ISingleObjectiveProblem, IStorableContent {
+  public sealed class UserDefinedProblem : ParameterizedNamedItem, ISingleObjectiveHeuristicOptimizationProblem, IStorableContent {
     public string Filename { get; set; }
 
@@ -60 +60 @@
       get { return (ValueParameter<BoolValue>)Parameters["Maximization"]; }
     }
-    IParameter ISingleObjectiveProblem.MaximizationParameter {
+    IParameter ISingleObjectiveHeuristicOptimizationProblem.MaximizationParameter {
       get { return MaximizationParameter; }
     }
@@ -66 +66 @@
       get { return (ValueParameter<ISolutionCreator>)Parameters["SolutionCreator"]; }
     }
-    IParameter IProblem.SolutionCreatorParameter {
+    IParameter IHeuristicOptimizationProblem.SolutionCreatorParameter {
       get { return SolutionCreatorParameter; }
     }
-    IParameter IProblem.EvaluatorParameter {
+    IParameter IHeuristicOptimizationProblem.EvaluatorParameter {
       get { return EvaluatorParameter; }
     }
@@ -75 +75 @@
       get { return (OptionalValueParameter<DoubleValue>)Parameters["BestKnownQuality"]; }
     }
-    IParameter ISingleObjectiveProblem.BestKnownQualityParameter {
+    IParameter ISingleObjectiveHeuristicOptimizationProblem.BestKnownQualityParameter {
       get { return BestKnownQualityParameter; }
     }
@@ -95 +95 @@
       set { SolutionCreatorParameter.Value = value; }
     }
-    ISolutionCreator IProblem.SolutionCreator {
+    ISolutionCreator IHeuristicOptimizationProblem.SolutionCreator {
       get { return SolutionCreatorParameter.Value; }
     }
@@ -102 +102 @@
       set { EvaluatorParameter.Value = value; }
     }
-    ISingleObjectiveEvaluator ISingleObjectiveProblem.Evaluator {
+    ISingleObjectiveEvaluator ISingleObjectiveHeuristicOptimizationProblem.Evaluator {
       get { return EvaluatorParameter.Value; }
     }
-    IEvaluator IProblem.Evaluator {
+    IEvaluator IHeuristicOptimizationProblem.Evaluator {
       get { return EvaluatorParameter.Value; }
     }

@@ -3 +3 @@
 obj
 *.user
+*.vs10x