Changeset 3664

Timestamp:

05/06/10 04:49:45 (14 years ago)

Author:

swagner

Message:

Worked on refactoring of algorithm analysis and tracing (#999)

• fixed bug in MultiAnalyzer
• fixed flickering of results

Location:

trunk/sources

Files:

• HeuristicLab.Analysis/3.3/MultiAnalyzer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Operators/3.3/ResultsCollector.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/ResultView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Analysis/3.3/MultiAnalyzer.cs

@@ -62 +62 @@
       IntValue interval = UpdateIntervalParameter.ActualValue;
       if (interval == null) interval = new IntValue(1);
+
       IntValue counter = UpdateCounterParameter.ActualValue;
-      if (counter == null) counter = new IntValue(interval.Value);
-      else counter.Value++;
+      if (counter == null) {
+        counter = new IntValue(interval.Value);
+        UpdateCounterParameter.ActualValue = counter;
+      } else counter.Value++;
 
       if (counter.Value == interval.Value) {

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs

@@ -104 +104 @@
 
     protected override void OnContentChanged() {
-      messageLabel.Visible = false;
-      viewsLabel.Visible = false;
-      viewPanel.Visible = false;
       viewContextMenuStrip.Item = Content;
 
       if (Content != null) {
-        if (viewContextMenuStrip.Items.Count == 0)
+        if (viewContextMenuStrip.Items.Count == 0) {
           messageLabel.Visible = true;
-        else {
+          viewsLabel.Visible = false;
+          viewPanel.Visible = false;
+        } else {
+          messageLabel.Visible = false;
           viewsLabel.Visible = true;
           viewPanel.Visible = true;
@@ -126 +126 @@
           view.Content = this.Content;
       } else {
+        messageLabel.Visible = false;
+        viewsLabel.Visible = false;
+        viewPanel.Visible = false;
         if (viewPanel.Controls.Count > 0) viewPanel.Controls[0].Dispose();
         viewPanel.Controls.Clear();

trunk/sources/HeuristicLab.Optimization.Operators/3.3/ResultsCollector.cs

@@ -49 +49 @@
       : base() {
       Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the collected values should be stored."));
-      Parameters.Add(new ValueParameter<BoolValue>("CopyValue", "True if the collected result value should be copied, otherwise false.", new BoolValue(true)));
+      Parameters.Add(new ValueParameter<BoolValue>("CopyValue", "True if the collected result value should be copied, otherwise false.", new BoolValue(false)));
     }
 

trunk/sources/HeuristicLab.Optimization.Views/3.3/ResultView.cs

@@ -103 +103 @@
         Invoke(new EventHandler(Content_ValueChanged), sender, e);
       else {
-        viewHost.ViewType = null;
         viewHost.Content = Content.Value;
       }