Changeset 14776 for branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/Binary/SolutionModel

Timestamp:

03/22/17 16:52:36 (8 years ago)

Author:

abeham

Message:

#2457: working on MemPR integration

Location:

branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/Binary/SolutionModel/Univariate

Files:

• BiasedModelTrainer.cs (modified) (3 diffs)
• StaticAPI (deleted)
• UnbiasedModelTrainer.cs (modified) (2 diffs)

branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/Binary/SolutionModel/Univariate/BiasedModelTrainer.cs

@@ -26 +26 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.BinaryVectorEncoding;
+using HeuristicLab.Encodings.BinaryVectorEncoding.SolutionModel;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
@@ -31 +32 @@
 
 namespace HeuristicLab.Algorithms.MemPR.Binary.SolutionModel.Univariate {
+  public enum ModelBiasOptions { Rank, Fitness }
+
   [Item("Biased Univariate Model Trainer (binary)", "", ExcludeGenericTypeInfo = true)]
   [StorableClass]
@@ -60 +63 @@
 
     public void TrainModel(TContext context) {
-      context.Model = Trainer.TrainBiased(ModelBias, context.Random, context.Maximization, context.Population.Select(x => x.Solution), context.Population.Select(x => x.Fitness));
+      var biasType = modelBiasParameter.Value.Value;
+      switch (biasType) {
+        case ModelBiasOptions.Fitness:
+          context.Model = UnivariateModelTrainer.TrainWithFitnessBias(context.Random, context.Maximization,
+            context.Population.Select(x => x.Solution),
+            context.Population.Select(x => x.Fitness));
+          break;
+        case ModelBiasOptions.Rank:
+          context.Model = UnivariateModelTrainer.TrainWithRankBias(context.Random, context.Maximization,
+            context.Population.Select(x => x.Solution),
+            context.Population.Select(x => x.Fitness));
+          break;
+      }
     }
   }

branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/Binary/SolutionModel/Univariate/UnbiasedModelTrainer.cs

@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.BinaryVectorEncoding;
+using HeuristicLab.Encodings.BinaryVectorEncoding.SolutionModel;
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -49 +50 @@
 
     public void TrainModel(TContext context) {
-      context.Model = Trainer.TrainUnbiased(context.Random, context.Population.Select(x => x.Solution));
+      context.Model = UnivariateModelTrainer.TrainUnbiased(context.Random, context.Population.Select(x => x.Solution));
     }
   }