- Timestamp:
- 12/16/21 16:45:18 (3 years ago)
- Location:
- branches/3136_Structural_GP
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3136_Structural_GP
- Property svn:mergeinfo changed
/branches/3140_NumberSymbol merged: 18144-18145,18147 /trunk merged: 18148
- Property svn:mergeinfo changed
-
branches/3136_Structural_GP/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding
- Property svn:mergeinfo changed
/branches/3140_NumberSymbol/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding merged: 18145 /trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding merged: 18148
- Property svn:mergeinfo changed
-
branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
/branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic merged: 18144-18145,18147 /trunk/HeuristicLab.Problems.DataAnalysis.Symbolic merged: 18148
- Property svn:mergeinfo changed
-
branches/3136_Structural_GP/HeuristicLab.Tests
- Property svn:mergeinfo changed
/branches/3140_NumberSymbol/HeuristicLab.Tests merged: 18145,18147 /trunk/HeuristicLab.Tests merged: 18148
- Property svn:mergeinfo changed
-
branches/3136_Structural_GP/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeSimplifierTest.cs
r18146 r18150 287 287 var formatter = new SymbolicExpressionTreeStringFormatter(); 288 288 var importer = new SymbolicExpressionImporter(); 289 var actualTree = TreeSimplifier.Simplify(importer.Import(original)); 289 var originalTree = importer.Import(original); 290 originalTree = ConstantsToNumberConverter.Convert(originalTree); 291 var actualTree = TreeSimplifier.Simplify(originalTree); 290 292 var expectedTree = importer.Import(expected); 291 293 Assert.AreEqual(formatter.Format(expectedTree), formatter.Format(actualTree)); -
branches/3136_Structural_GP/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicExpressionTreeBottomUpSimilarityCalculatorTest.cs
r18146 r18150 82 82 var sw = new Stopwatch(); 83 83 84 var similarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator { MatchVariableWeights = false, Match ParameterValues = false };84 var similarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator { MatchVariableWeights = false, MatchNumericValues = false }; 85 85 86 86 sw.Start(); … … 117 117 var trees = Util.CreateRandomTrees(twister, ds, grammar, N, 100); 118 118 119 var similarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator { Match ParameterValues = strict, MatchVariableWeights = strict };119 var similarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator { MatchNumericValues = strict, MatchVariableWeights = strict }; 120 120 var bottomUpSimilarity = 0d; 121 121 for (int i = 0; i < trees.Length - 1; ++i) {
Note: See TracChangeset
for help on using the changeset viewer.