Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/02/10 04:29:34 (14 years ago)
Author:
swagner
Message:

Reviewed diversity analysis branch and merged it into the trunk (#1188)

Location:
trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj

    r4623 r4703  
    107107  <ItemGroup>
    108108    <Compile Include="Analyzers\BestTSPSolutionAnalyzer.cs" />
     109    <Compile Include="Analyzers\TSPPopulationDiversityAnalyzer.cs" />
    109110    <Compile Include="Analyzers\TSPAlleleFrequencyAnalyzer.cs" />
    110111    <Compile Include="Evaluators\TSPEuclideanPathEvaluator.cs" />
  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

    r4641 r4703  
    131131      get { return operators.OfType<TSPAlleleFrequencyAnalyzer>().FirstOrDefault(); }
    132132    }
     133    private TSPPopulationDiversityAnalyzer TSPPopulationDiversityAnalyzer {
     134      get { return operators.OfType<TSPPopulationDiversityAnalyzer>().FirstOrDefault(); }
     135    }
    133136    #endregion
    134137
     
    273276      operators.Add(new BestTSPSolutionAnalyzer());
    274277      operators.Add(new TSPAlleleFrequencyAnalyzer());
     278      operators.Add(new TSPPopulationDiversityAnalyzer());
    275279      ParameterizeAnalyzers();
    276280      operators.AddRange(ApplicationManager.Manager.GetInstances<IPermutationOperator>().Cast<IOperator>());
     
    332336        TSPAlleleFrequencyAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
    333337        TSPAlleleFrequencyAnalyzer.ResultsParameter.ActualName = "Results";
     338      }
     339
     340      if (TSPPopulationDiversityAnalyzer != null) {
     341        TSPPopulationDiversityAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
     342        TSPPopulationDiversityAnalyzer.SolutionParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
     343        TSPPopulationDiversityAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
     344        TSPPopulationDiversityAnalyzer.ResultsParameter.ActualName = "Results";
    334345      }
    335346    }
Note: See TracChangeset for help on using the changeset viewer.