Changeset 5811 for branches/QAP/HeuristicLab.Optimization/3.3/Algorithm.cs

Timestamp:

03/23/11 09:28:34 (13 years ago)

Author:

abeham

Message:

#1330

• Adapted QAP to new problem base class structure
• Fixed a bug in a view
• Merged changes from Optimization plugin into branch

Location:

branches/QAP/HeuristicLab.Optimization/3.3

Files:

• . (modified) (2 props)
• Algorithm.cs (modified) (2 diffs)

branches/QAP/HeuristicLab.Optimization/3.3

@@ -3 +3 @@
 obj
 *.user
+*.vs10x

@@ -3 +3 @@
 obj
 *.user
+*.vs10x

branches/QAP/HeuristicLab.Optimization/3.3/Algorithm.cs

@@ -224 +224 @@
     public virtual void CollectResultValues(IDictionary<string, IItem> values) {
       values.Add("Execution Time", new TimeSpanValue(ExecutionTime));
-      foreach (IResult result in Results)
-        values.Add(result.Name, result.Value);
+      CollectResultsRecursively("", Results, values);
+    }
+
+    private void CollectResultsRecursively(string path, ResultCollection results, IDictionary<string, IItem> values) {
+      foreach (IResult result in results) {
+        values.Add(path + result.Name, result.Value);
+        ResultCollection childCollection = result.Value as ResultCollection;
+        if (childCollection != null) {
+          CollectResultsRecursively(path + result.Name + ".", childCollection, values);
+        }
+      }
     }
 
@@ -283 +292 @@
 
     protected virtual void DeregisterProblemEvents() {
-      problem.SolutionCreatorChanged -= new EventHandler(Problem_SolutionCreatorChanged);
-      problem.EvaluatorChanged -= new EventHandler(Problem_EvaluatorChanged);
       problem.OperatorsChanged -= new EventHandler(Problem_OperatorsChanged);
       problem.Reset -= new EventHandler(Problem_Reset);
     }
     protected virtual void RegisterProblemEvents() {
-      problem.SolutionCreatorChanged += new EventHandler(Problem_SolutionCreatorChanged);
-      problem.EvaluatorChanged += new EventHandler(Problem_EvaluatorChanged);
       problem.OperatorsChanged += new EventHandler(Problem_OperatorsChanged);
       problem.Reset += new EventHandler(Problem_Reset);
     }
-    protected virtual void Problem_SolutionCreatorChanged(object sender, EventArgs e) { }
-    protected virtual void Problem_EvaluatorChanged(object sender, EventArgs e) { }
     protected virtual void Problem_OperatorsChanged(object sender, EventArgs e) { }
     protected virtual void Problem_Reset(object sender, EventArgs e) {

@@ -3 +3 @@
 obj
 *.user
+*.vs10x