Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/22/17 16:52:36 (7 years ago)
Author:
abeham
Message:

#2457: working on MemPR integration

Location:
branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3
Files:
2 added
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

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

    r14563 r14776  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Encodings.BinaryVectorEncoding;
     28using HeuristicLab.Encodings.BinaryVectorEncoding.SolutionModel;
    2829using HeuristicLab.Optimization;
    2930using HeuristicLab.Parameters;
    … …  
    3132
    3233namespace HeuristicLab.Algorithms.MemPR.Binary.SolutionModel.Univariate {
     34  public enum ModelBiasOptions { Rank, Fitness }
     35
    3336  [Item("Biased Univariate Model Trainer (binary)", "", ExcludeGenericTypeInfo = true)]
    3437  [StorableClass]
    … …  
    6063
    6164    public void TrainModel(TContext context) {
    62       context.Model = Trainer.TrainBiased(ModelBias, context.Random, context.Maximization, context.Population.Select(x => x.Solution), context.Population.Select(x => x.Fitness));
     65      var biasType = modelBiasParameter.Value.Value;
     66      switch (biasType) {
     67        case ModelBiasOptions.Fitness:
     68          context.Model = UnivariateModelTrainer.TrainWithFitnessBias(context.Random, context.Maximization,
     69            context.Population.Select(x => x.Solution),
     70            context.Population.Select(x => x.Fitness));
     71          break;
     72        case ModelBiasOptions.Rank:
     73          context.Model = UnivariateModelTrainer.TrainWithRankBias(context.Random, context.Maximization,
     74            context.Population.Select(x => x.Solution),
     75            context.Population.Select(x => x.Fitness));
     76          break;
     77      }
    6378    }
    6479  }

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

    r14563 r14776  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Encodings.BinaryVectorEncoding;
     27using HeuristicLab.Encodings.BinaryVectorEncoding.SolutionModel;
    2728using HeuristicLab.Optimization;
    2829using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    4950
    5051    public void TrainModel(TContext context) {
    51       context.Model = Trainer.TrainUnbiased(context.Random, context.Population.Select(x => x.Solution));
     52      context.Model = UnivariateModelTrainer.TrainUnbiased(context.Random, context.Population.Select(x => x.Solution));
    5253    }
    5354  }

  • branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/HeuristicLab.Algorithms.MemPR-3.3.csproj

    r14691 r14776  
    102102      <Private>False</Private>
    103103    </Reference>
    104     <Reference Include="HeuristicLab.Encodings.BinaryVectorEncoding-3.3">
    105       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.dll</HintPath>
    106       <Private>False</Private>
    107     </Reference>
    108     <Reference Include="HeuristicLab.Encodings.LinearLinkageEncoding-3.4">
    109       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.LinearLinkageEncoding-3.4.dll</HintPath>
    110       <Private>False</Private>
    111     </Reference>
    112104    <Reference Include="HeuristicLab.Operators-3.3">
    113105      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
    … …  
    165157    <Compile Include="Binary\LocalSearch\ExhaustiveBitflip.cs" />
    166158    <Compile Include="Binary\LocalSearch\StaticAPI\ExhaustiveBitflip.cs" />
    167     <Compile Include="Binary\SolutionModel\Univariate\StaticAPI\Trainer.cs" />
    168     <Compile Include="Binary\SolutionModel\Univariate\UnivariateSolutionModel.cs" />
    169159    <Compile Include="Binary\SolutionModel\Univariate\BiasedModelTrainer.cs" />
    170160    <Compile Include="Binary\SolutionModel\Univariate\UnbiasedModelTrainer.cs" />
    … …  
    179169    <Compile Include="LinearLinkage\SolutionModel\Univariate\UnivariateSolutionModel.cs" />
    180170    <Compile Include="MemPRAlgorithm.cs" />
     171    <Compile Include="Permutation\InversionPathRelinker.cs" />
     172    <Compile Include="Permutation\LocalSearch\ExhaustiveInversionImprover.cs" />
    181173    <Compile Include="Permutation\PermutationMemPR.cs" />
    182174    <Compile Include="Permutation\PermutationMemPRContext.cs" />
    … …  
    212204      <Private>False</Private>
    213205    </ProjectReference>
     206    <ProjectReference Include="..\..\HeuristicLab.Encodings.BinaryVectorEncoding\3.3\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj">
     207      <Project>{66d249c3-a01d-42a8-82a2-919bc8ec3d83}</Project>
     208      <Name>HeuristicLab.Encodings.BinaryVectorEncoding-3.3</Name>
     209      <Private>False</Private>
     210    </ProjectReference>
     211    <ProjectReference Include="..\..\HeuristicLab.Encodings.LinearLinkageEncoding\3.4\HeuristicLab.Encodings.LinearLinkageEncoding-3.4.csproj">
     212      <Project>{be698769-975a-429e-828c-72bb2b6182c8}</Project>
     213      <Name>HeuristicLab.Encodings.LinearLinkageEncoding-3.4</Name>
     214      <Private>False</Private>
     215    </ProjectReference>
    214216    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    215217      <Project>{dbecb8b0-b166-4133-baf1-ed67c3fd7fca}</Project>

  • branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/Interfaces/Interfaces.cs

    r14690 r14776  
    3737   * ********************************************* *
    3838   *************************************************/
    39 
    40   public interface ISolutionModel<TSolution> : IItem {
    41     TSolution Sample();
    42   }
    4339
    4440  public interface ISolutionSubspace<TSolution> : IItem { }
    … …  
    8985      where TProblem : class, ISingleObjectiveHeuristicOptimizationProblem {
    9086    IEnumerable<ISingleObjectiveSolutionScope<TSolution>> Population { get; }
     87    int PopulationCount { get; }
    9188  }
    9289

  • branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/LinearLinkage/SolutionModel/Univariate/StaticAPI/Trainer.cs

    r14544 r14776  
    2121
    2222using System.Collections.Generic;
    23 using HeuristicLab.Algorithms.MemPR.Interfaces;
    2423using HeuristicLab.Core;
    2524using HeuristicLab.Encodings.LinearLinkageEncoding;
     25using HeuristicLab.Optimization;
    2626
    2727namespace HeuristicLab.Algorithms.MemPR.Grouping.SolutionModel.Univariate {

  • branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/LinearLinkage/SolutionModel/Univariate/UnivariateSolutionModel.cs

    r14544 r14776  
    2222using System;
    2323using System.Collections.Generic;
    24 using HeuristicLab.Algorithms.MemPR.Interfaces;
    2524using HeuristicLab.Common;
    2625using HeuristicLab.Core;
    2726using HeuristicLab.Data;
    2827using HeuristicLab.Encodings.LinearLinkageEncoding;
     28using HeuristicLab.Optimization;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030

  • branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/Permutation/SolutionModel/Univariate/StaticAPI/Trainer.cs

    r14496 r14776  
    2222using System;
    2323using System.Collections.Generic;
    24 using HeuristicLab.Algorithms.MemPR.Interfaces;
    2524using HeuristicLab.Core;
    2625using HeuristicLab.Encodings.PermutationEncoding;
     26using HeuristicLab.Optimization;
    2727
    2828namespace HeuristicLab.Algorithms.MemPR.Permutation.SolutionModel.Univariate {
Note: See TracChangeset for help on using the changeset viewer.