Changeset 13292


Ignore:
Timestamp:
11/19/15 13:24:15 (3 years ago)
Author:
gkronber
Message:

#2478: merged r13164,r13165,r13237,r13261 from trunk to stable (resolving conflicts). This should solve the build fail.

Location:
stable
Files:
8 edited
4 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab 3.3.sln

    r13285 r13292  
    442442EndProject
    443443Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.GeneticProgramming.Views-3.3", "HeuristicLab.Problems.GeneticProgramming.Views\3.3\HeuristicLab.Problems.GeneticProgramming.Views-3.3.csproj", "{26349C8D-72A1-4BAE-95A3-14E96A3B4AE8}"
     444EndProject
     445Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy-3.3", "HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy\3.3\HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy-3.3.csproj", "{1D41EAE6-CC79-41D4-858C-589C4DB5E50D}"
    444446EndProject
    445447Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.ALPS-3.3", "HeuristicLab.Algorithms.ALPS\3.3\HeuristicLab.Algorithms.ALPS-3.3.csproj", "{59F354CB-FE13-4253-AED2-AD86372BEC27}"
     
    21472149    {26349C8D-72A1-4BAE-95A3-14E96A3B4AE8}.Release|x86.ActiveCfg = Release|x86
    21482150    {26349C8D-72A1-4BAE-95A3-14E96A3B4AE8}.Release|x86.Build.0 = Release|x86
     2151    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2152    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2153    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Debug|x64.ActiveCfg = Debug|x64
     2154    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Debug|x64.Build.0 = Debug|x64
     2155    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Debug|x86.ActiveCfg = Debug|x86
     2156    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Debug|x86.Build.0 = Debug|x86
     2157    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2158    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Release|Any CPU.Build.0 = Release|Any CPU
     2159    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Release|x64.ActiveCfg = Release|x64
     2160    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Release|x64.Build.0 = Release|x64
     2161    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Release|x86.ActiveCfg = Release|x86
     2162    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Release|x86.Build.0 = Release|x86
    21492163    {59F354CB-FE13-4253-AED2-AD86372BEC27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    21502164    {59F354CB-FE13-4253-AED2-AD86372BEC27}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    21692183    {71CDE004-C50F-48DF-858E-AB0AAA3537BC} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
    21702184    {5E516C4F-9935-437F-8B15-ECEF4451744E} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
     2185    {7FC70D74-1813-48B7-9CE5-0BD913457579} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
    21712186    {0C67A033-F6D9-4237-B3CA-C033A44706BE} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
    2172     {7FC70D74-1813-48B7-9CE5-0BD913457579} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
    21732187  EndGlobalSection
    21742188EndGlobal
  • stable/HeuristicLab.Optimization.Operators/3.3/ChildrenCopyCreator.cs

    r13165 r13292  
    2020#endregion
    2121
     22using System;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
     
    4849    public ChildrenCopyCreator()
    4950      : base() {
    50       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope whose sub-scopes represent the parents."));
     51      Parameters.Add(new ScopeParameter("CurrentScope", "The current scope whose sub-scopes should be copied."));
    5152    }
    5253
     
    5657
    5758    public override IOperation Apply() {
    58       int parents = CurrentScope.SubScopes.Count;
     59      int nChildren = CurrentScope.SubScopes.Count;
    5960
    60       for (int i = 0; i < parents; i++) {
    61         IScope parent = CurrentScope.SubScopes[i];
    62         parent.SubScopes.Clear();
     61      for (int i = 0; i < nChildren; i++) {
     62        IScope child = CurrentScope.SubScopes[i];
     63        if (child.SubScopes.Count > 0) throw new ArgumentException("The sub-scope that should be cloned has further sub-scopes.");
    6364
    64         //copy parent
    65         IScope child = new Scope(i.ToString());
    66         foreach (IVariable var in parent.Variables)
    67           child.Variables.Add((IVariable)var.Clone());
     65        IScope childCopy = new Scope(i.ToString());
     66        var cloner = new Cloner();
     67        foreach (IVariable var in child.Variables)
     68          childCopy.Variables.Add(cloner.Clone(var));
    6869
    69         parent.SubScopes.Add(child);
     70        child.SubScopes.Add(childCopy);
    7071      }
    7172      return base.Apply();
  • stable/HeuristicLab.Optimization.Operators/3.3/HeuristicLab.Optimization.Operators-3.3.csproj

    r11920 r13292  
    115115  </ItemGroup>
    116116  <ItemGroup>
     117    <Compile Include="ChildrenCopyCreator.cs" />
    117118    <Compile Include="ExpressionCalculator.cs" />
    118119    <Compile Include="NoSimilarityCalculator.cs" />
  • stable/HeuristicLab.Selection/3.3/EvolutionStrategyOffspringSelector.cs

    r13165 r13292  
    2222using System;
    2323using System.Collections.Generic;
     24using System.Runtime.InteropServices;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
     
    3435  public class EvolutionStrategyOffspringSelector : SingleSuccessorOperator {
    3536
    36     private class QualityComparer : IComparer<IScope> {
     37    private class FitnessComparer : IComparer<IScope> {
    3738
    3839      #region IComparer<IScope> Member
    3940
    4041      private String qualityParameterName;
    41 
    42       public QualityComparer(String qualityParamName) {
     42      private bool maximization;
     43
     44      public FitnessComparer(String qualityParamName, bool maximization) {
    4345        this.qualityParameterName = qualityParamName;
    44       }
    45 
     46        this.maximization = maximization;
     47      }
     48
     49      // less than zero if x is-better-than y
     50      // larger than zero if y is-better-than x
     51      // zero if both are the same
    4652      public int Compare(IScope x, IScope y) {
    47           IVariable quality1, quality2;
    48 
    49           if (x.Variables.TryGetValue(qualityParameterName, out quality1)
    50             && y.Variables.TryGetValue(qualityParameterName, out quality2)) {
    51             DoubleValue dblVal = quality1.Value as DoubleValue;
    52             DoubleValue dblVal2 = quality2.Value as DoubleValue;
    53             return dblVal.CompareTo(dblVal2);
    54           }
    55           else
    56             throw new Exception("ERROR!!! Quality Param: "+qualityParameterName);
     53        IVariable quality1, quality2;
     54
     55        if (x.Variables.TryGetValue(qualityParameterName, out quality1)
     56          && y.Variables.TryGetValue(qualityParameterName, out quality2)) {
     57          DoubleValue left = quality1.Value as DoubleValue;
     58          DoubleValue right = quality2.Value as DoubleValue;
     59          var res = left.CompareTo(right);
     60          if (maximization) return -res; // in the maximization case the largest value should preceed all others in the sort order
     61          else return res;
     62        } else
     63          throw new ArgumentException("Quality variable " + qualityParameterName + " not found.");
    5764      }
    5865
     
    95102    public ILookupParameter<DoubleValue> QualityParameter {
    96103      get { return (ILookupParameter<DoubleValue>)Parameters["Quality"]; }
     104    }
     105    public ILookupParameter<BoolValue> MaximizationParameter {
     106      get { return (ILookupParameter<BoolValue>)Parameters["Maximization"]; }
    97107    }
    98108
     
    119129      Parameters.Add(new ScopeTreeLookupParameter<BoolValue>("SuccessfulOffspring", "True if the offspring was more successful than its parents.", 2));
    120130      Parameters.Add(new OperatorParameter("OffspringCreator", "The operator used to create new offspring."));
    121       Parameters.Add(new LookupParameter<IntValue>("EvaluatedSolutions", "The number of times solutions have been evaluated."));
     131      Parameters.Add(new LookupParameter<IntValue>("EvaluatedSolutions", "The number of solution evaluations."));
    122132      Parameters.Add(new LookupParameter<IntValue>("MaximumEvaluatedSolutions", "The maximum number of evaluated solutions (approximately)."));
    123133      Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality of a child"));
     134      Parameters.Add(new LookupParameter<BoolValue>("Maximization", "Flag that indicates if the problem is a maximization problem"));
    124135    }
    125136
     
    165176      // implement the ActualValue fetch here - otherwise the parent scope would also be included, given that there may be 1000 or more parents, this is quite unnecessary
    166177      string tname = SuccessfulOffspringParameter.TranslatedName;
    167       double tmpSelPress = selectionPressure.Value, tmpSelPressInc = 1.0 / populationSize;
     178      double tmpSelPress = selectionPressure.Value;
     179      double tmpSelPressInc = 1.0 / populationSize;
    168180      for (int i = 0; i < offspring.SubScopes.Count; i++) {
    169181        // fetch value
     
    176188        if (tmp.Value) {
    177189          IScope currentOffspring = offspring.SubScopes[i];
    178           offspring.SubScopes.Remove(currentOffspring);
    179           i--;
     190          offspring.SubScopes.RemoveAt(i);
     191          i--; // next loop should continue with the subscope at index i which replaced currentOffspring
    180192          population.Add(currentOffspring);
    181193          successfulOffspringAdded++;
    182         }
    183         else {
     194        } else {
    184195          IScope currentOffspring = offspring.SubScopes[i];
    185           offspring.SubScopes.Remove(currentOffspring);
     196          offspring.SubScopes.RemoveAt(i);
    186197          i--;
    187           virtual_population.Add(currentOffspring);
     198          virtual_population.Add(currentOffspring); // add to losers pool
    188199        }
    189200        tmpSelPress += tmpSelPressInc;
    190201
    191         double tmpSuccessRatio = (successfulOffspring.Value+successfulOffspringAdded) / ((double)populationSize);
     202        double tmpSuccessRatio = (successfulOffspring.Value + successfulOffspringAdded) / ((double)populationSize);
    192203        if (tmpSuccessRatio >= successRatio && (population.Count + virtual_population.Count) >= populationSize)
    193204          break;
     
    200211
    201212      // check if enough children have been generated (or limit of selection pressure or evaluted solutions is reached)
    202       if (((EvaluatedSolutionsParameter.ActualValue.Value < MaximumEvaluatedSolutionsParameter.ActualValue.Value) 
    203           && (selectionPressure.Value < maxSelPress) 
    204           && (currentSuccessRatio.Value < successRatio)) 
     213      if (((EvaluatedSolutionsParameter.ActualValue.Value < MaximumEvaluatedSolutionsParameter.ActualValue.Value)
     214          && (selectionPressure.Value < maxSelPress)
     215          && (currentSuccessRatio.Value < successRatio))
    205216        || ((population.Count + virtual_population.Count) < populationSize)) {
    206217        // more children required -> reduce left and start children generation again
     
    209220        while (parents.SubScopes.Count > 0) {
    210221          IScope parent = parents.SubScopes[0];
    211           parents.SubScopes.RemoveAt(0);
    212           scope.SubScopes.Add(parent);
    213         }
    214 
    215         IOperator moreOffspring = OffspringCreatorParameter.ActualValue as IOperator;
    216         if (moreOffspring == null) throw new InvalidOperationException(Name + ": More offspring are required, but no operator specified for creating them.");
    217         return ExecutionContext.CreateOperation(moreOffspring);
     222          parents.SubScopes.RemoveAt(0); // TODO: repeated call of RemoveAt(0) is inefficient?
     223          scope.SubScopes.Add(parent); // order of subscopes is reversed
     224        }
     225
     226        IOperator offspringCreator = OffspringCreatorParameter.ActualValue as IOperator;
     227        if (offspringCreator == null) throw new InvalidOperationException(Name + ": More offspring are required, but no operator specified for creating them.");
     228        return ExecutionContext.CreateOperation(offspringCreator); // this assumes that this operator will be called again indirectly or directly
    218229      } else {
    219230        // enough children generated
    220         QualityComparer qualityComparer = new QualityComparer(QualityParameter.TranslatedName);
    221         population.Sort(qualityComparer);
    222 
    223         //only keep minimum best successful children in population
     231        var fitnessComparer = new FitnessComparer(QualityParameter.TranslatedName, MaximizationParameter.ActualValue.Value);
     232        population.Sort(fitnessComparer); // sort individuals by descending fitness
     233
     234        // keeps only the best successRatio * populationSize solutions in the population (the remaining ones are added to the virtual population)
    224235        int removed = 0;
    225236        for (int i = 0; i < population.Count; i++) {
    226237          double tmpSuccessRatio = i / (double)populationSize;
    227238          if (tmpSuccessRatio > successRatio) {
    228               virtual_population.Add(population[i]);
    229               removed++;
     239            virtual_population.Add(population[i]);
     240            removed++;
    230241          }
    231242        }
     
    233244
    234245        //fill up population with best remaining children (successful or unsuccessful)
    235         virtual_population.Sort(qualityComparer);
     246        virtual_population.Sort(fitnessComparer);
    236247        int offspringNeeded = populationSize - population.Count;
    237248        for (int i = 0; i < offspringNeeded && i < virtual_population.Count; i++) {
    238           population.Add(virtual_population[i]);
     249          population.Add(virtual_population[i]); // children are sorted by descending fitness
    239250        }
    240251
  • stable/HeuristicLab.Selection/3.3/HeuristicLab.Selection-3.3.csproj

    r11920 r13292  
    119119    <Compile Include="ConditionalSelector.cs" />
    120120    <Compile Include="CrowdedTournamentSelector.cs" />
     121    <Compile Include="EvolutionStrategyOffspringSelector.cs" />
    121122    <Compile Include="GeneralizedRankSelector.cs" />
    122123    <Compile Include="LeftSelector.cs" />
  • stable/HeuristicLab.Tests

  • stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/SamplesUtils.cs

    r13285 r13292  
    55using HeuristicLab.Algorithms.EvolutionStrategy;
    66using HeuristicLab.Algorithms.GeneticAlgorithm;
     7using HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy;
    78using HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm;
    89using HeuristicLab.Data;
     
    7172    }
    7273
     74    public static void ConfigureOffspringSelectionEvolutionStrategyParameters<R, M, SC, SR, SM>(OffspringSelectionEvolutionStrategy es, int popSize,
     75      double successRatio, double comparisonFactor, double maxSelPres, int parentsPerChild, int maxGens, bool plusSelection)
     76      where R : ICrossover
     77      where M : IManipulator
     78      where SC : IStrategyParameterCreator
     79      where SR : IStrategyParameterCrossover
     80      where SM : IStrategyParameterManipulator {
     81      es.PopulationSize.Value = popSize;
     82      es.ComparisonFactor.Value = comparisonFactor;
     83      es.SuccessRatio.Value = successRatio;
     84      es.MaximumSelectionPressure.Value = maxSelPres;
     85      es.ParentsPerChild.Value = parentsPerChild;
     86      es.SelectedParents.Value = popSize * parentsPerChild;
     87      es.MaximumGenerations.Value = maxGens;
     88      es.PlusSelection.Value = false;
     89
     90      es.Seed.Value = 0;
     91      es.SetSeedRandomly.Value = true;
     92
     93      es.Recombinator = es.RecombinatorParameter.ValidValues
     94        .OfType<R>()
     95        .Single();
     96
     97      es.Mutator = es.MutatorParameter.ValidValues
     98        .OfType<M>()
     99        .Single();
     100
     101      es.StrategyParameterCreator = es.StrategyParameterCreatorParameter.ValidValues
     102        .OfType<SC>()
     103        .Single();
     104      es.StrategyParameterCrossover = es.StrategyParameterCrossoverParameter.ValidValues
     105        .OfType<SR>()
     106        .Single();
     107      es.StrategyParameterManipulator = es.StrategyParameterManipulatorParameter.ValidValues
     108        .OfType<SM>()
     109        .Single();
     110      es.Engine = new ParallelEngine.ParallelEngine();
     111    }
     112
    73113    public static void ConfigureGeneticAlgorithmParameters<S, C, M>(GeneticAlgorithm ga, int popSize, int elites, int maxGens, double mutationRate, int tournGroupSize = 0)
    74114      where S : ISelector
     
    194234
    195235      ga.MaximumGenerations = maxGens;
    196      
     236
    197237      ga.Engine = new ParallelEngine.ParallelEngine();
    198238    }
  • stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r13285 r13292  
    131131    <Reference Include="HeuristicLab.Algorithms.LocalSearch-3.3">
    132132      <HintPath>..\bin\HeuristicLab.Algorithms.LocalSearch-3.3.dll</HintPath>
     133      <Private>False</Private>
     134    </Reference>
     135    <Reference Include="HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     136      <HintPath>..\bin\HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy-3.3.dll</HintPath>
    133137      <Private>False</Private>
    134138    </Reference>
     
    436440    <Compile Include="HeuristicLab-3.3\PluginLoader.cs" />
    437441    <Compile Include="HeuristicLab-3.3\Samples\AlpsSampleTest.cs" />
     442    <Compile Include="HeuristicLab-3.3\Samples\OSESGriewankSampleTest.cs" />
    438443    <Compile Include="HeuristicLab-3.3\Samples\GAGroupingProblemSampleTest.cs" />
    439444    <Compile Include="HeuristicLab-3.3\Samples\VnsOpSampleTest.cs" />
Note: See TracChangeset for help on using the changeset viewer.