Changeset 11232

Timestamp:

07/29/14 20:03:15 (9 years ago)

Author:

bburlacu

Message:

#1772: Merged latest changes (directed graph and bottom up distance calculator) from the BottomUpDistance branch.

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic

Files:

• . (modified) (1 prop)
• 3.4/Analyzers/SymbolicDataAnalysisInternalDiversityAnalyzer.cs (copied) (copied from branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisInternalDiversityAnalyzer.cs)
• 3.4/DirectedGraph (copied) (copied from branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph)
• 3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (6 diffs)
• 3.4/Interpreter/SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs (modified) (1 diff)
• 3.4/Matching/SymbolicExpressionTreeMaxCommonSequenceCalculator.cs (modified) (1 diff, 1 prop)
• 3.4/SimilarityCalculators (copied) (copied from branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SimilarityCalculators)
• 3.4/SymbolicDataAnalysisProblem.cs (modified) (4 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

@@ -173 +173 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Analyzers\SymbolicDataAnalysisInternalDiversityAnalyzer.cs" />
     <Compile Include="Analyzers\SymbolicDataAnalysisSingleObjectivePruningAnalyzer.cs" />
     <Compile Include="Analyzers\SymbolicDataAnalysisGenealogyAnalyzer.cs" />
@@ -189 +190 @@
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="DirectedGraph\Arc.cs" />
+    <Compile Include="DirectedGraph\DirectedGraph.cs" />
+    <Compile Include="DirectedGraph\Interfaces\IArc.cs" />
+    <Compile Include="DirectedGraph\Interfaces\IDirectedGraph.cs" />
+    <Compile Include="DirectedGraph\Interfaces\IVertex.cs" />
+    <Compile Include="DirectedGraph\Vertex.cs" />
     <Compile Include="Interfaces\IModelBacktransformator.cs" />
-    <Compile Include="Interfaces\IDistanceCalculator.cs" />    <Compile Include="Matching\SymbolicExpressionTreeCanonicalSorter.cs" />
+    <Compile Include="Interfaces\IDistanceCalculator.cs" />
+    <Compile Include="Matching\SymbolicExpressionTreeCanonicalSorter.cs" />
     <Compile Include="Matching\SymbolicExpressionTreeEqualityComparer.cs" />
     <Compile Include="Matching\SymbolicExpressionTreeMatching.cs" />
@@ -196 +204 @@
     <Compile Include="Matching\SymbolicExpressionTreeNodeComparer.cs" />
     <Compile Include="Matching\SymbolicExpressionTreeNodeSimilarityComparer.cs" />
-
-    <Compile Include="SymbolicExpressionTreeBacktransformator.cs" />    <Compile Include="SlidingWindow\GenerationalSlidingWindowAnalyzer.cs" />
+    <Compile Include="SimilarityCalculators\BottomUpSimilarityCalculator.cs" />
+    <Compile Include="SimilarityCalculators\MaxCommonSubtreeSimilarityCalculator.cs" />
+    <Compile Include="SymbolicExpressionTreeBacktransformator.cs" />
+    <Compile Include="SlidingWindow\GenerationalSlidingWindowAnalyzer.cs" />
     <Compile Include="SlidingWindow\OffspringSelectionSlidingWindowAnalyzer.cs" />
     <Compile Include="SlidingWindow\SlidingWindowAnalyzer.cs" />
@@ -204 +214 @@
     <Compile Include="SlidingWindow\SlidingWindowVisualizer.cs" />
     <Compile Include="SymbolGraph\FPGraph.cs" />
-    <Compile Include="SymbolGraph\SymbolGraph.cs" />    <Compile Include="SymbolicDataAnalysisExpressionPruningOperator.cs" />
+    <Compile Include="SymbolGraph\SymbolGraph.cs" />
+    <Compile Include="SymbolicDataAnalysisExpressionPruningOperator.cs" />
     <Compile Include="SymbolicDataAnalysisExpressionTreeSimilarityCalculator.cs" />
     <Compile Include="SymbolicDataAnalysisSolutionPruningOptimizer.cs" />
@@ -302 +313 @@
     <Compile Include="Symbols\VariableConditionTreeNode.cs" />
     <Compile Include="Symbols\VariableTreeNode.cs" />
-
-    <Compile Include="TransformationToSymbolicTreeMapper.cs" />    <Compile Include="Tracking\FragmentGraph\FragmentGraph.cs" />
+    <Compile Include="TransformationToSymbolicTreeMapper.cs" />
+    <Compile Include="Tracking\FragmentGraph\FragmentGraph.cs" />
     <Compile Include="Tracking\SymbolicDataAnalysisExpressionAfterCrossoverOperator.cs" />
     <Compile Include="Tracking\SymbolicDataAnalysisExpressionBeforeCrossoverOperator.cs" />
@@ -309 +320 @@
     <Compile Include="Tracking\SymbolicDataAnalysisExpressionBeforeManipulatorOperator.cs" />
     <Compile Include="Tracking\SymbolicDataAnalysisExpressionTracing.cs" />
-    <Compile Include="TreeDistance\BottomUpDistanceCalculator.cs" />
-    <Compile Include="TreeDistance\IsomorphicTreeDistance.cs" />    <None Include="HeuristicLab.snk" />
+    <None Include="HeuristicLab.snk" />
     <None Include="Plugin.cs.frame" />
     <None Include="Properties\AssemblyInfo.cs.frame" />

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs

@@ -352 +352 @@
     }
 
-    private static void PrepareInstructions(LinearInstruction[] code, Dataset dataset) {
+    public static void PrepareInstructions(LinearInstruction[] code, Dataset dataset) {
       for (int i = 0; i != code.Length; ++i) {
         var instr = code[i];

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Matching/SymbolicExpressionTreeMaxCommonSequenceCalculator.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 
-namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Matching {
+namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   public class MaxCommonSequenceCalculator<T, TComp>
     where T : class

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

@@ -23 +23 @@
 using System.Drawing;
 using System.Linq;
+using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Common.Resources;
@@ -29 +30 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Optimization;
+using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.Problems.DataAnalysis.Symbolic.Analyzers;
 using HeuristicLab.Problems.Instances;
-
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
@@ -233 +233 @@
       Operators.Add(new MinAverageMaxSymbolicExpressionTreeLengthAnalyzer());
       Operators.Add(new SymbolicExpressionTreeLengthAnalyzer());
-      Operators.Add(new SymbolicDataAnalysisGenealogyAnalyzer());
+      Operators.Add(new SingleObjectivePopulationDiversityAnalyzer());
+      Operators.Add(new BottomUpSimilarityCalculator());
       ParameterizeOperators();
     }
@@ -353 +354 @@
         op.EvaluatorParameter.ActualName = EvaluatorParameter.Name;
       }
-      // add tracking analyzer
-      foreach (var op in operators.OfType<SymbolicDataAnalysisGenealogyAnalyzer>()) {
-        op.BeforeCrossoverOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionBeforeCrossoverOperator();
-        op.AfterCrossoverOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionAfterCrossoverOperator();
-        op.BeforeManipulatorOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionBeforeManipulatorOperator();
-        op.AfterManipulatorOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionAfterManipulatorOperator();
-        // get crossover parameter names
-        var crossover = operators.OfType<ISymbolicExpressionTreeCrossover>().FirstOrDefault();
-        if (crossover != null) {
-          op.BeforeCrossoverOperator.ParentsParameter.ActualName = crossover.ParentsParameter.Name;
-          op.AfterCrossoverOperator.ParentsParameter.ActualName = crossover.ParentsParameter.Name;
-          op.BeforeCrossoverOperator.ChildParameter.ActualName = crossover.ChildParameter.Name;
-          op.AfterCrossoverOperator.ChildParameter.ActualName = crossover.ChildParameter.Name;
-        }
-        // get manipulator parameter names
-        var manipulator = operators.OfType<ISymbolicExpressionTreeManipulator>().FirstOrDefault();
-        if (manipulator != null) {
-          op.BeforeManipulatorOperator.ChildParameter.ActualName = manipulator.SymbolicExpressionTreeParameter.Name;
-          op.AfterManipulatorOperator.ChildParameter.ActualName = manipulator.SymbolicExpressionTreeParameter.Name;
-        }
-        var creator = operators.OfType<ISymbolicExpressionTreeCreator>().FirstOrDefault();
-        if (creator != null) {
-          op.PopulationParameter.ActualName = creator.SymbolicExpressionTreeParameter.ActualName;
-        }
+      foreach (var op in operators.OfType<SingleObjectiveSolutionSimilarityCalculator>()) {
+        op.QualityVariableName = "Quality";
+        op.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
+      }
+      foreach (var op in operators.OfType<SingleObjectivePopulationDiversityAnalyzer>()) {
+        op.SimilarityCalculator = operators.OfType<BottomUpSimilarityCalculator>().SingleOrDefault();
       }
     }