Changeset 11900 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/Scripts/ProblemDefinitionScript.cs

Timestamp:

02/05/15 10:19:37 (9 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)

File:

• branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/Scripts/ProblemDefinitionScript.cs (modified) (2 diffs)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/Scripts/ProblemDefinitionScript.cs

@@ -55 +55 @@
     }
 
-    private readonly object locker = new object();
+    private readonly object compileLock = new object();
     private volatile IProblemDefinition compiledProblemDefinition;
     protected IProblemDefinition CompiledProblemDefinition {
       get {
-        if (compiledProblemDefinition == null) throw new InvalidOperationException("The problem definition script is not compiled and cannot be used.");
+        // double checked locking pattern
+        if (compiledProblemDefinition == null) {
+          lock (compileLock) {
+            if (compiledProblemDefinition == null) {
+              Compile(false);
+            }
+          }
+        }
         return compiledProblemDefinition;
-      }
-      private set {
-        compiledProblemDefinition = value;
-        OnProblemDefinitionChanged();
       }
     }
 
-    public override Assembly Compile() {
+    public sealed override Assembly Compile() {
+      return Compile(true);
+    }
+
+    protected virtual Assembly Compile(bool fireChanged) {
       var assembly = base.Compile();
       var types = assembly.GetTypes();
@@ -93 +100 @@
 
       try {
-        CompiledProblemDefinition = inst;
+        compiledProblemDefinition = inst;
+        if (fireChanged) OnProblemDefinitionChanged();
       } catch (Exception e) {
         compiledProblemDefinition = null;