Changeset 11947 for stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4
- Timestamp:
- 02/06/15 14:21:26 (10 years ago)
- Location:
- stable
- Files:
-
- 1 deleted
- 6 edited
- 3 copied
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 11915-11916,11918,11921,11934
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj
r11943 r11947 135 135 <Compile Include="Importer\Token.cs" /> 136 136 <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" />143 137 <Compile Include="SymbolicExpressionTreeBacktransformator.cs" /> 144 138 <Compile Include="SymbolicDataAnalysisExpressionPruningOperator.cs" /> … … 239 233 <Compile Include="Symbols\VariableTreeNode.cs" /> 240 234 <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" /> 241 242 <None Include="HeuristicLab.snk" /> 242 243 <None Include="Plugin.cs.frame" /> -
stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs
r11170 r11947 352 352 } 353 353 354 p rivatestatic void PrepareInstructions(LinearInstruction[] code, Dataset dataset) {354 public static void PrepareInstructions(LinearInstruction[] code, Dataset dataset) { 355 355 for (int i = 0; i != code.Length; ++i) { 356 356 var instr = code[i]; -
stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs
r11170 r11947 23 23 using System.Drawing; 24 24 using System.Linq; 25 using HeuristicLab.Analysis; 25 26 using HeuristicLab.Common; 26 27 using HeuristicLab.Common.Resources; … … 29 30 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding; 30 31 using HeuristicLab.Optimization; 32 using HeuristicLab.Optimization.Operators; 31 33 using HeuristicLab.Parameters; 32 34 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; … … 231 233 Operators.Add(new MinAverageMaxSymbolicExpressionTreeLengthAnalyzer()); 232 234 Operators.Add(new SymbolicExpressionTreeLengthAnalyzer()); 235 Operators.Add(new SingleObjectivePopulationDiversityAnalyzer()); 233 236 ParameterizeOperators(); 234 237 } … … 350 353 op.EvaluatorParameter.ActualName = EvaluatorParameter.Name; 351 354 } 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 } 352 362 } 353 363 -
stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeBottomUpSimilarityCalculator.cs
r11918 r11947 42 42 43 43 [StorableConstructor] 44 pr ivateSymbolicExpressionTreeBottomUpSimilarityCalculator(bool deserializing)44 protected SymbolicExpressionTreeBottomUpSimilarityCalculator(bool deserializing) 45 45 : base(deserializing) { 46 46 }
Note: See TracChangeset
for help on using the changeset viewer.