- Timestamp:
- 09/14/12 18:58:15 (12 years ago)
- Location:
- branches/GP-MoveOperators
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/GP-MoveOperators
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/GP-MoveOperators/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs
r8206 r8660 473 473 private void AddOptimizer(IOptimizer optimizer, Experiment experiment) { 474 474 if (createBatchRun) { 475 var batchRun = new BatchRun(); 476 batchRun.Repetitions = repetitions; 477 batchRun.Optimizer = optimizer; 475 var batchRun = new BatchRun(repetitions.ToString() + "x " + optimizer.Name) { 476 Repetitions = repetitions, 477 Optimizer = optimizer 478 }; 478 479 experiment.Optimizers.Add(batchRun); 479 480 } else { … … 708 709 709 710 int counter = 0, totalVariations = GetNumberOfVariations(); 710 if (instances.Count == 0) { 711 int totalInstances = instances.Values.SelectMany(x => x).Count(); 712 if (totalInstances == 0) { 711 713 try { 712 714 AddParameterVariations(Optimizer, localExperiment, ref counter, totalVariations); … … 729 731 if (!failed) { 730 732 try { 731 AddParameterVariations(algorithm, localExperiment, ref counter, totalVariations); 733 if (totalInstances > 1 && totalVariations / totalInstances > 1) { 734 var experiment = new Experiment(descriptor.Name); 735 AddParameterVariations(algorithm, experiment, ref counter, totalVariations); 736 localExperiment.Optimizers.Add(experiment); 737 } else { 738 AddParameterVariations(algorithm, localExperiment, ref counter, totalVariations); 739 } 732 740 } catch (OperationCanceledException) { 733 741 e.Cancel = true;
Note: See TracChangeset
for help on using the changeset viewer.