Changeset 7270 for branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization

Timestamp:

01/04/12 16:45:02 (13 years ago)

Author:

spimming

Message:

#1680:

• merged changes from trunk into branch

Location:

branches/HeuristicLab.Hive.Azure

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs (modified) (3 diffs)
• HeuristicLab.Optimization/3.3/Algorithms/EngineAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Algorithms/HeuristicOptimizationAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Algorithms/HeuristicOptimizationEngineAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Algorithms/UserDefinedAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/BatchRun.cs (modified) (3 diffs)
• HeuristicLab.Optimization/3.3/Calculator.cs (deleted)
• HeuristicLab.Optimization/3.3/Experiment.cs (modified) (6 diffs)
• HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/IRunCollectionModifier.cs (deleted)
• HeuristicLab.Optimization/3.3/Interfaces/IAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ICrossover.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IDiscreteDoubleMatrixModifier.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IDiscreteDoubleValueModifier.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IEvaluator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IExhaustiveMoveGenerator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IGlobalParticleUpdater.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IHeuristicOptimizationProblem.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IIterationBasedOperator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ILocalImprovementOperator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ILocalParticleUpdater.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IManipulator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IMigrator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IMoveGenerator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IMoveMaker.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IMoveOperator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IMultiAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IMultiMoveGenerator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IMultiNeighborhoodShakingOperator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IMultiObjectiveEvaluator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IMultiObjectiveHeuristicOptimizationProblem.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IMultiObjectiveSelector.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IOptimizer.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IParticleCreator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IParticleUpdater.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IProblem.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IQualityComparator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IReducer.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IReplacer.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IResult.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IRun.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IRunCollectionModifier.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/IRunCollectionModifier.cs)
• HeuristicLab.Optimization/3.3/Interfaces/ISelector.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ISelfAdaptiveManipulator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ISingleMoveGenerator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveEvaluator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveHeuristicOptimizationProblem.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveMoveEvaluator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveReplacer.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveSelector.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ISolutionCreator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IStochasticOperator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IStrategyParameterCreator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IStrategyParameterCrossover.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IStrategyParameterManipulator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ISubScopesQualityComparator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ISwarmUpdater.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ITabuChecker.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ITabuMaker.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ITopologyInitializer.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ITopologyUpdater.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/MoveHelper.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/OptimizerList.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Plugin.cs.frame (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/Problems/HeuristicOptimizationProblem.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Problems/MultiObjectiveHeuristicOptimizationProblem.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Problems/Problem.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) (1 diff, 1 prop)
• HeuristicLab.Optimization/3.3/Problems/UserDefinedProblem.cs (modified) (3 diffs)
• HeuristicLab.Optimization/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
• HeuristicLab.Optimization/3.3/Result.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/ResultCollection.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/Run.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/RunCollection.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/RunCollectionConstraints/IRunCollectionConstraint.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionComparisonConstraint.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionConstraintCollection.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionContentConstraint.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionEqualityConstraint.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionTypeCompatiblityConstraint.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/RunCollectionDiscretizer.cs (deleted)
• HeuristicLab.Optimization/3.3/RunCollectionFormulaModifer.cs (deleted)
• HeuristicLab.Optimization/3.3/RunCollectionGroupCreater.cs (deleted)
• HeuristicLab.Optimization/3.3/RunCollectionModification (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionModification)
• HeuristicLab.Optimization/3.3/RunCollectionRunRemover.cs (deleted)
• HeuristicLab.Optimization/3.3/RunCollectionSorter.cs (deleted)
• HeuristicLab.Optimization/3.3/RunCollectionValueRemover.cs (deleted)

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -37 +37 @@
   [StorableClass]
   public abstract class Algorithm : ParameterizedNamedItem, IAlgorithm {
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
+    }
     public override Image ItemImage {
       get {
@@ -43 +46 @@
         else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePaused;
         else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
-        else return HeuristicLab.Common.Resources.VSImageLibrary.Event;
+        else return base.ItemImage;
       }
     }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Algorithms/EngineAlgorithm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Algorithms/HeuristicOptimizationAlgorithm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Algorithms/HeuristicOptimizationEngineAlgorithm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Algorithms/UserDefinedAlgorithm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/BatchRun.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -39 +39 @@
     public string Filename { get; set; }
 
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
+    }
     public override Image ItemImage {
       get {
@@ -45 +48 @@
         else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VSImageLibrary.BatchRunPaused;
         else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VSImageLibrary.BatchRunStopped;
-        else return HeuristicLab.Common.Resources.VSImageLibrary.Event;
+        else return base.ItemImage;
       }
     }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Experiment.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -39 +39 @@
     public string Filename { get; set; }
 
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
+    }
     public override Image ItemImage {
       get {
@@ -45 +48 @@
         else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VSImageLibrary.ExperimentPaused;
         else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VSImageLibrary.ExperimentStopped;
-        else return HeuristicLab.Common.Resources.VSImageLibrary.Event;
+        else return base.ItemImage;
       }
     }
