Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/10/15 09:57:29 (10 years ago)
Author:
pfleck
Message:

#2269 merged trunk

Location:
branches/ALPS
Files:
15 edited
6 copied

Legend:

Unmodified
Added
Removed

  • branches/ALPS

  • branches/ALPS/HeuristicLab.Analysis

  • branches/ALPS/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalysis/AlleleFrequencyAnalyzer.cs

    r11171 r11975  
    3737  [Item("AlleleFrequencyAnalyzer", "An operator for analyzing the frequency of alleles.")]
    3838  [StorableClass]
    39   public abstract class AlleleFrequencyAnalyzer<T> : SingleSuccessorOperator, IAnalyzer where T : class, IItem {
     39  public abstract class AlleleFrequencyAnalyzer<T> : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator where T : class, IItem {
    4040    public virtual bool EnabledByDefault {
    4141      get { return false; }

  • branches/ALPS/HeuristicLab.Analysis/3.3/BestScopeSolutionAnalyzer.cs

    r11677 r11975  
    3737  [Item("BestScopeSolutionAnalyzer", "An operator that extracts the scope containing the best quality.")]
    3838  [StorableClass]
    39   public class BestScopeSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer {
     39  public class BestScopeSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
    4040
    4141    public virtual bool EnabledByDefault {
    … …  
    7373    [StorableHook(HookType.AfterDeserialization)]
    7474    private void AfterDeserialization() {
     75      // BackwardsCompatibility3.3
     76      #region Backwards compatible code, remove with 3.4
    7577      if (!Parameters.ContainsKey("BestSolution ResultName"))
    7678        Parameters.Add(new FixedValueParameter<StringValue>("BestSolution ResultName", "The name of the result for storing the best solution.", new StringValue("Best Solution")));
     79      if (Parameters.ContainsKey("BestSolution")) Parameters.Remove("BestSolution");
     80      if (Parameters.ContainsKey("BestKnownSolution")) Parameters.Remove("BestKnownSolution");
     81      #endregion
    7782    }
    7883    #endregion
    … …  
    114119      if (!results.ContainsKey(BestSolutionResultName)) {
    115120        var cloner = new Cloner();
    116         //avoid cloning of subscopes
     121        //avoid cloning of subscopes and the results collection that the solution is put in
     122        cloner.RegisterClonedObject(results, new ResultCollection());
    117123        cloner.RegisterClonedObject(currentBestScope.SubScopes, new ScopeList());
    118124        var solution = cloner.Clone(currentBestScope);
    … …  
    127133              || !max && qualities[i].Value < bestQuality) {
    128134            var cloner = new Cloner();
    129             //avoid cloning of subscopes
     135            //avoid cloning of subscopes and the results collection that the solution is put in
     136            cloner.RegisterClonedObject(results, new ResultCollection());
    130137            cloner.RegisterClonedObject(currentBestScope.SubScopes, new ScopeList());
    131138            var solution = cloner.Clone(currentBestScope);

  • branches/ALPS/HeuristicLab.Analysis/3.3/DataVisualization/DataRow.cs

    r11171 r11975  
    7676      this.values = new ObservableList<double>(original.values);
    7777    }
     78    public DataRow() : this("DataRow") { }
    7879    public DataRow(string name)
    7980      : base(name) {
    … …  
    116117      OnVisualPropertiesChanged();
    117118    }
     119    protected override void OnNameChanged() {
     120      base.OnNameChanged();
     121      VisualProperties.DisplayName = Name;
     122    }
    118123  }
    119124}

  • branches/ALPS/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

    r11677 r11975  
    159159    <Compile Include="QualityAnalysis\QualityDistributionAnalyzer.cs" />
    160160    <Compile Include="QualityAnalysis\ScaledQualityDifferenceAnalyzer.cs" />
     161    <Compile Include="Statistics\BonferroniHolm.cs" />
     162    <Compile Include="Statistics\EnumerableStatisticsExtension.cs" />
     163    <Compile Include="Statistics\Fitting\ExpFitting.cs" />
     164    <Compile Include="Statistics\Fitting\IFitting.cs" />
     165    <Compile Include="Statistics\KruskalWallisTest.cs" />
     166    <Compile Include="Statistics\Fitting\LinearLeastSquaresFitting.cs" />
     167    <Compile Include="Statistics\Fitting\LogFitting.cs" />
    161168    <Compile Include="Statistics\NormalDistribution.cs" />
     169    <Compile Include="Statistics\PairwiseTest.cs" />
     170    <Compile Include="Statistics\SampleSizeDetermination.cs" />
    162171    <Compile Include="ValueAnalysis\SingleValueAnalyzer.cs" />
    163172    <Compile Include="ValueAnalysis\MinAverageMaxValueAnalyzer.cs" />

  • branches/ALPS/HeuristicLab.Analysis/3.3/MultiObjective/ParetoFrontAnalyzer.cs

    r11171 r11975  
    3131  [Item("ParetoFrontAnalyzer", "Analyzer for multiobjective problems that collects and presents the current Pareto front as double matrix as well as the solution scopes that lie on the current front.")]
    3232  [StorableClass]
    33   public abstract class ParetoFrontAnalyzer : SingleSuccessorOperator, IAnalyzer {
     33  public abstract class ParetoFrontAnalyzer : SingleSuccessorOperator, IAnalyzer, IMultiObjectiveOperator {
    3434    public virtual bool EnabledByDefault {
    3535      get { return true; }

  • branches/ALPS/HeuristicLab.Analysis/3.3/PopulationDiversityAnalysis/PopulationDiversityAnalyzer.cs

    r11171 r11975  
    4040  [Item("PopulationDiversityAnalyzer", "An operator for analyzing the solution diversity in a population.")]
    4141  [StorableClass]
    42   public abstract class PopulationDiversityAnalyzer<T> : SingleSuccessorOperator, IAnalyzer where T : class, IItem {
     42  public abstract class PopulationDiversityAnalyzer<T> : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator where T : class, IItem {
    4343    public virtual bool EnabledByDefault {
    4444      get { return false; }

  • branches/ALPS/HeuristicLab.Analysis/3.3/PopulationDiversityAnalysis/SingleObjectivePopulationDiversityAnalyzer.cs

    r11171 r11975  
    3636  [Item("SingleObjectivePopulationDiversityAnalyzer", "An operator for analyzing the solution diversity in a population.")]
    3737  [StorableClass]
    38   public class SingleObjectivePopulationDiversityAnalyzer : SingleSuccessorOperator, IAnalyzer, ISimilarityBasedOperator {
     38  public class SingleObjectivePopulationDiversityAnalyzer : SingleSuccessorOperator, IAnalyzer, ISimilarityBasedOperator, ISingleObjectiveOperator {
    3939    #region ISimilarityBasedOperator Members
    4040    [Storable]

  • branches/ALPS/HeuristicLab.Analysis/3.3/QualityAnalysis/BestAverageWorstQualityAnalyzer.cs

    r11171 r11975  
    3636  [Item("BestAverageWorstQualityAnalyzer", "An operator which analyzes the best, average and worst quality of solutions in the scope tree.")]
    3737  [StorableClass]
    38   public sealed class BestAverageWorstQualityAnalyzer : AlgorithmOperator, IAnalyzer {
     38  public sealed class BestAverageWorstQualityAnalyzer : AlgorithmOperator, IAnalyzer, ISingleObjectiveOperator {
    3939    #region Parameter properties
    4040    public ValueLookupParameter<BoolValue> MaximizationParameter {

  • branches/ALPS/HeuristicLab.Analysis/3.3/QualityAnalysis/BestAverageWorstQualityCalculator.cs

    r11171 r11975  
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Operators;
     26using HeuristicLab.Optimization;
    2627using HeuristicLab.Parameters;
    2728using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    3334  [Item("BestAverageWorstQualityCalculator", "An operator which calculates the best, average and worst quality of solutions in the scope tree.")]
    3435  [StorableClass]
    35   public sealed class BestAverageWorstQualityCalculator : SingleSuccessorOperator {
     36  public sealed class BestAverageWorstQualityCalculator : SingleSuccessorOperator, ISingleObjectiveOperator {
    3637    public ValueLookupParameter<BoolValue> MaximizationParameter {
    3738      get { return (ValueLookupParameter<BoolValue>)Parameters["Maximization"]; }

  • branches/ALPS/HeuristicLab.Analysis/3.3/QualityAnalysis/BestQualityMemorizer.cs

    r11171 r11975  
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Operators;
     26using HeuristicLab.Optimization;
    2627using HeuristicLab.Parameters;
    2728using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    3334  [Item("BestQualityMemorizer", "An operator that updates the best quality found so far with those qualities contained in the scope tree.")]
    3435  [StorableClass]
    35   public class BestQualityMemorizer : SingleSuccessorOperator {
     36  public class BestQualityMemorizer : SingleSuccessorOperator, ISingleObjectiveOperator {
    3637    public ValueLookupParameter<BoolValue> MaximizationParameter {
    3738      get { return (ValueLookupParameter<BoolValue>)Parameters["Maximization"]; }

  • branches/ALPS/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityAnalyzer.cs

    r11171 r11975  
    3636  [Item("QualityAnalyzer", "An operator which analyzes the quality of solutions in the scope tree.")]
    3737  [StorableClass]
    38   public sealed class QualityAnalyzer : AlgorithmOperator, IAnalyzer {
     38  public sealed class QualityAnalyzer : AlgorithmOperator, IAnalyzer, ISingleObjectiveOperator {
    3939    #region Parameter properties
    4040    public ValueLookupParameter<BoolValue> MaximizationParameter {

  • branches/ALPS/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityDistributionAnalyzer.cs

    r11171 r11975  
    3232  [Item("QualityDistributionAnalyzer", "Analyzes the distribution of the quality values in that it adds a Histogram of them into the result collection.")]
    3333  [StorableClass]
    34   public class QualityDistributionAnalyzer : SingleSuccessorOperator, IAnalyzer, IIterationBasedOperator {
     34  public class QualityDistributionAnalyzer : SingleSuccessorOperator, IAnalyzer, IIterationBasedOperator, ISingleObjectiveOperator {
    3535
    3636    #region Parameter properties

  • branches/ALPS/HeuristicLab.Analysis/3.3/QualityAnalysis/ScaledQualityDifferenceAnalyzer.cs

    r11171 r11975  
    3333A value towards 0 always means that it's closer to the better fitness value, while a value towards 1 means that it's closer to the worse fitness value.")]
    3434  [StorableClass]
    35   public class ScaledQualityDifferenceAnalyzer : SingleSuccessorOperator, IAnalyzer {
     35  public class ScaledQualityDifferenceAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
    3636    public virtual bool EnabledByDefault {
    3737      get { return true; }
Note: See TracChangeset for help on using the changeset viewer.