Changeset 12832 for branches/HeuristicLab.Problems.GrammaticalOptimization/Evaluation

Timestamp:

08/03/15 00:03:18 (9 years ago)

Author:

aballeit

Message:

#2283 limit parallelism

Location:

branches/HeuristicLab.Problems.GrammaticalOptimization/Evaluation

Files:

• MainWindow.xaml (modified) (1 diff)
• MainWindow.xaml.cs (modified) (5 diffs)
• ViewModel/EvaluationViewModel.cs (modified) (1 diff)

branches/HeuristicLab.Problems.GrammaticalOptimization/Evaluation/MainWindow.xaml

@@ -73 +73 @@
                 <TextBlock Margin="2" Grid.Column="0" Grid.Row="1" VerticalAlignment="Center">MaxIterations:</TextBlock>
                 <TextBox Name="TextBoxMaxIterations" Margin="2" Grid.Column="1" Grid.Row="1" Width="100" VerticalAlignment="Center" TextAlignment="Right" Text="{Binding MaxIterations}"></TextBox>
+                <TextBlock Margin="2" Grid.Column="2" Grid.Row="1" VerticalAlignment="Center">MaxThreads:</TextBlock>
+                <TextBox Name="MaxThreads" Margin="2" Grid.Column="3" Grid.Row="1" Width="100" VerticalAlignment="Center" TextAlignment="Right" Text="{Binding MaxThreads}"></TextBox>
                 <TextBlock Margin="2" Grid.Column="2" Grid.Row="0" VerticalAlignment="Center">MaxLen:</TextBlock>
                 <TextBox Name="TextBoxMaxLen" Margin="2" Grid.Column="3" Grid.Row="0" Width="100" VerticalAlignment="Center" TextAlignment="Right" Text="{Binding MaxLen}"></TextBox>

branches/HeuristicLab.Problems.GrammaticalOptimization/Evaluation/MainWindow.xaml.cs

@@ -3 +3 @@
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Windows.Documents;
 using System.Xml.Serialization;
@@ -45 +46 @@
             vm.MaxIterations = 500000;
             vm.NrRuns = 20;
+            vm.MaxThreads = 5;
         }
 
@@ -126 +128 @@
                     //    File.WriteAllBytes(run.SvgFile, mctsSolver.GenerateSvg());
                     //}
+                    mctsSolver.FreeAll();
                 }
             }
@@ -183 +186 @@
             }
 
+
+
             for (int i = 0; i < vm.NrRuns; i++)
             {
@@ -218 +223 @@
 
                 vm.Runs.Add(run);
-
-                ThreadPool.QueueUserWorkItem(DoRun, run);
-            }
+            }
+            Task.Run(() =>
+                Parallel.For(0, vm.NrRuns, new ParallelOptions {MaxDegreeOfParallelism = vm.MaxThreads},
+                    i => DoRun(vm.Runs[i])));
         }
 

branches/HeuristicLab.Problems.GrammaticalOptimization/Evaluation/ViewModel/EvaluationViewModel.cs

@@ -107 +107 @@
                 this.maxIterations = value;
                 this.OnPropertyChanged("MaxIterations");
+            }
+        }
+
+        private int maxThreads;
+
+        public int MaxThreads
+        {
+            get { return this.maxThreads; }
+            set
+            {
+                this.maxThreads = value;
+                this.OnPropertyChanged("MaxThreads");
             }
         }