@@ -172 +175 @@
 
       if (clearRuns) runs.Clear();
+
+      experimentStarted = false;
+      experimentStopped = false;
       foreach (IOptimizer optimizer in Optimizers.Where(x => x.ExecutionState != ExecutionState.Started))
         if (clearRuns || optimizer.ExecutionState != ExecutionState.Prepared)
@@ -203 +209 @@
       experimentStarted = false;
       experimentStopped = true;
-      foreach (IOptimizer optimizer in Optimizers.Where(x => (x.ExecutionState == ExecutionState.Started) || (x.ExecutionState == ExecutionState.Paused)))
-        optimizer.Stop();
+      if (Optimizers.Any(x => (x.ExecutionState == ExecutionState.Started) || (x.ExecutionState == ExecutionState.Paused))) {
+        foreach (IOptimizer optimizer in Optimizers.Where(x => (x.ExecutionState == ExecutionState.Started) || (x.ExecutionState == ExecutionState.Paused)))
+          optimizer.Stop();
+      } else {
+        OnStopped();
+      }
     }
 
@@ -323 +333 @@
     }
     private void optimizer_Paused(object sender, EventArgs e) {
-      if (Optimizers.All(x => x.ExecutionState != ExecutionState.Started))
-        OnPaused();
+      if (Optimizers.All(x => x.ExecutionState != ExecutionState.Started)) OnPaused();
     }
     private void optimizer_Prepared(object sender, EventArgs e) {
-      if (ExecutionState == ExecutionState.Stopped)
-        OnPrepared();
+      if (Optimizers.All(x => x.ExecutionState == ExecutionState.Prepared)) OnPrepared();
+      else if (Optimizers.All(x => x.ExecutionState != ExecutionState.Started)) OnPaused();
     }
     private void optimizer_Started(object sender, EventArgs e) {
-      if (ExecutionState != ExecutionState.Started)
-        OnStarted();
+      if (ExecutionState != ExecutionState.Started) OnStarted();
     }
     private void optimizer_Stopped(object sender, EventArgs e) {
-      if (experimentStopped && Optimizers.All(o => o.ExecutionState == ExecutionState.Stopped || o.ExecutionState == ExecutionState.Prepared)) OnStopped();
-      else if (Optimizers.All(o => o.ExecutionState == ExecutionState.Stopped)) OnStopped();
-      else if (Optimizers.Any(o => o.ExecutionState == ExecutionState.Paused) && Optimizers.All(o => o.ExecutionState != ExecutionState.Started)) OnPaused();
-      else if (experimentStarted && !experimentStopped && Optimizers.Any(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused))) {
-        Optimizers.First(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused)).Start();
+      if (experimentStopped) {
+        if (Optimizers.All(x => (x.ExecutionState == ExecutionState.Stopped) || (x.ExecutionState == ExecutionState.Prepared))) OnStopped();
+      } else {
+        if (experimentStarted && Optimizers.Any(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused))) {
+          Optimizers.First(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused)).Start();
+        } else if (Optimizers.All(x => x.ExecutionState == ExecutionState.Stopped)) OnStopped();
+        else if (Optimizers.Any(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused)) && Optimizers.All(o => o.ExecutionState != ExecutionState.Started)) OnPaused();
       }
     }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -114 +114 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="RunCollectionRunRemover.cs" />
+    <Compile Include="RunCollectionModification\RunCollectionRunRemover.cs" />
     <Compile Include="Plugin.cs" />
