Changeset 11949 for branches/ProgrammableProblem/HeuristicLab.Optimization

Timestamp:

02/06/15 14:42:48 (10 years ago)

Author:

mkommend

Message:

#2174: Distributed files in programmable problem branch to the correct plugins.

Location:

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3

Files:

• BasicProblems (added)
• BasicProblems/BasicProblem.cs (copied) (copied from branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/BasicProblem.cs) (1 diff)
• BasicProblems/Encoding.cs (copied) (copied from branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/Encoding.cs) (1 diff)
• BasicProblems/Individuals (moved) (moved from branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Individuals)
• BasicProblems/Individuals/Individual.cs (modified) (2 diffs)
• BasicProblems/Individuals/MultiEncodingIndividual.cs (modified) (1 diff)
• BasicProblems/Individuals/SingleEncodingIndividual.cs (modified) (1 diff)
• BasicProblems/Interfaces (moved) (moved from branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Interfaces)
• BasicProblems/Interfaces/IEncoding.cs (modified) (1 diff)
• BasicProblems/Interfaces/IEncodingOperator.cs (modified) (1 diff)
• BasicProblems/Interfaces/IMultiEncodingOperator.cs (modified) (1 diff)
• BasicProblems/Interfaces/IMultiObjectiveProblemDefinition.cs (modified) (1 diff)
• BasicProblems/Interfaces/IProblemDefinition.cs (modified) (1 diff)
• BasicProblems/Interfaces/ISingleObjectiveMoveOperator.cs (modified) (1 diff)
• BasicProblems/Interfaces/ISingleObjectiveProblemDefinition.cs (modified) (1 diff)
• BasicProblems/Interfaces/internal/IMultiObjectiveAnalysisOperator.cs (modified) (1 diff)
• BasicProblems/Interfaces/internal/IMultiObjectiveEvaluationOperator.cs (modified) (1 diff)
• BasicProblems/Interfaces/internal/INeighborBasedOperator.cs (modified) (1 diff)
• BasicProblems/Interfaces/internal/ISingleObjectiveAnalysisOperator.cs (modified) (1 diff)
• BasicProblems/Interfaces/internal/ISingleObjectiveEvaluationOperator.cs (modified) (1 diff)
• BasicProblems/MultiEncoding.cs (copied) (copied from branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/MultiEncoding.cs) (1 diff)
• BasicProblems/MultiObjectiveBasicProblem.cs (copied) (copied from branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/MultiObjectiveBasicProblem.cs) (1 diff)
• BasicProblems/Operators (moved) (moved from branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators)
• BasicProblems/Operators/MultiEncodingCreator.cs (modified) (1 diff)
• BasicProblems/Operators/MultiEncodingCrossover.cs (modified) (1 diff)
• BasicProblems/Operators/MultiEncodingManipulator.cs (modified) (1 diff)
• BasicProblems/Operators/MultiEncodingOperator.cs (modified) (1 diff)
• BasicProblems/Operators/MultiObjectiveAnalyzer.cs (modified) (1 diff)
• BasicProblems/Operators/MultiObjectiveEvaluator.cs (modified) (1 diff)
• BasicProblems/Operators/SingleObjectiveAnalyzer.cs (modified) (1 diff)
• BasicProblems/Operators/SingleObjectiveEvaluator.cs (modified) (1 diff)
• BasicProblems/Operators/SingleObjectiveImprover.cs (modified) (1 diff)
• BasicProblems/Operators/SingleObjectiveMoveEvaluator.cs (modified) (1 diff)
• BasicProblems/Operators/SingleObjectiveMoveGenerator.cs (modified) (1 diff)
• BasicProblems/Operators/SingleObjectiveMoveMaker.cs (modified) (1 diff)
• BasicProblems/SingleObjectiveBasicProblem.cs (copied) (copied from branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/SingleObjectiveBasicProblem.cs) (2 diffs)
• HeuristicLab.Optimization-3.3.csproj (modified) (2 diffs)
• Plugin.cs.frame (modified) (1 diff)

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/BasicProblem.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   [StorableClass]
   public abstract class BasicProblem<TEncoding, TEvaluator> : HeuristicOptimizationProblem<TEvaluator, ISolutionCreator>, IProblemDefinition, IStorableContent

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs

