Changeset 5653 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3/OptimizableView.cs

Timestamp:

03/10/11 10:44:42 (14 years ago)

Author:

cneumuel

Message:

#1215

• evaluation operator returns operatorgraph which creates a scope and an operation for each algorithm execution (each repetition and problem)
• split ValueConfiguration into ParameterizedValueConfiguration and RangeValueConfiguration

Location:

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3

Files:

• . (modified) (1 prop)
• OptimizableView.cs (modified) (2 diffs)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3

@@ -3 +3 @@
 HeuristicLab.Problems.MetaOptimization.Views-3.3.csproj.user
 HeuristicLabProblemsMetaOptimizationViewsPlugin.cs
+*.vs10x

@@ -3 +3 @@
 HeuristicLab.Problems.MetaOptimization.Views-3.3.csproj.user
 HeuristicLabProblemsMetaOptimizationViewsPlugin.cs
+*.vs10x

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3/OptimizableView.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
 using HeuristicLab.Core.Views;
+using HeuristicLab.Data;
 using HeuristicLab.MainForm;
-using HeuristicLab.Parameters;
-using HeuristicLab.Core;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.MetaOptimization.Views.ValueConfigurationViews {
@@ -47 +39 @@
         if (Content.Optimize) {
           this.viewHost.ViewType = null;
-          if (Content is IParameterConfiguration) {
+
+          var pc = Content as IParameterConfiguration;
+          var vc = Content as IValueConfiguration;
+
+          if (pc != null) {
             this.viewHost.Content = ((IParameterConfiguration)Content).ValueConfigurations;
-          } else if (Content is IValueConfiguration) {
-            if (Content.ActualValue.ValueDataType == typeof(IntValue) ||
+          } else if(vc != null) {
+            var rvc = Content as RangeValueConfiguration;
+            if (rvc != null) {
+              if (Content.ActualValue.ValueDataType == typeof(IntValue) ||
                 Content.ActualValue.ValueDataType == typeof(DoubleValue) ||
                 Content.ActualValue.ValueDataType == typeof(PercentValue)) {
-              this.viewHost.ViewsLabelVisible = true;
-              this.viewHost.Content = ((IValueConfiguration)Content).RangeConstraint;
-            } else if(Content.ActualValue.ValueDataType == typeof(BoolValue)) {
-              this.viewHost.Content = null; // no configuration required
-            } else {
+                this.viewHost.ViewsLabelVisible = true;
+                this.viewHost.Content = rvc.RangeConstraint;
+              } else if (Content.ActualValue.ValueDataType == typeof(BoolValue)) {
+                this.viewHost.Content = null; // no configuration required
+              }
+            }
+
+            var pvc = Content as ParameterizedValueConfiguration;
+            if (pvc != null) {
               this.viewHost.ViewsLabelVisible = false;
-              this.viewHost.Content = ((IValueConfiguration)Content).ParameterConfigurations;
+              this.viewHost.Content = pvc.ParameterConfigurations;
             }
           } else {

@@ -3 +3 @@
 HeuristicLab.Problems.MetaOptimization.Views-3.3.csproj.user
 HeuristicLabProblemsMetaOptimizationViewsPlugin.cs
+*.vs10x