Context Navigation

Changeset 11767 for branches

Timestamp:

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

Author:

mkommend

Message:

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

Location:

Files:

r11753	r11767
290	290	foreach (var shakingOperator in shakingOperators) {
291	291	shakingOperator.RealVectorParameter.ActualName = Name;
	292	shakingOperator.BoundsParameter.ActualName = BoundsParameter.Name;
292	293	}
293	294	}

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

r11753	r11767
44	44	Operators.Add(Evaluator);
45	45	Operators.Add(new BestScopeSolutionAnalyzer());
46		Operators.Add(new ~~Single~~ObjectiveAnalyzer());
	46	Operators.Add(new MultiObjectiveAnalyzer());
47	47
48	48	ParameterizeOperators();

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

-                      r11753
+                      r11767
     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;

-                      r11753
+                      r11767
+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 {

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

r11753	r11767
30	30
31	31	namespace HeuristicLab.Problems.Programmable.Operators {
	32	[StorableClass]
32	33	public abstract class MultiEncodingOperator<T> : Operator, IMultiEncodingOperator where T : class,IOperator {
33	34	private List<IEncoding> encodings = new List<IEncoding>();

Note: See TracChangeset for help on using the changeset viewer.