- Timestamp:
- 04/16/13 13:13:41 (11 years ago)
- Location:
- branches/OaaS
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/OaaS
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll 23 24 packages
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs
r8188 r9363 30 30 using HeuristicLab.Core; 31 31 using HeuristicLab.Data; 32 using HeuristicLab.MainForm.WindowsForms; 32 33 using HeuristicLab.Optimization; 33 34 using HeuristicLab.Parameters; … … 473 474 private void AddOptimizer(IOptimizer optimizer, Experiment experiment) { 474 475 if (createBatchRun) { 475 var batchRun = new BatchRun(); 476 batchRun.Repetitions = repetitions; 477 batchRun.Optimizer = optimizer; 476 var batchRun = new BatchRun(repetitions.ToString() + "x " + optimizer.Name) { 477 Repetitions = repetitions, 478 Optimizer = optimizer 479 }; 478 480 experiment.Optimizers.Add(batchRun); 479 481 } else { … … 708 710 709 711 int counter = 0, totalVariations = GetNumberOfVariations(); 710 if (instances.Count == 0) { 712 int totalInstances = instances.Values.SelectMany(x => x).Count(); 713 if (totalInstances == 0) { 711 714 try { 712 715 AddParameterVariations(Optimizer, localExperiment, ref counter, totalVariations); … … 729 732 if (!failed) { 730 733 try { 731 AddParameterVariations(algorithm, localExperiment, ref counter, totalVariations); 734 if (totalInstances > 1 && totalVariations / totalInstances > 1) { 735 var experiment = new Experiment(descriptor.Name); 736 AddParameterVariations(algorithm, experiment, ref counter, totalVariations); 737 localExperiment.Optimizers.Add(experiment); 738 } else { 739 AddParameterVariations(algorithm, localExperiment, ref counter, totalVariations); 740 } 732 741 } catch (OperationCanceledException) { 733 742 e.Cancel = true;
Note: See TracChangeset
for help on using the changeset viewer.