Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/20/15 16:45:08 (9 years ago)
Author:
aballeit
Message:

#2283 stable GUI; ThreadPool for runs; improved TreeAnalysis

Location:
branches/HeuristicLab.Problems.GrammaticalOptimization
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Problems.GrammaticalOptimization

    • Property svn:ignore

      •  

        old new  
        33TestResults
        44_ReSharper.GrammaticalOptimization
         5EvaluationResults

  • branches/HeuristicLab.Problems.GrammaticalOptimization/Evaluation

    • Property svn:ignore set to
      bin
      obj

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

    r12762 r12781  
    3939                          DisplayMemberPath="Name"
    4040                          SelectedValue="{Binding SelectedAlgorithm}"
    41                           Width="200"
     41                          Width="280"
    4242                          SelectionChanged="ComboBoxAlgorithms_OnSelectionChanged"></ComboBox>
    4343                <ComboBox Name="ComboBoxPolicies"
    … …  
    7575                <TextBlock Margin="2" Grid.Column="2" Grid.Row="0" VerticalAlignment="Center">MaxLen:</TextBlock>
    7676                <TextBox Name="TextBoxMaxLen" Margin="2" Grid.Column="3" Grid.Row="0" Width="100" VerticalAlignment="Center" TextAlignment="Right" Text="{Binding MaxLen}"></TextBox>
    77                 <TextBlock Margin="2" Grid.Column="2" Grid.Row="1" VerticalAlignment="Center">Threads:</TextBlock>
    78                 <TextBox Name="TextBoxThreads" Margin="2" Grid.Column="3" Grid.Row="1" Width="100" VerticalAlignment="Center" TextAlignment="Right" Text="{Binding Threads}"></TextBox>
    7977            </Grid>
    8078        </GroupBox>
    … …  
    125123                                        <ColumnDefinition Width="*"></ColumnDefinition>
    126124                                    </Grid.ColumnDefinitions>
    127                                     <Grid Name="MyGrid" Grid.Column="0" DataContext="{Binding CurrentRun.TreeInfos}">
     125                                    <Grid Name="MyGrid" Grid.Column="0" DataContext="{Binding SelectedRun.TreeInfos}">
    128126                                        <Grid.RowDefinitions>
    129                                             <RowDefinition Height="Auto"></RowDefinition>
    130                                             <RowDefinition Height="Auto"></RowDefinition>
    131127                                            <RowDefinition Height="Auto"></RowDefinition>
    132128                                            <RowDefinition Height="Auto"></RowDefinition>
    … …  
    148144                                        <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding LeaveNodes}" TextAlignment="Right"></TextBlock>
    149145                                        <TextBlock Grid.Row="4" Grid.Column="0" Text="DeepestLevel:"></TextBlock>
    150                                         <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding DeepestLevel}" TextAlignment="Right"></TextBlock>
    151                                         <TextBlock Grid.Row="5" Grid.Column="0" Text="AverageLevel:"></TextBlock>
    152                                         <TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding AverageLevel}" TextAlignment="Right"></TextBlock>
    153                                         <TextBlock Grid.Row="6" Grid.Column="0" Text="AverageChildren:"></TextBlock>
    154                                         <TextBlock Grid.Row="6" Grid.Column="1" Text="{Binding AverageChildren}" TextAlignment="Right"></TextBlock>
     146                                        <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding DeepestLevel}" TextAlignment="Right"></TextBlock>                                       
    155147                                    </Grid>
    156148                                    <Frame Grid.Column="1" Name="treeDrawing" Source="pack://application:,,,/WpfTestSvgSample;component/DrawingPage.xaml"/>
    … …  
    162154
    163155                <TabItem Header="Run-Comparison">
    164                     <TabControl Name="TabControlRunComparison" SelectionChanged="TabControlRunComparison_OnSelectionChanged">
     156                    <TabControl Name="TabControlRunComparison">
    165157                        <TabItem Name="TabItemChartRunComparison" Header="Chart">
    166158                            <d3:ChartPlotter x:Name="ComparisonChartPlotter" LegendVisible="False" EnableSmoothPanningForNumericAxes="True">
    … …  
    182174                                                            Header="BestKnownQuality"/>
    183175                                            <GridViewColumn DisplayMemberBinding="{Binding Path=BestSolutionQuality}"
    184                                                             Header="BestFoundQuality"/>
     176                                                            Header="BestQuality"/>
    185177                                            <GridViewColumn DisplayMemberBinding="{Binding Path=EvaluationsPerSecond}"
    186178                                                            Header="EvaluationsPerSecond"/>
    … …  
    211203                    <RowDefinition Height="Auto" />
    212204                    <RowDefinition Height="Auto" />
     205                    <RowDefinition Height="Auto" />
    213206                </Grid.RowDefinitions>
    214207                <Grid.ColumnDefinitions>
    … …  
    216209                    <ColumnDefinition Width="*" />
    217210                </Grid.ColumnDefinitions>
    218                 <TextBlock Grid.Row="0" Grid.Column="0">Run:</TextBlock>
    219                 <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding CurrentRunString}" Margin="5,0,0,0" HorizontalAlignment="Right"/>
    220                 <TextBlock Grid.Row="1" Grid.Column="0">Evaluations:</TextBlock>
    221                 <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Evaluations}" Margin="5,0,0,0" HorizontalAlignment="Right"/>
    222                 <TextBlock Grid.Row="2" Grid.Column="0">MaxEvaluations:</TextBlock>
    223                 <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding MaxEvaluations}" Margin="5,0,0,0" HorizontalAlignment="Right"/>
    224                 <TextBlock Grid.Row="3" Grid.Column="0">CurrentBestQuality:</TextBlock>
    225                 <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding CurrentBestQuality}" Margin="5,0,0,0" HorizontalAlignment="Right"/>
    226                 <TextBlock Grid.Row="4" Grid.Column="0">BestKnownQuality:</TextBlock>
    227                 <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding BestKnownQuality}" Margin="5,0,0,0" HorizontalAlignment="Right"/>
    228                 <TextBlock Grid.Row="5" Grid.Column="0">MaxLen:</TextBlock>
    229                 <TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding MaxLen}" Margin="5,0,0,0" HorizontalAlignment="Right"/>
    230                 <TextBlock Grid.Row="6" Grid.Column="0">Evaluations/sec:</TextBlock>
    231                 <TextBlock Grid.Row="6" Grid.Column="1" Text="{Binding EvaluationsPerSec}" Margin="5,0,0,0" HorizontalAlignment="Right"/>
    232                 <TextBlock Grid.Row="7" Grid.Column="0">BestSolutionFoundAt:</TextBlock>
    233                 <TextBlock Grid.Row="7" Grid.Column="1" Text="{Binding BestSolutionFoundAt}" Margin="5,0,0,0" HorizontalAlignment="Right"/>
    234                 <TextBlock Grid.Row="8" Grid.Column="0">BestSolution:</TextBlock>
    235                 <TextBlock Grid.Row="8" Grid.Column="1" Text="{Binding BestSolution}" Margin="5,0,0,0" HorizontalAlignment="Right" MaxWidth="100"/>
     211                <TextBlock Grid.Row="0" Grid.Column="0">CompletedRuns:</TextBlock>
     212                <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding CompletedRuns}" Margin="5,0,0,0" HorizontalAlignment="Right"/>
     213                <TextBlock Grid.Row="1" Grid.Column="0">RunState:</TextBlock>
     214                <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding SelectedRun.RunState}" Margin="5,0,0,0" HorizontalAlignment="Right"/>
     215                <TextBlock Grid.Row="2" Grid.Column="0">Evaluations:</TextBlock>
     216                <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding SelectedRun.Evaluations}" Margin="5,0,0,0" HorizontalAlignment="Right"/>
     217                <TextBlock Grid.Row="3" Grid.Column="0">MaxEvaluations:</TextBlock>
     218                <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding SelectedRun.MaxEvaluations}" Margin="5,0,0,0" HorizontalAlignment="Right"/>
     219                <TextBlock Grid.Row="4" Grid.Column="0">BestQuality:</TextBlock>
     220                <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding SelectedRun.BestQuality}" Margin="5,0,0,0" HorizontalAlignment="Right"/>
     221                <TextBlock Grid.Row="5" Grid.Column="0">BestKnownQuality:</TextBlock>
     222                <TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding SelectedRun.BestKnownQuality}" Margin="5,0,0,0" HorizontalAlignment="Right"/>
     223                <TextBlock Grid.Row="6" Grid.Column="0">MaxLen:</TextBlock>
     224                <TextBlock Grid.Row="6" Grid.Column="1" Text="{Binding SelectedRun.MaxLen}" Margin="5,0,0,0" HorizontalAlignment="Right"/>
     225                <TextBlock Grid.Row="7" Grid.Column="0">Evaluations/sec:</TextBlock>
     226                <TextBlock Grid.Row="7" Grid.Column="1" Text="{Binding SelectedRun.EvaluationsPerSecond}" Margin="5,0,0,0" HorizontalAlignment="Right"/>
     227                <TextBlock Grid.Row="8" Grid.Column="0">BestSolutionFoundAt:</TextBlock>
     228                <TextBlock Grid.Row="8" Grid.Column="1" Text="{Binding SelectedRun.BestSolutionFoundAt}" Margin="5,0,0,0" HorizontalAlignment="Right"/>
     229                <TextBlock Grid.Row="9" Grid.Column="0">BestSolution:</TextBlock>
     230                <TextBlock Grid.Row="9" Grid.Column="1" Text="{Binding SelectedRun.BestSolution}" TextWrapping="Wrap" Margin="5,0,0,0" HorizontalAlignment="Right" MaxWidth="100"/>
    236231            </Grid>
    237232        </Grid>
Note: See TracChangeset for help on using the changeset viewer.