Changeset 11900 for branches

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)

Location:

branches/ProgrammableProblem

Files:

• HeuristicLab.Problems.ExternalEvaluation/3.4/ExternalEvaluationProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/SingleObjectiveOptimizationSupportScript.cs (modified) (1 diff)
• HeuristicLab.Problems.Programmable/3.3/New/MultiObjectiveProgrammableProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.Programmable/3.3/New/Scripts/ProblemDefinitionScript.cs (modified) (2 diffs)
• HeuristicLab.Problems.Programmable/3.3/New/Scripts/Templates/CompiledMultiObjectiveProblemDefinition.cs (modified) (1 diff)
• HeuristicLab.Problems.Programmable/3.3/New/Scripts/Templates/CompiledSingleObjectiveProblemDefinition.cs (modified) (1 diff)
• HeuristicLab.Problems.Programmable/3.3/New/SingleObjectiveProgrammableProblem.cs (modified) (2 diffs)

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;
       }

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/MultiObjectiveProgrammableProblem.cs

@@ -48 +48 @@
       : base(original, cloner) {
       RegisterEvents();
-      try {
-        ProblemScript.Compile();
-      } catch (InvalidOperationException) {
-        //Compilation error
-      }
     }
     public override IDeepCloneable Clone(Cloner cloner) { return new MultiObjectiveProgrammableProblem(this, cloner); }
 
-
     [StorableConstructor]
     private MultiObjectiveProgrammableProblem(bool deserializing) : base(deserializing) { }
-
     public MultiObjectiveProgrammableProblem()
       : base() {
@@ -69 +62 @@
     private void AfterDeserialization() {
       RegisterEvents();
-      try {
-        ProblemScript.Compile();
-      } catch (InvalidOperationException) {
-        //Compilation error
-      }
     }
 

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;

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/Scripts/Templates/CompiledMultiObjectiveProblemDefinition.cs

@@ -16 +16 @@
       // Use vars.yourVariable to access variables in the variable store i.e. yourVariable
       // Define the solution encoding which can also consist of multiple vectors, examples below
-      //Encoding = new BinaryEncoding("b", length: 5);
-      //Encoding = new IntegerEncoding("i", length: 5, min: 2, max: 14, step: 4);
-      //Encoding = new RealEncoding("r", length: 5, min: -1.0, max: 1.0);
+      //Encoding = new BinaryVectorEncoding("b", length: 5);
+      //Encoding = new IntegerVectorEncoding("i", length: 5, min: 2, max: 14, step: 4);
+      //Encoding = new RealVectorEncoding("r", length: 5, min: -1.0, max: 1.0);
       //Encoding = new PermutationEncoding("p", length: 5, type: PermutationTypes.Absolute);
       // The encoding can also be a combination
       //Encoding = new MultiEncoding()
-      //.Add(new BinaryEncoding("b", length: 5))
-      //.Add(new IntegerEncoding("i", length: 5, min: 2, max: 14, step: 4))
-      //.Add(new RealEncoding("r", length: 5, min: -1.0, max: 1.0))
+      //.Add(new BinaryVectorEncoding("b", length: 5))
+      //.Add(new IntegerVectorEncoding("i", length: 5, min: 2, max: 14, step: 4))
+      //.Add(new RealVectorEncoding("r", length: 5, min: -1.0, max: 1.0))
       //.Add(new PermutationEncoding("p", length: 5, type: PermutationTypes.Absolute))
       ;

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/Scripts/Templates/CompiledSingleObjectiveProblemDefinition.cs

@@ -16 +16 @@
       // Use vars.yourVariable to access variables in the variable store i.e. yourVariable
       // Define the solution encoding which can also consist of multiple vectors, examples below
-      //Encoding = new BinaryEncoding("b", length: 5);
-      //Encoding = new IntegerEncoding("i", length: 5, min: 2, max: 14, step: 2);
-      //Encoding = new RealEncoding("r", length: 5, min: -1.0, max: 1.0);
+      //Encoding = new BinaryVectorEncoding("b", length: 5);
+      //Encoding = new IntegerVectorEncoding("i", length: 5, min: 2, max: 14, step: 2);
+      //Encoding = new RealVectorEncoding("r", length: 5, min: -1.0, max: 1.0);
       //Encoding = new PermutationEncoding("p", length: 5, type: PermutationTypes.Absolute);
       // The encoding can also be a combination
       //Encoding = new MultiEncoding()
-      //.Add(new BinaryEncoding("b", length: 5))
-      //.Add(new IntegerEncoding("i", length: 5, min: 2, max: 14, step: 4))
-      //.Add(new RealEncoding("r", length: 5, min: -1.0, max: 1.0))
+      //.Add(new BinaryVectorEncoding("b", length: 5))
+      //.Add(new IntegerVectorEncoding("i", length: 5, min: 2, max: 14, step: 4))
+      //.Add(new RealVectorEncoding("r", length: 5, min: -1.0, max: 1.0))
       //.Add(new PermutationEncoding("p", length: 5, type: PermutationTypes.Absolute))
       ;

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

@@ -49 +49 @@
       : base(original, cloner) {
       RegisterEvents();
-      try {
-        ProblemScript.Compile();
-      } catch (ProblemDefinitionScriptException e) {
-        PluginInfrastructure.ErrorHandling.ShowErrorDialog(e);
-      }
     }
     public override IDeepCloneable Clone(Cloner cloner) { return new SingleObjectiveProgrammableProblem(this, cloner); }
 
-
     [StorableConstructor]
     private SingleObjectiveProgrammableProblem(bool deserializing) : base(deserializing) { }
-
     public SingleObjectiveProgrammableProblem()
       : base() {
       Parameters.Add(new FixedValueParameter<SingleObjectiveProblemDefinitionScript>("ProblemScript", "Defines the problem.", new SingleObjectiveProblemDefinitionScript() { Name = Name }));
       RegisterEvents();
-
-
     }
 
@@ -72 +63 @@
     private void AfterDeserialization() {
       RegisterEvents();
-      try {
-        ProblemScript.Compile();
-      } catch (InvalidOperationException) {
-        //Compilation error
-      }
     }