Changeset 6445

Timestamp:

06/20/11 08:56:15 (14 years ago)

Author:

cneumuel

Message:

#1215

• minor changes

Location:

branches/HeuristicLab.MetaOptimization

Files:

• HeuristicLab.MetaOptimization.Test/HeuristicLab.MetaOptimization.Test.csproj (modified) (1 diff)
• HeuristicLab.MetaOptimization.Test/Program.cs (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization/3.3/AlgorithmExecutor.cs (modified) (2 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurations/ParameterConfiguration.cs (modified) (2 diffs)

branches/HeuristicLab.MetaOptimization/HeuristicLab.MetaOptimization.Test/HeuristicLab.MetaOptimization.Test.csproj

@@ -379 +379 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ObjectDumper.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

branches/HeuristicLab.MetaOptimization/HeuristicLab.MetaOptimization.Test/Program.cs

@@ -63 +63 @@
 
 
+      bool y = ParameterConfiguration.IsSubclassOfRawGeneric(typeof(Tuple<,,,>), typeof(Tuple<,>));
+      bool a = ParameterConfiguration.IsSubclassOfRawGeneric(typeof(Tuple<>), typeof(Tuple<int>));
+
+
       var x = typeof(float).IsPrimitive;
 

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/AlgorithmExecutor.cs

@@ -22 +22 @@
 using System;
 using System.Threading;
-using HeuristicLab.Optimization;
+using HeuristicLab.Core;
 
 namespace HeuristicLab.Problems.MetaOptimization {
   public static class AlgorithmExtensions {
-    public static void StartSync(this IAlgorithm algorithm, CancellationToken cancellationToken) {
-      var executor = new AlgorithmExecutor(algorithm, cancellationToken);
+    public static void StartSync(this IExecutable executable, CancellationToken cancellationToken) {
+      var executor = new AlgorithmExecutor(executable, cancellationToken);
       executor.StartSync();
     }
@@ -36 +36 @@
   /// </summary>
   internal class AlgorithmExecutor {
-    private IAlgorithm algorithm;
+    private IExecutable executable;
     private AutoResetEvent waitHandle = new AutoResetEvent(false);
     private CancellationToken cancellationToken;
 
-    public AlgorithmExecutor(IAlgorithm algorithm, CancellationToken cancellationToken) {
-      this.algorithm = algorithm;
+    public AlgorithmExecutor(IExecutable executable, CancellationToken cancellationToken) {
+      this.executable = executable;
       this.cancellationToken = cancellationToken;
     }
 
     public void StartSync() {
-      algorithm.Stopped += new EventHandler(algorithm_Stopped);
-      algorithm.Paused += new EventHandler(algorithm_Paused);
+      executable.Stopped += new EventHandler(algorithm_Stopped);
+      executable.Paused += new EventHandler(algorithm_Paused);
 
       using (CancellationTokenRegistration registration = cancellationToken.Register(new Action(cancellationToken_Canceled))) {
-        algorithm.Start();
+        executable.Start();
         waitHandle.WaitOne();
         waitHandle.Dispose();
       }
 
-      algorithm.Stopped -= new EventHandler(algorithm_Stopped);
-      algorithm.Paused -= new EventHandler(algorithm_Paused);
-      if (algorithm.ExecutionState == Core.ExecutionState.Started) {
-        algorithm.Pause();
+      executable.Stopped -= new EventHandler(algorithm_Stopped);
+      executable.Paused -= new EventHandler(algorithm_Paused);
+      if (executable.ExecutionState == Core.ExecutionState.Started) {
+        executable.Pause();
       }
       cancellationToken.ThrowIfCancellationRequested();

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurations/ParameterConfiguration.cs

@@ -316 +316 @@
         return null;
       }
+      
     }
 
@@ -351 +352 @@
     }
 
-    private static bool IsSubclassOfRawGeneric(Type generic, Type toCheck) {
+    public static bool IsSubclassOfRawGeneric(Type generic, Type toCheck) {
       while (toCheck != typeof(object)) {
         var cur = toCheck.IsGenericType ? toCheck.GetGenericTypeDefinition() : toCheck;