Changeset 5996


Ignore:
Timestamp:
04/09/11 19:59:16 (9 years ago)
Author:
abeham
Message:

#1469

  • implemented QAPAlleleFrequencyAnalyzer and QAPPopulationDiversityAnalyzer
Location:
branches/histogram/HeuristicLab.Problems.QuadraticAssignment/3.3
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • branches/histogram/HeuristicLab.Problems.QuadraticAssignment/3.3/HeuristicLab.Problems.QuadraticAssignment-3.3.csproj

    r5950 r5996  
    109109  <ItemGroup>
    110110    <Compile Include="Analyzers\BestQAPSolutionAnalyzer.cs" />
     111    <Compile Include="Analyzers\QAPAlleleFrequencyAnalyzer.cs" />
     112    <Compile Include="Analyzers\QAPPopulationDiversityAnalyzer.cs" />
    111113    <Compile Include="Evaluators\QAPSwap2MoveEvaluator.cs" />
    112114    <Compile Include="Evaluators\QAPEvaluator.cs" />
     
    386388  </ItemGroup>
    387389  <ItemGroup>
     390    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     391      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
     392      <Name>HeuristicLab.Analysis-3.3</Name>
     393    </ProjectReference>
    388394    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    389395      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
  • branches/histogram/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs

    r5953 r5996  
    8888      get { return Operators.OfType<BestQAPSolutionAnalyzer>().FirstOrDefault(); }
    8989    }
     90
     91    private QAPAlleleFrequencyAnalyzer QAPAlleleFrequencyAnalyzer {
     92      get { return Operators.OfType<QAPAlleleFrequencyAnalyzer>().FirstOrDefault(); }
     93    }
     94
     95    private QAPPopulationDiversityAnalyzer QAPPopulationDiversityAnalyzer {
     96      get { return Operators.OfType<QAPPopulationDiversityAnalyzer>().FirstOrDefault(); }
     97    }
    9098    #endregion
    9199
     
    236244      Operators.AddRange(ApplicationManager.Manager.GetInstances<IPermutationOperator>());
    237245      Operators.Add(new BestQAPSolutionAnalyzer());
     246      Operators.Add(new QAPAlleleFrequencyAnalyzer());
     247      Operators.Add(new QAPPopulationDiversityAnalyzer());
    238248      ParameterizeAnalyzers();
    239249      ParameterizeOperators();
     
    262272        BestQAPSolutionAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
    263273        BestQAPSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
     274      }
     275      if (QAPAlleleFrequencyAnalyzer != null) {
     276        QAPAlleleFrequencyAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
     277        QAPAlleleFrequencyAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
     278        QAPAlleleFrequencyAnalyzer.DistancesParameter.ActualName = DistancesParameter.Name;
     279        QAPAlleleFrequencyAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
     280        QAPAlleleFrequencyAnalyzer.ResultsParameter.ActualName = "Results";
     281        QAPAlleleFrequencyAnalyzer.SolutionParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
     282        QAPAlleleFrequencyAnalyzer.WeightsParameter.ActualName = WeightsParameter.Name;
     283      }
     284      if (QAPPopulationDiversityAnalyzer != null) {
     285        QAPPopulationDiversityAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
     286        QAPPopulationDiversityAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
     287        QAPPopulationDiversityAnalyzer.ResultsParameter.ActualName = "Results";
     288        QAPPopulationDiversityAnalyzer.SolutionParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
    264289      }
    265290    }
Note: See TracChangeset for help on using the changeset viewer.