Changeset 13666


Ignore:
Timestamp:
03/08/16 15:06:33 (18 months ago)
Author:
abeham
Message:

#2560:

  • changed embedding of fla in okb problem
  • added new view for characteristic calculators
Location:
trunk/sources
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Clients.OKB.Views/3.3/RunCreation/Views/OKBProblemView.Designer.cs

    r13593 r13666  
    5252      this.parametersTabPage = new System.Windows.Forms.TabPage();
    5353      this.parameterCollectionView = new HeuristicLab.Core.Views.ParameterCollectionView();
    54       this.characteristicsTabPage = new System.Windows.Forms.TabPage();
     54      this.flaAnalysisTabPage = new System.Windows.Forms.TabPage();
     55      this.calculateButton = new System.Windows.Forms.Button();
     56      this.flaSplitContainer = new System.Windows.Forms.SplitContainer();
     57      this.characteristicsMatrixView = new HeuristicLab.Data.Views.StringConvertibleMatrixView();
    5558      this.uploadCharacteristicsButton = new System.Windows.Forms.Button();
    5659      this.downloadCharacteristicsButton = new System.Windows.Forms.Button();
    57       this.flaAnalysisTabPage = new System.Windows.Forms.TabPage();
    58       this.calculatorListView = new System.Windows.Forms.ListView();
    59       this.calculateButton = new System.Windows.Forms.Button();
    60       this.calculatorSplitContainer = new System.Windows.Forms.SplitContainer();
    61       this.calculatorViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    62       this.characteristicsMatrixView = new HeuristicLab.Data.Views.StringConvertibleMatrixView();
    6360      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    6461      this.tabControl.SuspendLayout();
    6562      this.parametersTabPage.SuspendLayout();
    66       this.characteristicsTabPage.SuspendLayout();
    6763      this.flaAnalysisTabPage.SuspendLayout();
    68       ((System.ComponentModel.ISupportInitialize)(this.calculatorSplitContainer)).BeginInit();
    69       this.calculatorSplitContainer.Panel1.SuspendLayout();
    70       this.calculatorSplitContainer.Panel2.SuspendLayout();
    71       this.calculatorSplitContainer.SuspendLayout();
     64      ((System.ComponentModel.ISupportInitialize)(this.flaSplitContainer)).BeginInit();
     65      this.flaSplitContainer.Panel1.SuspendLayout();
     66      this.flaSplitContainer.Panel2.SuspendLayout();
     67      this.flaSplitContainer.SuspendLayout();
    7268      this.SuspendLayout();
    7369      //
     
    7773      this.errorProvider.SetIconPadding(this.nameTextBox, 2);
    7874      this.nameTextBox.Location = new System.Drawing.Point(72, 27);
    79       this.nameTextBox.Size = new System.Drawing.Size(604, 20);
     75      this.nameTextBox.Size = new System.Drawing.Size(640, 20);
    8076      this.nameTextBox.TabIndex = 5;
    8177      //
     
    8783      // infoLabel
    8884      //
    89       this.infoLabel.Location = new System.Drawing.Point(687, 30);
     85      this.infoLabel.Location = new System.Drawing.Point(723, 30);
    9086      this.infoLabel.TabIndex = 6;
    9187      //
     
    9894      this.problemComboBox.Location = new System.Drawing.Point(72, 0);
    9995      this.problemComboBox.Name = "problemComboBox";
    100       this.problemComboBox.Size = new System.Drawing.Size(574, 21);
     96      this.problemComboBox.Size = new System.Drawing.Size(610, 21);
    10197      this.problemComboBox.TabIndex = 1;
    10298      this.problemComboBox.SelectedValueChanged += new System.EventHandler(this.problemComboBox_SelectedValueChanged);
     
    114110      //
    115111      this.refreshButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    116       this.refreshButton.Location = new System.Drawing.Point(682, -1);
     112      this.refreshButton.Location = new System.Drawing.Point(718, -1);
    117113      this.refreshButton.Name = "refreshButton";
    118114      this.refreshButton.Size = new System.Drawing.Size(24, 24);
     
    125121      //
    126122      this.cloneProblemButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    127       this.cloneProblemButton.Location = new System.Drawing.Point(652, -1);
     123      this.cloneProblemButton.Location = new System.Drawing.Point(688, -1);
    128124      this.cloneProblemButton.Name = "cloneProblemButton";
    129125      this.cloneProblemButton.Size = new System.Drawing.Size(24, 24);
     
    139135            | System.Windows.Forms.AnchorStyles.Right)));
    140136      this.tabControl.Controls.Add(this.parametersTabPage);
    141       this.tabControl.Controls.Add(this.characteristicsTabPage);
    142137      this.tabControl.Controls.Add(this.flaAnalysisTabPage);
    143138      this.tabControl.Location = new System.Drawing.Point(6, 53);
    144139      this.tabControl.Name = "tabControl";
    145140      this.tabControl.SelectedIndex = 0;
    146       this.tabControl.Size = new System.Drawing.Size(700, 340);
     141      this.tabControl.Size = new System.Drawing.Size(736, 473);
    147142      this.tabControl.TabIndex = 8;
    148143      //
     
    171166      this.parameterCollectionView.TabIndex = 8;
    172167      //
    173       // characteristicsTabPage
    174       //
    175       this.characteristicsTabPage.Controls.Add(this.characteristicsMatrixView);
    176       this.characteristicsTabPage.Controls.Add(this.uploadCharacteristicsButton);
    177       this.characteristicsTabPage.Controls.Add(this.downloadCharacteristicsButton);
    178       this.characteristicsTabPage.Location = new System.Drawing.Point(4, 22);
    179       this.characteristicsTabPage.Name = "characteristicsTabPage";
    180       this.characteristicsTabPage.Padding = new System.Windows.Forms.Padding(3);
    181       this.characteristicsTabPage.Size = new System.Drawing.Size(692, 314);
    182       this.characteristicsTabPage.TabIndex = 1;
    183       this.characteristicsTabPage.Text = "Characteristics";
    184       this.characteristicsTabPage.UseVisualStyleBackColor = true;
    185       //
    186       // uploadCharacteristicsButton
    187       //
    188       this.uploadCharacteristicsButton.Location = new System.Drawing.Point(38, 6);
    189       this.uploadCharacteristicsButton.Name = "uploadCharacteristicsButton";
    190       this.uploadCharacteristicsButton.Size = new System.Drawing.Size(26, 23);
    191       this.uploadCharacteristicsButton.TabIndex = 0;
    192       this.uploadCharacteristicsButton.Text = "Upload";
    193       this.uploadCharacteristicsButton.UseVisualStyleBackColor = true;
    194       this.uploadCharacteristicsButton.Click += new System.EventHandler(this.uploadCharacteristicsButton_Click);
    195       //
    196       // downloadCharacteristicsButton
    197       //
    198       this.downloadCharacteristicsButton.Location = new System.Drawing.Point(6, 6);
    199       this.downloadCharacteristicsButton.Name = "downloadCharacteristicsButton";
    200       this.downloadCharacteristicsButton.Size = new System.Drawing.Size(26, 23);
    201       this.downloadCharacteristicsButton.TabIndex = 0;
    202       this.downloadCharacteristicsButton.Text = "Download";
    203       this.downloadCharacteristicsButton.UseVisualStyleBackColor = true;
    204       this.downloadCharacteristicsButton.Click += new System.EventHandler(this.downloadCharacteristicsButton_Click);
    205       //
    206168      // flaAnalysisTabPage
    207169      //
    208       this.flaAnalysisTabPage.Controls.Add(this.calculatorSplitContainer);
     170      this.flaAnalysisTabPage.Controls.Add(this.flaSplitContainer);
    209171      this.flaAnalysisTabPage.Location = new System.Drawing.Point(4, 22);
    210172      this.flaAnalysisTabPage.Name = "flaAnalysisTabPage";
    211173      this.flaAnalysisTabPage.Padding = new System.Windows.Forms.Padding(3);
    212       this.flaAnalysisTabPage.Size = new System.Drawing.Size(692, 314);
     174      this.flaAnalysisTabPage.Size = new System.Drawing.Size(728, 447);
    213175      this.flaAnalysisTabPage.TabIndex = 2;
    214       this.flaAnalysisTabPage.Text = "FLA Analysis";
     176      this.flaAnalysisTabPage.Text = "Fitness Landscape Analysis";
    215177      this.flaAnalysisTabPage.UseVisualStyleBackColor = true;
    216178      //
    217       // calculatorListView
    218       //
    219       this.calculatorListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    220             | System.Windows.Forms.AnchorStyles.Left)
    221             | System.Windows.Forms.AnchorStyles.Right)));
    222       this.calculatorListView.HideSelection = false;
    223       this.calculatorListView.Location = new System.Drawing.Point(0, 0);
    224       this.calculatorListView.Name = "calculatorListView";
    225       this.calculatorListView.Size = new System.Drawing.Size(225, 276);
    226       this.calculatorListView.TabIndex = 1;
    227       this.calculatorListView.UseCompatibleStateImageBehavior = false;
    228       this.calculatorListView.View = System.Windows.Forms.View.List;
    229       this.calculatorListView.SelectedIndexChanged += new System.EventHandler(this.calculatorListView_SelectedIndexChanged);
    230       //
    231179      // calculateButton
    232180      //
    233       this.calculateButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
    234             | System.Windows.Forms.AnchorStyles.Right)));
    235       this.calculateButton.Location = new System.Drawing.Point(0, 282);
     181      this.calculateButton.Location = new System.Drawing.Point(3, 3);
    236182      this.calculateButton.Name = "calculateButton";
    237       this.calculateButton.Size = new System.Drawing.Size(225, 23);
    238       this.calculateButton.TabIndex = 2;
     183      this.calculateButton.Size = new System.Drawing.Size(26, 23);
     184      this.calculateButton.TabIndex = 8;
    239185      this.calculateButton.Text = "Calculate";
    240186      this.calculateButton.UseVisualStyleBackColor = true;
    241187      this.calculateButton.Click += new System.EventHandler(this.calculateButton_Click);
    242188      //
    243       // calculatorSplitContainer
    244       //
    245       this.calculatorSplitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
    246       this.calculatorSplitContainer.Location = new System.Drawing.Point(3, 3);
    247       this.calculatorSplitContainer.Name = "calculatorSplitContainer";
    248       //
    249       // calculatorSplitContainer.Panel1
    250       //
    251       this.calculatorSplitContainer.Panel1.Controls.Add(this.calculatorListView);
    252       this.calculatorSplitContainer.Panel1.Controls.Add(this.calculateButton);
    253       //
    254       // calculatorSplitContainer.Panel2
    255       //
    256       this.calculatorSplitContainer.Panel2.Controls.Add(this.calculatorViewHost);
    257       this.calculatorSplitContainer.Size = new System.Drawing.Size(686, 308);
    258       this.calculatorSplitContainer.SplitterDistance = 228;
    259       this.calculatorSplitContainer.TabIndex = 3;
    260       //
    261       // calculatorViewHost
    262       //
    263       this.calculatorViewHost.Caption = "View";
    264       this.calculatorViewHost.Content = null;
    265       this.calculatorViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
    266       this.calculatorViewHost.Enabled = false;
    267       this.calculatorViewHost.Location = new System.Drawing.Point(0, 0);
    268       this.calculatorViewHost.Name = "calculatorViewHost";
    269       this.calculatorViewHost.ReadOnly = false;
    270       this.calculatorViewHost.Size = new System.Drawing.Size(454, 308);
    271       this.calculatorViewHost.TabIndex = 0;
    272       this.calculatorViewHost.ViewsLabelVisible = true;
    273       this.calculatorViewHost.ViewType = null;
     189      // flaSplitContainer
     190      //
     191      this.flaSplitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
     192      this.flaSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
     193      this.flaSplitContainer.Location = new System.Drawing.Point(3, 3);
     194      this.flaSplitContainer.Name = "flaSplitContainer";
     195      //
     196      // flaSplitContainer.Panel1
     197      //
     198      this.flaSplitContainer.Panel1.Controls.Add(this.calculateButton);
     199      //
     200      // flaSplitContainer.Panel2
     201      //
     202      this.flaSplitContainer.Panel2.Controls.Add(this.characteristicsMatrixView);
     203      this.flaSplitContainer.Panel2.Controls.Add(this.uploadCharacteristicsButton);
     204      this.flaSplitContainer.Panel2.Controls.Add(this.downloadCharacteristicsButton);
     205      this.flaSplitContainer.Size = new System.Drawing.Size(722, 441);
     206      this.flaSplitContainer.SplitterDistance = 363;
     207      this.flaSplitContainer.TabIndex = 7;
    274208      //
    275209      // characteristicsMatrixView
     
    280214      this.characteristicsMatrixView.Caption = "StringConvertibleMatrix View";
    281215      this.characteristicsMatrixView.Content = null;
    282       this.characteristicsMatrixView.Location = new System.Drawing.Point(3, 35);
     216      this.characteristicsMatrixView.Location = new System.Drawing.Point(3, 32);
    283217      this.characteristicsMatrixView.Name = "characteristicsMatrixView";
    284218      this.characteristicsMatrixView.ReadOnly = false;
    285219      this.characteristicsMatrixView.ShowRowsAndColumnsTextBox = false;
    286220      this.characteristicsMatrixView.ShowStatisticalInformation = false;
    287       this.characteristicsMatrixView.Size = new System.Drawing.Size(686, 276);
    288       this.characteristicsMatrixView.TabIndex = 2;
     221      this.characteristicsMatrixView.Size = new System.Drawing.Size(349, 406);
     222      this.characteristicsMatrixView.TabIndex = 4;
     223      //
     224      // uploadCharacteristicsButton
     225      //
     226      this.uploadCharacteristicsButton.Location = new System.Drawing.Point(35, 3);
     227      this.uploadCharacteristicsButton.Name = "uploadCharacteristicsButton";
     228      this.uploadCharacteristicsButton.Size = new System.Drawing.Size(26, 23);
     229      this.uploadCharacteristicsButton.TabIndex = 5;
     230      this.uploadCharacteristicsButton.Text = "Upload";
     231      this.uploadCharacteristicsButton.UseVisualStyleBackColor = true;
     232      this.uploadCharacteristicsButton.Click += new System.EventHandler(this.uploadCharacteristicsButton_Click);
     233      //
     234      // downloadCharacteristicsButton
     235      //
     236      this.downloadCharacteristicsButton.Location = new System.Drawing.Point(3, 3);
     237      this.downloadCharacteristicsButton.Name = "downloadCharacteristicsButton";
     238      this.downloadCharacteristicsButton.Size = new System.Drawing.Size(26, 23);
     239      this.downloadCharacteristicsButton.TabIndex = 6;
     240      this.downloadCharacteristicsButton.Text = "Download";
     241      this.downloadCharacteristicsButton.UseVisualStyleBackColor = true;
     242      this.downloadCharacteristicsButton.Click += new System.EventHandler(this.downloadCharacteristicsButton_Click);
    289243      //
    290244      // OKBProblemView
     
    298252      this.Controls.Add(this.refreshButton);
    299253      this.Name = "OKBProblemView";
    300       this.Size = new System.Drawing.Size(706, 393);
     254      this.Size = new System.Drawing.Size(742, 526);
    301255      this.Controls.SetChildIndex(this.refreshButton, 0);
    302256      this.Controls.SetChildIndex(this.cloneProblemButton, 0);
     
    310264      this.tabControl.ResumeLayout(false);
    311265      this.parametersTabPage.ResumeLayout(false);
    312       this.characteristicsTabPage.ResumeLayout(false);
    313266      this.flaAnalysisTabPage.ResumeLayout(false);
    314       this.calculatorSplitContainer.Panel1.ResumeLayout(false);
    315       this.calculatorSplitContainer.Panel2.ResumeLayout(false);
    316       ((System.ComponentModel.ISupportInitialize)(this.calculatorSplitContainer)).EndInit();
    317       this.calculatorSplitContainer.ResumeLayout(false);
     267      this.flaSplitContainer.Panel1.ResumeLayout(false);
     268      this.flaSplitContainer.Panel2.ResumeLayout(false);
     269      ((System.ComponentModel.ISupportInitialize)(this.flaSplitContainer)).EndInit();
     270      this.flaSplitContainer.ResumeLayout(false);
    318271      this.ResumeLayout(false);
    319272      this.PerformLayout();
     
    329282    private System.Windows.Forms.TabControl tabControl;
    330283    private System.Windows.Forms.TabPage parametersTabPage;
    331     private System.Windows.Forms.TabPage characteristicsTabPage;
    332284    private Core.Views.ParameterCollectionView parameterCollectionView;
     285    private System.Windows.Forms.TabPage flaAnalysisTabPage;
     286    private System.Windows.Forms.Button calculateButton;
     287    private System.Windows.Forms.SplitContainer flaSplitContainer;
     288    private Data.Views.StringConvertibleMatrixView characteristicsMatrixView;
    333289    private System.Windows.Forms.Button uploadCharacteristicsButton;
    334290    private System.Windows.Forms.Button downloadCharacteristicsButton;
    335     private System.Windows.Forms.TabPage flaAnalysisTabPage;
    336     private System.Windows.Forms.ListView calculatorListView;
    337     private System.Windows.Forms.Button calculateButton;
    338     private System.Windows.Forms.SplitContainer calculatorSplitContainer;
    339     private MainForm.WindowsForms.ViewHost calculatorViewHost;
    340     private Data.Views.StringConvertibleMatrixView characteristicsMatrixView;
    341291
    342292
  • trunk/sources/HeuristicLab.Clients.OKB.Views/3.3/RunCreation/Views/OKBProblemView.cs

    r13593 r13666  
    2121
    2222using HeuristicLab.Common.Resources;
     23using HeuristicLab.Core;
    2324using HeuristicLab.Core.Views;
    2425using HeuristicLab.Data;
     
    2829using System;
    2930using System.Collections.Generic;
     31using System.Drawing;
    3032using System.Linq;
    3133using System.Windows.Forms;
     
    3638  [Content(typeof(MultiObjectiveOKBProblem), true)]
    3739  public sealed partial class OKBProblemView : NamedItemView {
     40    private readonly CheckedItemList<ICharacteristicCalculator> calculatorList;
     41
    3842    public new OKBProblem Content {
    3943      get { return (OKBProblem)base.Content; }
     
    4347    public OKBProblemView() {
    4448      InitializeComponent();
     49      var calculatorListView = new CheckedItemListView<ICharacteristicCalculator>() {
     50        Anchor = AnchorStyles.Left | AnchorStyles.Bottom | AnchorStyles.Right | AnchorStyles.Top,
     51        Location = new Point(flaSplitContainer.Padding.Left, calculateButton.Location.Y + calculateButton.Height + calculateButton.Padding.Bottom + 3),
     52      };
     53      calculatorListView.Size = new Size(flaSplitContainer.Panel1.Size.Width - flaSplitContainer.Panel1.Padding.Horizontal,
     54          flaSplitContainer.Panel1.Height - calculatorListView.Location.Y - flaSplitContainer.Panel1.Padding.Bottom);
     55      calculatorList = new CheckedItemList<ICharacteristicCalculator>();
     56      calculatorList.ItemsAdded += CalculatorListOnChanged;
     57      calculatorList.ItemsRemoved += CalculatorListOnChanged;
     58      calculatorList.ItemsReplaced += CalculatorListOnChanged;
     59      calculatorList.CollectionReset += CalculatorListOnChanged;
     60      calculatorList.CheckedItemsChanged += CalculatorListOnChanged;
     61
     62      calculatorListView.Content = calculatorList.AsReadOnly();
     63
     64      flaSplitContainer.Panel1.Controls.Add(calculatorListView);
     65      calculateButton.Text = string.Empty;
     66      calculateButton.Image = VSImageLibrary.Play;
    4567      refreshButton.Text = string.Empty;
    4668      refreshButton.Image = VSImageLibrary.Refresh;
     
    5173      uploadCharacteristicsButton.Text = string.Empty;
    5274      uploadCharacteristicsButton.Image = VSImageLibrary.PublishToWeb;
     75    }
     76
     77    private void CalculatorListOnChanged(object sender, EventArgs e) {
     78      SetEnabledStateOfControls();
    5379    }
    5480
     
    91117      uploadCharacteristicsButton.Enabled = Content != null && Content.ProblemId != -1 && !Locked && !ReadOnly
    92118        && characteristicsMatrixView.Content != null && characteristicsMatrixView.Content.Rows > 0;
    93       calculateButton.Enabled = Content != null && Content.ProblemId != -1 && !Locked && !ReadOnly;
     119      calculateButton.Enabled = Content != null && Content.ProblemId != -1 && !Locked && !ReadOnly && calculatorList.CheckedItems.Any();
    94120    }
    95121
     
    101127
    102128    private void UpdateCharacteristicCalculators() {
    103       calculatorListView.Items.Clear();
    104       calculatorListView.Groups.Clear();
     129      calculatorList.Clear();
    105130      if (Content == null || Content.ProblemId == -1) return;
    106131      var problem = Content.CloneProblem();
    107132      var calculators = ApplicationManager.Manager.GetInstances<ICharacteristicCalculator>().ToList();
    108       try {
    109         calculatorListView.BeginUpdate();
    110         foreach (var calc in calculators) {
    111           calc.Problem = problem;
    112           var group = calculatorListView.Groups.Add(calc.Name, calc.Name);
    113           group.Tag = calc;
    114 
    115           var paramItem = calculatorListView.Items.Add(calc.Name + ".Parameters", "Parameters");
    116           paramItem.Group = group;
    117           paramItem.Tag = "param";
    118 
    119           var charactItem = calculatorListView.Items.Add(calc.Name + ".Characteristics", "Characteristics");
    120           charactItem.Group = group;
    121           charactItem.Tag = "chara";
    122         }
    123       } finally { calculatorListView.EndUpdate(); }
     133      foreach (var calc in calculators) {
     134        calc.Problem = problem;
     135        if (!calc.CanCalculate()) continue;
     136        calculatorList.Add(calc, true);
     137      }
    124138    }
    125139
     
    193207      } catch (Exception ex) { ErrorHandling.ShowErrorDialog(ex); }
    194208    }
    195     private void calculatorListView_SelectedIndexChanged(object sender, EventArgs e) {
    196       if (InvokeRequired) {
    197         Invoke((Action<object, EventArgs>)calculatorListView_SelectedIndexChanged, sender, e);
    198         return;
    199       }
    200       if (calculatorListView.SelectedIndices.Count == 0) calculatorViewHost.Content = null;
    201       else {
    202         var item = calculatorListView.SelectedItems[0];
    203         if ((string)item.Tag == "param") {
    204           calculatorViewHost.Content = ((ICharacteristicCalculator)item.Group.Tag);
    205         } else if ((string)item.Tag == "chara") {
    206           calculatorViewHost.Content = ((ICharacteristicCalculator)item.Group.Tag).Characteristics;
    207         }
    208       }
    209     }
    210209    private void calculateButton_Click(object sender, EventArgs e) {
    211       var calculators = calculatorListView.Groups.OfType<ListViewGroup>()
    212                                                      .Select(x => (ICharacteristicCalculator)x.Tag)
    213                                                      .Where(x => x.Characteristics.CheckedItems.Any()
    214                                                               && x.CanCalculate()).ToList();
     210      var calculators = calculatorList.CheckedItems.Select(x => x.Value).Where(x => x.CanCalculate()).ToList();
    215211      if (calculators.Count == 0) return;
    216212
  • trunk/sources/HeuristicLab.Clients.OKB/3.3/RunCreation/ServiceClient/Value.cs

    r13550 r13666  
    3535          Name = name,
    3636          Value = bool.Parse(strValue)
    37         }; break;
     37        };
    3838        case "IntValue": return new IntValue() {
    3939          Name = name,
    4040          Value = int.Parse(strValue, CultureInfo.CurrentCulture.NumberFormat)
    41         }; break;
     41        };
    4242        case "LongValue": return new LongValue() {
    4343          Name = name,
    4444          Value = long.Parse(strValue, CultureInfo.CurrentCulture.NumberFormat)
    45         }; break;
     45        };
    4646        case "FloatValue": return new FloatValue() {
    4747          Name = name,
    4848          Value = float.Parse(strValue, CultureInfo.CurrentCulture.NumberFormat)
    49         }; break;
     49        };
    5050        case "DoubleValue": return new DoubleValue() {
    5151          Name = name,
    5252          Value = double.Parse(strValue, CultureInfo.CurrentCulture.NumberFormat)
    53         }; break;
     53        };
    5454        case "PercentValue": return new PercentValue() {
    5555          Name = name,
    5656          Value = double.Parse(Regex.Match(strValue, "[0-9.,]+").Value, CultureInfo.CurrentCulture.NumberFormat) / 100.0
    57         }; break;
     57        };
    5858        case "StringValue": return new StringValue() {
    5959          Name = name,
    6060          Value = strValue
    61         }; break;
     61        };
    6262        case "TimeSpanValue": return new TimeSpanValue() {
    6363          Name = name,
    6464          Value = long.Parse(strValue, CultureInfo.CurrentCulture.NumberFormat)
    65         }; break;
     65        };
    6666        default: throw new ArgumentException(string.Format("type {0} is unknown", type), "type");
    6767      }
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r12975 r13666  
    148148      <DependentUpon>CreateNewSingleEncodingDialog.cs</DependentUpon>
    149149    </Compile>
     150    <Compile Include="ICharacteristicCalculatorView.cs">
     151      <SubType>UserControl</SubType>
     152    </Compile>
     153    <Compile Include="ICharacteristicCalculatorView.Designer.cs">
     154      <DependentUpon>ICharacteristicCalculatorView.cs</DependentUpon>
     155    </Compile>
    150156    <Compile Include="ISolutionSimilarityCalculatorView.cs">
    151157      <SubType>UserControl</SubType>
Note: See TracChangeset for help on using the changeset viewer.