Changeset 12861


Ignore:
Timestamp:
08/13/15 16:19:51 (6 years ago)
Author:
ascheibe
Message:

#2388 removed old code and switched to new code

Location:
branches/HiveStatistics/sources
Files:
7 deleted
5 edited
4 moved

Legend:

Unmodified
Added
Removed
  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HeuristicLab.Services.Hive.DataAccess-3.3.csproj

    r12853 r12861  
    133133    <Compile Include="Enums\CpuArchitecture.cs" />
    134134    <Compile Include="Interfaces\IPersistenceManager.cs" />
    135     <Compile Include="Interfaces\ITransactionManager.cs" />
    136135    <Compile Include="Manager\PersistenceManager.cs" />
    137     <Compile Include="Manager\TransactionManager.cs" />
    138136    <Compile Include="Plugin.cs" />
    139137    <Compile Include="HiveDataContext.cs">
  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj

    r12857 r12861  
    118118  </ItemGroup>
    119119  <ItemGroup>
    120     <Compile Include="Convert.cs" />
    121120    <Compile Include="Converter.cs" />
    122121    <Compile Include="DataTransfer\Command.cs" />
     
    143142    <Compile Include="HiveStatisticsGenerator.cs" />
    144143    <Compile Include="Interfaces\IStatisticsGenerator.cs" />
    145     <Compile Include="Manager\NewEventManager.cs" />
    146     <Compile Include="Manager\NewHeartbeatManager.cs" />
    147     <Compile Include="NewHiveService.cs" />
    148     <Compile Include="OptimizedHiveDao.cs" />
    149     <Compile Include="HiveDao.cs" />
    150144    <Compile Include="HiveJanitor.cs" />
    151145    <Compile Include="HiveOperationContext.cs" />
    152     <Compile Include="Interfaces\IOptimizedHiveDao.cs" />
    153     <Compile Include="Interfaces\IHiveDao.cs" />
    154146    <Compile Include="Interfaces\ITaskScheduler.cs" />
    155147    <Compile Include="PerformanceLogger.cs" />
    156     <Compile Include="Scheduler\NewRoundRobinTaskScheduler.cs" />
    157148    <Compile Include="Scheduler\TaskInfoForScheduler.cs" />
    158149    <Compile Include="Scheduler\JobInfoForScheduler.cs" />
  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HiveService.cs

    r12860 r12861  
    4040  [ServiceBehavior(InstanceContextMode = InstanceContextMode.PerCall, IgnoreExtensionDataObject = true)]
    4141  [HiveOperationContextBehavior]
    42   public class NewHiveService : IHiveService {
     42  public class HiveService : IHiveService {
    4343    private static readonly DA.TaskState[] CompletedStates = { DA.TaskState.Finished, DA.TaskState.Aborted, DA.TaskState.Failed };
    4444
     
    6161      get { return ServiceLocator.Instance.EventManager; }
    6262    }
    63     private NewHeartbeatManager HeartbeatManager {
    64       get { return ServiceLocator.Instance.NewHeartbeatManager; }
     63    private HeartbeatManager HeartbeatManager {
     64      get { return ServiceLocator.Instance.HeartbeatManager; }
    6565    }
    6666
  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Interfaces/IServiceLocator.cs

    r12691 r12861  
    2828    IAuthorizationManager AuthorizationManager { get; }
    2929    IPersistenceManager PersistenceManager { get; }
    30     IHiveDao HiveDao { get; }
    31     IOptimizedHiveDao OptimizedHiveDao { get; }
    3230    IEventManager EventManager { get; }
    3331    IStatisticsGenerator StatisticsGenerator { get; }
    34     ITransactionManager TransactionManager { get; }
    3532    Access.IUserManager UserManager { get; }
    36     NewHeartbeatManager NewHeartbeatManager { get; }
    3733    HeartbeatManager HeartbeatManager { get; }
    3834    ITaskScheduler TaskScheduler { get; }
    39     ITaskScheduler NewTaskScheduler { get; }
    4035  }
    4136}
  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Interfaces/IStatisticsGenerator.cs

    r12441 r12861  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs

    r12860 r12861  
    2626
    2727namespace HeuristicLab.Services.Hive.Manager {
    28   public class NewEventManager : IEventManager {
     28  public class EventManager : IEventManager {
    2929    private const string SlaveTimeout = "Slave timed out.";
    3030    private IPersistenceManager PersistenceManager {
  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs

    r12860 r12861  
    3030
    3131namespace HeuristicLab.Services.Hive.Manager {
    32   public class NewHeartbeatManager {
     32  public class HeartbeatManager {
    3333    private const string MutexName = "HiveTaskSchedulingMutex";
    3434
     
    3838
    3939    private ITaskScheduler TaskScheduler {
    40       get { return ServiceLocator.Instance.NewTaskScheduler; }
     40      get { return ServiceLocator.Instance.TaskScheduler; }
    4141    }
    4242
  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Scheduler/RoundRobinTaskScheduler.cs

    r12860 r12861  
    2727
    2828namespace HeuristicLab.Services.Hive {
    29   public class NewRoundRobinTaskScheduler : ITaskScheduler {
     29  public class RoundRobinTaskScheduler : ITaskScheduler {
    3030    private IPersistenceManager PersistenceManager {
    3131      get { return ServiceLocator.Instance.PersistenceManager; }
  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/ServiceLocator.cs

    r12857 r12861  
    2626
    2727namespace HeuristicLab.Services.Hive {
    28 
    2928  public class ServiceLocator : IServiceLocator {
    3029    private static IServiceLocator instance;
     
    4342                            : new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString);
    4443        return new PersistenceManager(dataContext);
    45       }
    46     }
    47 
    48     private IHiveDao hiveDao;
    49     public IHiveDao HiveDao {
    50       get {
    51         if (hiveDao == null) hiveDao = new HiveDao();
    52         return hiveDao;
    53       }
    54     }
    55 
    56     public IOptimizedHiveDao OptimizedHiveDao {
    57       get {
    58         var dataContext = HiveOperationContext.Current != null
    59                             ? HiveOperationContext.Current.DataContext
    60                             : new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString);
    61         return new OptimizedHiveDao(dataContext);
    6244      }
    6345    }
     
    8264    public IEventManager EventManager {
    8365      get {
    84         if (eventManager == null) eventManager = new NewEventManager();
     66        if (eventManager == null) eventManager = new EventManager();
    8567        return eventManager;
    8668      }
     
    9274    }
    9375
    94     private ITransactionManager transactionManager;
    95     public ITransactionManager TransactionManager {
    96       get {
    97         if (transactionManager == null) transactionManager = new TransactionManager();
    98         return transactionManager;
    99       }
    100     }
    101 
    10276    private Access.IUserManager userManager;
    10377    public Access.IUserManager UserManager {
     
    10579        if (userManager == null) userManager = new Access.UserManager();
    10680        return userManager;
    107       }
    108     }
    109 
    110     private NewHeartbeatManager newheartbeatManager;
    111     public NewHeartbeatManager NewHeartbeatManager {
    112       get {
    113         if (newheartbeatManager == null) newheartbeatManager = new NewHeartbeatManager();
    114         return newheartbeatManager;
    11581      }
    11682    }
     
    13197      }
    13298    }
    133 
    134     private ITaskScheduler newtaskScheduler;
    135     public ITaskScheduler NewTaskScheduler {
    136       get {
    137         if (newtaskScheduler == null) newtaskScheduler = new RoundRobinTaskScheduler();
    138         return newtaskScheduler;
    139       }
    140     }
    14199  }
    142100}
Note: See TracChangeset for help on using the changeset viewer.