- Timestamp:
- 06/25/15 11:26:25 (9 years ago)
- Location:
- branches/HeuristicLab.DatasetRefactor/sources
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.DatasetRefactor/sources
- Property svn:mergeinfo changed
/trunk/sources merged: 12442-12443,12445,12455-12458,12461,12463-12465,12470-12476,12478-12482,12485,12488,12490-12494,12496-12497,12504 -
Property
svn:global-ignores
set to
*.nuget
packages
- Property svn:mergeinfo changed
-
branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Tests
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Tests merged: 12482,12488
- Property svn:mergeinfo changed
-
branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4/AllArchitectureAlteringOperatorsTest.cs
r12031 r12505 61 61 // manipulate 62 62 stopwatch.Start(); 63 var selectedTree = (ISymbolicExpressionTree)trees.S electRandom(random).Clone();63 var selectedTree = (ISymbolicExpressionTree)trees.SampleRandom(random).Clone(); 64 64 var oldTree = (ISymbolicExpressionTree)selectedTree.Clone(); 65 65 bool success = false; … … 83 83 SymbolicExpressionTree par1 = null; 84 84 do { 85 par0 = (SymbolicExpressionTree)trees.S electRandom(random).Clone();86 par1 = (SymbolicExpressionTree)trees.S electRandom(random).Clone();85 par0 = (SymbolicExpressionTree)trees.SampleRandom(random).Clone(); 86 par1 = (SymbolicExpressionTree)trees.SampleRandom(random).Clone(); 87 87 } while (par0.Length > MAX_TREE_LENGTH || par1.Length > MAX_TREE_LENGTH); 88 88 var newTree = SubtreeCrossover.Cross(random, par0, par1, 0.9, MAX_TREE_LENGTH, MAX_TREE_DEPTH); -
branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4/SubtreeCrossoverTest.cs
r12031 r12505 50 50 for (int gCount = 0; gCount < generations; gCount++) { 51 51 for (int i = 0; i < POPULATION_SIZE; i++) { 52 var par0 = (ISymbolicExpressionTree)trees.S electRandom(random).Clone();53 var par1 = (ISymbolicExpressionTree)trees.S electRandom(random).Clone();52 var par0 = (ISymbolicExpressionTree)trees.SampleRandom(random).Clone(); 53 var par1 = (ISymbolicExpressionTree)trees.SampleRandom(random).Clone(); 54 54 SubtreeCrossover.Cross(random, par0, par1, 0.9, 100, 10); 55 55 } -
branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionCrossoverTest.cs
r12031 r12505 125 125 stopwatch.Start(); 126 126 for (int i = 0; i != PopulationSize; ++i) { 127 var parent0 = (ISymbolicExpressionTree)trees.S electRandom(twister).Clone();127 var parent0 = (ISymbolicExpressionTree)trees.SampleRandom(twister).Clone(); 128 128 var scopeParent0 = new Scope(); 129 129 scopeParent0.Variables.Add(new Core.Variable(crossover.ParentsParameter.ActualName, parent0)); 130 130 context.Scope.SubScopes.Add(scopeParent0); 131 131 132 var parent1 = (ISymbolicExpressionTree)trees.S electRandom(twister).Clone();132 var parent1 = (ISymbolicExpressionTree)trees.SampleRandom(twister).Clone(); 133 133 var scopeParent1 = new Scope(); 134 134 scopeParent1.Variables.Add(new Core.Variable(crossover.ParentsParameter.ActualName, parent1)); -
branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Tests/HeuristicLab.Problems.VehicleRouting-3.4/VRPInstancesTest.cs
r12031 r12505 42 42 foreach (var provider in providers) { 43 43 IEnumerable<IDataDescriptor> instances = ((dynamic)provider).GetDataDescriptors(); 44 Assert.IsTrue(instances.Any(), "No instances could be found.");44 Assert.IsTrue(instances.Any(), string.Format("No instances could be found in {0}.", provider.Name)); 45 45 46 46 foreach (var instance in instances) {
Note: See TracChangeset
for help on using the changeset viewer.