Changeset 11987 for trunk/sources/HeuristicLab.Problems.Binary

Timestamp:

02/12/15 15:39:28 (9 years ago)

Author:

abeham

Message:

#2282:

• Renamed BinaryVectorProblem to BinaryProblem
• Removed IBinaryVectorProblem interface
• Derived BinaryProblem from SingleObjectiveBasicProblem
• Changed bool[] datatype to BinaryVector

Location:

trunk/sources/HeuristicLab.Problems.Binary

Files:

• . (moved) (moved from trunk/sources/HeuristicLab.Problems.BinaryVector)
• 3.3/BinaryProblem.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.BinaryVector/3.3/BinaryVectorProblem.cs) (1 diff)
• 3.3/BinaryVectorProblem.cs (deleted)
• 3.3/DeceptiveStepTrapProblem.cs (modified) (2 diffs)
• 3.3/DeceptiveTrapProblem.cs (modified) (3 diffs)
• 3.3/HIFFProblem.cs (modified) (2 diffs)
• 3.3/HeuristicLab.Problems.Binary-3.3.csproj (copied) (copied from trunk/sources/HeuristicLab.Problems.BinaryVector/3.3/HeuristicLab.Problems.BinaryVector-3.3.csproj) (3 diffs)
• 3.3/HeuristicLab.Problems.BinaryVector-3.3.csproj (deleted)
• 3.3/IBinaryVectorProblem.cs (deleted)
• 3.3/Plugin.cs.frame (modified) (2 diffs)
• 3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.Binary/3.3/BinaryProblem.cs

