Changeset 4564

Timestamp:

10/06/10 21:50:16 (14 years ago)

Author:

mkommend

Message:

Added Problem and SingleObjectiveProblem (ticket #1232).

Location:

trunk/sources/HeuristicLab.Optimization/3.3

Files:

• HeuristicLab.Optimization-3.3.csproj (modified) (2 diffs)
• Problem.cs (copied) (copied from branches/HeuristicLab.Classification/HeuristicLab.Problems.DataAnalysis.Classification/3.3/ProblemBase/Problem.cs) (4 diffs)
• SingleObjectiveProblem.cs (copied) (copied from branches/HeuristicLab.Classification/HeuristicLab.Problems.DataAnalysis.Classification/3.3/ProblemBase/SingleObjectiveProblem.cs) (1 diff)

trunk/sources/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -115 +115 @@
     <Compile Include="Interfaces\IRealVectorDecoder.cs" />
     <Compile Include="Interfaces\IRealVectorEncoder.cs" />
+    <Compile Include="Problem.cs" />
     <Compile Include="RunCollectionConstraints\RunCollectionComparisonConstraint.cs" />
     <Compile Include="RunCollectionConstraints\RunCollectionConstraintCollection.cs" />
@@ -163 +164 @@
     <Compile Include="Interfaces\ITabuMaker.cs" />
     <Compile Include="Result.cs" />
+    <Compile Include="SingleObjectiveProblem.cs" />
     <Compile Include="UserDefinedAlgorithm.cs" />
     <Compile Include="EngineAlgorithm.cs" />

trunk/sources/HeuristicLab.Optimization/3.3/Problem.cs

@@ -27 +27 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.DataAnalysis.Classification {
+namespace HeuristicLab.Optimization {
   [Item("Problem", "Represents a the base class for a problem.")]
   [StorableClass]
@@ -48 +47 @@
     protected Problem()
       : base() {
-      operators = new ItemCollection<IOperator>();
+      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."));
@@ -61 +60 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       Problem<T, U> clone = (Problem<T, U>)base.Clone(cloner);
-      clone.operators = new ItemCollection<IOperator>(operators.Select(x => (IOperator)cloner.Clone(x)));
+      clone.operators = new OperatorCollection(operators.Select(x => (IOperator)cloner.Clone(x)));
       clone.RegisterEventHandlers();
       return clone;
@@ -76 +75 @@
 
     #region properties
-    private ItemCollection<IOperator> operators;
+    private OperatorCollection operators;
     [Storable(Name = "Operators")]
     private IEnumerable<IOperator> StorableOperators {
       get { return operators; }
-      set { operators = new ItemCollection<IOperator>(value); }
+      set { operators = new OperatorCollection(value); }
     }
-    protected ItemCollection<IOperator> Operators {
+    protected OperatorCollection Operators {
       get { return this.operators; }
     }

trunk/sources/HeuristicLab.Optimization/3.3/SingleObjectiveProblem.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.DataAnalysis.Classification {
+namespace HeuristicLab.Optimization {
   [Item("Single Objective Problem", "Represents a the base class for a single objective problem.")]
   [StorableClass]