Changeset 11893 for branches/ProgrammableProblem/HeuristicLab.Problems.ExternalEvaluation/3.4/ExternalEvaluationProblem.cs

Timestamp:

02/04/15 21:38:28 (9 years ago)

Author:

abeham

Message:

#2174:

• Added possibility to define neighborhood and analyze function for external evaluation problems

Location:

branches/ProgrammableProblem/HeuristicLab.Problems.ExternalEvaluation/3.4

Files:

• . (modified) (1 prop)
• ExternalEvaluationProblem.cs (modified) (5 diffs)

branches/ProgrammableProblem/HeuristicLab.Problems.ExternalEvaluation/3.4

@@ -5 +5 @@
 *.vs10x
 Plugin.cs
+*.DotSettings

@@ -5 +5 @@
 *.vs10x
 Plugin.cs
+*.DotSettings

branches/ProgrammableProblem/HeuristicLab.Problems.ExternalEvaluation/3.4/ExternalEvaluationProblem.cs

@@ -29 +29 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -54 +55 @@
       get { return (IValueParameter<SolutionMessageBuilder>)Parameters["MessageBuilder"]; }
     }
+    public IFixedValueParameter<SingleObjectiveOptimizationSupportScript> SupportScriptParameter {
+      get { return (IFixedValueParameter<SingleObjectiveOptimizationSupportScript>)Parameters["SupportScript"]; }
+    }
 
     public EvaluationCache Cache {
@@ -64 +68 @@
       get { return MessageBuilderParameter.Value; }
     }
+    public SingleObjectiveOptimizationSupportScript OptimizationSupportScript {
+      get { return SupportScriptParameter.Value; }
+    }
+    private ISingleObjectiveOptimizationSupport OptimizationSupport {
+      get { return SupportScriptParameter.Value; }
+    }
 
     [StorableConstructor]
     private ExternalEvaluationProblem(bool deserializing) : base(deserializing) { }
-    private ExternalEvaluationProblem(ExternalEvaluationProblem original, Cloner cloner) : base(original, cloner) { }
+
+    private ExternalEvaluationProblem(ExternalEvaluationProblem original, Cloner cloner)
+      : base(original, cloner) {
+      try {
+        OptimizationSupportScript.Compile();
+      } catch (SingleObjectiveOptimizationSupportException ex) {
+        PluginInfrastructure.ErrorHandling.ShowErrorDialog("Support script doesn't compile.", ex);
+      }
+    }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new ExternalEvaluationProblem(this, cloner);
@@ -76 +94 @@
       Parameters.Add(new ValueParameter<CheckedItemCollection<IEvaluationServiceClient>>("Clients", "The clients that are used to communicate with the external application.", new CheckedItemCollection<IEvaluationServiceClient>() { new EvaluationServiceClient() }));
       Parameters.Add(new ValueParameter<SolutionMessageBuilder>("MessageBuilder", "The message builder that converts from HeuristicLab objects to SolutionMessage representation.", new SolutionMessageBuilder()));
+      Parameters.Add(new FixedValueParameter<SingleObjectiveOptimizationSupportScript>("SupportScript", "A script that can provide neighborhood and analyze the results of the optimization.", new SingleObjectiveOptimizationSupportScript()));
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      try {
+        OptimizationSupportScript.Compile();
+      } catch (SingleObjectiveOptimizationSupportException ex) {
+        PluginInfrastructure.ErrorHandling.ShowErrorDialog("Support script doesn't compile.", ex);
+      }
     }
 
@@ -85 +113 @@
       return Cache == null ? EvaluateOnNextAvailableClient(BuildSolutionMessage(individual)).Quality
         : Cache.GetValue(BuildSolutionMessage(individual), m => EvaluateOnNextAvailableClient(m).Quality);
+    }
+
+    public override void Analyze(Individual[] individuals, double[] qualities, ResultCollection results, IRandom random) {
+      OptimizationSupport.Analyze(individuals, qualities, results, random);
+    }
+
+    public override IEnumerable<Individual> GetNeighbors(Individual individual, IRandom random) {
+      return OptimizationSupport.GetNeighbors(individual, random);
     }
 

@@ -5 +5 @@
 *.vs10x
 Plugin.cs
+*.DotSettings