@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.BinaryVector {
+namespace HeuristicLab.Problems.Binary {
   [StorableClass]
-  public abstract class BinaryVectorProblem : Problem, IBinaryVectorProblem {
-    private const string LengthParameterName = "Length";
+  public abstract class BinaryProblem : SingleObjectiveBasicProblem<BinaryVectorEncoding> {
 
-    public IFixedValueParameter<IntValue> LengthParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters[LengthParameterName]; }
-    }
-
-    public int Length {
-      get { return LengthParameter.Value.Value; }
-      set { LengthParameter.Value.Value = value; }
-    }
-
-    public abstract bool Maximization {
-      get;
+    public virtual int Length {
+      get { return Encoding.Length; }
+      set { Encoding.Length = value; }
     }
 
     [StorableConstructor]
-    protected BinaryVectorProblem(bool deserializing) : base(deserializing) { }
-    protected BinaryVectorProblem(BinaryVectorProblem original, Cloner cloner) : base(original, cloner) { }
-    public bool IsBetter(double quality, double bestQuality) {
+    protected BinaryProblem(bool deserializing) : base(deserializing) { }
+    protected BinaryProblem(BinaryProblem original, Cloner cloner) : base(original, cloner) { }
+    protected BinaryProblem() : base() { }
+
+    public virtual bool IsBetter(double quality, double bestQuality) {
       return (Maximization && quality > bestQuality || !Maximization && quality < bestQuality);
     }
 
-    public BinaryVectorProblem()
-      : base() {
-      Parameters.Add(new FixedValueParameter<IntValue>(LengthParameterName, "", new IntValue(20)));
+    public sealed override double Evaluate(Individual individual, IRandom random) {
+      return Evaluate(individual.BinaryVector(), random);
     }
 
-    public abstract double Evaluate(bool[] individual);
-
-
+    public abstract double Evaluate(BinaryVector vector, IRandom random);
   }
 }

trunk/sources/HeuristicLab.Problems.Binary/3.3/DeceptiveStepTrapProblem.cs

@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.BinaryVector {
+namespace HeuristicLab.Problems.Binary {
   [Item("Deceptive Step Trap Problem", "Genome encodes completely separable blocks, where each block deceptive with fitness plateaus.")]
   [StorableClass]
@@ -83 +84 @@
     }
 
-    protected override int Score(bool[] individual, int trapIndex, int trapSize) {
+    protected override int Score(BinaryVector individual, int trapIndex, int trapSize) {
       int partial = base.Score(individual, trapIndex, trapSize);
       // introduce plateaus using integer division

trunk/sources/HeuristicLab.Problems.Binary/3.3/DeceptiveTrapProblem.cs

@@ -26 +26 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.BinaryVector {
+namespace HeuristicLab.Problems.Binary {
   [Item("Deceptive Trap Problem", "Genome encodes completely separable blocks, where each block is fully deceptive.")]
   [StorableClass]
   [Creatable("Problems")]
-  public class DeceptiveTrapProblem : BinaryVectorProblem {
+  public class DeceptiveTrapProblem : BinaryProblem {
     [StorableConstructor]
     protected DeceptiveTrapProblem(bool deserializing) : base(deserializing) { }
@@ -69 +70 @@
 
     // In the GECCO paper, calculates Equation 3
-    protected virtual int Score(bool[] individual, int trapIndex, int trapSize) {
+    protected virtual int Score(BinaryVector individual, int trapIndex, int trapSize) {
       int result = 0;
       // count number of bits in trap set to 1
@@ -83 +84 @@
     }
 
-    public override double Evaluate(bool[] individual) {
+    public override double Evaluate(BinaryVector individual, IRandom random) {
       if (individual.Length != Length) throw new ArgumentException("The individual has not the correct length.");
       int total = 0;

trunk/sources/HeuristicLab.Problems.Binary/3.3/HIFFProblem.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.BinaryVector {
+namespace HeuristicLab.Problems.Binary {
   [Item("Hierararchical If and only If problem", "Genome evaluated in nested subsets to see if each subset contains either all 0s or all 1s.")]
   [StorableClass]
   [Creatable("Problems")]
-  public class HIFFProblem : BinaryVectorProblem {
+  public class HIFFProblem : BinaryProblem {
     [StorableConstructor]
     protected HIFFProblem(bool deserializing) : base(deserializing) { }
@@ -50 +51 @@
     }
     // In the GECCO paper, Section 4.1
-    public override double Evaluate(bool[] individual) {
+    public override double Evaluate(BinaryVector individual, IRandom random) {
       int[] level = new int[individual.Length];
       int levelLength = individual.Length;

trunk/sources/HeuristicLab.Problems.Binary/3.3/HeuristicLab.Problems.Binary-3.3.csproj

@@ -8 +8 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HeuristicLab.Problems.BinaryVector</RootNamespace>
-    <AssemblyName>HeuristicLab.Problems.BinaryVector-3.3</AssemblyName>
+    <RootNamespace>HeuristicLab.Problems.Binary</RootNamespace>
+    <AssemblyName>HeuristicLab.Problems.Binary-3.3</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -82 +82 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BinaryVectorProblem.cs" />
+    <Compile Include="BinaryProblem.cs" />
     <Compile Include="DeceptiveStepTrapProblem.cs" />
     <Compile Include="DeceptiveTrapProblem.cs" />
     <Compile Include="HIFFProblem.cs" />
-    <Compile Include="IBinaryVectorProblem.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -99 +98 @@
       <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
       <Name>HeuristicLab.Collections-3.3</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
       <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
       <Name>HeuristicLab.Common-3.3</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
       <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
       <Name>HeuristicLab.Core-3.3</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
       <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
       <Name>HeuristicLab.Data-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.BinaryVectorEncoding\3.3\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj">
+      <Project>{66d249c3-a01d-42a8-82a2-919bc8ec3d83}</Project>
+      <Name>HeuristicLab.Encodings.BinaryVectorEncoding-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
+      <Project>{23da7ff4-d5b8-41b6-aa96-f0561d24f3ee}</Project>
+      <Name>HeuristicLab.Operators-3.3</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
       <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
       <Name>HeuristicLab.Optimization-3.3</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
       <Project>{56f9106a-079f-4c61-92f6-86a84c2d84b7}</Project>
       <Name>HeuristicLab.Parameters-3.3</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
       <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>
       <Name>HeuristicLab.Persistence-3.3</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
       <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>

trunk/sources/HeuristicLab.Problems.Binary/3.3/Plugin.cs.frame

@@ -25 +25 @@
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.Problems.BinaryVector {
-  [Plugin("HeuristicLab.Problems.BinaryVector","Provides binary benchmark problems.", "3.3.10.$WCREV$")]
-  [PluginFile("HeuristicLab.Problems.BinaryVector-3.3.dll", PluginFileType.Assembly)]
+namespace HeuristicLab.Problems.Binary {
+  [Plugin("HeuristicLab.Problems.Binary","Provides binary benchmark problems.", "3.3.10.$WCREV$")]
+  [PluginFile("HeuristicLab.Problems.Binary-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
@@ -35 +35 @@
   [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
-  public class Plugin : PluginBase {
+  public class HeuristicLabProblemsBinaryPlugin : PluginBase {
   }
 }

trunk/sources/HeuristicLab.Problems.Binary/3.3/Properties/AssemblyInfo.cs.frame

@@ -26 +26 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("HeuristicLab.Problems.BinaryVector")]
+[assembly: AssemblyTitle("HeuristicLab.Problems.Binary")]
 [assembly: AssemblyDescription("Provides binary benchmark problems.")]
 [assembly: AssemblyConfiguration("")]