Changeset 8661


Ignore:
Timestamp:
09/16/12 16:49:18 (7 years ago)
Author:
ascheibe
Message:

#1886 adapted operators so that they can be used with Scatter Search

Location:
branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj

    r8569 r8661  
    117117  <ItemGroup>
    118118    <Compile Include="AlgorithmBehaviorHelpers.cs" />
     119    <Compile Include="VariableRemover.cs" />
    119120    <Compile Include="LinearLeastSquaresFitting.cs" />
    120121    <Compile Include="RunCollectionStatisticalTabularView.cs">
  • branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/MutationPerformanceAnalyzer.cs

    r8511 r8661  
    129129      var permutationAfter = PermutationAfterMutationParameter.ActualValue;
    130130
    131       qualityPlotHelper.InitializePlot(Results, "Mutation Quality", "Solution Index", "Absolut Quality Difference");
    132       diversityPlotHelper.InitializePlot(Results, "Mutation Diversity", "Solution Index", "Diversity");
    133       avgDataTableHelper.InitializeChart(Results, "Average Mutation Performance", "Average Mutation Performance per Generation");
     131      if (permutationBefore != null) {
     132        qualityPlotHelper.InitializePlot(Results, "Mutation Quality", "Solution Index", "Absolut Quality Difference");
     133        diversityPlotHelper.InitializePlot(Results, "Mutation Diversity", "Solution Index", "Diversity");
     134        avgDataTableHelper.InitializeChart(Results, "Average Mutation Performance", "Average Mutation Performance per Generation");
    134135
    135       divPoint = new Point2D<double>(cnt, TSPSimilarityCalculator.CalculateSimilarity(permutationBefore, permutationAfter));
    136       curPoint = new Point2D<double>(cnt++, qualityCX - qualityM);
    137       qualityPoints.Add(curPoint.Y);
     136        divPoint = new Point2D<double>(cnt, TSPSimilarityCalculator.CalculateSimilarity(permutationBefore, permutationAfter));
     137        curPoint = new Point2D<double>(cnt++, qualityCX - qualityM);
     138        qualityPoints.Add(curPoint.Y);
    138139
    139       string curGenStr = GenerationsParameter.ActualValue.Value.ToString();
     140        string curGenStr = GenerationsParameter.ActualValue.Value.ToString();
    140141
    141       qualityPlotHelper.AddPoint(curGenStr, curPoint);
    142       diversityPlotHelper.AddPoint(curGenStr, divPoint);
     142        qualityPlotHelper.AddPoint(curGenStr, curPoint);
     143        diversityPlotHelper.AddPoint(curGenStr, divPoint);
    143144
    144       if (GenerationsParameter.ActualValue.Value != 0) {
    145         if (GenerationsParameter.ActualValue.Value > lastGeneration) {
    146           double avg = qualityPoints.Average();
    147           avgDataTableHelper.AddPoint(avg);
     145        if (GenerationsParameter.ActualValue.Value != 0) {
     146          if (GenerationsParameter.ActualValue.Value > lastGeneration) {
     147            double avg = qualityPoints.Average();
     148            avgDataTableHelper.AddPoint(avg);
     149            Reset();
     150          }
     151        } else {
    148152          Reset();
    149153        }
    150       } else {
    151         Reset();
    152154      }
    153155
Note: See TracChangeset for help on using the changeset viewer.