Changeset 11899

Timestamp:

02/05/15 09:33:22 (9 years ago)

Author:

abeham

Message:

#2174:

• Added regions to structure code
• Added compile call to the default creator

File:

• branches/ProgrammableProblem/HeuristicLab.Problems.ExternalEvaluation/3.4/ExternalEvaluationProblem.cs (modified) (8 diffs)

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

@@ -39 +39 @@
   [StorableClass]
   public sealed class ExternalEvaluationProblem : SingleObjectiveBasicProblem<IEncoding> {
-    private HashSet<IEvaluationServiceClient> activeClients = new HashSet<IEvaluationServiceClient>();
-    private object clientLock = new object();
 
     public static new Image StaticItemImage {
@@ -46 +44 @@
     }
 
+    #region Parameters
     public OptionalValueParameter<EvaluationCache> CacheParameter {
       get { return (OptionalValueParameter<EvaluationCache>)Parameters["Cache"]; }
@@ -58 +57 @@
       get { return (IFixedValueParameter<SingleObjectiveOptimizationSupportScript>)Parameters["SupportScript"]; }
     }
+    #endregion
 
+    #region Properties
     public EvaluationCache Cache {
       get { return CacheParameter.Value; }
@@ -74 +75 @@
       get { return SupportScriptParameter.Value; }
     }
+    #endregion
 
     [StorableConstructor]
     private ExternalEvaluationProblem(bool deserializing) : base(deserializing) { }
-
     private ExternalEvaluationProblem(ExternalEvaluationProblem original, Cloner cloner)
       : base(original, cloner) {
-      try {
-        OptimizationSupportScript.Compile();
-      } catch (SingleObjectiveOptimizationSupportException ex) {
-        PluginInfrastructure.ErrorHandling.ShowErrorDialog("Support script doesn't compile.", ex);
-      }
+      CompileSupportScript();
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -95 +92 @@
       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()));
+      CompileSupportScript();
     }
 
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
+      CompileSupportScript();
+    }
+
+    private void CompileSupportScript() {
       try {
         OptimizationSupportScript.Compile();
@@ -106 +108 @@
     }
 
+    #region Single Objective Problem Overrides
     public override bool Maximization {
       get { return Parameters.ContainsKey("Maximization") && ((IValueParameter<BoolValue>)Parameters["Maximization"]).Value.Value; }
@@ -122 +125 @@
       return OptimizationSupport.GetNeighbors(individual, random);
     }
+    #endregion
 
+    #region Evaluation Helpers
+    private HashSet<IEvaluationServiceClient> activeClients = new HashSet<IEvaluationServiceClient>();
+    private object clientLock = new object();
     private QualityMessage EvaluateOnNextAvailableClient(SolutionMessage message) {
       IEvaluationServiceClient client = null;
@@ -164 +171 @@
       }
     }
+    #endregion
   }
 }