Free cookie consent management tool by TermsFeed Policy Generator

Changeset 4703


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

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

Location:
trunk/sources
Files:
12 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj

    r4641 r4703  
    123123      <DependentUpon>AlleleFrequencyCollectionView.cs</DependentUpon>
    124124    </Compile>
     125    <Compile Include="HeatMapHistoryView.cs">
     126      <SubType>UserControl</SubType>
     127    </Compile>
     128    <Compile Include="HeatMapHistoryView.Designer.cs">
     129      <DependentUpon>HeatMapHistoryView.cs</DependentUpon>
     130    </Compile>
     131    <Compile Include="DataTableHistoryView.cs">
     132      <SubType>UserControl</SubType>
     133    </Compile>
     134    <Compile Include="DataTableHistoryView.Designer.cs">
     135      <DependentUpon>DataTableHistoryView.cs</DependentUpon>
     136    </Compile>
     137    <Compile Include="HeatMapView.cs">
     138      <SubType>UserControl</SubType>
     139    </Compile>
     140    <Compile Include="HeatMapView.Designer.cs">
     141      <DependentUpon>HeatMapView.cs</DependentUpon>
     142    </Compile>
    125143    <Compile Include="HeuristicLabAnalysisViewsPlugin.cs" />
    126144    <Compile Include="AlleleFrequencyView.cs">
    … …  
    210228      <Install>true</Install>
    211229    </BootstrapperPackage>
     230  </ItemGroup>
     231  <ItemGroup>
     232    <EmbeddedResource Include="HeatMapView.resx">
     233      <DependentUpon>HeatMapView.cs</DependentUpon>
     234    </EmbeddedResource>
    212235  </ItemGroup>
    213236  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • trunk/sources/HeuristicLab.Analysis/3.3/DataRow.cs

    r4644 r4703  
    4949    }
    5050    private ObservableList<double> values;
    51     public IObservableList<double> Values {
     51    public ObservableList<double> Values {
    5252      get { return values; }
    5353    }

  • trunk/sources/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

    r4644 r4703  
    118118    <Compile Include="Allele.cs" />
    119119    <Compile Include="AlleleFrequency.cs" />
     120    <Compile Include="DataTableHistory.cs" />
     121    <Compile Include="HeatMapHistory.cs" />
     122    <Compile Include="HeatMap.cs" />
     123    <Compile Include="PopulationDiversityAnalyzer.cs" />
    120124    <Compile Include="DataRowVisualProperties.cs" />
    121125    <Compile Include="QualityAnalyzer.cs" />

  • 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.