Changeset 13385 for branches/ProblemRefactoring/HeuristicLab.Problems.Programmable

Timestamp:

11/24/15 18:22:29 (9 years ago)

Author:

abeham

Message:

#2521: fixed plugin dependencies and updated samples

Location:

branches/ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3

Files:

• MultiObjectiveProgrammableProblem.cs (modified) (1 diff)
• Plugin.cs.frame (modified) (1 diff)
• ProblemDefinitionScript.cs (modified) (3 diffs)
• SingleObjectiveProgrammableProblem.cs (modified) (1 diff)

branches/ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs

@@ -90 +90 @@
       var multiEnc = ProblemScript.Encoding as CombinedEncoding;
       if (multiEnc != null) multiEnc.Clear();
-      ProblemScript.Initialize();
       Encoding = (TEncoding)ProblemScript.Encoding.Clone();
 

branches/ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/Plugin.cs.frame

@@ -31 +31 @@
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Data", "3.3")]
+  [PluginDependency("HeuristicLab.Encodings.BinaryVectorEncoding", "3.3")]
+  [PluginDependency("HeuristicLab.Encodings.IntegerVectorEncoding", "3.3")]
+  [PluginDependency("HeuristicLab.Encodings.RealVectorEncoding", "3.3")]
+  [PluginDependency("HeuristicLab.Encodings.PermutationEncoding", "3.3")]
+  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.3")]
+  [PluginDependency("HeuristicLab.Encodings.LinearLinkageEncoding", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Parameters", "3.3")]

branches/ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/ProblemDefinitionScript.cs

@@ -124 +124 @@
       try {
         inst = (CompiledProblemDefinition<TEncoding, TSolution>)Activator.CreateInstance(types.Single(x => typeof(CompiledProblemDefinition<TEncoding, TSolution>).IsAssignableFrom(x)));
-      }
-      catch (Exception e) {
+      } catch (Exception e) {
         compiledProblemDefinition = null;
         throw new ProblemDefinitionScriptException("Instantiating the problem definition failed." + Environment.NewLine + "Check your default constructor.", e);
@@ -133 +132 @@
         inst.vars = new Variables(VariableStore);
         inst.Encoding = encoding;
-      }
-      catch (Exception e) {
+        inst.Initialize();
+      } catch (Exception e) {
         compiledProblemDefinition = null;
         throw new ProblemDefinitionScriptException("Initializing the problem definition failed." + Environment.NewLine + "Check your Initialize() method.", e);
@@ -142 +141 @@
         compiledProblemDefinition = inst;
         if (fireChanged) OnProblemDefinitionChanged();
-      }
-      catch (Exception e) {
+      } catch (Exception e) {
         compiledProblemDefinition = null;
         throw new ProblemDefinitionScriptException("Using the problem definition in the problem failed." + Environment.NewLine + "Examine this error message carefully (often there is an issue with the defined encoding).", e);

branches/ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs

@@ -93 +93 @@
       var multiEnc = ProblemScript.Encoding as CombinedEncoding;
       if (multiEnc != null) multiEnc.Clear();
-      ProblemScript.Initialize();
       Encoding = (TEncoding)ProblemScript.Encoding.Clone();