Changeset 11767 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable

Timestamp:

01/15/15 14:30:14 (9 years ago)

Author:

mkommend

Message:

#2174: Several bug fixes in programmable problem that were discovered during testing.

Location:

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3

Files:

• Encodings/RealEncoding.cs (modified) (1 diff)
• Interfaces/IProblemDefinition.cs (modified) (1 diff)
• New/MultiObjectiveProgrammableProblem.cs (modified) (1 diff)
• New/MultiObjectiveScriptableProblem.cs (modified) (3 diffs)
• New/Scripts/ProblemDefinitionScript.cs (modified) (1 diff)
• New/Scripts/Templates/CompiledMultiObjectiveProblemDefinition.cs (modified) (1 diff)
• New/SingleObjectiveScriptableProblem.cs (modified) (3 diffs)
• Operators/MultiEncodingOperator.cs (modified) (1 diff)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/RealEncoding.cs

@@ -290 +290 @@
       foreach (var shakingOperator in shakingOperators) {
         shakingOperator.RealVectorParameter.ActualName = Name;
+        shakingOperator.BoundsParameter.ActualName = BoundsParameter.Name;
       }
     }

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Interfaces/IProblemDefinition.cs

@@ -20 +20 @@
 #endregion
 
-using System.Collections.Generic;
 using HeuristicLab.Core;
 
 namespace HeuristicLab.Problems.Programmable {
   public interface IProblemDefinition : INamedItem {
-    IEncoding Encoding { get; }    
+    IEncoding Encoding { get; }
   }
 }

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

@@ -44 +44 @@
       Operators.Add(Evaluator);
       Operators.Add(new BestScopeSolutionAnalyzer());
-      Operators.Add(new SingleObjectiveAnalyzer());
+      Operators.Add(new MultiObjectiveAnalyzer());
 
       ParameterizeOperators();

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

@@ -20 +20 @@
 #endregion
 
-using System.Collections.Generic;
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -48 +48 @@
       : base(original, cloner) {
       RegisterEvents();
-      ProblemScript.Compile();
+      try {
+        ProblemScript.Compile();
+      }
+      catch (InvalidOperationException) {
+        //Compilation error
+      }
     }
     public override IDeepCloneable Clone(Cloner cloner) { return new MultiObjectiveScriptableProblem(this, cloner); }
@@ -65 +70 @@
     private void AfterDeserialization() {
       RegisterEvents();
-      ProblemScript.Compile();
+      try {
+        ProblemScript.Compile();
+      }
+      catch (InvalidOperationException) {
+        //Compilation error
+      }
     }
 

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

@@ -59 +59 @@
     protected IProblemDefinition CompiledProblemDefinition {
       get {
-        //lock (locker) {
-        //  if (compiledProblemDefinition == null) {
-        //    Compile();
-        //  }
-        //}
         if (compiledProblemDefinition == null) throw new InvalidOperationException("The problem definition script is not compiled and cannot be used.");
         return compiledProblemDefinition;

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

@@ -1 @@
-using HeuristicLab.Core;
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Optimization;
+using HeuristicLab.Problems.Programmable;
 
 namespace HeuristicLab.Problems.Programmable {

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -49 +49 @@
       : base(original, cloner) {
       RegisterEvents();
-      ProblemScript.Compile();
+      try {
+        ProblemScript.Compile();
+      }
+      catch (InvalidOperationException) {
+        //Compilation error
+      }
     }
     public override IDeepCloneable Clone(Cloner cloner) { return new SingleObjectiveScriptableProblem(this, cloner); }
@@ -68 +73 @@
     private void AfterDeserialization() {
       RegisterEvents();
-      ProblemScript.Compile();
+      try {
+        ProblemScript.Compile();
+      }
+      catch (InvalidOperationException) {
+        //Compilation error
+      }
     }
 

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/MultiEncodingOperator.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.Programmable.Operators {
+  [StorableClass]
   public abstract class MultiEncodingOperator<T> : Operator, IMultiEncodingOperator where T : class,IOperator {
     private List<IEncoding> encodings = new List<IEncoding>();