Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/18/14 12:35:00 (10 years ago)
Author:
ascheibe
Message:

reverted last commit

Location:
branches/HiveStatistics/sources
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/HiveStatistics/sources

  • branches/HiveStatistics/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    7979      get { return (ValueParameter<IntValue>)Parameters["Elites"]; }
    8080    }
    81     private IFixedValueParameter<BoolValue> ReevaluateElitesParameter {
    82       get { return (IFixedValueParameter<BoolValue>)Parameters["ReevaluateElites"]; }
    83     }
    8481    private ValueParameter<MultiAnalyzer> AnalyzerParameter {
    8582      get { return (ValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
    … …  
    122119      get { return ElitesParameter.Value; }
    123120      set { ElitesParameter.Value = value; }
    124     }
    125     public bool ReevaluteElites {
    126       get { return ReevaluateElitesParameter.Value.Value; }
    127       set { ReevaluateElitesParameter.Value.Value = value; }
    128121    }
    129122    public MultiAnalyzer Analyzer {
    … …  
    158151      Parameters.Add(new OptionalConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions."));
    159152      Parameters.Add(new ValueParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation.", new IntValue(1)));
    160       Parameters.Add(new FixedValueParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)", new BoolValue(false)) { Hidden = true });
    161153      Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze each generation.", new MultiAnalyzer()));
    162154      Parameters.Add(new ValueParameter<IntValue>("MaximumGenerations", "The maximum number of generations which should be processed.", new IntValue(1000)));
    … …  
    190182      mainLoop.CrossoverParameter.ActualName = CrossoverParameter.Name;
    191183      mainLoop.ElitesParameter.ActualName = ElitesParameter.Name;
    192       mainLoop.ReevaluateElitesParameter.ActualName = ReevaluateElitesParameter.Name;
    193184      mainLoop.MaximumGenerationsParameter.ActualName = MaximumGenerationsParameter.Name;
    194185      mainLoop.MutatorParameter.ActualName = MutatorParameter.Name;
    … …  
    216207    [StorableHook(HookType.AfterDeserialization)]
    217208    private void AfterDeserialization() {
    218       // BackwardsCompatibility3.3
    219       #region Backwards compatible code, remove with 3.4
    220       if (!Parameters.ContainsKey("ReevaluateElites")) {
    221         Parameters.Add(new FixedValueParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)", (BoolValue)new BoolValue(false).AsReadOnly()) { Hidden = true });
    222       }
    223       #endregion
    224 
    225209      Initialize();
    226210    }
    227 
    228 
    229211
    230212    private GeneticAlgorithm(GeneticAlgorithm original, Cloner cloner)

  • branches/HiveStatistics/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithmMainLoop.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    6363    public ValueLookupParameter<IntValue> ElitesParameter {
    6464      get { return (ValueLookupParameter<IntValue>)Parameters["Elites"]; }
    65     }
    66     public IValueLookupParameter<BoolValue> ReevaluateElitesParameter {
    67       get { return (IValueLookupParameter<BoolValue>)Parameters["ReevaluateElites"]; }
    6865    }
    6966    public ValueLookupParameter<IntValue> MaximumGenerationsParameter {
    … …  
    115112      Parameters.Add(new ValueLookupParameter<IOperator>("Evaluator", "The operator used to evaluate solutions. This operator is executed in parallel, if an engine is used which supports parallelization."));
    116113      Parameters.Add(new ValueLookupParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation."));
    117       Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)"));
    118114      Parameters.Add(new ValueLookupParameter<IntValue>("MaximumGenerations", "The maximum number of generations which should be processed."));
    119115      Parameters.Add(new ValueLookupParameter<VariableCollection>("Results", "The variable collection where results should be stored."));
    … …  
    147143      Placeholder analyzer2 = new Placeholder();
    148144      ConditionalBranch conditionalBranch = new ConditionalBranch();
    149       ConditionalBranch reevaluateElitesBranch = new ConditionalBranch();
    150145
    151146      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0))); // Class GeneticAlgorithm expects this to be called Generations
    … …  
    198193
    199194      conditionalBranch.ConditionParameter.ActualName = "Terminate";
    200 
    201       reevaluateElitesBranch.ConditionParameter.ActualName = "ReevaluateElites";
    202       reevaluateElitesBranch.Name = "Reevaluate elites ?";
    203195      #endregion
    204196
    … …  
    229221      subScopesProcessor2.Successor = mergingReducer;
    230222      bestSelector.Successor = rightReducer;
    231       rightReducer.Successor = reevaluateElitesBranch;
    232       reevaluateElitesBranch.TrueBranch = uniformSubScopesProcessor2;
    233       reevaluateElitesBranch.FalseBranch = null;
    234       reevaluateElitesBranch.Successor = null;
     223      rightReducer.Successor = null;
    235224      mergingReducer.Successor = intCounter;
    236225      intCounter.Successor = comparator;
    … …  
    243232    }
    244233
    245     [StorableHook(HookType.AfterDeserialization)]
    246     private void AfterDeserialization() {
    247       // BackwardsCompatibility3.3
    248       #region Backwards compatible code, remove with 3.4
    249       if (!Parameters.ContainsKey("ReevaluateElites")) {
    250         Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)"));
    251       }
    252       #endregion
    253     }
    254 
    255234    public override IOperation Apply() {
    256235      if (CrossoverParameter.ActualValue == null)

  • branches/HiveStatistics/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    100100      get { return (ValueParameter<IntValue>)Parameters["Elites"]; }
    101101    }
    102     private IFixedValueParameter<BoolValue> ReevaluateElitesParameter {
    103       get { return (IFixedValueParameter<BoolValue>)Parameters["ReevaluateElites"]; }
    104     }
    105102    private ValueParameter<MultiAnalyzer> AnalyzerParameter {
    106103      get { return (ValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
    … …  
    171168      get { return ElitesParameter.Value; }
    172169      set { ElitesParameter.Value = value; }
    173     }
    174     public bool ReevaluteElites {
    175       get { return ReevaluateElitesParameter.Value.Value; }
    176       set { ReevaluateElitesParameter.Value.Value = value; }
    177170    }
    178171    public MultiAnalyzer Analyzer {
    … …  
    206199    [StorableHook(HookType.AfterDeserialization)]
    207200    private void AfterDeserialization() {
    208       // BackwardsCompatibility3.3
    209       #region Backwards compatible code, remove with 3.4
    210       if (!Parameters.ContainsKey("ReevaluateElites")) {
    211         Parameters.Add(new FixedValueParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)", (BoolValue)new BoolValue(false).AsReadOnly()) { Hidden = true });
    212       }
    213       #endregion
    214 
    215201      Initialize();
    216202    }
    … …  
    242228      Parameters.Add(new OptionalConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions."));
    243229      Parameters.Add(new ValueParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation.", new IntValue(1)));
    244       Parameters.Add(new FixedValueParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)", new BoolValue(false)) { Hidden = true });
    245230      Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze the islands.", new MultiAnalyzer()));
    246231      Parameters.Add(new ValueParameter<MultiAnalyzer>("IslandAnalyzer", "The operator used to analyze each island.", new MultiAnalyzer()));
    … …  
    316301      mainLoop.CrossoverParameter.ActualName = CrossoverParameter.Name;
    317302      mainLoop.ElitesParameter.ActualName = ElitesParameter.Name;
    318       mainLoop.ReevaluateElitesParameter.ActualName = ReevaluateElitesParameter.Name;
    319303      mainLoop.MutatorParameter.ActualName = MutatorParameter.Name;
    320304      mainLoop.MutationProbabilityParameter.ActualName = MutationProbabilityParameter.Name;

  • branches/HiveStatistics/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithmMainLoop.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    9191    public ValueLookupParameter<IntValue> ElitesParameter {
    9292      get { return (ValueLookupParameter<IntValue>)Parameters["Elites"]; }
    93     }
    94     public IValueLookupParameter<BoolValue> ReevaluateElitesParameter {
    95       get { return (IValueLookupParameter<BoolValue>)Parameters["ReevaluateElites"]; }
    9693    }
    9794    public ValueLookupParameter<ResultCollection> ResultsParameter {
    … …  
    147144      Parameters.Add(new ValueLookupParameter<IOperator>("Evaluator", "The operator used to evaluate solutions."));
    148145      Parameters.Add(new ValueLookupParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation."));
    149       Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)"));
    150146      Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The results collection to store the results."));
    151147      Parameters.Add(new ValueLookupParameter<IOperator>("Analyzer", "The operator used to the analyze the islands."));
    … …  
    198194      Placeholder analyzer2 = new Placeholder();
    199195      ConditionalBranch generationsTerminationCondition = new ConditionalBranch();
    200       ConditionalBranch reevaluateElitesBranch = new ConditionalBranch();
    201196
    202197
    … …  
    310305      generationsTerminationCondition.Name = "Terminate?";
    311306      generationsTerminationCondition.ConditionParameter.ActualName = "TerminateGenerations";
    312 
    313       reevaluateElitesBranch.ConditionParameter.ActualName = "ReevaluateElites";
    314       reevaluateElitesBranch.Name = "Reevaluate elites ?";
    315307      #endregion
    316308
    … …  
    353345      evaluator.Successor = null;
    354346      subScopesCounter.Successor = null;
     347      subScopesCounter.Successor = null;
    355348      subScopesProcessor2.Operators.Add(bestSelector);
    356349      subScopesProcessor2.Operators.Add(new EmptyOperator());
    … …  
    358351      mergingReducer.Successor = islandAnalyzer2;
    359352      bestSelector.Successor = rightReducer;
    360       rightReducer.Successor = reevaluateElitesBranch;
    361       reevaluateElitesBranch.TrueBranch = uniformSubScopesProcessor3;
    362       reevaluateElitesBranch.FalseBranch = null;
    363       reevaluateElitesBranch.Successor = null;
     353      rightReducer.Successor = null;
    364354      islandAnalyzer2.Successor = islandGenerationsCounter;
    365355      islandGenerationsCounter.Successor = checkIslandGenerationsReachedMaximum;
    … …  
    379369    }
    380370
    381     [StorableHook(HookType.AfterDeserialization)]
    382     private void AfterDeserialization() {
    383       // BackwardsCompatibility3.3
    384       #region Backwards compatible code, remove with 3.4
    385       if (!Parameters.ContainsKey("ReevaluateElites")) {
    386         Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)"));
    387       }
    388       #endregion
    389     }
    390 
    391371    public override IOperation Apply() {
    392372      if (CrossoverParameter.ActualValue == null)

  • branches/HiveStatistics/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/Plugin.cs.frame

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626  /// Plugin class for HeuristicLab.Algorithms.GeneticAlgorithm plugin.
    2727  /// </summary>
    28   [Plugin("HeuristicLab.Algorithms.GeneticAlgorithm", "3.3.10.$WCREV$")]
     28  [Plugin("HeuristicLab.Algorithms.GeneticAlgorithm", "3.3.7.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Algorithms.GeneticAlgorithm-3.3.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Analysis", "3.3")]

  • branches/HiveStatistics/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/Properties/AssemblyInfo.cs.frame

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3131[assembly: AssemblyCompany("")]
    3232[assembly: AssemblyProduct("HeuristicLab")]
    33 [assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
     33[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
    3434[assembly: AssemblyTrademark("")]
    3535[assembly: AssemblyCulture("")]
    … …  
    5353// by using the '*' as shown below:
    5454[assembly: AssemblyVersion("3.3.0.0")]
    55 [assembly: AssemblyFileVersion("3.3.10.$WCREV$")]
     55[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]
Note: See TracChangeset for help on using the changeset viewer.