Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/05/11 21:55:55 (13 years ago)
Author:
abeham
Message:

#1614

  • updated branch from trunk
Location:
branches/GeneralizedQAP
Files:
2 deleted
13 edited
2 copied

Legend:

Unmodified
Added
Removed

  • branches/GeneralizedQAP

  • branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4

    • Property svn:ignore

      •  

        old new  
        44HeuristicLabProblemsDataAnalysisSymbolicViewsPlugin.cs
        55*.vs10x
         6Plugin.cs

  • branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj

    r6685 r6878  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>bin\Release\</OutputPath>
     52    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
    … …  
    5858  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    5959    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>bin\x64\Debug\</OutputPath>
     60    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6161    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6262    <DebugType>full</DebugType>
    … …  
    6666  </PropertyGroup>
    6767  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    68     <OutputPath>bin\x64\Release\</OutputPath>
     68    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6969    <DefineConstants>TRACE</DefineConstants>
    7070    <Optimize>true</Optimize>
    … …  
    7676  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7777    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>bin\x86\Debug\</OutputPath>
     78    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7979    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8080    <DebugType>full</DebugType>
    … …  
    8484  </PropertyGroup>
    8585  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    86     <OutputPath>bin\x86\Release\</OutputPath>
     86    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8787    <DefineConstants>TRACE</DefineConstants>
    8888    <Optimize>true</Optimize>
    … …  
    9393  </PropertyGroup>
    9494  <ItemGroup>
    95     <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
     95    <Reference Include="ALGLIB-3.1.0, Version=3.1.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     96      <HintPath>..\..\bin\ALGLIB-3.1.0.dll</HintPath>
     97    </Reference>
    9698    <Reference Include="System" />
    9799    <Reference Include="System.Core">
    … …  
    111113  </ItemGroup>
    112114  <ItemGroup>
     115    <Compile Include="Plugin.cs" />
    113116    <Compile Include="SymbolicDataAnalysisSolutionResponseFunctionView.cs">
    114117      <SubType>UserControl</SubType>
    … …  
    172175    </Compile>
    173176    <None Include="HeuristicLab.snk" />
    174     <None Include="HeuristicLabProblemsDataAnalysisSymbolicViewsPlugin.cs.frame" />
    175     <None Include="Properties\AssemblyInfo.frame" />
    176     <Compile Include="HeuristicLabProblemsDataAnalysisSymbolicViewsPlugin.cs" />
     177    <None Include="Plugin.cs.frame" />
     178    <None Include="Properties\AssemblyInfo.cs.frame" />
    177179    <Compile Include="RunCollectionVariableImpactView.cs">
    178180      <SubType>UserControl</SubType>
    … …  
    187189      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    188190      <Name>HeuristicLab.Collections-3.3</Name>
     191      <Private>False</Private>
     192    </ProjectReference>
     193    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     194      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
     195      <Name>HeuristicLab.Common.Resources-3.3</Name>
     196      <Private>False</Private>
    189197    </ProjectReference>
    190198    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    191199      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    192200      <Name>HeuristicLab.Common-3.3</Name>
     201      <Private>False</Private>
    193202    </ProjectReference>
    194203    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    195204      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    196205      <Name>HeuristicLab.Core.Views-3.3</Name>
     206      <Private>False</Private>
    197207    </ProjectReference>
    198208    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    199209      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    200210      <Name>HeuristicLab.Core-3.3</Name>
     211      <Private>False</Private>
    201212    </ProjectReference>
    202213    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
    203214      <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
    204215      <Name>HeuristicLab.Data.Views-3.3</Name>
     216      <Private>False</Private>
    205217    </ProjectReference>
    206218    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    207219      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    208220      <Name>HeuristicLab.Data-3.3</Name>
     221      <Private>False</Private>
    209222    </ProjectReference>
    210223    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj">
    211224      <Project>{423BD94F-963A-438E-BA45-3BB3D61CD03B}</Project>
    212225      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4</Name>
     226      <Private>False</Private>
    213227    </ProjectReference>
    214228    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
    215229      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
    216230      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
    217     </ProjectReference>
    218     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj">
    219       <Project>{FC841674-62A7-4055-BE91-E41944B6C606}</Project>
    220       <Name>ALGLIB-3.1.0</Name>
    221     </ProjectReference>
    222     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0.csproj">
    223       <Project>{DE69A359-A5B8-4D3D-BA8D-D5780D7F96D6}</Project>
    224       <Name>HeuristicLab.ALGLIB-3.1.0 %28HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0%29</Name>
     231      <Private>False</Private>
    225232    </ProjectReference>
    226233    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    227234      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    228235      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     236      <Private>False</Private>
    229237    </ProjectReference>
    230238    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    231239      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    232240      <Name>HeuristicLab.MainForm-3.3</Name>
     241      <Private>False</Private>
    233242    </ProjectReference>
    234243    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    235244      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    236245      <Name>HeuristicLab.Operators-3.3</Name>
     246      <Private>False</Private>
    237247    </ProjectReference>
    238248    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    239249      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    240250      <Name>HeuristicLab.Optimization.Views-3.3</Name>
     251      <Private>False</Private>
    241252    </ProjectReference>
    242253    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    243254      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    244255      <Name>HeuristicLab.Optimization-3.3</Name>
     256      <Private>False</Private>
    245257    </ProjectReference>
    246258    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    247259      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    248260      <Name>HeuristicLab.Parameters-3.3</Name>
     261      <Private>False</Private>
    249262    </ProjectReference>
    250263    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    251264      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    252265      <Name>HeuristicLab.Persistence-3.3</Name>
     266      <Private>False</Private>
    253267    </ProjectReference>
    254268    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    255269      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    256270      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     271      <Private>False</Private>
    257272    </ProjectReference>
    258273    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
    259274      <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
    260275      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
     276      <Private>False</Private>
    261277    </ProjectReference>
    262278    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    263279      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
    264280      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     281      <Private>False</Private>
    265282    </ProjectReference>
    266283    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
    267284      <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
    268285      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
     286      <Private>False</Private>
    269287    </ProjectReference>
    270288  </ItemGroup>
    … …  
    301319
    302320call PreBuildEvent.cmd
    303 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisSymbolicViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisSymbolicViewsPlugin.cs"</PreBuildEvent>
     321</PreBuildEvent>
    304322  </PropertyGroup>
    305323</Project>

  • branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

    r6256 r6878  
    9595          List<ISymbolicExpressionTreeNode> nodeList = Content.Model.SymbolicExpressionTree.Root.GetSubtree(0).IterateNodesPrefix().ToList();
    9696          foreach (var parent in nodeList) {
    97             for (int subTreeIndex = 0; subTreeIndex < parent.SubtreesCount; subTreeIndex++) {
     97            for (int subTreeIndex = 0; subTreeIndex < parent.SubtreeCount; subTreeIndex++) {
    9898              var child = parent.GetSubtree(subTreeIndex);
    9999              if (!(child.Symbol is Constant) && nodeImpacts[child].IsAlmost(0.0)) {
    … …  
    105105
    106106        // show only interesting part of solution
    107         if (tree.Root.SubtreesCount > 1)
     107        if (tree.Root.SubtreeCount > 1)
    108108          this.treeChart.Tree = new SymbolicExpressionTree(tree.Root); // RPB + ADFs
    109109        else
    … …  
    130130      var tree = Content.Model.SymbolicExpressionTree;
    131131      foreach (SymbolicExpressionTreeNode treeNode in tree.IterateNodesPostfix()) {
    132         for (int i = 0; i < treeNode.SubtreesCount; i++) {
     132        for (int i = 0; i < treeNode.SubtreeCount; i++) {
    133133          ISymbolicExpressionTreeNode subTree = treeNode.GetSubtree(i);
    134134          // only allow to replace nodes for which a replacement value is known (replacement value for ADF nodes are not available)
    … …  
    137137
    138138            // show only interesting part of solution
    139             if (tree.Root.SubtreesCount > 1)
     139            if (tree.Root.SubtreeCount > 1)
    140140              this.treeChart.Tree = new SymbolicExpressionTree(tree.Root); // RPB + ADFs
    141141            else

  • branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/RunCollectionVariableImpactView.Designer.cs

    r5809 r6878  
    4646    private void InitializeComponent() {
    4747      this.matrixView = new HeuristicLab.Data.Views.StringConvertibleMatrixView();
     48      this.comboBox = new System.Windows.Forms.ComboBox();
     49      this.label1 = new System.Windows.Forms.Label();
     50      this.variableImpactsGroupBox = new System.Windows.Forms.GroupBox();
     51      this.variableImpactsGroupBox.SuspendLayout();
    4852      this.SuspendLayout();
    4953      //
    … …  
    5559      this.matrixView.Caption = "StringConvertibleMatrix View";
    5660      this.matrixView.Content = null;
    57       this.matrixView.Location = new System.Drawing.Point(3, 3);
     61      this.matrixView.Location = new System.Drawing.Point(6, 19);
    5862      this.matrixView.Name = "matrixView";
    5963      this.matrixView.ReadOnly = true;
    60       this.matrixView.Size = new System.Drawing.Size(303, 229);
     64      this.matrixView.ShowRowsAndColumnsTextBox = true;
     65      this.matrixView.ShowStatisticalInformation = true;
     66      this.matrixView.Size = new System.Drawing.Size(294, 174);
    6167      this.matrixView.TabIndex = 0;
     68      //
     69      // comboBox
     70      //
     71      this.comboBox.FormattingEnabled = true;
     72      this.comboBox.Location = new System.Drawing.Point(39, 6);
     73      this.comboBox.Name = "comboBox";
     74      this.comboBox.Size = new System.Drawing.Size(68, 21);
     75      this.comboBox.TabIndex = 1;
     76      this.comboBox.SelectedValueChanged += new System.EventHandler(this.comboBox_SelectedValueChanged);
     77      //
     78      // label1
     79      //
     80      this.label1.AutoSize = true;
     81      this.label1.Location = new System.Drawing.Point(3, 9);
     82      this.label1.Name = "label1";
     83      this.label1.Size = new System.Drawing.Size(30, 13);
     84      this.label1.TabIndex = 2;
     85      this.label1.Text = "Fold:";
     86      //
     87      // variableImpactsGroupBox
     88      //
     89      this.variableImpactsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     90                  | System.Windows.Forms.AnchorStyles.Left)
     91                  | System.Windows.Forms.AnchorStyles.Right)));
     92      this.variableImpactsGroupBox.Controls.Add(this.matrixView);
     93      this.variableImpactsGroupBox.Location = new System.Drawing.Point(0, 33);
     94      this.variableImpactsGroupBox.Name = "variableImpactsGroupBox";
     95      this.variableImpactsGroupBox.Size = new System.Drawing.Size(306, 199);
     96      this.variableImpactsGroupBox.TabIndex = 3;
     97      this.variableImpactsGroupBox.TabStop = false;
     98      this.variableImpactsGroupBox.Text = "Variable impacts:";
    6299      //
    63100      // RunCollectionVariableImpactView
    … …  
    65102      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    66103      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    67       this.Controls.Add(this.matrixView);
     104      this.Controls.Add(this.variableImpactsGroupBox);
     105      this.Controls.Add(this.label1);
     106      this.Controls.Add(this.comboBox);
    68107      this.Name = "RunCollectionVariableImpactView";
    69108      this.Size = new System.Drawing.Size(309, 235);
     109      this.variableImpactsGroupBox.ResumeLayout(false);
    70110      this.ResumeLayout(false);
     111      this.PerformLayout();
    71112
    72113    }
    … …  
    75116
    76117    private HeuristicLab.Data.Views.StringConvertibleMatrixView matrixView;
     118    private System.Windows.Forms.ComboBox comboBox;
     119    private System.Windows.Forms.Label label1;
     120    private System.Windows.Forms.GroupBox variableImpactsGroupBox;
    77121  }
    78122}

  • branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/RunCollectionVariableImpactView.cs

    r5975 r6878  
    3535  public sealed partial class RunCollectionVariableImpactView : AsynchronousContentView {
    3636    private const string variableImpactResultName = "Variable impacts";
     37    private const string crossValidationFoldsResultName = "CrossValidation Folds";
     38    private const string numberOfFoldsParameterName = "Folds";
    3739    public RunCollectionVariableImpactView() {
    3840      InitializeComponent();
    … …  
    9597    }
    9698
     99    private void comboBox_SelectedValueChanged(object sender, EventArgs e) {
     100      if (comboBox.SelectedItem != null) {
     101        var cvRuns = from r in Content
     102                     where r.Visible
     103                     where r.Parameters.ContainsKey(numberOfFoldsParameterName)
     104                     select r;
     105        if (comboBox.SelectedIndex == 0) {
     106          var selectedFolds = cvRuns
     107            .SelectMany(r => (RunCollection)r.Results[crossValidationFoldsResultName])
     108            .Where(r => r.Results.ContainsKey(variableImpactResultName));
     109          matrixView.Content = CalculateVariableImpactMatrix(selectedFolds.ToArray());
     110        } else {
     111          var selectedFolds = from r in cvRuns
     112                              let foldCollection = (RunCollection)r.Results[crossValidationFoldsResultName]
     113                              let run = foldCollection.ElementAt(comboBox.SelectedIndex - 1)
     114                              where run.Results.ContainsKey(variableImpactResultName)
     115                              select new { run, r.Name };
     116          matrixView.Content = CalculateVariableImpactMatrix(selectedFolds.Select(x => x.run).ToArray(), selectedFolds.Select(x => x.Name).ToArray());
     117        }
     118      }
     119    }
     120
     121
    97122    private void UpdateData() {
    98       matrixView.Content = CalculateVariableImpactMatrix();
    99     }
    100 
    101     private DoubleMatrix CalculateVariableImpactMatrix() {
     123      if (Content != null) {
     124        comboBox.Items.Clear();
     125        comboBox.Enabled = false;
     126        var visibleRuns = Content.Where(r => r.Visible).ToArray();
     127        var representativeCvRun =
     128          visibleRuns.Where(r => r.Parameters.ContainsKey(numberOfFoldsParameterName)).FirstOrDefault();
     129        if (representativeCvRun != null) {
     130          // make sure all runs have the same number of folds
     131          int nFolds = ((IntValue)representativeCvRun.Parameters[numberOfFoldsParameterName]).Value;
     132          var cvRuns = visibleRuns.Where(r => r.Parameters.ContainsKey(numberOfFoldsParameterName));
     133          if (cvRuns.All(r => ((IntValue)r.Parameters[numberOfFoldsParameterName]).Value == nFolds)) {
     134            // populate combobox
     135            comboBox.Items.Add("Overall");
     136            for (int foldIndex = 0; foldIndex < nFolds; foldIndex++) {
     137              comboBox.Items.Add("Fold " + foldIndex);
     138            }
     139            comboBox.SelectedIndex = 0;
     140            comboBox.Enabled = true;
     141          } else {
     142            matrixView.Content = null;
     143          }
     144        } else {
     145          var runsWithVariables = visibleRuns.Where(r => r.Results.ContainsKey(variableImpactResultName)).ToArray();
     146          matrixView.Content = CalculateVariableImpactMatrix(runsWithVariables);
     147        }
     148      }
     149    }
     150
     151    private IStringConvertibleMatrix CalculateVariableImpactMatrix(IRun[] runs) {
     152      return CalculateVariableImpactMatrix(runs, runs.Select(r => r.Name).ToArray());
     153    }
     154
     155    private DoubleMatrix CalculateVariableImpactMatrix(IRun[] runs, string[] runNames) {
    102156      DoubleMatrix matrix = null;
    103       if (Content != null) {
    104         List<IRun> runsWithVariables = Content.Where(r => r.Visible && r.Results.ContainsKey(variableImpactResultName)).ToList();
    105         IEnumerable<DoubleMatrix> allVariableImpacts = (from run in runsWithVariables
    106                                                         select run.Results[variableImpactResultName]).Cast<DoubleMatrix>();
    107         IEnumerable<string> variableNames = (from variableImpact in allVariableImpacts
    108                                              from variableName in variableImpact.RowNames
    109                                              select variableName)
    110                                             .Distinct();
    111         // filter variableNames: only include names that have at least one non-zero value in a run
    112         List<string> variableNamesList = (from variableName in variableNames
    113                                           where GetVariableImpacts(variableName, allVariableImpacts).Any(x => !x.IsAlmost(0.0))
    114                                           select variableName)
    115                                          .ToList();
    116 
    117         List<string> statictics = new List<string> { "Median Rank", "Mean", "StdDev", "pValue" };
    118         List<string> columnNames = runsWithVariables.Select(r => r.Name).ToList();
    119         columnNames.AddRange(statictics);
    120         int runs = runsWithVariables.Count();
    121 
    122         matrix = new DoubleMatrix(variableNamesList.Count, runs + statictics.Count);
    123         matrix.SortableView = true;
    124         matrix.RowNames = variableNamesList;
    125         matrix.ColumnNames = columnNames;
    126 
    127         for (int i = 0; i < runsWithVariables.Count; i++) {
    128           IRun run = runsWithVariables[i];
    129           DoubleMatrix runVariableImpacts = (DoubleMatrix)run.Results[variableImpactResultName];
    130           for (int j = 0; j < runVariableImpacts.Rows; j++) {
    131             int rowIndex = variableNamesList.FindIndex(s => s == runVariableImpacts.RowNames.ElementAt(j));
    132             if (rowIndex > -1) {
    133               matrix[rowIndex, i] = runVariableImpacts[j, 0];
    134             }
    135           }
    136         }
    137 
    138         List<List<double>> variableImpactsOverRuns = (from variableName in variableNamesList
    139                                                       select GetVariableImpacts(variableName, allVariableImpacts).ToList())
    140                                                      .ToList();
    141         List<List<double>> variableRanks = (from variableName in variableNamesList
    142                                             select GetVariableImpactRanks(variableName, allVariableImpacts).ToList())
    143                                         .ToList();
    144         if (variableImpactsOverRuns.Count() > 0) {
    145           // the variable with the worst median impact value is chosen as the reference variable
    146           // this is problematic if all variables are relevant, however works often in practice
    147           List<double> referenceImpacts = (from impacts in variableImpactsOverRuns
    148                                            let avg = impacts.Median()
    149                                            orderby avg
    150                                            select impacts)
    151                                            .First();
    152           // for all variables
    153           for (int row = 0; row < variableImpactsOverRuns.Count; row++) {
    154             // median rank
    155             matrix[row, runs] = variableRanks[row].Median();
    156             // also show mean and std.dev. of relative variable impacts to indicate the relative difference in impacts of variables
    157             matrix[row, runs + 1] = variableImpactsOverRuns[row].Average();
    158             matrix[row, runs + 2] = variableImpactsOverRuns[row].StandardDeviation();
    159 
    160             double leftTail = 0; double rightTail = 0; double bothTails = 0;
    161             // calc differences of impacts for current variable and reference variable
    162             double[] z = new double[referenceImpacts.Count];
    163             for (int i = 0; i < z.Length; i++) {
    164               z[i] = variableImpactsOverRuns[row][i] - referenceImpacts[i];
    165             }
    166             // wilcoxon signed rank test is used because the impact values of two variables in a single run are not independent
    167             alglib.wsr.wilcoxonsignedranktest(z, z.Length, 0, ref bothTails, ref leftTail, ref rightTail);
    168             matrix[row, runs + 3] = bothTails;
    169           }
    170         }
    171       }
    172       return matrix;
     157      IEnumerable<DoubleMatrix> allVariableImpacts = (from run in runs
     158                                                      select run.Results[variableImpactResultName]).Cast<DoubleMatrix>();
     159      IEnumerable<string> variableNames = (from variableImpact in allVariableImpacts
     160                                           from variableName in variableImpact.RowNames
     161                                           select variableName)
     162                                          .Distinct();
     163      // filter variableNames: only include names that have at least one non-zero value in a run
     164      List<string> variableNamesList = (from variableName in variableNames
     165                                        where GetVariableImpacts(variableName, allVariableImpacts).Any(x => !x.IsAlmost(0.0))
     166                                        select variableName)
     167                                       .ToList();
     168
     169      List<string> statictics = new List<string> { "Median Rank", "Mean", "StdDev", "pValue" };
     170      List<string> columnNames = new List<string>(runNames);
     171      columnNames.AddRange(statictics);
     172      int numberOfRuns = runs.Length;
     173
     174      matrix = new DoubleMatrix(variableNamesList.Count, numberOfRuns + statictics.Count);
     175      matrix.SortableView = true;
     176      matrix.ColumnNames = columnNames;
     177
     178      // calculate statistics
     179      List<List<double>> variableImpactsOverRuns = (from variableName in variableNamesList
     180                                                    select GetVariableImpacts(variableName, allVariableImpacts).ToList())
     181                                             .ToList();
     182      List<List<double>> variableRanks = (from variableName in variableNamesList
     183                                          select GetVariableImpactRanks(variableName, allVariableImpacts).ToList())
     184                                      .ToList();
     185      if (variableImpactsOverRuns.Count() > 0) {
     186        // the variable with the worst median impact value is chosen as the reference variable
     187        // this is problematic if all variables are relevant, however works often in practice
     188        List<double> referenceImpacts = (from impacts in variableImpactsOverRuns
     189                                         let avg = impacts.Median()
     190                                         orderby avg
     191                                         select impacts)
     192                                         .First();
     193        // for all variables
     194        for (int row = 0; row < variableImpactsOverRuns.Count; row++) {
     195          // median rank
     196          matrix[row, numberOfRuns] = variableRanks[row].Median();
     197          // also show mean and std.dev. of relative variable impacts to indicate the relative difference in impacts of variables
     198          matrix[row, numberOfRuns + 1] = Math.Round(variableImpactsOverRuns[row].Average(), 3);
     199          matrix[row, numberOfRuns + 2] = Math.Round(variableImpactsOverRuns[row].StandardDeviation(), 3);
     200
     201          double leftTail = 0; double rightTail = 0; double bothTails = 0;
     202          // calc differences of impacts for current variable and reference variable
     203          double[] z = new double[referenceImpacts.Count];
     204          for (int i = 0; i < z.Length; i++) {
     205            z[i] = variableImpactsOverRuns[row][i] - referenceImpacts[i];
     206          }
     207          // wilcoxon signed rank test is used because the impact values of two variables in a single run are not independent
     208          alglib.wsr.wilcoxonsignedranktest(z, z.Length, 0, ref bothTails, ref leftTail, ref rightTail);
     209          matrix[row, numberOfRuns + 3] = Math.Round(bothTails, 4);
     210        }
     211      }
     212
     213      // fill matrix with impacts from runs
     214      for (int i = 0; i < runs.Length; i++) {
     215        IRun run = runs[i];
     216        DoubleMatrix runVariableImpacts = (DoubleMatrix)run.Results[variableImpactResultName];
     217        for (int j = 0; j < runVariableImpacts.Rows; j++) {
     218          int rowIndex = variableNamesList.FindIndex(s => s == runVariableImpacts.RowNames.ElementAt(j));
     219          if (rowIndex > -1) {
     220            matrix[rowIndex, i] = Math.Round(runVariableImpacts[j, 0], 3);
     221          }
     222        }
     223      }
     224      // sort by median
     225      var sortedMatrix = (DoubleMatrix)matrix.Clone();
     226      var sortedIndexes = from i in Enumerable.Range(0, sortedMatrix.Rows)
     227                          orderby matrix[i, numberOfRuns]
     228                          select i;
     229
     230      int targetIndex = 0;
     231      foreach (var sourceIndex in sortedIndexes) {
     232        for (int c = 0; c < matrix.Columns; c++)
     233          sortedMatrix[targetIndex, c] = matrix[sourceIndex, c];
     234        targetIndex++;
     235      }
     236      sortedMatrix.RowNames = sortedIndexes.Select(i => variableNamesList[i]);
     237
     238      return sortedMatrix;
    173239    }
    174240
    … …  
    213279      }
    214280    }
     281
    215282  }
    216283}

  • branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SymbolicDataAnalysisSolutionResponseFunctionView.cs

    r6685 r6878  
    2727using HeuristicLab.Common;
    2828using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    29 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views;
     29using HeuristicLab.MainForm;
    3030using HeuristicLab.MainForm.WindowsForms;
    31 using System.Windows.Forms.DataVisualization.Charting;
    32 using HeuristicLab.MainForm;
    3331
    3432namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views {
    … …  
    8886        select varNode.VariableName)
    8987         .Distinct()
    90          .OrderBy(x=>x)
     88         .OrderBy(x => x)
    9189         .ToList();
    9290
    9391        medianValues.Clear();
    9492        foreach (var variableName in referencedVariables) {
    95           medianValues.Add(variableName, Content.ProblemData.Dataset.GetEnumeratedVariableValues(variableName).Median());
     93          medianValues.Add(variableName, Content.ProblemData.Dataset.GetDoubleValues(variableName).Median());
    9694        }
    9795
    … …  
    107105      foreach (var variableName in variableNames) {
    108106        var variableTrackbar = new VariableTrackbar(variableName,
    109                                                     Content.ProblemData.Dataset.GetEnumeratedVariableValues(variableName));
     107                                                    Content.ProblemData.Dataset.GetDoubleValues(variableName));
    110108        variableTrackbar.Size = new Size(variableTrackbar.Size.Width, flowLayoutPanel.Size.Height - 23);
    111109        variableTrackbar.ValueChanged += TrackBarValueChanged;
    … …  
    132130        .Except(new string[] { freeVariable });
    133131
    134       var freeVariableValues = Content.ProblemData.Dataset.GetEnumeratedVariableValues(freeVariable, Content.ProblemData.TrainingIndizes).ToArray();
     132      var freeVariableValues = Content.ProblemData.Dataset.GetDoubleValues(freeVariable, Content.ProblemData.TrainingIndizes).ToArray();
    135133      var responseValues = Content.Model.Interpreter.GetSymbolicExpressionTreeValues(clonedTree,
    136134                                                                              Content.ProblemData.Dataset,

  • branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/ConstantView.Designer.cs

    r5832 r6878  
    6969      this.initialFrequencyTextBox.Size = new System.Drawing.Size(280, 20);
    7070      //
     71      // minimumArityTextBox
     72      //
     73      this.errorProvider.SetIconAlignment(this.minimumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     74      this.minimumArityTextBox.Size = new System.Drawing.Size(280, 20);
     75      //
     76      // maximumArityTextBox
     77      //
     78      this.errorProvider.SetIconAlignment(this.maximumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     79      this.maximumArityTextBox.Size = new System.Drawing.Size(280, 20);
     80      //
    7181      // nameTextBox
    7282      //
    … …  
    92102      //
    93103      this.minValueTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    94                   | System.Windows.Forms.AnchorStyles.Right)));
     104            | System.Windows.Forms.AnchorStyles.Right)));
    95105      this.errorProvider.SetIconAlignment(this.minValueTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    96106      this.minValueTextBox.Location = new System.Drawing.Point(92, 19);
    … …  
    104114      //
    105115      this.initializationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    106                   | System.Windows.Forms.AnchorStyles.Right)));
     116            | System.Windows.Forms.AnchorStyles.Right)));
    107117      this.initializationGroupBox.Controls.Add(this.weightSigmaLabel);
    108118      this.initializationGroupBox.Controls.Add(this.maxValueTextBox);
    109119      this.initializationGroupBox.Controls.Add(this.weightNuLabel);
    110120      this.initializationGroupBox.Controls.Add(this.minValueTextBox);
    111       this.initializationGroupBox.Location = new System.Drawing.Point(0, 52);
     121      this.initializationGroupBox.Location = new System.Drawing.Point(0, 127);
    112122      this.initializationGroupBox.Name = "initializationGroupBox";
    113123      this.initializationGroupBox.Size = new System.Drawing.Size(398, 73);
    … …  
    129139      //
    130140      this.maxValueTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    131                   | System.Windows.Forms.AnchorStyles.Right)));
     141            | System.Windows.Forms.AnchorStyles.Right)));
    132142      this.errorProvider.SetIconAlignment(this.maxValueTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    133143      this.maxValueTextBox.Location = new System.Drawing.Point(92, 45);
    … …  
    141151      //
    142152      this.mutationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    143                   | System.Windows.Forms.AnchorStyles.Right)));
     153            | System.Windows.Forms.AnchorStyles.Right)));
    144154      this.mutationGroupBox.Controls.Add(this.multiplicativeChangeLabel);
    145155      this.mutationGroupBox.Controls.Add(this.multiplicativeChangeSigmaTextBox);
    146156      this.mutationGroupBox.Controls.Add(this.additiveChangeLabel);
    147157      this.mutationGroupBox.Controls.Add(this.additiveChangeSigmaTextBox);
    148       this.mutationGroupBox.Location = new System.Drawing.Point(0, 131);
     158      this.mutationGroupBox.Location = new System.Drawing.Point(0, 206);
    149159      this.mutationGroupBox.Name = "mutationGroupBox";
    150160      this.mutationGroupBox.Size = new System.Drawing.Size(398, 73);
    … …  
    162172      this.multiplicativeChangeLabel.Text = "Multiplicative change (sigma):";
    163173      this.toolTip.SetToolTip(this.multiplicativeChangeLabel, "The sigma (std. dev.) parameter for the normal distribution to use to sample the " +
    164               "multiplicative change.");
     174        "multiplicative change.");
    165175      //
    166176      // multiplicativeChangeSigmaTextBox
    167177      //
    168178      this.multiplicativeChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    169                   | System.Windows.Forms.AnchorStyles.Right)));
     179            | System.Windows.Forms.AnchorStyles.Right)));
    170180      this.errorProvider.SetIconAlignment(this.multiplicativeChangeSigmaTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    171181      this.multiplicativeChangeSigmaTextBox.Location = new System.Drawing.Point(168, 45);
    … …  
    174184      this.multiplicativeChangeSigmaTextBox.TabIndex = 3;
    175185      this.toolTip.SetToolTip(this.multiplicativeChangeSigmaTextBox, "The sigma (std. dev.) parameter for the normal distribution to use to sample a mu" +
    176               "ltiplicative change.");
     186        "ltiplicative change.");
    177187      this.multiplicativeChangeSigmaTextBox.TextChanged += new System.EventHandler(this.multiplicativeChangeSigmaTextBox_TextChanged);
    178188      //
    … …  
    186196      this.additiveChangeLabel.Text = "Additive change (sigma):";
    187197      this.toolTip.SetToolTip(this.additiveChangeLabel, "The sigma (std. dev.) parameter for the normal distribution to sample the additiv" +
    188               "e change.");
     198        "e change.");
    189199      //
    190200      // additiveChangeSigmaTextBox
    191201      //
    192202      this.additiveChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    193                   | System.Windows.Forms.AnchorStyles.Right)));
     203            | System.Windows.Forms.AnchorStyles.Right)));
    194204      this.errorProvider.SetIconAlignment(this.additiveChangeSigmaTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    195205      this.additiveChangeSigmaTextBox.Location = new System.Drawing.Point(168, 19);
    … …  
    198208      this.additiveChangeSigmaTextBox.TabIndex = 1;
    199209      this.toolTip.SetToolTip(this.additiveChangeSigmaTextBox, "The sigma (std. dev.) parameter for the normal distribution to use to sample an a" +
    200               "dditive change.");
     210        "dditive change.");
    201211      this.additiveChangeSigmaTextBox.TextChanged += new System.EventHandler(this.additiveChangeSigmaTextBox_TextChanged);
    202212      //
    … …  
    208218      this.Controls.Add(this.initializationGroupBox);
    209219      this.Name = "ConstantView";
    210       this.Size = new System.Drawing.Size(398, 211);
     220      this.Size = new System.Drawing.Size(398, 284);
     221      this.Controls.SetChildIndex(this.maximumArityLabel, 0);
     222      this.Controls.SetChildIndex(this.maximumArityTextBox, 0);
     223      this.Controls.SetChildIndex(this.minimumArityLabel, 0);
     224      this.Controls.SetChildIndex(this.minimumArityTextBox, 0);
    211225      this.Controls.SetChildIndex(this.infoLabel, 0);
    212226      this.Controls.SetChildIndex(this.initializationGroupBox, 0);

  • branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/LaggedVariableView.Designer.cs

    r5832 r6878  
    6464      //
    6565      this.toolTip.SetToolTip(this.weightInitializationMuTextBox, "The mu (mean) parameter of the normal distribution from which to sample the initi" +
    66               "al weights.");
     66        "al weights.");
    6767      //
    6868      // initializationGroupBox
    … …  
    7878      //
    7979      this.toolTip.SetToolTip(this.weightInitializationSigmaTextBox, "The sigma parameter for the normal distribution from which to sample the initial " +
    80               "weights.");
     80        "weights.");
    8181      //
    8282      // mutationGroupBox
    … …  
    8888      //
    8989      this.toolTip.SetToolTip(this.multiplicativeWeightChangeLabel, "The sigma parameter for the normal distribution to use to sample a multiplicative" +
    90               " change in weight.");
     90        " change in weight.");
    9191      //
    9292      // multiplicativeWeightChangeSigmaTextBox
    9393      //
    9494      this.toolTip.SetToolTip(this.multiplicativeWeightChangeSigmaTextBox, "The sigma (std.dev.) parameter for the normal distribution to sample a multiplica" +
    95               "tive change in weight.");
     95        "tive change in weight.");
    9696      //
    9797      // additiveWeightChangeLabel
    9898      //
    9999      this.toolTip.SetToolTip(this.additiveWeightChangeLabel, "The sigma (std.dev.) parameter for the normal distribution to sample an additive " +
    100               "change in weight.");
     100        "change in weight.");
    101101      //
    102102      // additiveWeightChangeSigmaTextBox
    103103      //
    104104      this.toolTip.SetToolTip(this.additiveWeightChangeSigmaTextBox, "The sigma (std.dev.) parameter for the normal distribution to sample an additive " +
    105               "change in weight.");
     105        "change in weight.");
    106106      //
    107107      // variableNamesTabPage
    108108      //
    109       this.variableNamesTabPage.Size = new System.Drawing.Size(400, 164);
     109      this.variableNamesTabPage.Size = new System.Drawing.Size(400, 149);
    110110      //
    111111      // parametersTabPage
    112112      //
    113       this.parametersTabPage.Size = new System.Drawing.Size(400, 164);
     113      this.parametersTabPage.Size = new System.Drawing.Size(400, 149);
    114114      //
    115115      // tabControl
    116116      //
    117       this.tabControl.Location = new System.Drawing.Point(0, 104);
    118       this.tabControl.Size = new System.Drawing.Size(408, 190);
     117      this.tabControl.Location = new System.Drawing.Point(0, 179);
     118      this.tabControl.Size = new System.Drawing.Size(408, 175);
    119119      this.tabControl.TabIndex = 9;
    120120      //
    … …  
    126126      //
    127127      this.errorProvider.SetIconAlignment(this.initialFrequencyTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     128      //
     129      // minimumArityTextBox
     130      //
     131      this.errorProvider.SetIconAlignment(this.minimumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     132      this.minimumArityTextBox.Size = new System.Drawing.Size(315, 20);
     133      //
     134      // maximumArityTextBox
     135      //
     136      this.errorProvider.SetIconAlignment(this.maximumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     137      this.maximumArityTextBox.Size = new System.Drawing.Size(315, 20);
    128138      //
    129139      // nameTextBox
    … …  
    135145      //
    136146      this.minTimeOffsetLabel.AutoSize = true;
    137       this.minTimeOffsetLabel.Location = new System.Drawing.Point(3, 55);
     147      this.minTimeOffsetLabel.Location = new System.Drawing.Point(3, 130);
    138148      this.minTimeOffsetLabel.Name = "minTimeOffsetLabel";
    139149      this.minTimeOffsetLabel.Size = new System.Drawing.Size(81, 13);
    … …  
    144154      //
    145155      this.maxTimeOffsetLabel.AutoSize = true;
    146       this.maxTimeOffsetLabel.Location = new System.Drawing.Point(3, 81);
     156      this.maxTimeOffsetLabel.Location = new System.Drawing.Point(3, 156);
    147157      this.maxTimeOffsetLabel.Name = "maxTimeOffsetLabel";
    148158      this.maxTimeOffsetLabel.Size = new System.Drawing.Size(84, 13);
    … …  
    152162      // minTimeOffsetTextBox
    153163      //
    154       this.minTimeOffsetTextBox.Location = new System.Drawing.Point(93, 52);
     164      this.minTimeOffsetTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     165            | System.Windows.Forms.AnchorStyles.Right)));
     166      this.minTimeOffsetTextBox.Location = new System.Drawing.Point(93, 127);
    155167      this.minTimeOffsetTextBox.Name = "minTimeOffsetTextBox";
    156168      this.minTimeOffsetTextBox.Size = new System.Drawing.Size(315, 20);
    … …  
    160172      // maxTimeOffsetTextBox
    161173      //
    162       this.maxTimeOffsetTextBox.Location = new System.Drawing.Point(93, 78);
     174      this.maxTimeOffsetTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     175            | System.Windows.Forms.AnchorStyles.Right)));
     176      this.maxTimeOffsetTextBox.Location = new System.Drawing.Point(93, 153);
    163177      this.maxTimeOffsetTextBox.Name = "maxTimeOffsetTextBox";
    164178      this.maxTimeOffsetTextBox.Size = new System.Drawing.Size(315, 20);
    … …  
    171185      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    172186      this.Controls.Add(this.minTimeOffsetTextBox);
     187      this.Controls.Add(this.maxTimeOffsetLabel);
    173188      this.Controls.Add(this.minTimeOffsetLabel);
    174       this.Controls.Add(this.maxTimeOffsetLabel);
    175189      this.Controls.Add(this.maxTimeOffsetTextBox);
    176190      this.Name = "LaggedVariableView";
    177       this.Size = new System.Drawing.Size(408, 292);
     191      this.Size = new System.Drawing.Size(408, 352);
    178192      this.Controls.SetChildIndex(this.maxTimeOffsetTextBox, 0);
     193      this.Controls.SetChildIndex(this.minTimeOffsetLabel, 0);
    179194      this.Controls.SetChildIndex(this.maxTimeOffsetLabel, 0);
    180       this.Controls.SetChildIndex(this.minTimeOffsetLabel, 0);
    181195      this.Controls.SetChildIndex(this.minTimeOffsetTextBox, 0);
     196      this.Controls.SetChildIndex(this.maximumArityLabel, 0);
     197      this.Controls.SetChildIndex(this.maximumArityTextBox, 0);
     198      this.Controls.SetChildIndex(this.minimumArityLabel, 0);
     199      this.Controls.SetChildIndex(this.minimumArityTextBox, 0);
    182200      this.Controls.SetChildIndex(this.infoLabel, 0);
    183201      this.Controls.SetChildIndex(this.tabControl, 0);

  • branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/TimeLagView.Designer.cs

    r5832 r6878  
    6262      this.initialFrequencyTextBox.Size = new System.Drawing.Size(315, 20);
    6363      //
     64      // minimumArityTextBox
     65      //
     66      this.errorProvider.SetIconAlignment(this.minimumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     67      this.minimumArityTextBox.Size = new System.Drawing.Size(315, 20);
     68      //
     69      // maximumArityTextBox
     70      //
     71      this.errorProvider.SetIconAlignment(this.maximumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     72      this.maximumArityTextBox.Size = new System.Drawing.Size(315, 20);
     73      //
    6474      // nameTextBox
    6575      //
    … …  
    7585      //
    7686      this.minTimeOffsetLabel.AutoSize = true;
    77       this.minTimeOffsetLabel.Location = new System.Drawing.Point(3, 55);
     87      this.minTimeOffsetLabel.Location = new System.Drawing.Point(3, 130);
    7888      this.minTimeOffsetLabel.Name = "minTimeOffsetLabel";
    7989      this.minTimeOffsetLabel.Size = new System.Drawing.Size(81, 13);
    … …  
    8494      //
    8595      this.maxTimeOffsetLabel.AutoSize = true;
    86       this.maxTimeOffsetLabel.Location = new System.Drawing.Point(3, 81);
     96      this.maxTimeOffsetLabel.Location = new System.Drawing.Point(3, 156);
    8797      this.maxTimeOffsetLabel.Name = "maxTimeOffsetLabel";
    8898      this.maxTimeOffsetLabel.Size = new System.Drawing.Size(84, 13);
    … …  
    92102      // minTimeOffsetTextBox
    93103      //
    94       this.minTimeOffsetTextBox.Location = new System.Drawing.Point(93, 52);
     104      this.minTimeOffsetTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     105            | System.Windows.Forms.AnchorStyles.Right)));
     106      this.minTimeOffsetTextBox.Location = new System.Drawing.Point(93, 127);
    95107      this.minTimeOffsetTextBox.Name = "minTimeOffsetTextBox";
    96108      this.minTimeOffsetTextBox.Size = new System.Drawing.Size(315, 20);
    … …  
    100112      // maxTimeOffsetTextBox
    101113      //
    102       this.maxTimeOffsetTextBox.Location = new System.Drawing.Point(93, 78);
     114      this.maxTimeOffsetTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     115            | System.Windows.Forms.AnchorStyles.Right)));
     116      this.maxTimeOffsetTextBox.Location = new System.Drawing.Point(93, 153);
    103117      this.maxTimeOffsetTextBox.Name = "maxTimeOffsetTextBox";
    104118      this.maxTimeOffsetTextBox.Size = new System.Drawing.Size(315, 20);
    … …  
    115129      this.Controls.Add(this.minTimeOffsetLabel);
    116130      this.Name = "LaggedSymbolView";
    117       this.Size = new System.Drawing.Size(408, 104);
     131      this.Size = new System.Drawing.Size(408, 179);
     132      this.Controls.SetChildIndex(this.maximumArityLabel, 0);
     133      this.Controls.SetChildIndex(this.maximumArityTextBox, 0);
     134      this.Controls.SetChildIndex(this.minimumArityLabel, 0);
     135      this.Controls.SetChildIndex(this.minimumArityTextBox, 0);
    118136      this.Controls.SetChildIndex(this.infoLabel, 0);
    119137      this.Controls.SetChildIndex(this.initialFrequencyTextBox, 0);

  • branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableConditionView.Designer.cs

    r5832 r6878  
    7878      this.initialFrequencyTextBox.Size = new System.Drawing.Size(233, 20);
    7979      //
     80      // minimumArityTextBox
     81      //
     82      this.errorProvider.SetIconAlignment(this.minimumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     83      //
     84      // maximumArityTextBox
     85      //
     86      this.errorProvider.SetIconAlignment(this.maximumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     87      //
    8088      // nameTextBox
    8189      //
    … …  
    97105      //
    98106      this.thresholdInitializationMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    99                   | System.Windows.Forms.AnchorStyles.Right)));
     107            | System.Windows.Forms.AnchorStyles.Right)));
    100108      this.thresholdInitializationMuTextBox.Location = new System.Drawing.Point(114, 15);
    101109      this.thresholdInitializationMuTextBox.Name = "thresholdInitializationMuTextBox";
    … …  
    103111      this.thresholdInitializationMuTextBox.TabIndex = 1;
    104112      this.toolTip.SetToolTip(this.thresholdInitializationMuTextBox, "The mu (mean) parameter of the normal distribution from which to sample the initi" +
    105               "al thresholds.");
     113        "al thresholds.");
    106114      this.thresholdInitializationMuTextBox.TextChanged += new System.EventHandler(this.thresholdMuTextBox_TextChanged);
    107115      //
    … …  
    109117      //
    110118      this.initializationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    111                   | System.Windows.Forms.AnchorStyles.Right)));
     119            | System.Windows.Forms.AnchorStyles.Right)));
    112120      this.initializationGroupBox.Controls.Add(this.slopeInitializationSigmaLabel);
    113121      this.initializationGroupBox.Controls.Add(this.slopeInitializationSigmaTextBox);
    … …  
    118126      this.initializationGroupBox.Controls.Add(this.thresholdInitializationMuLabel);
    119127      this.initializationGroupBox.Controls.Add(this.thresholdInitializationMuTextBox);
    120       this.initializationGroupBox.Location = new System.Drawing.Point(0, 52);
     128      this.initializationGroupBox.Location = new System.Drawing.Point(0, 127);
    121129      this.initializationGroupBox.Name = "initializationGroupBox";
    122130      this.initializationGroupBox.Size = new System.Drawing.Size(326, 127);
    … …  
    138146      //
    139147      this.slopeInitializationSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    140                   | System.Windows.Forms.AnchorStyles.Right)));
     148            | System.Windows.Forms.AnchorStyles.Right)));
    141149      this.slopeInitializationSigmaTextBox.Location = new System.Drawing.Point(114, 102);
    142150      this.slopeInitializationSigmaTextBox.Name = "slopeInitializationSigmaTextBox";
    … …  
    144152      this.slopeInitializationSigmaTextBox.TabIndex = 7;
    145153      this.toolTip.SetToolTip(this.slopeInitializationSigmaTextBox, "The sigma parameter for the normal distribution from which to sample the initial " +
    146               "slopes.");
     154        "slopes.");
    147155      this.slopeInitializationSigmaTextBox.TextChanged += new System.EventHandler(this.slopeInitializationSigmaTextBox_TextChanged);
    148156      //
    … …  
    160168      //
    161169      this.slopeInitializationMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    162                   | System.Windows.Forms.AnchorStyles.Right)));
     170            | System.Windows.Forms.AnchorStyles.Right)));
    163171      this.slopeInitializationMuTextBox.Location = new System.Drawing.Point(114, 76);
    164172      this.slopeInitializationMuTextBox.Name = "slopeInitializationMuTextBox";
    … …  
    166174      this.slopeInitializationMuTextBox.TabIndex = 5;
    167175      this.toolTip.SetToolTip(this.slopeInitializationMuTextBox, "The mu (mean) parameter of the normal distribution from which to sample the initi" +
    168               "al slopes.");
     176        "al slopes.");
    169177      this.slopeInitializationMuTextBox.TextChanged += new System.EventHandler(this.slopeInitializationMuTextBox_TextChanged);
    170178      //
    … …  
    182190      //
    183191      this.thresholdInitializationSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    184                   | System.Windows.Forms.AnchorStyles.Right)));
     192            | System.Windows.Forms.AnchorStyles.Right)));
    185193      this.thresholdInitializationSigmaTextBox.Location = new System.Drawing.Point(114, 41);
    186194      this.thresholdInitializationSigmaTextBox.Name = "thresholdInitializationSigmaTextBox";
    … …  
    188196      this.thresholdInitializationSigmaTextBox.TabIndex = 3;
    189197      this.toolTip.SetToolTip(this.thresholdInitializationSigmaTextBox, "The sigma parameter for the normal distribution from which to sample the initial " +
    190               "thresholds.");
     198        "thresholds.");
    191199      this.thresholdInitializationSigmaTextBox.TextChanged += new System.EventHandler(this.thresholdInitializationSigmaTextBox_TextChanged);
    192200      //
    … …  
    194202      //
    195203      this.mutationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    196                   | System.Windows.Forms.AnchorStyles.Right)));
     204            | System.Windows.Forms.AnchorStyles.Right)));
    197205      this.mutationGroupBox.Controls.Add(this.slopeChangeSigmaLabel);
    198206      this.mutationGroupBox.Controls.Add(this.slopeChangeSigmaTextBox);
    … …  
    203211      this.mutationGroupBox.Controls.Add(this.ThresholdChangeMuLabel);
    204212      this.mutationGroupBox.Controls.Add(this.thresholdChangeMuTextBox);
    205       this.mutationGroupBox.Location = new System.Drawing.Point(0, 185);
     213      this.mutationGroupBox.Location = new System.Drawing.Point(0, 260);
    206214      this.mutationGroupBox.Name = "mutationGroupBox";
    207215      this.mutationGroupBox.Size = new System.Drawing.Size(326, 127);
    … …  
    219227      this.slopeChangeSigmaLabel.Text = "Slope change (sigma):";
    220228      this.toolTip.SetToolTip(this.slopeChangeSigmaLabel, "The sigma parameter for the normal distribution to use to sample the change in sl" +
    221               "ope.");
     229        "ope.");
    222230      //
    223231      // slopeChangeSigmaTextBox
    224232      //
    225233      this.slopeChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    226                   | System.Windows.Forms.AnchorStyles.Right)));
     234            | System.Windows.Forms.AnchorStyles.Right)));
    227235      this.slopeChangeSigmaTextBox.Location = new System.Drawing.Point(149, 99);
    228236      this.slopeChangeSigmaTextBox.Name = "slopeChangeSigmaTextBox";
    … …  
    230238      this.slopeChangeSigmaTextBox.TabIndex = 7;
    231239      this.toolTip.SetToolTip(this.slopeChangeSigmaTextBox, "The sigma parameter for the normal distribution to use to sample the change in sl" +
    232               "ope.");
     240        "ope.");
    233241      this.slopeChangeSigmaTextBox.TextChanged += new System.EventHandler(this.slopeChangeSigmaTextBox_TextChanged);
    234242      //
    … …  
    242250      this.slopeChangeMuLabel.Text = "Slope change (mu):";
    243251      this.toolTip.SetToolTip(this.slopeChangeMuLabel, "The nu (mean) parameter for the normal distribution to sample the change in slope" +
    244               ".");
     252        ".");
    245253      //
    246254      // slopeChangeMuTextBox
    247255      //
    248256      this.slopeChangeMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    249                   | System.Windows.Forms.AnchorStyles.Right)));
     257            | System.Windows.Forms.AnchorStyles.Right)));
    250258      this.slopeChangeMuTextBox.Location = new System.Drawing.Point(149, 73);
    251259      this.slopeChangeMuTextBox.Name = "slopeChangeMuTextBox";
    … …  
    253261      this.slopeChangeMuTextBox.TabIndex = 5;
    254262      this.toolTip.SetToolTip(this.slopeChangeMuTextBox, "The mu (mean) parameter for the normal distribution to sample the change in slope" +
    255               ".");
     263        ".");
    256264      this.slopeChangeMuTextBox.TextChanged += new System.EventHandler(this.slopeChangeMuTextBox_TextChanged);
    257265      //
    … …  
    265273      this.thresholdChangeSigmaLabel.Text = "Threshold change (sigma):";
    266274      this.toolTip.SetToolTip(this.thresholdChangeSigmaLabel, "The sigma parameter for the normal distribution to use to sample the change in th" +
    267               "reshold.");
     275        "reshold.");
    268276      //
    269277      // thresholdChangeSigmaTextBox
    270278      //
    271279      this.thresholdChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    272                   | System.Windows.Forms.AnchorStyles.Right)));
     280            | System.Windows.Forms.AnchorStyles.Right)));
    273281      this.thresholdChangeSigmaTextBox.Location = new System.Drawing.Point(149, 41);
    274282      this.thresholdChangeSigmaTextBox.Name = "thresholdChangeSigmaTextBox";
    … …  
    276284      this.thresholdChangeSigmaTextBox.TabIndex = 3;
    277285      this.toolTip.SetToolTip(this.thresholdChangeSigmaTextBox, "The sigma parameter for the normal distribution to use to sample the change in th" +
    278               "reshold.");
     286        "reshold.");
    279287      this.thresholdChangeSigmaTextBox.TextChanged += new System.EventHandler(this.thresholdChangeSigmaTextBox_TextChanged);
    280288      //
    … …  
    288296      this.ThresholdChangeMuLabel.Text = "Threshold change (mu):";
    289297      this.toolTip.SetToolTip(this.ThresholdChangeMuLabel, "The nu (mean) parameter for the normal distribution to sample the change in thres" +
    290               "hold.");
     298        "hold.");
    291299      //
    292300      // thresholdChangeMuTextBox
    293301      //
    294302      this.thresholdChangeMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    295                   | System.Windows.Forms.AnchorStyles.Right)));
     303            | System.Windows.Forms.AnchorStyles.Right)));
    296304      this.thresholdChangeMuTextBox.Location = new System.Drawing.Point(149, 15);
    297305      this.thresholdChangeMuTextBox.Name = "thresholdChangeMuTextBox";
    … …  
    299307      this.thresholdChangeMuTextBox.TabIndex = 1;
    300308      this.toolTip.SetToolTip(this.thresholdChangeMuTextBox, "The mu (mean) parameter for the normal distribution to sample the change in thres" +
    301               "hold.");
     309        "hold.");
    302310      this.thresholdChangeMuTextBox.TextChanged += new System.EventHandler(this.thresholdChangeMuTextBox_TextChanged);
    303311      //
    … …  
    309317      this.Controls.Add(this.initializationGroupBox);
    310318      this.Name = "VariableConditionView";
    311       this.Size = new System.Drawing.Size(326, 315);
     319      this.Size = new System.Drawing.Size(326, 376);
     320      this.Controls.SetChildIndex(this.maximumArityLabel, 0);
     321      this.Controls.SetChildIndex(this.maximumArityTextBox, 0);
     322      this.Controls.SetChildIndex(this.minimumArityLabel, 0);
     323      this.Controls.SetChildIndex(this.minimumArityTextBox, 0);
    312324      this.Controls.SetChildIndex(this.infoLabel, 0);
    313325      this.Controls.SetChildIndex(this.initializationGroupBox, 0);

  • branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.Designer.cs

    r5832 r6878  
    7272      //
    7373      this.errorProvider.SetIconAlignment(this.initialFrequencyTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    74       this.initialFrequencyTextBox.Size = new System.Drawing.Size(315, 20);
     74      this.initialFrequencyTextBox.Size = new System.Drawing.Size(311, 20);
     75      //
     76      // minimumArityTextBox
     77      //
     78      this.errorProvider.SetIconAlignment(this.minimumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     79      this.minimumArityTextBox.Size = new System.Drawing.Size(311, 20);
     80      //
     81      // maximumArityTextBox
     82      //
     83      this.errorProvider.SetIconAlignment(this.maximumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     84      this.maximumArityTextBox.Size = new System.Drawing.Size(311, 20);
    7585      //
    7686      // nameTextBox
    … …  
    96106      // weightInitializationMuTextBox
    97107      //
    98       this.weightInitializationMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    99                   | System.Windows.Forms.AnchorStyles.Right)));
     108      this.weightInitializationMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     109            | System.Windows.Forms.AnchorStyles.Right)));
    100110      this.weightInitializationMuTextBox.Location = new System.Drawing.Point(92, 19);
    101111      this.weightInitializationMuTextBox.Name = "weightInitializationMuTextBox";
    102       this.weightInitializationMuTextBox.Size = new System.Drawing.Size(275, 20);
     112      this.weightInitializationMuTextBox.Size = new System.Drawing.Size(290, 20);
    103113      this.weightInitializationMuTextBox.TabIndex = 1;
    104114      this.toolTip.SetToolTip(this.weightInitializationMuTextBox, "The mu (mean) parameter of the normal distribution from which to sample the initi" +
    105               "al weights.");
     115        "al weights.");
    106116      this.weightInitializationMuTextBox.TextChanged += new System.EventHandler(this.weightMuTextBox_TextChanged);
    107117      //
    108118      // initializationGroupBox
    109119      //
    110       this.initializationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    111                   | System.Windows.Forms.AnchorStyles.Right)));
     120      this.initializationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     121            | System.Windows.Forms.AnchorStyles.Right)));
    112122      this.initializationGroupBox.Controls.Add(this.weightSigmaLabel);
    113123      this.initializationGroupBox.Controls.Add(this.weightInitializationSigmaTextBox);
    … …  
    116126      this.initializationGroupBox.Location = new System.Drawing.Point(6, 6);
    117127      this.initializationGroupBox.Name = "initializationGroupBox";
    118       this.initializationGroupBox.Size = new System.Drawing.Size(373, 73);
     128      this.initializationGroupBox.Size = new System.Drawing.Size(388, 73);
    119129      this.initializationGroupBox.TabIndex = 0;
    120130      this.initializationGroupBox.TabStop = false;
    … …  
    133143      // weightInitializationSigmaTextBox
    134144      //
    135       this.weightInitializationSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    136                   | System.Windows.Forms.AnchorStyles.Right)));
     145      this.weightInitializationSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     146            | System.Windows.Forms.AnchorStyles.Right)));
    137147      this.weightInitializationSigmaTextBox.Location = new System.Drawing.Point(92, 45);
    138148      this.weightInitializationSigmaTextBox.Name = "weightInitializationSigmaTextBox";
    139       this.weightInitializationSigmaTextBox.Size = new System.Drawing.Size(275, 20);
     149      this.weightInitializationSigmaTextBox.Size = new System.Drawing.Size(290, 20);
    140150      this.weightInitializationSigmaTextBox.TabIndex = 3;
    141151      this.toolTip.SetToolTip(this.weightInitializationSigmaTextBox, "The sigma parameter for the normal distribution from which to sample the initial " +
    142               "weights.");
     152        "weights.");
    143153      this.weightInitializationSigmaTextBox.TextChanged += new System.EventHandler(this.weightSigmaTextBox_TextChanged);
    144154      //
    145155      // mutationGroupBox
    146156      //
    147       this.mutationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    148                   | System.Windows.Forms.AnchorStyles.Right)));
     157      this.mutationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     158            | System.Windows.Forms.AnchorStyles.Right)));
    149159      this.mutationGroupBox.Controls.Add(this.multiplicativeWeightChangeLabel);
    150160      this.mutationGroupBox.Controls.Add(this.multiplicativeWeightChangeSigmaTextBox);
    … …  
    153163      this.mutationGroupBox.Location = new System.Drawing.Point(6, 85);
    154164      this.mutationGroupBox.Name = "mutationGroupBox";
    155       this.mutationGroupBox.Size = new System.Drawing.Size(373, 73);
     165      this.mutationGroupBox.Size = new System.Drawing.Size(391, 73);
    156166      this.mutationGroupBox.TabIndex = 1;
    157167      this.mutationGroupBox.TabStop = false;
    … …  
    167177      this.multiplicativeWeightChangeLabel.Text = "Multiplicative weight change (sigma):";
    168178      this.toolTip.SetToolTip(this.multiplicativeWeightChangeLabel, "The sigma parameter for the normal distribution to use to sample a multiplicative" +
    169               " change in weight.");
     179        " change in weight.");
    170180      //
    171181      // multiplicativeWeightChangeSigmaTextBox
    172182      //
    173       this.multiplicativeWeightChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    174                   | System.Windows.Forms.AnchorStyles.Right)));
     183      this.multiplicativeWeightChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     184            | System.Windows.Forms.AnchorStyles.Right)));
    175185      this.multiplicativeWeightChangeSigmaTextBox.Location = new System.Drawing.Point(201, 45);
    176186      this.multiplicativeWeightChangeSigmaTextBox.Name = "multiplicativeWeightChangeSigmaTextBox";
    177       this.multiplicativeWeightChangeSigmaTextBox.Size = new System.Drawing.Size(166, 20);
     187      this.multiplicativeWeightChangeSigmaTextBox.Size = new System.Drawing.Size(184, 20);
    178188      this.multiplicativeWeightChangeSigmaTextBox.TabIndex = 3;
    179189      this.toolTip.SetToolTip(this.multiplicativeWeightChangeSigmaTextBox, "The sigma (std.dev.) parameter for the normal distribution to sample a multiplica" +
    180               "tive change in weight.");
     190        "tive change in weight.");
    181191      this.multiplicativeWeightChangeSigmaTextBox.TextChanged += new System.EventHandler(this.multiplicativeWeightChangeSigmaTextBox_TextChanged);
    182192      //
    … …  
    190200      this.additiveWeightChangeLabel.Text = "Additive weight change (sigma):";
    191201      this.toolTip.SetToolTip(this.additiveWeightChangeLabel, "The sigma (std.dev.) parameter for the normal distribution to sample an additive " +
    192               "change in weight.");
     202        "change in weight.");
    193203      //
    194204      // additiveWeightChangeSigmaTextBox
    195205      //
    196       this.additiveWeightChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    197                   | System.Windows.Forms.AnchorStyles.Right)));
     206      this.additiveWeightChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     207            | System.Windows.Forms.AnchorStyles.Right)));
    198208      this.additiveWeightChangeSigmaTextBox.Location = new System.Drawing.Point(201, 19);
    199209      this.additiveWeightChangeSigmaTextBox.Name = "additiveWeightChangeSigmaTextBox";
    200       this.additiveWeightChangeSigmaTextBox.Size = new System.Drawing.Size(166, 20);
     210      this.additiveWeightChangeSigmaTextBox.Size = new System.Drawing.Size(184, 20);
    201211      this.additiveWeightChangeSigmaTextBox.TabIndex = 1;
    202212      this.toolTip.SetToolTip(this.additiveWeightChangeSigmaTextBox, "The sigma (std.dev.) parameter for the normal distribution to sample an additive " +
    203               "change in weight.");
     213        "change in weight.");
    204214      this.additiveWeightChangeSigmaTextBox.TextChanged += new System.EventHandler(this.additiveWeightChangeSigmaTextBox_TextChanged);
    205215      //
    206216      // tabControl
    207217      //
    208       this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    209                   | System.Windows.Forms.AnchorStyles.Left)
    210                   | System.Windows.Forms.AnchorStyles.Right)));
     218      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     219            | System.Windows.Forms.AnchorStyles.Left)
     220            | System.Windows.Forms.AnchorStyles.Right)));
    211221      this.tabControl.Controls.Add(this.variableNamesTabPage);
    212222      this.tabControl.Controls.Add(this.parametersTabPage);
    213       this.tabControl.Location = new System.Drawing.Point(0, 52);
     223      this.tabControl.Location = new System.Drawing.Point(0, 127);
    214224      this.tabControl.Name = "tabControl";
    215225      this.tabControl.SelectedIndex = 0;
    216       this.tabControl.Size = new System.Drawing.Size(408, 242);
     226      this.tabControl.Size = new System.Drawing.Size(408, 190);
    217227      this.tabControl.TabIndex = 5;
    218228      //
    … …  
    222232      this.variableNamesTabPage.Name = "variableNamesTabPage";
    223233      this.variableNamesTabPage.Padding = new System.Windows.Forms.Padding(3);
    224       this.variableNamesTabPage.Size = new System.Drawing.Size(400, 216);
     234      this.variableNamesTabPage.Size = new System.Drawing.Size(400, 141);
    225235      this.variableNamesTabPage.TabIndex = 0;
    226236      this.variableNamesTabPage.Text = "Variable Names";
    … …  
    234244      this.parametersTabPage.Name = "parametersTabPage";
    235245      this.parametersTabPage.Padding = new System.Windows.Forms.Padding(3);
    236       this.parametersTabPage.Size = new System.Drawing.Size(400, 216);
     246      this.parametersTabPage.Size = new System.Drawing.Size(400, 164);
    237247      this.parametersTabPage.TabIndex = 1;
    238248      this.parametersTabPage.Text = "Parameters";
    … …  
    245255      this.Controls.Add(this.tabControl);
    246256      this.Name = "VariableView";
    247       this.Size = new System.Drawing.Size(408, 294);
     257      this.Size = new System.Drawing.Size(408, 317);
     258      this.Controls.SetChildIndex(this.maximumArityLabel, 0);
     259      this.Controls.SetChildIndex(this.maximumArityTextBox, 0);
     260      this.Controls.SetChildIndex(this.minimumArityLabel, 0);
     261      this.Controls.SetChildIndex(this.minimumArityTextBox, 0);
    248262      this.Controls.SetChildIndex(this.infoLabel, 0);
    249263      this.Controls.SetChildIndex(this.initialFrequencyTextBox, 0);

  • branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.cs

    r6599 r6878  
    8787    protected override void OnContentChanged() {
    8888      base.OnContentChanged();
    89       variableNamesView.Content.Clear();
    9089      UpdateControl();
    9190    }
    … …  
    126125    private void UpdateContent() {
    127126      if (Content != null) {
    128         Content.Changed -= new EventHandler(Content_Changed);
     127        DeregisterContentEvents();
    129128        Content.VariableNames = variableNamesView.Content.CheckedItems.Select(x => x.Value).ToList();
    130         Content.Changed += new EventHandler(Content_Changed);
     129        RegisterContentEvents();
    131130      }
    132131    }
Note: See TracChangeset for help on using the changeset viewer.