Changeset 7669 for branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3

Timestamp:

03/28/12 15:47:26 (13 years ago)

Author:

spimming

Message:

#1680: merged changes from trunk into branch

Location:

branches/HeuristicLab.Hive.Azure

Files:

• . (modified) (2 props)
• HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs (modified) (3 diffs)
• HeuristicLab.Optimization/3.3/BatchRun.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Experiment.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Problems/Problem.cs (modified) (5 diffs)
• HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) (4 diffs, 1 prop)
• HeuristicLab.Optimization/3.3/Problems/UserDefinedProblem.cs (modified) (3 diffs)

branches/HeuristicLab.Hive.Azure

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs

@@ -240 +240 @@
     }
 
+    protected override IEnumerable<KeyValuePair<string, IItem>> GetCollectedValues(IItem value) {
+      var children = base.GetCollectedValues(value);
+      foreach (var child in children) {
+        if (child.Value is IOperator)
+          yield return new KeyValuePair<string, IItem>(child.Key, new StringValue(((IOperator)child.Value).Name));
+        else yield return child;
+      }
+    }
+
     #region Events
     public event EventHandler ExecutionStateChanged;
@@ -265 +274 @@
       ExecutionState = ExecutionState.Prepared;
       ExecutionTime = TimeSpan.Zero;