@@ -28 +28 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   [Item("Encoding", "Base class for describing different encodings.")]
   [StorableClass]

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Individuals/Individual.cs

@@ -22 +22 @@
 using System;
 using HeuristicLab.Core;
-using HeuristicLab.Encodings.BinaryVectorEncoding;
-using HeuristicLab.Encodings.IntegerVectorEncoding;
-using HeuristicLab.Encodings.PermutationEncoding;
-using HeuristicLab.Encodings.RealVectorEncoding;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   public abstract class Individual {
     protected IEncoding Encoding { get; private set; }
@@ -61 +57 @@
     }
   }
-
-  #region extension methods
-  public static class IndividualExtensionMethods {
-    public static BinaryVector BinaryVector(this Individual individual) {
-      var encoding = individual.GetEncoding<BinaryVectorEncoding>();
-      return individual.BinaryVector(encoding.Name);
-    }
-    public static BinaryVector BinaryVector(this Individual individual, string name) {
-      return (BinaryVector)individual[name];
-    }
-
-    public static IntegerVector IntegerVector(this Individual individual) {
-      var encoding = individual.GetEncoding<IntegerVectorEncoding>();
-      return individual.IntegerVector(encoding.Name);
-    }
-    public static IntegerVector IntegerVector(this Individual individual, string name) {
-      return (IntegerVector)individual[name];
-    }
-
-    public static Permutation Permutation(this Individual individual) {
-      var encoding = individual.GetEncoding<PermutationEncoding>();
-      return individual.Permutation(encoding.Name);
-    }
-    public static Permutation Permutation(this Individual individual, string name) {
-      return (Permutation)individual[name];
-    }
-
-    public static RealVector RealVector(this Individual individual) {
-      var encoding = individual.GetEncoding<RealVectorEncoding>();
-      return individual.RealVector(encoding.Name);
-    }
-    public static RealVector RealVector(this Individual individual, string name) {
-      return (RealVector)individual[name];
-    }
-  }
-  #endregion
 }

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Individuals/MultiEncodingIndividual.cs

