Changeset 9363 for branches/OaaS/HeuristicLab.Optimization/3.3/Algorithms

Timestamp:

04/16/13 13:13:41 (12 years ago)

Author:

spimming

Message:

#1888:

• Merged revisions from trunk

Location:

branches/OaaS

Files:

• . (modified) (2 props)
• HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs (modified) (6 diffs)
• HeuristicLab.Optimization/3.3/Algorithms/UserDefinedAlgorithm.cs (modified) (1 diff)

branches/OaaS

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

branches/OaaS/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs

@@ -134 +134 @@
       storeAlgorithmInEachRun = false;
       runsCounter = 0;
-      Runs = new RunCollection();
+      Runs = new RunCollection { OptimizerName = Name };
     }
     protected Algorithm(string name)
@@ -142 +142 @@
       storeAlgorithmInEachRun = false;
       runsCounter = 0;
-      Runs = new RunCollection();
+      Runs = new RunCollection { OptimizerName = Name };
     }
     protected Algorithm(string name, ParameterCollection parameters)
@@ -150 +150 @@
       storeAlgorithmInEachRun = false;
       runsCounter = 0;
-      Runs = new RunCollection();
+      Runs = new RunCollection { OptimizerName = Name };
     }
     protected Algorithm(string name, string description)
@@ -158 +158 @@
       storeAlgorithmInEachRun = false;
       runsCounter = 0;
-      Runs = new RunCollection();
+      Runs = new RunCollection { OptimizerName = Name };
     }
     protected Algorithm(string name, string description, ParameterCollection parameters)
@@ -166 +166 @@
       storeAlgorithmInEachRun = false;
       runsCounter = 0;
-      Runs = new RunCollection();
+      Runs = new RunCollection { OptimizerName = Name };
     }
     [StorableConstructor]
@@ -250 +250 @@
 
     #region Events
+    protected override void OnNameChanged() {
+      base.OnNameChanged();
+      Runs.OptimizerName = Name;
+    }
+
     public event EventHandler ExecutionStateChanged;
     protected virtual void OnExecutionStateChanged() {

branches/OaaS/HeuristicLab.Optimization/3.3/Algorithms/UserDefinedAlgorithm.cs

@@ -107 +107 @@
       if (Analyzer != null && Problem != null) {
         foreach (IAnalyzer analyzer in Problem.Operators.OfType<IAnalyzer>()) {
-          Analyzer.Operators.Add(analyzer);
+          Analyzer.Operators.Add(analyzer, analyzer.EnabledByDefault);
         }
       }

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages