Changeset 11915


Ignore:
Timestamp:
02/05/15 16:35:21 (8 years ago)
Author:
mkommend
Message:

#2215: Merged changes in bottom up similartiy calculator branch in the trunk.

Location:
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic
Files:
1 deleted
4 edited
3 copied

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

    r11623 r11915  
    135135    <Compile Include="Importer\Token.cs" />
    136136    <Compile Include="Interfaces\IModelBacktransformator.cs" />
    137     <Compile Include="Matching\SymbolicExpressionTreeCanonicalSorter.cs" />
    138     <Compile Include="Matching\SymbolicExpressionTreeEqualityComparer.cs" />
    139     <Compile Include="Matching\SymbolicExpressionTreeMatching.cs" />
    140     <Compile Include="Matching\SymbolicExpressionTreeMaxCommonSequenceCalculator.cs" />
    141     <Compile Include="Matching\SymbolicExpressionTreeNodeComparer.cs" />
    142     <Compile Include="Matching\SymbolicExpressionTreeNodeSimilarityComparer.cs" />
    143137    <Compile Include="SymbolicExpressionTreeBacktransformator.cs" />
    144138    <Compile Include="SymbolicDataAnalysisExpressionPruningOperator.cs" />
     
    239233    <Compile Include="Symbols\VariableTreeNode.cs" />
    240234    <Compile Include="TransformationToSymbolicTreeMapper.cs" />
     235    <Compile Include="TreeMatching\SymbolicExpressionTreeBottomUpSimilarityCalculator.cs" />
     236    <Compile Include="TreeMatching\SymbolicExpressionTreeCanonicalSorter.cs" />
     237    <Compile Include="TreeMatching\SymbolicExpressionTreeEqualityComparer.cs" />
     238    <Compile Include="TreeMatching\SymbolicExpressionTreeMatching.cs" />
     239    <Compile Include="TreeMatching\SymbolicExpressionTreeMaxCommonSubtreeSimilarityCalculator.cs" />
     240    <Compile Include="TreeMatching\SymbolicExpressionTreeNodeComparer.cs" />
     241    <Compile Include="TreeMatching\SymbolicExpressionTreeNodeEqualityComparer.cs" />
    241242    <None Include="HeuristicLab.snk" />
    242243    <None Include="Plugin.cs.frame" />
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs

    r11171 r11915  
    352352    }
    353353
    354     private static void PrepareInstructions(LinearInstruction[] code, Dataset dataset) {
     354    public static void PrepareInstructions(LinearInstruction[] code, Dataset dataset) {
    355355      for (int i = 0; i != code.Length; ++i) {
    356356        var instr = code[i];
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

    r11171 r11915  
    2323using System.Drawing;
    2424using System.Linq;
     25using HeuristicLab.Analysis;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Common.Resources;
     
    2930using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    3031using HeuristicLab.Optimization;
     32using HeuristicLab.Optimization.Operators;
    3133using HeuristicLab.Parameters;
    3234using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    231233      Operators.Add(new MinAverageMaxSymbolicExpressionTreeLengthAnalyzer());
    232234      Operators.Add(new SymbolicExpressionTreeLengthAnalyzer());
     235      Operators.Add(new SingleObjectivePopulationDiversityAnalyzer());
    233236      ParameterizeOperators();
    234237    }
     
    350353        op.EvaluatorParameter.ActualName = EvaluatorParameter.Name;
    351354      }
     355      foreach (var op in operators.OfType<SingleObjectiveSolutionSimilarityCalculator>()) {
     356        op.QualityVariableName = "Quality";
     357        op.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
     358      }
     359      foreach (var op in operators.OfType<SingleObjectivePopulationDiversityAnalyzer>()) {
     360        op.SimilarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator();
     361      }
    352362    }
    353363
Note: See TracChangeset for help on using the changeset viewer.