Changeset 11405

Timestamp:

09/29/14 17:39:19 (8 years ago)

Author:

abeham

Message:

#2174: Made single-objective programmable problem compatible with scatter search

Location:

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3

Files:

• Helper.cs (modified) (1 diff)
• HeuristicLab.Problems.Programmable-3.3.csproj (modified) (1 diff)
• Operators/SingleObjectiveAnalyzer.cs (modified) (1 diff)
• Operators/SingleObjectiveEvaluator.cs (modified) (1 diff)
• Operators/SingleObjectiveParameterVectorImprover.cs (added)
• SingleObjectiveProgrammableProblem.cs (modified) (2 diffs)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Helper.cs

@@ -64 +64 @@
         permutations: permDict.Count > 0 ? permDict : null);
     }
+
+    internal static void Write(IScope scope, ParameterVector vector) {
+      foreach (var param in vector.BinaryNames) {
+        if (scope.Variables.ContainsKey(param))
+          scope.Variables[param].Value = vector.BinaryVector(param);
+        else scope.Variables.Add(new Variable(param, vector.BinaryVector(param)));
+      }
+      foreach (var param in vector.IntegerNames) {
+        if (scope.Variables.ContainsKey(param))
+          scope.Variables[param].Value = vector.IntegerVector(param);
+        else scope.Variables.Add(new Variable(param, vector.IntegerVector(param)));
+      }
+      foreach (var param in vector.RealNames) {
+        if (scope.Variables.ContainsKey(param))
+          scope.Variables[param].Value = vector.RealVector(param);
+        else scope.Variables.Add(new Variable(param, vector.RealVector(param)));
+      }
+      foreach (var param in vector.PermutationNames) {
+        if (scope.Variables.ContainsKey(param))
+          scope.Variables[param].Value = vector.Permutation(param);
+        else scope.Variables.Add(new Variable(param, vector.Permutation(param)));
+      }
+    }
   }
 }

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/HeuristicLab.Problems.Programmable-3.3.csproj

@@ -159 +159 @@
     <Compile Include="Interfaces\IProblemDefinition.cs" />
     <Compile Include="Interfaces\ISingleObjectiveProblemDefinition.cs" />
+    <Compile Include="Operators\SingleObjectiveParameterVectorImprover.cs" />
     <Compile Include="ProblemDefinition.cs" />
     <Compile Include="ProblemDefinitionScript.cs" />

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/SingleObjectiveAnalyzer.cs

@@ -49 +49 @@
     public override IOperation Apply() {
       var host = ProblemDefinitionParameter.ActualValue;
-      if (host.Instance == null) throw new InvalidOperationException("Script instance is null, maybe the code doesn't compile.");
+      if (host.Instance == null) throw new InvalidOperationException("Problem definition is not available.");
       var config = ConfigurationParameter.ActualValue;
       var results = ResultsParameter.ActualValue;

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/SingleObjectiveEvaluator.cs

@@ -67 +67 @@
       var random = RandomParameter.ActualValue;
       var host = ProblemDefinitionParameter.ActualValue;
-      if (host.Instance == null) throw new InvalidOperationException("Script instance is null, maybe the code doesn't compile.");
+      if (host.Instance == null) throw new InvalidOperationException("Problem definition is not available.");
       var config = ConfigurationParameter.ActualValue;
       var vector = Helper.Extract(ExecutionContext.Scope, config);

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs

@@ -171 +171 @@
         UpdateMultiVectorEncodingOperators(solutionCreators, configuration);
       }
+      UpdateImprovementOperators();
       UpdateMoveOperators();
     }
@@ -852 +853 @@
     }
 
+    protected virtual void UpdateImprovementOperators() {
+      if (!Operators.Any(x => x is SingleObjectiveParameterVectorImprover))
+        Operators.Add(new SingleObjectiveParameterVectorImprover());
+      foreach (var improver in Operators.OfType<SingleObjectiveParameterVectorImprover>()) {
+        improver.ConfigurationParameter.ActualName = ConfigurationParameter.Name;
+        improver.MaximizationParameter.ActualName = MaximizationParameter.Name;
+        improver.ProblemDefinitionParameter.ActualName = ProblemDefinitionParameter.Name;
+        improver.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
+      }
+    }
+
     protected virtual void UpdateMoveOperators() {
       Operators.RemoveAll(x => x is IParameterVectorMoveOperator);