Changeset 12861 for branches/HiveStatistics

Timestamp:

08/13/15 16:19:51 (9 years ago)

Author:

ascheibe

Message:

#2388 removed old code and switched to new code

Location:

branches/HiveStatistics/sources

Files:

• HeuristicLab.Services.Hive.DataAccess/3.3/HeuristicLab.Services.Hive.DataAccess-3.3.csproj (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.3/Interfaces/ITransactionManager.cs (deleted)
• HeuristicLab.Services.Hive.DataAccess/3.3/Manager/TransactionManager.cs (deleted)
• HeuristicLab.Services.Hive/3.3/Convert.cs (deleted)
• HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/HiveDao.cs (deleted)
• HeuristicLab.Services.Hive/3.3/HiveService.cs (moved) (moved from branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/NewHiveService.cs) (2 diffs)
• HeuristicLab.Services.Hive/3.3/Interfaces/IHiveDao.cs (deleted)
• HeuristicLab.Services.Hive/3.3/Interfaces/IOptimizedHiveDao.cs (deleted)
• HeuristicLab.Services.Hive/3.3/Interfaces/IServiceLocator.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/Interfaces/IStatisticsGenerator.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs (moved) (moved from branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Manager/NewEventManager.cs) (1 diff)
• HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs (moved) (moved from branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Manager/NewHeartbeatManager.cs) (2 diffs)
• HeuristicLab.Services.Hive/3.3/OptimizedHiveDao.cs (deleted)
• HeuristicLab.Services.Hive/3.3/Scheduler/RoundRobinTaskScheduler.cs (moved) (moved from branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Scheduler/NewRoundRobinTaskScheduler.cs) (1 diff)
• HeuristicLab.Services.Hive/3.3/ServiceLocator.cs (modified) (6 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HeuristicLab.Services.Hive.DataAccess-3.3.csproj

@@ -133 +133 @@
     <Compile Include="Enums\CpuArchitecture.cs" />
     <Compile Include="Interfaces\IPersistenceManager.cs" />
-    <Compile Include="Interfaces\ITransactionManager.cs" />
     <Compile Include="Manager\PersistenceManager.cs" />
-    <Compile Include="Manager\TransactionManager.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="HiveDataContext.cs">

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj

@@ -118 +118 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Convert.cs" />
     <Compile Include="Converter.cs" />
     <Compile Include="DataTransfer\Command.cs" />
@@ -143 +142 @@
     <Compile Include="HiveStatisticsGenerator.cs" />
     <Compile Include="Interfaces\IStatisticsGenerator.cs" />
-    <Compile Include="Manager\NewEventManager.cs" />
-    <Compile Include="Manager\NewHeartbeatManager.cs" />
-    <Compile Include="NewHiveService.cs" />
-    <Compile Include="OptimizedHiveDao.cs" />
-    <Compile Include="HiveDao.cs" />
     <Compile Include="HiveJanitor.cs" />
     <Compile Include="HiveOperationContext.cs" />
-    <Compile Include="Interfaces\IOptimizedHiveDao.cs" />
-    <Compile Include="Interfaces\IHiveDao.cs" />
     <Compile Include="Interfaces\ITaskScheduler.cs" />
     <Compile Include="PerformanceLogger.cs" />
-    <Compile Include="Scheduler\NewRoundRobinTaskScheduler.cs" />
     <Compile Include="Scheduler\TaskInfoForScheduler.cs" />
     <Compile Include="Scheduler\JobInfoForScheduler.cs" />

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -40 +40 @@
   [ServiceBehavior(InstanceContextMode = InstanceContextMode.PerCall, IgnoreExtensionDataObject = true)]
   [HiveOperationContextBehavior]
-  public class NewHiveService : IHiveService {
+  public class HiveService : IHiveService {
     private static readonly DA.TaskState[] CompletedStates = { DA.TaskState.Finished, DA.TaskState.Aborted, DA.TaskState.Failed };
 
@@ -61 +61 @@
       get { return ServiceLocator.Instance.EventManager; }
     }
-    private NewHeartbeatManager HeartbeatManager {
-      get { return ServiceLocator.Instance.NewHeartbeatManager; }
+    private HeartbeatManager HeartbeatManager {
+      get { return ServiceLocator.Instance.HeartbeatManager; }
     }
 

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Interfaces/IServiceLocator.cs

@@ -28 +28 @@
     IAuthorizationManager AuthorizationManager { get; }
     IPersistenceManager PersistenceManager { get; }
-    IHiveDao HiveDao { get; }
-    IOptimizedHiveDao OptimizedHiveDao { get; }
     IEventManager EventManager { get; }
     IStatisticsGenerator StatisticsGenerator { get; }
-    ITransactionManager TransactionManager { get; }
     Access.IUserManager UserManager { get; }
-    NewHeartbeatManager NewHeartbeatManager { get; }
     HeartbeatManager HeartbeatManager { get; }
     ITaskScheduler TaskScheduler { get; }
-    ITaskScheduler NewTaskScheduler { get; }
   }
 }

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Interfaces/IStatisticsGenerator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Services.Hive.Manager {
-  public class NewEventManager : IEventManager {
+  public class EventManager : IEventManager {
     private const string SlaveTimeout = "Slave timed out.";
     private IPersistenceManager PersistenceManager {

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Services.Hive.Manager {
-  public class NewHeartbeatManager {
+  public class HeartbeatManager {
     private const string MutexName = "HiveTaskSchedulingMutex";
 
@@ -38 +38 @@
 
     private ITaskScheduler TaskScheduler {
-      get { return ServiceLocator.Instance.NewTaskScheduler; }
+      get { return ServiceLocator.Instance.TaskScheduler; }
     }
 

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Scheduler/RoundRobinTaskScheduler.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Services.Hive {
-  public class NewRoundRobinTaskScheduler : ITaskScheduler {
+  public class RoundRobinTaskScheduler : ITaskScheduler {
     private IPersistenceManager PersistenceManager {
       get { return ServiceLocator.Instance.PersistenceManager; }

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/ServiceLocator.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Services.Hive {
-
   public class ServiceLocator : IServiceLocator {
     private static IServiceLocator instance;
@@ -43 +42 @@
                             : new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString);
         return new PersistenceManager(dataContext);
-      }
-    }
-
-    private IHiveDao hiveDao;
-    public IHiveDao HiveDao {
-      get {
-        if (hiveDao == null) hiveDao = new HiveDao();
-        return hiveDao;
-      }
-    }
-
-    public IOptimizedHiveDao OptimizedHiveDao {
-      get {
-        var dataContext = HiveOperationContext.Current != null
-                            ? HiveOperationContext.Current.DataContext
-                            : new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString);
-        return new OptimizedHiveDao(dataContext);
       }
     }
@@ -82 +64 @@
     public IEventManager EventManager {
       get {
-        if (eventManager == null) eventManager = new NewEventManager();
+        if (eventManager == null) eventManager = new EventManager();
         return eventManager;
       }
@@ -92 +74 @@
     }
 
-    private ITransactionManager transactionManager;
-    public ITransactionManager TransactionManager {
-      get {
-        if (transactionManager == null) transactionManager = new TransactionManager();
-        return transactionManager;
-      }
-    }
-
     private Access.IUserManager userManager;
     public Access.IUserManager UserManager {
@@ -105 +79 @@
         if (userManager == null) userManager = new Access.UserManager();
         return userManager;
-      }
-    }
-
-    private NewHeartbeatManager newheartbeatManager;
-    public NewHeartbeatManager NewHeartbeatManager {
-      get {
-        if (newheartbeatManager == null) newheartbeatManager = new NewHeartbeatManager();
-        return newheartbeatManager;
       }
     }
@@ -131 +97 @@
       }
     }
-
-    private ITaskScheduler newtaskScheduler;
-    public ITaskScheduler NewTaskScheduler {
-      get {
-        if (newtaskScheduler == null) newtaskScheduler = new RoundRobinTaskScheduler();
-        return newtaskScheduler;
-      }
-    }
   }
 }