Changeset 17140


Ignore:
Timestamp:
07/17/19 21:57:59 (5 months ago)
Author:
abeham
Message:

#2991: merged to stable

  • fixed merge conflict (order of items added to csproj, first DiversitySelector.cs, then SymbolicDataAnalysisExpressionTreeAverageSimilarityCalculator.cs
Location:
stable
Files:
5 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

    r17105 r17140  
    170170    <Compile Include="Interpreter\SymbolicDataAnalysisExpressionTreeBatchInterpreter.cs" />
    171171    <Compile Include="Interpreter\SymbolicDataAnalysisExpressionTreeNativeInterpreter.cs" />
     172    <Compile Include="Selectors\DiversitySelector.cs" />
    172173    <Compile Include="SymbolicDataAnalysisExpressionTreeAverageSimilarityCalculator.cs" />
    173174    <Compile Include="SymbolicDataAnalysisExpressionTreeSimplificationOperator.cs" />
     
    402403      <Private>False</Private>
    403404    </ProjectReference>
     405    <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj">
     406      <Project>{2C36CD4F-E5F5-43A4-801A-201EA895FE17}</Project>
     407      <Name>HeuristicLab.Selection-3.3</Name>
     408    </ProjectReference>
    404409  </ItemGroup>
    405410  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Plugin.cs.frame

    r17105 r17140  
    4646  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    4747  [PluginDependency("HeuristicLab.Random", "3.3")]
     48  [PluginDependency("HeuristicLab.Selection", "3.3")]
    4849  public class HeuristicLabProblemsDataAnalysisSymbolicPlugin : PluginBase {
    4950  }
  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Selectors/DiversitySelector.cs

    r16623 r17140  
    100100    #region Events
    101101    private void RegisterParameterEventHandlers() {
    102       SelectorParameter.ValueChanged += new EventHandler(SelectorParameter_ValueChanged);
    103       CopySelected.ValueChanged += new EventHandler(CopySelected_ValueChanged);
     102      SelectorParameter.ValueChanged += SelectorParameter_ValueChanged;
     103      CopySelectedParameter.ValueChanged += CopySelectedParameter_ValueChanged;
     104      CopySelected.ValueChanged += CopySelected_ValueChanged;
     105    }
     106
     107    private void CopySelectedParameter_ValueChanged(object sender, EventArgs e) {
     108      if (CopySelected.Value != true) {
     109        CopySelected.Value = true;
     110      }
     111      CopySelected.ValueChanged += CopySelected_ValueChanged;
    104112    }
    105113
Note: See TracChangeset for help on using the changeset viewer.