Changeset 6486 for branches

Timestamp:

06/27/11 17:43:48 (13 years ago)

Author:

cneumuel

Message:

#1215

• fixed generating combinations for non EngineAlgoritms

Location:

branches/HeuristicLab.MetaOptimization

Files:

• HeuristicLab.Problems.MetaOptimization.Views/3.3/MetaOptimizationProblemView.cs (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurations/ParameterConfiguration.cs (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization/3.3/MetaOptimizationUtil.cs (modified) (1 diff)

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

@@ -70 +70 @@
 
           if (dlgResult == DialogResult.OK) {
-            var algorithm = (EngineAlgorithm)Content.Algorithm.Clone();
+            var algorithm = (IAlgorithm)Content.Algorithm.Clone();
             if(Content.Problems.Count > 0) algorithm.Problem = Content.Problems.First();
-            algorithm.Engine = (IEngine)dlg.Engine.Clone();
+            if(algorithm is EngineAlgorithm) ((EngineAlgorithm)algorithm).Engine = (IEngine)dlg.Engine.Clone();
             Experiment experiment;
 

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurations/ParameterConfiguration.cs

@@ -485 +485 @@
 
     public void Parameterize(IValueParameter parameter) {
-      if (parameter is IFixedValueParameter)
-        return;
-
       if (Optimize) {
         if (this.ActualValue.Value is IParameterizedItem) {

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/MetaOptimizationUtil.cs

@@ -84 +84 @@
       var algorithm = (IAlgorithm)Activator.CreateInstance(algorithmType);
       algorithm.Problem = problem;
-      ((EngineAlgorithm)algorithm).Engine = new SequentialEngine.SequentialEngine();
+      if (algorithm is EngineAlgorithm) {
+        ((EngineAlgorithm)algorithm).Engine = new SequentialEngine.SequentialEngine();
+      }
       if (randomize) parameterConfigurationTree.Randomize(random);
       parameterConfigurationTree.Parameterize(algorithm);