Changeset 9418


Ignore:
Timestamp:
05/02/13 13:15:07 (6 years ago)
Author:
ascheibe
Message:

#1886

  • changed duplicate solutions analyzer to also track avg. diversity as the standard diversity analyzer needs too much memory
  • fixed project references of eslGA
Location:
branches/HeuristicLab.Analysis.AlgorithmBehavior
Files:
2 edited

Legend:

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

    r9412 r9418  
    103103    <Reference Include="HeuristicLab.Analysis-3.3">
    104104      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
     105      <Private>False</Private>
    105106    </Reference>
    106107    <Reference Include="HeuristicLab.Collections-3.3">
    107108      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     109      <Private>False</Private>
    108110    </Reference>
    109111    <Reference Include="HeuristicLab.Common-3.3">
    110112      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     113      <Private>False</Private>
    111114    </Reference>
    112115    <Reference Include="HeuristicLab.Core-3.3">
    113116      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     117      <Private>False</Private>
    114118    </Reference>
    115119    <Reference Include="HeuristicLab.Data-3.3">
    116120      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     121      <Private>False</Private>
    117122    </Reference>
    118123    <Reference Include="HeuristicLab.Operators-3.3">
    119124      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     125      <Private>False</Private>
    120126    </Reference>
    121127    <Reference Include="HeuristicLab.Optimization-3.3">
    122128      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     129      <Private>False</Private>
    123130    </Reference>
    124131    <Reference Include="HeuristicLab.Optimization.Operators-3.3">
    125132      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     133      <Private>False</Private>
    126134    </Reference>
    127135    <Reference Include="HeuristicLab.Parameters-3.3">
    128136      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     137      <Private>False</Private>
    129138    </Reference>
    130139    <Reference Include="HeuristicLab.Persistence-3.3">
    131140      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     141      <Private>False</Private>
    132142    </Reference>
    133143    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    134144      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     145      <Private>False</Private>
    135146    </Reference>
    136147    <Reference Include="HeuristicLab.Random-3.3">
    137148      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
     149      <Private>False</Private>
    138150    </Reference>
    139151    <Reference Include="HeuristicLab.Selection-3.3">
    140152      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Selection-3.3.dll</HintPath>
     153      <Private>False</Private>
    141154    </Reference>
    142155    <Reference Include="System" />
  • branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/DuplicateSolutionsAnalyzer.cs

    r8797 r9418  
    2121
    2222
     23using System.Collections.Generic;
    2324using System.Linq;
    2425using HeuristicLab.Common;
     
    5960
    6061    [Storable]
    61     private DataTableHelper chartingHelper;
     62    private DataTableHelper chartingHelper, similarityChartHelper;
    6263    #endregion
    6364
     
    6869      : base(original, cloner) {
    6970      chartingHelper = (DataTableHelper)original.chartingHelper.Clone(cloner);
     71      similarityChartHelper = (DataTableHelper)original.similarityChartHelper.Clone(cloner);
    7072    }
    7173
     
    7779
    7880      chartingHelper = new DataTableHelper();
     81      similarityChartHelper = new DataTableHelper();
    7982    }
    8083
     
    8891      }
    8992      chartingHelper.InitializeChart(Results, "Duplicate Solutions", new string[] { "Duplicate Solutions per Generation" });
     93      similarityChartHelper.InitializeChart(Results, "Average Similarity", new string[] { "Avg. Similarity per Generation" });
    9094
    9195      var similarities = SimilarityCalculatorParameter.Value.CalculateSolutionCrowdSimilarity(ExecutionContext.Scope);
     96      List<double> similaritiesArr = new List<double>();
    9297      int counter = 0;
    9398      for (int i = 0; i < similarities.Length; i++) {
     
    98103          }
    99104        }
     105        for (int j = 0; j < similarities[i].Length; j++) {
     106          if (i != j) {
     107            similaritiesArr.Add(similarities[i][j]);
     108          }
     109        }
    100110      }
    101111
     112      similarityChartHelper.AddPoint(similaritiesArr.Average());
    102113      chartingHelper.AddPoint(counter / (double)similarities.Length);
    103114      return base.Apply();
Note: See TracChangeset for help on using the changeset viewer.