@@ -26 +26 @@
 using HeuristicLab.Core;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   public sealed class MultiEncodingIndividual : Individual {
     private new MultiEncoding Encoding {

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Individuals/SingleEncodingIndividual.cs

@@ -24 +24 @@
 using HeuristicLab.Core;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   public sealed class SingleEncodingIndividual : Individual {
     public SingleEncodingIndividual(IEncoding encoding, IScope scope)

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IEncoding.cs

@@ -25 +25 @@
 using HeuristicLab.Optimization;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   public interface IEncoding : IParameterizedNamedItem {
     ISolutionCreator SolutionCreator { get; set; }

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IEncodingOperator.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   public interface IEncodingOperator : IOperator {
     ILookupParameter<IEncoding> EncodingParameter { get; }

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IMultiEncodingOperator.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   public interface IMultiEncodingOperator : IOperator {
     void AddEncoding(IEncoding encoding);

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IMultiObjectiveProblemDefinition.cs

@@ -23 +23 @@
 using HeuristicLab.Optimization;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   public interface IMultiObjectiveProblemDefinition : IProblemDefinition {
     bool[] Maximization { get; }

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IProblemDefinition.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   public interface IProblemDefinition {
     IEncoding Encoding { get; }

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/ISingleObjectiveMoveOperator.cs

@@ -21 +21 @@
 using HeuristicLab.Optimization;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   public interface ISingleObjectiveMoveOperator : IMoveOperator {
   }

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/ISingleObjectiveProblemDefinition.cs

@@ -24 +24 @@
 using HeuristicLab.Optimization;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   public interface ISingleObjectiveProblemDefinition : IProblemDefinition {
     bool Maximization { get; }

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/IMultiObjectiveAnalysisOperator.cs

@@ -22 +22 @@
 using System;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   internal interface IMultiObjectiveAnalysisOperator : IEncodingOperator, IAnalyzer {
     Action<Individual[], double[][], ResultCollection, IRandom> AnalyzeAction { get; set; }

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/IMultiObjectiveEvaluationOperator.cs

@@ -24 +24 @@
 using HeuristicLab.Optimization;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   internal interface IMultiObjectiveEvaluationOperator : IMultiObjectiveEvaluator, IEncodingOperator {
     Func<Individual, IRandom, double[]> EvaluateFunc { get; set; }

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/INeighborBasedOperator.cs

@@ -24 +24 @@
 using HeuristicLab.Core;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   internal interface INeighborBasedOperator : IEncodingOperator {
     Func<Individual, IRandom, IEnumerable<Individual>> GetNeighborsFunc { get; set; }

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/ISingleObjectiveAnalysisOperator.cs

@@ -24 +24 @@
 using HeuristicLab.Optimization;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   internal interface ISingleObjectiveAnalysisOperator : IEncodingOperator {
     Action<Individual[], double[], ResultCollection, IRandom> AnalyzeAction { get; set; }

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/ISingleObjectiveEvaluationOperator.cs

@@ -24 +24 @@
 using HeuristicLab.Optimization;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   internal interface ISingleObjectiveEvaluationOperator : ISingleObjectiveEvaluator, IEncodingOperator {
     Func<Individual, IRandom, double> EvaluateFunc { get; set; }

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/MultiEncoding.cs

@@ -28 +28 @@
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   [Item("MultiEncoding", "Describes a combined encoding consisting of multiple simpler encodings.")]
   [StorableClass]

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/MultiObjectiveBasicProblem.cs

@@ -24 +24 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   [StorableClass]
   public abstract class MultiObjectiveBasicProblem<TEncoding> : BasicProblem<TEncoding, MultiObjectiveEvaluator>, IMultiObjectiveHeuristicOptimizationProblem, IMultiObjectiveProblemDefinition

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingCreator.cs

@@ -24 +24 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   [Item("MultiEncodingCreator", "Contains solution creators that together create a multi-encoding.")]
   [StorableClass]

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingCrossover.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   [Item("MultiEncoding Crossover", "Applies different crossovers to cross a multi-encoding.")]
   [StorableClass]

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingManipulator.cs

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   [Item("MultiEncoding Manipulator", "Applies different manipulators to change a multi-encoding.")]
   [StorableClass]

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingOperator.cs

@@ -28 +28 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   [StorableClass]
   public abstract class MultiEncodingOperator<T> : Operator, IMultiEncodingOperator where T : class,IOperator {

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiObjectiveAnalyzer.cs

@@ -10 +10 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   [Item("Multi-objective Analyzer", "Calls the Analyze method of the problem definition.")]
   [StorableClass]

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiObjectiveEvaluator.cs

@@ -29 +29 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   [Item("Multi-objective Evaluator", "Calls the Evaluate method of the problem definition and writes the return value into the scope.")]
   [StorableClass]

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveAnalyzer.cs

@@ -10 +10 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   [Item("Single-objective Analyzer", "Calls the script's Analyze method to be able to write into the results collection.")]
   [StorableClass]

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveEvaluator.cs

@@ -29 +29 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   [Item("Single-objective Evaluator", "Calls the script's Evaluate method to get the quality value of the parameter vector.")]
   [StorableClass]

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveImprover.cs

@@ -31 +31 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   [Item("Single-objective Improver", "Improves a solution by calling GetNeighbors and Evaluate of the corresponding problem definition.")]
   [StorableClass]

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveMoveEvaluator.cs

@@ -29 +29 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   [Item("Single-objective MoveEvaluator", "Evaluates a parameter vector that results from a move.")]
   [StorableClass]

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveMoveGenerator.cs

@@ -32 +32 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   [Item("Single-objective MoveGenerator", "Calls the GetNeighbors method of the problem definition to obtain the moves.")]
   [StorableClass]

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveMoveMaker.cs

@@ -25 +25 @@
 using HeuristicLab.Data;
 using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   [Item("Single-objective MoveMaker", "Applies a move.")]
   [StorableClass]

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveBasicProblem.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.Linq;
-using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Programmable {
+namespace HeuristicLab.Optimization {
   [StorableClass]
   public abstract class SingleObjectiveBasicProblem<TEncoding> : BasicProblem<TEncoding, SingleObjectiveEvaluator>,
@@ -49 +47 @@
 
       Operators.Add(Evaluator);
-      Operators.Add(new BestScopeSolutionAnalyzer());
       Operators.Add(new SingleObjectiveAnalyzer());
       Operators.Add(new SingleObjectiveImprover());

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

@@ -125 +125 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.Parameters-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
@@ -153 +157 @@
   <ItemGroup>
     <Compile Include="Algorithms\BasicAlgorithm.cs" />
+    <Compile Include="BasicProblems\BasicProblem.cs" />
+    <Compile Include="BasicProblems\Encoding.cs" />
+    <Compile Include="BasicProblems\Individuals\Individual.cs" />
+    <Compile Include="BasicProblems\Individuals\MultiEncodingIndividual.cs" />
+    <Compile Include="BasicProblems\Individuals\SingleEncodingIndividual.cs" />
+    <Compile Include="BasicProblems\Interfaces\IEncoding.cs" />
+    <Compile Include="BasicProblems\Interfaces\IEncodingOperator.cs" />
+    <Compile Include="BasicProblems\Interfaces\IMultiEncodingOperator.cs" />
+    <Compile Include="BasicProblems\Interfaces\IMultiObjectiveProblemDefinition.cs" />
+    <Compile Include="BasicProblems\Interfaces\internal\IMultiObjectiveAnalysisOperator.cs" />
+    <Compile Include="BasicProblems\Interfaces\internal\IMultiObjectiveEvaluationOperator.cs" />
+    <Compile Include="BasicProblems\Interfaces\internal\INeighborBasedOperator.cs" />
+    <Compile Include="BasicProblems\Interfaces\internal\ISingleObjectiveAnalysisOperator.cs" />
+    <Compile Include="BasicProblems\Interfaces\internal\ISingleObjectiveEvaluationOperator.cs" />
+    <Compile Include="BasicProblems\Interfaces\IProblemDefinition.cs" />
+    <Compile Include="BasicProblems\Interfaces\ISingleObjectiveMoveOperator.cs" />
+    <Compile Include="BasicProblems\Interfaces\ISingleObjectiveProblemDefinition.cs" />
+    <Compile Include="BasicProblems\MultiEncoding.cs" />
+    <Compile Include="BasicProblems\MultiObjectiveBasicProblem.cs" />
+    <Compile Include="BasicProblems\Operators\MultiEncodingCreator.cs" />
+    <Compile Include="BasicProblems\Operators\MultiEncodingCrossover.cs" />
+    <Compile Include="BasicProblems\Operators\MultiEncodingManipulator.cs" />
+    <Compile Include="BasicProblems\Operators\MultiEncodingOperator.cs" />
+    <Compile Include="BasicProblems\Operators\MultiObjectiveAnalyzer.cs" />
+    <Compile Include="BasicProblems\Operators\MultiObjectiveEvaluator.cs" />
+    <Compile Include="BasicProblems\Operators\SingleObjectiveAnalyzer.cs" />
+    <Compile Include="BasicProblems\Operators\SingleObjectiveEvaluator.cs" />
+    <Compile Include="BasicProblems\Operators\SingleObjectiveImprover.cs" />
+    <Compile Include="BasicProblems\Operators\SingleObjectiveMoveEvaluator.cs" />
+    <Compile Include="BasicProblems\Operators\SingleObjectiveMoveGenerator.cs" />
+    <Compile Include="BasicProblems\Operators\SingleObjectiveMoveMaker.cs" />
+    <Compile Include="BasicProblems\SingleObjectiveBasicProblem.cs" />
     <Compile Include="Interfaces\ILocalImprovementAlgorithmOperator.cs" />
     <Compile Include="Interfaces\ISingleObjectivePathRelinker.cs" />

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/Plugin.cs.frame

@@ -33 +33 @@
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Data", "3.3")]
+  [PluginDependency("HeuristicLab.Operators", "3.3")]
   [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]