Changeset 11900 for branches/ProgrammableProblem/HeuristicLab.Problems.ExternalEvaluation

Timestamp:

02/05/15 10:19:37 (10 years ago)

Author:

abeham

Message:

#2174:

• Removed compilation calls from the problem (AfterDeserialization and in cloning constructor) and instead compile instance lazily when accessed
• Compile support code in ExternalEvaluationProblem lazy
• Fixed encoding class names in template code files (forgot to add vector)

Location:

branches/ProgrammableProblem/HeuristicLab.Problems.ExternalEvaluation/3.4

Files:

• ExternalEvaluationProblem.cs (modified) (2 diffs)
• Programmable/SingleObjectiveOptimizationSupportScript.cs (modified) (1 diff)

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

@@ -79 +79 @@
     [StorableConstructor]
     private ExternalEvaluationProblem(bool deserializing) : base(deserializing) { }
-    private ExternalEvaluationProblem(ExternalEvaluationProblem original, Cloner cloner)
-      : base(original, cloner) {
-      CompileSupportScript();
-    }
+    private ExternalEvaluationProblem(ExternalEvaluationProblem original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new ExternalEvaluationProblem(this, cloner);
@@ -92 +89 @@
       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();
-      } catch (SingleObjectiveOptimizationSupportException ex) {
-        PluginInfrastructure.ErrorHandling.ShowErrorDialog("Support script doesn't compile.", ex);
-      }
     }
 

branches/ProgrammableProblem/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/SingleObjectiveOptimizationSupportScript.cs

@@ -62 +62 @@
     }
 
+    private readonly object compileLock = new object();
     private volatile ISingleObjectiveOptimizationSupport compiledInstance;
     private ISingleObjectiveOptimizationSupport CompiledInstance {
       get {
-        if (compiledInstance == null) throw new InvalidOperationException("The problem definition script is not compiled and cannot be used.");
+        if (compiledInstance == null) {
+          lock (compileLock) {
+            if (compiledInstance == null) {
+              Compile();
+            }
+          }
+        }
         return compiledInstance;
       }