-    <Compile Include="RunCollectionDiscretizer.cs" />
-    <Compile Include="RunCollectionGroupCreater.cs" />
-    <Compile Include="RunCollectionSorter.cs" />
-    <Compile Include="RunCollectionValueRemover.cs" />
-    <Compile Include="IRunCollectionModifier.cs" />
+    <Compile Include="RunCollectionModification\RunCollectionDiscretizer.cs" />
+    <Compile Include="RunCollectionModification\RunCollectionGroupCreater.cs" />
+    <Compile Include="RunCollectionModification\RunCollectionSorter.cs" />
+    <Compile Include="RunCollectionModification\RunCollectionValueRemover.cs" />
+    <Compile Include="Interfaces\IRunCollectionModifier.cs" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="Algorithms\Algorithm.cs" />
     <Compile Include="BatchRun.cs" />
-    <Compile Include="Calculator.cs" />
+    <Compile Include="RunCollectionModification\Calculator.cs" />
     <Compile Include="Interfaces\IDiscreteDoubleMatrixModifier.cs" />
     <Compile Include="Algorithms\HeuristicOptimizationEngineAlgorithm.cs" />
@@ -147 +147 @@
     <Compile Include="Interfaces\ISingleObjectiveHeuristicOptimizationProblem.cs" />
     <Compile Include="Problems\Problem.cs" />
-    <Compile Include="RunCollectionFormulaModifer.cs" />
+    <Compile Include="RunCollectionModification\RunCollectionFormulaModifer.cs" />
     <Compile Include="RunCollectionConstraints\RunCollectionComparisonConstraint.cs" />
     <Compile Include="RunCollectionConstraints\RunCollectionConstraintCollection.cs" />

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IAlgorithm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IAnalyzer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/ICrossover.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IDiscreteDoubleMatrixModifier.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IDiscreteDoubleValueModifier.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IEvaluator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IExhaustiveMoveGenerator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IGlobalParticleUpdater.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IHeuristicOptimizationProblem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IIterationBasedOperator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/ILocalImprovementOperator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/ILocalParticleUpdater.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IManipulator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IMigrator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IMoveGenerator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IMoveMaker.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IMoveOperator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IMultiAnalyzer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IMultiMoveGenerator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IMultiNeighborhoodShakingOperator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IMultiObjectiveEvaluator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IMultiObjectiveHeuristicOptimizationProblem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IMultiObjectiveSelector.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IOptimizer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IParticleCreator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IParticleUpdater.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IProblem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IQualityComparator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IReducer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IReplacer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IResult.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IRun.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/ISelector.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/ISelfAdaptiveManipulator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/ISingleMoveGenerator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveEvaluator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveHeuristicOptimizationProblem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveMoveEvaluator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveReplacer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveSelector.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/ISolutionCreator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IStochasticOperator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IStrategyParameterCreator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IStrategyParameterCrossover.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/IStrategyParameterManipulator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/ISubScopesQualityComparator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/ISwarmUpdater.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/ITabuChecker.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/ITabuMaker.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/ITopologyInitializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Interfaces/ITopologyUpdater.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/MoveHelper.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/OptimizerList.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Plugin.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Optimization plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Optimization", "3.3.5.$WCREV$")]
+  [Plugin("HeuristicLab.Optimization", "3.3.6.$WCREV$")]
   [PluginFile("HeuristicLab.Optimization-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Problems/HeuristicOptimizationProblem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Problems/MultiObjectiveHeuristicOptimizationProblem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Problems/Problem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -39 +39 @@
     }
 
-    public override Image ItemImage {
+    public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Type; }
     }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Problems/UserDefinedProblem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -43 +43 @@
     public string Filename { get; set; }
 
-    public override Image ItemImage {
+    public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Type; }
     }
@@ -263 +263 @@
       #endregion
 
-      public override Image ItemImage {
+      public static new Image StaticItemImage {
         get { return HeuristicLab.Common.Resources.VSImageLibrary.Method; }
       }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Properties/AssemblyInfo.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -32 +32 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2011 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.5.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Result.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -39 +39 @@
         if (value != null) return value.ItemImage;
         else return base.ItemImage;
-      }
-    }
-
-    public override string ItemDescription {
-      get {
-        if (Description != String.Empty) return Description;
-        else return base.ItemDescription;
       }
     }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/ResultCollection.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -41 +41 @@
     }
 
-    public override System.Drawing.Image ItemImage {
+    public static new System.Drawing.Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Object; }
     }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Run.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/RunCollection.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/RunCollectionConstraints/IRunCollectionConstraint.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionComparisonConstraint.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionConstraintCollection.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionContentConstraint.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionEqualityConstraint.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionTypeCompatiblityConstraint.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.