-      foreach (IStatefulItem statefulObject in this.GetObjectGraphObjects().OfType<IStatefulItem>()) {
+      foreach (IStatefulItem statefulObject in this.GetObjectGraphObjects(new HashSet<string>() { "runs" }).OfType<IStatefulItem>()) {
         statefulObject.InitializeState();
       }
@@ -286 +295 @@
     protected virtual void OnStopped() {
       ExecutionState = ExecutionState.Stopped;
-      foreach (IStatefulItem statefulObject in this.GetObjectGraphObjects().OfType<IStatefulItem>()) {
+      foreach (IStatefulItem statefulObject in this.GetObjectGraphObjects(new HashSet<string>() { "runs" }).OfType<IStatefulItem>()) {
         statefulObject.ClearState();
       }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/BatchRun.cs

@@ -339 +339 @@
     private void Optimizer_Paused(object sender, EventArgs e) {
       if (ExecutionState == ExecutionState.Started) {
-        batchRunStarted = false;
-        batchRunPaused = true;
-        batchRunStopped = false;
         OnPaused();
       }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Experiment.cs

@@ -337 +337 @@
     private void optimizer_Prepared(object sender, EventArgs e) {
       if (Optimizers.All(x => x.ExecutionState == ExecutionState.Prepared)) OnPrepared();
-      else if (Optimizers.All(x => x.ExecutionState != ExecutionState.Started)) OnPaused();
     }
     private void optimizer_Started(object sender, EventArgs e) {

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Problems/Problem.cs

@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -44 +45 @@
 
     [StorableConstructor]
-    protected Problem(bool deserializing)
-      : base(deserializing) {
-      operators = new OperatorCollection(); // operators must never be null
-    }
+    protected Problem(bool deserializing) : base(deserializing) { }
     protected Problem(Problem original, Cloner cloner)
       : base(original, cloner) {
-      operators = cloner.Clone(original.operators);
       RegisterEventHandlers();
     }
@@ -56 +53 @@
     protected Problem()
       : base() {
-      operators = new OperatorCollection();
-      Parameters.Add(new FixedValueParameter<OperatorCollection>(OperatorsParameterName, "The operators that the problem provides to the algorithms.", operators, false));
+      Parameters.Add(new FixedValueParameter<OperatorCollection>(OperatorsParameterName, "The operators that the problem provides to the algorithms.", new OperatorCollection(), false));
       OperatorsParameter.Hidden = true;
       RegisterEventHandlers();
@@ -64 +60 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      // BackwardsCompatibility3.3
-      #region Backwards compatible code, remove with 3.4
-      if (!Parameters.ContainsKey(OperatorsParameterName)) {
-        Parameters.Add(new FixedValueParameter<OperatorCollection>(OperatorsParameterName, "The operators that the problem provides to the algorithms.", operators, false));
-        OperatorsParameter.Hidden = true;
-      }
-      #endregion
       RegisterEventHandlers();
     }
@@ -81 +70 @@
 
     #region properties
-    private OperatorCollection operators;
+    // BackwardsCompatibility3.3
+    #region Backwards compatible code, remove with 3.4
     [Storable(Name = "Operators")]
     private IEnumerable<IOperator> StorableOperators {
-      get { return operators; }
-      set { operators = new OperatorCollection(value); }
+      get { return null; }
+      set {
+        if (!Parameters.ContainsKey(OperatorsParameterName)) {
+          Parameters.Add(new FixedValueParameter<OperatorCollection>(OperatorsParameterName, "The operators that the problem provides to the algorithms.", new OperatorCollection(value), false));
+          OperatorsParameter.Hidden = true;
+        }
+      }
     }
+    #endregion
     protected OperatorCollection Operators {
-      get { return this.operators; }
+      get {
+        // BackwardsCompatibility3.3
+        #region Backwards compatible code, remove with 3.4
+        if (!Parameters.ContainsKey(OperatorsParameterName)) {
+          Parameters.Add(new FixedValueParameter<OperatorCollection>(OperatorsParameterName, "The operators that the problem provides to the algorithms.", new OperatorCollection(), false));
+          OperatorsParameter.Hidden = true;
+        }
+        #endregion
+        return OperatorsParameter.Value;
+      }
     }
-    IEnumerable<IOperator> IProblem.Operators { get { return operators; } }
+    IEnumerable<IOperator> IProblem.Operators { get { return Operators; } }
     #endregion
+
+    protected override IEnumerable<KeyValuePair<string, IItem>> GetCollectedValues(IItem value) {
+      var children = base.GetCollectedValues(value);
+      foreach (var child in children) {
+        if (child.Value is IOperator)
+          yield return new KeyValuePair<string, IItem>(child.Key, new StringValue(((IOperator)child.Value).Name));
+        else yield return child;
+      }
+    }
 
     #region events

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs

@@ -41 +41 @@
       : base() {
       Parameters.Add(new ValueParameter<BoolValue>(MaximizationParameterName, "Set to false if the problem should be minimized.", new BoolValue()));
-      Parameters.Add(new OptionalValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem.", new DoubleValue()));
+      Parameters.Add(new OptionalValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem."));
     }
 
@@ -47 +47 @@
       : base(evaluator, solutionCreator) {
       Parameters.Add(new ValueParameter<BoolValue>(MaximizationParameterName, "Set to false if the problem should be minimized.", new BoolValue()));
-      Parameters.Add(new OptionalValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem.", new DoubleValue()));
+      Parameters.Add(new OptionalValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem."));
     }
 
@@ -68 +68 @@
     public BoolValue Maximization {
       get { return MaximizationParameter.Value; }
-      protected set { MaximizationParameter.Value = value; }
+      set { MaximizationParameter.Value = value; }
     }
 
@@ -79 +79 @@
     public DoubleValue BestKnownQuality {
       get { return BestKnownQualityParameter.Value; }
-      protected set { BestKnownQualityParameter.Value = value; }
+      set { BestKnownQualityParameter.Value = value; }
     }
 

branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Problems/UserDefinedProblem.cs

@@ -121 +121 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      AttachEventHandlers();
+      RegisterEventHandlers();
     }
     public UserDefinedProblem()
@@ -132 +132 @@
       Parameters.Add(new ValueParameter<ItemList<IOperator>>("Operators", "The operators that are passed to the algorithm.", new ItemList<IOperator>()));
 
-      AttachEventHandlers();
+      RegisterEventHandlers();
     }
 
     private UserDefinedProblem(UserDefinedProblem original, Cloner cloner)
       : base(original, cloner) {
-      AttachEventHandlers();
+      RegisterEventHandlers();
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -194 +194 @@
 
     #region Helpers
-    private void AttachEventHandlers() {
+    private void RegisterEventHandlers() {
       SolutionCreatorParameter.ValueChanged += new EventHandler(SolutionCreatorParameter_ValueChanged);
       EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user