Changeset 6760 for branches/PersistenceSpeedUp/HeuristicLab.Optimization.Operators

Timestamp:

09/14/11 13:59:25 (13 years ago)

Author:

epitzer

Message:

#1530 integrate changes from trunk

Location:

branches/PersistenceSpeedUp

Files:

• . (modified) (2 props)
• HeuristicLab.Optimization.Operators/3.3/DiscreteDoubleValueModifier.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Operators/3.3/HeuristicLabOptimizationOperatorsPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Optimization.Operators/3.3/Properties/AssemblyInfo.frame (modified) (1 diff)
• HeuristicLab.Optimization.Operators/3.3/SolutionsCreator.cs (modified) (4 diffs)

branches/PersistenceSpeedUp

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

branches/PersistenceSpeedUp/HeuristicLab.Optimization.Operators/3.3/DiscreteDoubleValueModifier.cs

@@ -34 +34 @@
   [StorableClass]
   public abstract class DiscreteDoubleValueModifier : SingleSuccessorOperator, IDiscreteDoubleValueModifier {
+    #region parameter properties
     /// <summary>
     /// The parameter that should be modified.
@@ -70 +71 @@
       get { return (IValueLookupParameter<IntValue>)Parameters["EndIndex"]; }
     }
-
+    #endregion
     [StorableConstructor]
     protected DiscreteDoubleValueModifier(bool deserializing) : base(deserializing) { }

branches/PersistenceSpeedUp/HeuristicLab.Optimization.Operators/3.3/HeuristicLabOptimizationOperatorsPlugin.cs.frame

@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Optimization.Operators plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Optimization.Operators", "3.3.4.$WCREV$")]
+  [Plugin("HeuristicLab.Optimization.Operators", "3.3.5.$WCREV$")]
   [PluginFile("HeuristicLab.Optimization.Operators-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/PersistenceSpeedUp/HeuristicLab.Optimization.Operators/3.3/Properties/AssemblyInfo.frame

@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.4.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.5.$WCREV$")]

branches/PersistenceSpeedUp/HeuristicLab.Optimization.Operators/3.3/SolutionsCreator.cs

@@ -43 +43 @@
       get { return (ValueLookupParameter<IOperator>)Parameters["Evaluator"]; }
     }
+    public ValueLookupParameter<BoolValue> ParallelParameter {
+      get { return (ValueLookupParameter<BoolValue>)Parameters["Parallel"]; }
+    }
     private ScopeParameter CurrentScopeParameter {
       get { return (ScopeParameter)Parameters["CurrentScope"]; }
@@ -62 +65 @@
       Parameters.Add(new ValueLookupParameter<IOperator>("SolutionCreator", "The operator which is used to create new solutions."));
       Parameters.Add(new ValueLookupParameter<IOperator>("Evaluator", "The operator which is used to evaluate new solutions. This operator is executed in parallel, if an engine is used which supports parallelization."));
-      Parameters.Add(new ScopeParameter("CurrentScope", "The current scope to which the new solutions are added as sub-scopes."));
+      Parameters.Add(new ValueLookupParameter<BoolValue>("Parallel", "True if the operator should be applied in parallel on all sub-scopes, otherwise false.", new BoolValue(true)));
+      Parameters.Add(new ScopeParameter("CurrentScope", "The current scope to which the new solutions are added as sub-scopes."));      
+    }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      if (!Parameters.ContainsKey("Parallel")) Parameters.Add(new ValueLookupParameter<BoolValue>("Parallel", "True if the operator should be applied in parallel on all sub-scopes, otherwise false.", new BoolValue(true))); // backwards compatibility
     }
 
@@ -73 +81 @@
       IOperator creator = SolutionCreatorParameter.ActualValue;
       IOperator evaluator = EvaluatorParameter.ActualValue;
+      bool parallel = ParallelParameter.ActualValue.Value;
 
       int current = CurrentScope.SubScopes.Count;
@@ -79 +88 @@
 
       OperationCollection creation = new OperationCollection();
-      OperationCollection evaluation = new OperationCollection() { Parallel = true };
+      OperationCollection evaluation = new OperationCollection() { Parallel = parallel };
       for (int i = 0; i < count; i++) {
         if (creator != null) creation.Add(ExecutionContext.CreateOperation(creator, CurrentScope.SubScopes[current + i]));

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates