Changeset 11926


Ignore:
Timestamp:
02/05/15 23:16:30 (7 years ago)
Author:
bburlacu
Message:

#1772: Merged trunk changes.

Location:
branches/HeuristicLab.EvolutionTracking
Files:
1 deleted
5 edited
2 copied

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic

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

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionExcelFormatter.cs

    r11638 r11926  
    215215        double threshold = variableConditionTreeNode.Threshold;
    216216        double slope = variableConditionTreeNode.Slope;
    217         string p = "(1 / (1 + EXP(-" + slope.ToString(CultureInfo.InvariantCulture) + "* (" + GetColumnToVariableName(variableConditionTreeNode.VariableName) + "-" + threshold.ToString(CultureInfo.InvariantCulture) + "))))";
    218         stringBuilder.Append("INT((");
     217        string p = "(1 / (1 + EXP(-" + slope.ToString(CultureInfo.InvariantCulture) + " * (" + GetColumnToVariableName(variableConditionTreeNode.VariableName) + "-" + threshold.ToString(CultureInfo.InvariantCulture) + "))))";
     218        stringBuilder.Append("((");
    219219        stringBuilder.Append(FormatRecursively(node.GetSubtree(0)));
    220220        stringBuilder.Append("*");
  • branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

    r11925 r11926  
    204204    <Compile Include="Importer\Token.cs" />
    205205    <Compile Include="Interfaces\IModelBacktransformator.cs" />
    206     <Compile Include="Interfaces\ISymbolicDataAnalysisExpressionSimilarityCalculator.cs" />
    207     <Compile Include="Matching\SymbolicExpressionTreeCanonicalSorter.cs" />
    208     <Compile Include="Matching\SymbolicExpressionTreeEqualityComparer.cs" />
    209     <Compile Include="Matching\SymbolicExpressionTreeMatching.cs" />
    210     <Compile Include="Matching\SymbolicExpressionTreeMaxCommonSequenceCalculator.cs" />
    211     <Compile Include="Matching\SymbolicExpressionTreeNodeComparer.cs" />
    212     <Compile Include="Matching\SymbolicExpressionTreeNodeSimilarityComparer.cs" />
    213206    <Compile Include="SimilarityCalculators\BottomUpSimilarityCalculator.cs" />
    214207    <Compile Include="SimilarityCalculators\MaxCommonSubtreeSimilarityCalculator.cs" />
     
    321314    <Compile Include="Tracking\TraceCalculator.cs" />
    322315    <Compile Include="TransformationToSymbolicTreeMapper.cs" />
    323     <Compile Include="Tracking\SymbolicDataAnalysisExpressionAfterCrossoverOperator.cs" />
    324     <Compile Include="Tracking\SymbolicDataAnalysisExpressionBeforeCrossoverOperator.cs" />
    325     <Compile Include="Tracking\SymbolicDataAnalysisExpressionAfterManipulatorOperator.cs" />
    326     <Compile Include="Tracking\SymbolicDataAnalysisExpressionBeforeManipulatorOperator.cs" />
     316    <Compile Include="TreeMatching\SymbolicExpressionTreeBottomUpSimilarityCalculator.cs" />
     317    <Compile Include="TreeMatching\SymbolicExpressionTreeCanonicalSorter.cs" />
     318    <Compile Include="TreeMatching\SymbolicExpressionTreeEqualityComparer.cs" />
     319    <Compile Include="TreeMatching\SymbolicExpressionTreeMatching.cs" />
     320    <Compile Include="TreeMatching\SymbolicExpressionTreeMaxCommonSubtreeSimilarityCalculator.cs" />
     321    <Compile Include="TreeMatching\SymbolicExpressionTreeNodeComparer.cs" />
     322    <Compile Include="TreeMatching\SymbolicExpressionTreeNodeEqualityComparer.cs" />
    327323    <None Include="HeuristicLab.snk" />
    328324    <None Include="Plugin.cs.frame" />
  • branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

    r11291 r11926  
    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;
     
    232234      Operators.Add(new MinAverageMaxSymbolicExpressionTreeLengthAnalyzer());
    233235      Operators.Add(new SymbolicExpressionTreeLengthAnalyzer());
    234       Operators.Add(new SymbolicDataAnalysisPhenotypicDiversityAnalyzer());
    235       Operators.Add(new SymbolicDataAnalysisBottomUpDiversityAnalyzer());
    236       Operators.Add(new SymbolicDataAnalysisGenealogyAnalyzer());
     236      Operators.Add(new SingleObjectivePopulationDiversityAnalyzer());
    237237      ParameterizeOperators();
    238238    }
     
    354354        op.EvaluatorParameter.ActualName = EvaluatorParameter.Name;
    355355      }
    356       // add tracking analyzer
    357       foreach (var op in operators.OfType<SymbolicDataAnalysisGenealogyAnalyzer>()) {
    358         op.BeforeCrossoverOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionBeforeCrossoverOperator();
    359         op.AfterCrossoverOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionAfterCrossoverOperator();
    360         op.BeforeManipulatorOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionBeforeManipulatorOperator();
    361         op.AfterManipulatorOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionAfterManipulatorOperator();
    362         // get crossover parameter names
    363         var crossover = operators.OfType<ISymbolicExpressionTreeCrossover>().FirstOrDefault();
    364         if (crossover != null) {
    365           op.BeforeCrossoverOperator.ParentsParameter.ActualName = crossover.ParentsParameter.Name;
    366           op.AfterCrossoverOperator.ParentsParameter.ActualName = crossover.ParentsParameter.Name;
    367           op.BeforeCrossoverOperator.ChildParameter.ActualName = crossover.ChildParameter.Name;
    368           op.AfterCrossoverOperator.ChildParameter.ActualName = crossover.ChildParameter.Name;
    369         }
    370         // get manipulator parameter names
    371         var manipulator = operators.OfType<ISymbolicExpressionTreeManipulator>().FirstOrDefault();
    372         if (manipulator != null) {
    373           op.BeforeManipulatorOperator.ChildParameter.ActualName = manipulator.SymbolicExpressionTreeParameter.Name;
    374           op.AfterManipulatorOperator.ChildParameter.ActualName = manipulator.SymbolicExpressionTreeParameter.Name;
    375         }
    376         var creator = operators.OfType<ISymbolicExpressionTreeCreator>().FirstOrDefault();
    377         if (creator != null) {
    378           op.PopulationParameter.ActualName = creator.SymbolicExpressionTreeParameter.ActualName;
    379         }
     356      foreach (var op in operators.OfType<SingleObjectiveSolutionSimilarityCalculator>()) {
     357        op.QualityVariableName = "Quality";
     358        op.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
     359      }
     360      foreach (var op in operators.OfType<SingleObjectivePopulationDiversityAnalyzer>()) {
     361        op.SimilarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator();
    380362      }
    381363    }
Note: See TracChangeset for help on using the changeset viewer.