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

Timestamp:

01/13/15 18:47:19 (10 years ago)

Author:

mkommend

Message:

#2174: First working version of refactored programmable problem.

File:

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

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

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -47 +46 @@
       variableStore = cloner.Clone(original.variableStore);
     }
-    protected ProblemDefinitionScript() :base(){
+    protected ProblemDefinitionScript()
+      : base() {
       variableStore = new VariableStore();
     }
 
     IEncoding IProblemDefinition.Encoding {
-      get { return CompiledProblemDefinition != null ? CompiledProblemDefinition.Encoding : null; }
-    }
-    IEnumerable<Individual> IProblemDefinition.GetNeighbors(Individual individual, IRandom random) {
-      return CompiledProblemDefinition.GetNeighbors(individual, random);
+      get { return CompiledProblemDefinition.Encoding; }
     }
 
@@ -62 +59 @@
     protected IProblemDefinition CompiledProblemDefinition {
       get {
-          lock (locker) {
-            if (compiledProblemDefinition == null) {
-              Compile();
-            }
-          }
+        //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;
       }