Changeset 11009 for branches/DataPreprocessing/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4
- Timestamp:
- 06/12/14 13:26:18 (10 years ago)
- Location:
- branches/DataPreprocessing
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DataPreprocessing
- Property svn:ignore
-
old new 8 8 FxCopResults.txt 9 9 Google.ProtocolBuffers-0.9.1.dll 10 Google.ProtocolBuffers-2.4.1.473.dll 10 11 HeuristicLab 3.3.5.1.ReSharper.user 11 12 HeuristicLab 3.3.6.0.ReSharper.user 12 13 HeuristicLab.4.5.resharper.user 13 14 HeuristicLab.ExtLibs.6.0.ReSharper.user 15 HeuristicLab.Scripting.Development 14 16 HeuristicLab.resharper.user 15 17 ProtoGen.exe … … 17 19 _ReSharper.HeuristicLab 18 20 _ReSharper.HeuristicLab 3.3 21 _ReSharper.HeuristicLab 3.3 Tests 19 22 _ReSharper.HeuristicLab.ExtLibs 20 23 bin 21 24 protoc.exe 22 _ReSharper.HeuristicLab 3.3 Tests23 Google.ProtocolBuffers-2.4.1.473.dll
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/DataPreprocessing/HeuristicLab.Tests
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Tests merged: 10578,10646,10652,10790,10895-10896,10983
- Property svn:mergeinfo changed
-
branches/DataPreprocessing/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeInterpreterTest.cs
r9956 r11009 22 22 using System; 23 23 using System.Collections.Generic; 24 using System.Diagnostics;25 24 using System.Globalization; 26 25 using System.Linq; 27 using System.Linq.Expressions;28 26 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding; 29 27 using HeuristicLab.Random; … … 319 317 Evaluate(interpreter, ds, "(and (log -1.0) 1.0)", 0, -1.0); // (and NaN 1.0) 320 318 321 322 319 // OR 323 320 Evaluate(interpreter, ds, "(or -1.0 -2.0)", 0, -1.0); … … 330 327 Evaluate(interpreter, ds, "(or (log -1.0))", 0, -1.0); // (or NaN) 331 328 Evaluate(interpreter, ds, "(or (log -1.0) 1.0)", 0, -1.0); // (or NaN 1.0) 329 330 // XOR 331 Evaluate(interpreter, ds, "(xor -1.0 -2.0)", 0, -1.0); 332 Evaluate(interpreter, ds, "(xor -1.0 2.0)", 0, 1.0); 333 Evaluate(interpreter, ds, "(xor 1.0 -2.0)", 0, 1.0); 334 Evaluate(interpreter, ds, "(xor 1.0 2.0)", 0, -1.0); 335 Evaluate(interpreter, ds, "(xor 0.0 0.0)", 0, -1.0); 336 Evaluate(interpreter, ds, "(xor -1.0 -2.0 -3.0)", 0, -1.0); 337 Evaluate(interpreter, ds, "(xor -1.0 -2.0 3.0)", 0, 1.0); 338 Evaluate(interpreter, ds, "(xor -1.0 2.0 3.0)", 0, -1.0); 339 Evaluate(interpreter, ds, "(xor 1.0 2.0 3.0)", 0, 1.0); 340 Evaluate(interpreter, ds, "(xor (log -1.0))", 0, -1.0); 341 Evaluate(interpreter, ds, "(xor (log -1.0) 1.0)", 0, 1.0); 332 342 333 343 // sin, cos, tan -
branches/DataPreprocessing/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicExpressionImporter.cs
r9785 r11009 70 70 {"OR", new Or()}, 71 71 {"NOT", new Not()}, 72 {"XOR", new Xor()}, 72 73 {"DIFF", new Derivative()}, 73 74 {"PROG", new ProgramRootSymbol()},
Note: See TracChangeset
for help on using the changeset viewer.