Context Navigation

HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

Timestamp:

04/01/15 17:43:13 (10 years ago)

Author:

mkommend

Message:

#2326: Merged r12103, 12108, r12110 and r12122 into stable.

Location:

stable

Files:

stable
- Property svn:mergeinfo changed
  /trunk/sources merged: 12103,12108,12110,12122

Property svn:mergeinfo changed

/branches/SymbolicExpressionTreeDiversityAnalyzers/HeuristicLab.Problems.DataAnalysis.Symbolic (added)	merged: 12028-12030,12049,12055,12064,12068,12075,12086
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic	merged: 12103,12108,12122

-                      r11947
+                      r12281
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Analyzers\SymbolicDataAnalysisBottomUpDiversityAnalyzer.cs" />
     <Compile Include="Analyzers\SymbolicDataAnalysisSingleObjectivePruningAnalyzer.cs" />
     <Compile Include="Analyzers\SymbolicDataAnalysisSingleObjectiveValidationParetoBestSolutionAnalyzer.cs" />
 …
     <Compile Include="TreeMatching\SymbolicExpressionTreeNodeComparer.cs" />
     <Compile Include="TreeMatching\SymbolicExpressionTreeNodeEqualityComparer.cs" />
+    <Compile Include="TreeMatching\SymbolicExpressionTreePhenotypicSimilarityCalculator.cs" />
     <None Include="HeuristicLab.snk" />
     <None Include="Plugin.cs.frame" />

Note: See TracChangeset for help on using the changeset viewer.