Changeset 12326 for branches/OptimizationNetworks/HeuristicLab.Networks

Timestamp:

04/17/15 19:23:51 (9 years ago)

Author:

gkronber

Message:

#2205: derived selection problem from BinaryProblem (now PPP can be used as feature selection algorithm)

Location:

branches/OptimizationNetworks/HeuristicLab.Networks/3.3

Files:

• FeatureSelection Network/SelectionProblem.cs (modified) (3 diffs)
• HeuristicLab.Networks-3.3.csproj (modified) (1 diff)

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/FeatureSelection Network/SelectionProblem.cs

@@ -7 +7 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.Binary;
 
 namespace HeuristicLab.Networks.FeatureSelection_Network {
-  public class SelectionProblem : SingleObjectiveBasicProblem<BinaryVectorEncoding> {
+  public class SelectionProblem : BinaryProblem {
     private Func<BinaryVector, double> eval;
-
-    public virtual int Length {
-      get { return Encoding.Length; }
-      set { Encoding.Length = value; }
-    }
 
     protected SelectionProblem(SelectionProblem original, Cloner cloner)
@@ -30 +26 @@
 
       var lengthParam = new ValueParameter<IntValue>("Length");
+
+
       lengthParam.ValueChanged += (o, s) => { Length = lengthParam.Value.Value; };
+      // we cannot use the fixed value parameter from BinaryProblem in the network
+      Parameters.Remove("Length");
       Parameters.Add(lengthParam);
     }
@@ -38 +38 @@
     }
 
-    public override double Evaluate(Individual individual, IRandom random) {
-      return eval(individual.BinaryVector());
+    public override double Evaluate(BinaryVector vector, IRandom random) {
+      return eval(vector);
+
     }
 

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/HeuristicLab.Networks-3.3.csproj

@@ -145 +145 @@
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Problems.Binary-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Binary-3.3.dll</HintPath>
       <Private>False</Private>
     </Reference>