Changeset 5653 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterCombinationsEnumerator.cs

Timestamp:

03/10/11 10:44:42 (13 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/3.3

Files:

• . (modified) (1 prop)
• Encoding/ParameterCombinationsEnumerator.cs (modified) (4 diffs)

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

@@ -3 +3 @@
 obj
 HeuristicLabProblemsMetaOptimizationPlugin.cs
+*.vs10x

@@ -3 +3 @@
 obj
 HeuristicLabProblemsMetaOptimizationPlugin.cs
+*.vs10x

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterCombinationsEnumerator.cs

@@ -1 +1 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Collections;
 using HeuristicLab.Core;
 
@@ -25 +23 @@
         if (!initialized)
           throw new SystemException("Enumeration not started. Call MoveNext!");
-        return Current; 
+        return Current;
       }
     }
@@ -94 +92 @@
       }
 
-      var vc = node as IValueConfiguration;
-      if (vc != null) {
-        if (vc.RangeConstraint != null) {
-          valueEnumerator = new EnumeratorCollectionEnumerator<IItem>();
-          valueEnumerator.AddEnumerator(vc.RangeConstraint.GetCombinations().GetEnumerator());
-          valueEnumerator.Reset();
-          enumerators.Add(valueEnumerator);
-        } else {
-          foreach (var parameterConfiguration in vc.ParameterConfigurations) {
-            if (parameterConfiguration.Optimize) {
-              var enumerator = new ParameterCombinationsEnumerator(parameterConfiguration);
-              enumerator.Reset();
-              enumerators.Add(enumerator);
-            }
+      var rangeVc = node as RangeValueConfiguration;
+      if (rangeVc != null) {
+        valueEnumerator = new EnumeratorCollectionEnumerator<IItem>();
+        valueEnumerator.AddEnumerator(rangeVc.RangeConstraint.GetCombinations().GetEnumerator());
+        valueEnumerator.Reset();
+        enumerators.Add(valueEnumerator);
+      }
+
+      var parameterizedVc = node as ParameterizedValueConfiguration;
+      if (parameterizedVc != null) {
+        foreach (var parameterConfiguration in parameterizedVc.ParameterConfigurations) {
+          if (parameterConfiguration.Optimize) {
+            var enumerator = new ParameterCombinationsEnumerator(parameterConfiguration);
+            enumerator.Reset();
+            enumerators.Add(enumerator);
           }
-          enumerators.Reverse(); // this makes the list of combinations better readable
         }
+        enumerators.Reverse(); // this makes the list of combinations better readable
       }
     }
@@ -129 +128 @@
     }
 
-    public void Dispose() {  }
+    public void Dispose() { }
 
     public T Current {

@@ -3 +3 @@
 obj
 HeuristicLabProblemsMetaOptimizationPlugin.cs
+*.vs10x