Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/18/15 10:54:32 (9 years ago)
Author:
bburlacu
Message:

#2276: Merged trunk changes.

Location:
branches/HeuristicLab.DatasetRefactor/sources
Files:
41 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.DatasetRefactor/sources

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalysis/Allele.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalysis/AlleleFrequency.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalysis/AlleleFrequencyAnalyzer.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    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/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalysis/AlleleFrequencyCollection.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalysis/AlleleFrequencyCollectionHistory.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/BestScopeSolutionAnalyzer.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2020#endregion
    2121
     22using System;
    2223using System.Collections.Generic;
    2324using System.Linq;
    … …  
    3637  [Item("BestScopeSolutionAnalyzer", "An operator that extracts the scope containing the best quality.")]
    3738  [StorableClass]
    38   public class BestScopeSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer {
     39  public class BestScopeSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
     40
    3941    public virtual bool EnabledByDefault {
    4042      get { return true; }
    4143    }
    42 
    4344    public LookupParameter<BoolValue> MaximizationParameter {
    4445      get { return (LookupParameter<BoolValue>)Parameters["Maximization"]; }
    … …  
    4748      get { return (ScopeTreeLookupParameter<DoubleValue>)Parameters["Quality"]; }
    4849    }
    49     public ILookupParameter<IScope> BestSolutionParameter {
    50       get { return (ILookupParameter<IScope>)Parameters["BestSolution"]; }
    51     }
    52     public ILookupParameter<IScope> BestKnownSolutionParameter {
    53       get { return (ILookupParameter<IScope>)Parameters["BestKnownSolution"]; }
     50    public IFixedValueParameter<StringValue> BestSolutionResultNameParameter {
     51      get { return (IFixedValueParameter<StringValue>)Parameters["BestSolution ResultName"]; }
    5452    }
    5553    public ILookupParameter<DoubleValue> BestKnownQualityParameter {
    … …  
    5856    public IValueLookupParameter<ResultCollection> ResultsParameter {
    5957      get { return (IValueLookupParameter<ResultCollection>)Parameters["Results"]; }
     58    }
     59
     60    public string BestSolutionResultName {
     61      get { return BestSolutionResultNameParameter.Value.Value; }
     62      set { BestSolutionResultNameParameter.Value.Value = value; }
    6063    }
    6164
    … …  
    6770      return new BestScopeSolutionAnalyzer(this, cloner);
    6871    }
     72
     73    [StorableHook(HookType.AfterDeserialization)]
     74    private void AfterDeserialization() {
     75      // BackwardsCompatibility3.3
     76      #region Backwards compatible code, remove with 3.4
     77      if (!Parameters.ContainsKey("BestSolution ResultName"))
     78        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
     82    }
    6983    #endregion
    7084    public BestScopeSolutionAnalyzer()
    … …  
    7286      Parameters.Add(new LookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem."));
    7387      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The qualities of the solutions."));
    74       Parameters.Add(new LookupParameter<IScope>("BestSolution", "The best solution."));
    75       Parameters.Add(new LookupParameter<IScope>("BestKnownSolution", "The best known solution."));
     88      Parameters.Add(new FixedValueParameter<StringValue>("BestSolution ResultName", "The name of the result for storing the best solution.", new StringValue("Best Solution")));
    7689      Parameters.Add(new LookupParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution."));
    7790      Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the solution should be stored."));
    … …  
    8497      DoubleValue bestKnownQuality = BestKnownQualityParameter.ActualValue;
    8598
     99      if (results.ContainsKey(BestSolutionResultName) && !typeof(IScope).IsAssignableFrom(results[BestSolutionResultName].DataType)) {
     100        throw new InvalidOperationException(string.Format("Could not add best solution result, because there is already a result with the name \"{0}\" present in the result collection.", BestSolutionResultName));
     101      }
     102
    86103      int i = -1;
    87104      if (!max)
    … …  
    91108      IEnumerable<IScope> scopes = new IScope[] { ExecutionContext.Scope };
    92109      for (int j = 0; j < QualityParameter.Depth; j++)
    93         scopes = scopes.Select(x => (IEnumerable<IScope>)x.SubScopes).Aggregate((a, b) => a.Concat(b));
     110        scopes = scopes.SelectMany(x => x.SubScopes);
    94111      IScope currentBestScope = scopes.ToList()[i];
    95112
    … …  
    98115          || !max && qualities[i].Value < bestKnownQuality.Value) {
    99116        BestKnownQualityParameter.ActualValue = new DoubleValue(qualities[i].Value);
    100         BestKnownSolutionParameter.ActualValue = (IScope)currentBestScope.Clone();
    101117      }
    102118
    103       IScope solution = BestSolutionParameter.ActualValue;
    104       if (solution == null) {
    105         solution = (IScope)currentBestScope.Clone();
    106         BestSolutionParameter.ActualValue = solution;
    107         results.Add(new Result("Best Solution", solution));
     119      if (!results.ContainsKey(BestSolutionResultName)) {
     120        var cloner = new Cloner();
     121        //avoid cloning of subscopes and the results collection that the solution is put in
     122        cloner.RegisterClonedObject(results, new ResultCollection());
     123        cloner.RegisterClonedObject(currentBestScope.SubScopes, new ScopeList());
     124        var solution = cloner.Clone(currentBestScope);
     125
     126        results.Add(new Result(BestSolutionResultName, solution));
    108127      } else {
     128        var bestSolution = (IScope)results[BestSolutionResultName].Value;
    109129        string qualityName = QualityParameter.TranslatedName;
    110         if (solution.Variables.ContainsKey(qualityName)) {
    111           double bestSoFarQuality = (solution.Variables[qualityName].Value as DoubleValue).Value;
    112           if (max && qualities[i].Value > bestSoFarQuality
    113             || !max && qualities[i].Value < bestSoFarQuality) {
    114             solution = (IScope)currentBestScope.Clone();
    115             BestSolutionParameter.ActualValue = solution;
    116             results["Best Solution"].Value = solution;
     130        if (bestSolution.Variables.ContainsKey(qualityName)) {
     131          double bestQuality = ((DoubleValue)bestSolution.Variables[qualityName].Value).Value;
     132          if (max && qualities[i].Value > bestQuality
     133              || !max && qualities[i].Value < bestQuality) {
     134            var cloner = new Cloner();
     135            //avoid cloning of subscopes and the results collection that the solution is put in
     136            cloner.RegisterClonedObject(results, new ResultCollection());
     137            cloner.RegisterClonedObject(currentBestScope.SubScopes, new ScopeList());
     138            var solution = cloner.Clone(currentBestScope);
     139
     140            results[BestSolutionResultName].Value = solution;
    117141          }
    118142        }
    119143      }
    120 
    121144      return base.Apply();
    122145    }

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/DataVisualization/DataRow.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    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/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/DataVisualization/DataTable.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/DataVisualization/DataTableHistory.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/DataVisualization/DataTableValuesCollector.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/DataVisualization/DataTableVisualProperties.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/DataVisualization/HeatMap.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/DataVisualization/HeatMapHistory.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlot.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotDataRow.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotDataRowVisualProperties.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotHistory.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotVisualProperties.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

    r9288 r12031  
    1111    <RootNamespace>HeuristicLab.Analysis</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Analysis-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1414    <TargetFrameworkProfile>
    1515    </TargetFrameworkProfile>
    … …  
    4646    <WarningLevel>4</WarningLevel>
    4747    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     48    <Prefer32Bit>false</Prefer32Bit>
    4849  </PropertyGroup>
    4950  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    … …  
    5758    </DocumentationFile>
    5859    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     60    <Prefer32Bit>false</Prefer32Bit>
    5961  </PropertyGroup>
    6062  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    … …  
    6668    <ErrorReport>prompt</ErrorReport>
    6769    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     70    <Prefer32Bit>false</Prefer32Bit>
    6871  </PropertyGroup>
    6972  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    … …  
    7780    <ErrorReport>prompt</ErrorReport>
    7881    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     82    <Prefer32Bit>false</Prefer32Bit>
    7983  </PropertyGroup>
    8084  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    … …  
    8690    <ErrorReport>prompt</ErrorReport>
    8791    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     92    <Prefer32Bit>false</Prefer32Bit>
    8893  </PropertyGroup>
    8994  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    … …  
    97102    <ErrorReport>prompt</ErrorReport>
    98103    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     104    <Prefer32Bit>false</Prefer32Bit>
    99105  </PropertyGroup>
    100106  <ItemGroup>
    … …  
    153159    <Compile Include="QualityAnalysis\QualityDistributionAnalyzer.cs" />
    154160    <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" />
     168    <Compile Include="Statistics\NormalDistribution.cs" />
     169    <Compile Include="Statistics\PairwiseTest.cs" />
     170    <Compile Include="Statistics\SampleSizeDetermination.cs" />
    155171    <Compile Include="ValueAnalysis\SingleValueAnalyzer.cs" />
    156172    <Compile Include="ValueAnalysis\MinAverageMaxValueAnalyzer.cs" />
    … …  
    236252    </BootstrapperPackage>
    237253  </ItemGroup>
     254  <ItemGroup />
    238255  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    239256  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    … …  
    245262  -->
    246263  <PropertyGroup>
    247    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     264    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    248265set ProjectDir=$(ProjectDir)
    249266set SolutionDir=$(SolutionDir)
    … …  
    252269call PreBuildEvent.cmd
    253270</PreBuildEvent>
    254 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     271    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    255272export ProjectDir=$(ProjectDir)
    256273export SolutionDir=$(SolutionDir)

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/MultiAnalyzer.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/MultiObjective/ParetoFrontAnalyzer.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    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/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/MultiObjective/RankBasedParetoFrontAnalyzer.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/MultidimensionalScaling/MultidimensionalScaling.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/Plugin.cs.frame

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

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/PopulationDiversityAnalysis/PopulationDiversityAnalyzer.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    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/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/PopulationDiversityAnalysis/SingleObjectivePopulationDiversityAnalyzer.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    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/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/Properties/AssemblyInfo.cs.frame

    r11174 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3232[assembly: AssemblyCompany("")]
    3333[assembly: AssemblyProduct("HeuristicLab")]
    34 [assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
     34[assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
    3535[assembly: AssemblyTrademark("")]
    3636[assembly: AssemblyCulture("")]
    … …  
    5454// by using the '*' as shown below:
    5555[assembly: AssemblyVersion("3.3.0.0")]
    56 [assembly: AssemblyFileVersion("3.3.10.$WCREV$")]
     56[assembly: AssemblyFileVersion("3.3.11.$WCREV$")]

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/QualityAnalysis/BestAverageWorstQualityAnalyzer.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    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/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/QualityAnalysis/BestAverageWorstQualityCalculator.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    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/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/QualityAnalysis/BestQualityMemorizer.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    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/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityAnalyzer.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    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/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityDifferenceCalculator.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityDistributionAnalyzer.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    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/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/QualityAnalysis/ScaledQualityDifferenceAnalyzer.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    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; }

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/ValueAnalysis/MinAverageMaxValueAnalyzer.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/ValueAnalysis/MinAverageMaxValueCalculator.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/ValueAnalysis/SingleValueAnalyzer.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis/3.3/ValueAnalysis/ValueAnalyzer.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
Note: See TracChangeset for help on using the changeset viewer.