Free cookie consent management tool by TermsFeed Policy Generator

Changeset 4623 for trunk/sources


Ignore:
Timestamp:
10/20/10 06:23:06 (14 years ago)
Author:
swagner
Message:

Added first version of allele frequency analysis (#1234)

Location:
trunk/sources
Files:
9 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.cs

    r4142 r4623  
    332332    }
    333333    #endregion
    334     #region chart events
     334
     335    #region Chart Events
    335336    private void chart_MouseDown(object sender, MouseEventArgs e) {
    336337      HitTestResult result = chart.HitTest(e.X, e.Y);

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

    r4065 r4623  
    112112  <ItemGroup>
    113113    <None Include="HeuristicLabAnalysisViewsPlugin.cs.frame" />
     114    <Compile Include="AlleleFrequencyArrayView.cs">
     115      <SubType>UserControl</SubType>
     116    </Compile>
     117    <Compile Include="AlleleFrequencyArrayView.Designer.cs">
     118      <DependentUpon>AlleleFrequencyArrayView.cs</DependentUpon>
     119    </Compile>
    114120    <Compile Include="HeuristicLabAnalysisViewsPlugin.cs" />
     121    <Compile Include="AlleleFrequencyView.cs">
     122      <SubType>UserControl</SubType>
     123    </Compile>
     124    <Compile Include="AlleleFrequencyView.Designer.cs">
     125      <DependentUpon>AlleleFrequencyView.cs</DependentUpon>
     126    </Compile>
    115127    <Compile Include="Properties\AssemblyInfo.cs" />
    116128    <Compile Include="DataTableView.cs">

  • trunk/sources/HeuristicLab.Analysis.Views/3.3/HeuristicLabAnalysisViewsPlugin.cs.frame

    r4497 r4623  
    3333  [PluginDependency("HeuristicLab.Core", "3.3")]
    3434  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
     35  [PluginDependency("HeuristicLab.Data", "3.3")]
    3536  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    3637  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]

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

    r4065 r4623  
    114114    <Compile Include="BestScopeSolutionAnalyzer.cs" />
    115115    <Compile Include="BestQualityMemorizer.cs" />
     116    <Compile Include="Allele.cs" />
     117    <Compile Include="AlleleFrequency.cs" />
     118    <Compile Include="AlleleFrequencyArray.cs" />
    116119    <Compile Include="QualityAnalyzer.cs" />
    117120    <Compile Include="MinAverageMaxValueAnalyzer.cs" />
    … …  
    124127    <Compile Include="DataTable.cs" />
    125128    <Compile Include="DataTableValuesCollector.cs" />
     129    <Compile Include="AlleleFrequencyAnalyzer.cs" />
    126130    <Compile Include="ValueAnalyzer.cs" />
    127131  </ItemGroup>

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj

    r4477 r4623  
    107107  <ItemGroup>
    108108    <Compile Include="Analyzers\BestTSPSolutionAnalyzer.cs" />
     109    <Compile Include="Analyzers\TSPAlleleFrequencyAnalyzer.cs" />
    109110    <Compile Include="Evaluators\TSPEuclideanPathEvaluator.cs" />
    110111    <Compile Include="Evaluators\TSPGeoPathEvaluator.cs" />
    … …  
    135136  </ItemGroup>
    136137  <ItemGroup>
     138    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     139      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
     140      <Name>HeuristicLab.Analysis-3.3</Name>
     141    </ProjectReference>
    137142    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    138143      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLabProblemsTravelingSalesmanPlugin.cs.frame

    r4497 r4623  
    2828  [Plugin("HeuristicLab.Problems.TravelingSalesman", "3.3.1.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.TravelingSalesman-3.3.dll", PluginFileType.Assembly)]
     30  [PluginDependency("HeuristicLab.Analysis", "3.3")]
    3031  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3132  [PluginDependency("HeuristicLab.Common", "3.3")]

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

    r4419 r4623  
    128128      get { return operators.OfType<BestTSPSolutionAnalyzer>().FirstOrDefault(); }
    129129    }
     130    private TSPAlleleFrequencyAnalyzer TSPAlleleFrequencyAnalyzer {
     131      get { return operators.OfType<TSPAlleleFrequencyAnalyzer>().FirstOrDefault(); }
     132    }
    130133    #endregion
    131134
    … …  
    212215      ParameterizeSolutionCreator();
    213216      ParameterizeEvaluator();
    214       ParameterizeAnalyzer();
     217      ParameterizeAnalyzers();
    215218      ParameterizeOperators();
    216219      OnSolutionCreatorChanged();
    … …  
    218221    private void SolutionCreator_PermutationParameter_ActualNameChanged(object sender, EventArgs e) {
    219222      ParameterizeEvaluator();
    220       ParameterizeAnalyzer();
     223      ParameterizeAnalyzers();
    221224      ParameterizeOperators();
    222225    }
    … …  
    225228      ParameterizeEvaluator();
    226229      UpdateMoveEvaluators();
    227       ParameterizeAnalyzer();
     230      ParameterizeAnalyzers();
    228231      ClearDistanceMatrix();
    229232      OnEvaluatorChanged();
    230233    }
    231234    private void Evaluator_QualityParameter_ActualNameChanged(object sender, EventArgs e) {
    232       ParameterizeAnalyzer();
     235      ParameterizeAnalyzers();
    233236    }
    234237    private void MoveGenerator_InversionMoveParameter_ActualNameChanged(object sender, EventArgs e) {
    … …  
    269272      operators = new List<IOperator>();
    270273      operators.Add(new BestTSPSolutionAnalyzer());
    271       ParameterizeAnalyzer();
     274      operators.Add(new TSPAlleleFrequencyAnalyzer());
     275      ParameterizeAnalyzers();
    272276      operators.AddRange(ApplicationManager.Manager.GetInstances<IPermutationOperator>().Cast<IOperator>());
    273277      ParameterizeOperators();
    … …  
    310314      }
    311315    }
    312     private void ParameterizeAnalyzer() {
     316    private void ParameterizeAnalyzers() {
    313317      BestTSPSolutionAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
    314318      BestTSPSolutionAnalyzer.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
    … …  
    318322      BestTSPSolutionAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
    319323      BestTSPSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
     324
     325      TSPAlleleFrequencyAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
     326      TSPAlleleFrequencyAnalyzer.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
     327      TSPAlleleFrequencyAnalyzer.SolutionParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
     328      TSPAlleleFrequencyAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
     329      TSPAlleleFrequencyAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
     330      TSPAlleleFrequencyAnalyzer.ResultsParameter.ActualName = "Results";
    320331    }
    321332    private void ParameterizeOperators() {
Note: See TracChangeset for help on using the changeset viewer.