Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/07/16 10:18:05 (9 years ago)
Author:
ascheibe
Message:

#2582 created branch for Hive Web Job Manager

Location:
branches/WebJobManager
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/WebJobManager/HeuristicLab.Optimization/3.3/MetaOptimizers/BatchRun.cs

    r12504 r13656  
    4141    public string Filename { get; set; }
    4242
    43     public static new Image StaticItemImage {
    44       get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
    45     }
    46     public override Image ItemImage {
    47       get {
     43    public static new Image StaticItemImage
     44    {
     45      get { return new Bitmap(25, 25); }
     46    }
     47    public override Image ItemImage
     48    {
     49      get
     50      {
    4851        if (ExecutionState == ExecutionState.Prepared) return HeuristicLab.Common.Resources.VSImageLibrary.BatchRunPrepared;
    4952        else if (ExecutionState == ExecutionState.Started) return HeuristicLab.Common.Resources.VSImageLibrary.BatchRunStarted;
    … …  
    5659    [Storable]
    5760    private ExecutionState executionState;
    58     public ExecutionState ExecutionState {
     61    public ExecutionState ExecutionState
     62    {
    5963      get { return executionState; }
    60       private set {
     64      private set
     65      {
    6166        if (executionState != value) {
    6267          executionState = value;
    … …  
    6974    [Storable]
    7075    private TimeSpan executionTime;
    71     public TimeSpan ExecutionTime {
    72       get {
     76    public TimeSpan ExecutionTime
     77    {
     78      get
     79      {
    7380        if ((Optimizer != null) && (Optimizer.ExecutionState != ExecutionState.Stopped))
    7481          return executionTime + Optimizer.ExecutionTime;
    … …  
    7683          return executionTime;
    7784      }
    78       private set {
     85      private set
     86      {
    7987        executionTime = value;
    8088        OnExecutionTimeChanged();
    … …  
    8795    [Storable]
    8896    private IOptimizer optimizer;
    89     public IOptimizer Optimizer {
     97    public IOptimizer Optimizer
     98    {
    9099      get { return optimizer; }
    91       set {
     100      set
     101      {
    92102        if (optimizer != value) {
    93103          if (optimizer != null) {
    … …  
    110120    #region Backwards compatible code (remove with 3.4)
    111121    [Storable(AllowOneWay = true)]
    112     private IAlgorithm algorithm {
     122    private IAlgorithm algorithm
     123    {
    113124      set { optimizer = value; }
    114125    }
    … …  
    117128    [Storable]
    118129    private int repetitions;
    119     public int Repetitions {
     130    public int Repetitions
     131    {
    120132      get { return repetitions; }
    121       set {
     133      set
     134      {
    122135        if (repetitions != value) {
    123136          repetitions = value;
    … …  
    130143    [Storable]
    131144    private int repetitionsCounter;
    132     public int RepetitionsCounter {
     145    public int RepetitionsCounter
     146    {
    133147      get { return repetitionsCounter; }
    134       private set {
     148      private set
     149      {
    135150        if (value != repetitionsCounter) {
    136151          repetitionsCounter = value;
    … …  
    142157    [Storable]
    143158    private RunCollection runs;
    144     public RunCollection Runs {
     159    public RunCollection Runs
     160    {
    145161      get { return runs; }
    146       private set {
     162      private set
     163      {
    147164        if (value == null) throw new ArgumentNullException();
    148165        if (runs != value) {
    … …  
    154171    }
    155172
    156     public IEnumerable<IOptimizer> NestedOptimizers {
    157       get {
     173    public IEnumerable<IOptimizer> NestedOptimizers
     174    {
     175      get
     176      {
    158177        if (Optimizer == null) yield break;
    159178

  • branches/WebJobManager/HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs

    r13000 r13656  
    4040    public string Filename { get; set; }
    4141
    42     public static new Image StaticItemImage {
    43       get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
    44     }
    45     public override Image ItemImage {
    46       get {
     42    public static new Image StaticItemImage
     43    {
     44      get { return new Bitmap(25, 25); }
     45    }
     46    public override Image ItemImage
     47    {
     48      get
     49      {
    4750        if (ExecutionState == ExecutionState.Prepared) return HeuristicLab.Common.Resources.VSImageLibrary.ExperimentPrepared;
    4851        else if (ExecutionState == ExecutionState.Started) return HeuristicLab.Common.Resources.VSImageLibrary.ExperimentStarted;
    … …  
    5558    [Storable]
    5659    private ExecutionState executionState;
    57     public ExecutionState ExecutionState {
     60    public ExecutionState ExecutionState
     61    {
    5862      get { return executionState; }
    59       private set {
     63      private set
     64      {
    6065        if (executionState != value) {
    6166          executionState = value;
    … …  
    6873    [Storable]
    6974    private TimeSpan executionTime;
    70     public TimeSpan ExecutionTime {
     75    public TimeSpan ExecutionTime
     76    {
    7177      get { return executionTime; }
    72       private set {
     78      private set
     79      {
    7380        executionTime = value;
    7481        OnExecutionTimeChanged();
    … …  
    7885    [Storable]
    7986    private OptimizerList optimizers;
    80     public OptimizerList Optimizers {
     87    public OptimizerList Optimizers
     88    {
    8189      get { return optimizers; }
    8290    }
    … …  
    8492    [Storable]
    8593    private RunCollection runs;
    86     public RunCollection Runs {
     94    public RunCollection Runs
     95    {
    8796      get { return runs; }
    88       private set {
     97      private set
     98      {
    8999        if (value == null) throw new ArgumentNullException();
    90100        if (runs != value) {
    … …  
    96106    }
    97107
    98     public IEnumerable<IOptimizer> NestedOptimizers {
    99       get {
     108    public IEnumerable<IOptimizer> NestedOptimizers
     109    {
     110      get
     111      {
    100112        if (Optimizers == null) yield break;
    101113

  • branches/WebJobManager/HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs

    r13321 r13656  
    4343
    4444    #region ItemImage
    45     public static new Image StaticItemImage {
    46       get { return VSImageLibrary.Event; }
    47     }
    48     public override Image ItemImage {
     45    public static new Image StaticItemImage
     46    {
     47      get { return new Bitmap(25, 25); }
     48    }
     49    public override Image ItemImage
     50    {
    4951      get { return (Algorithm != null) ? Algorithm.ItemImage : VSImageLibrary.ExecutableStopped; }
    5052    }
    … …  
    5658    [Storable]
    5759    private TimeSpan maximumExecutionTime;
    58     public TimeSpan MaximumExecutionTime {
     60    public TimeSpan MaximumExecutionTime
     61    {
    5962      get { return maximumExecutionTime; }
    60       set {
     63      set
     64      {
    6165        if (maximumExecutionTime == value) return;
    6266        maximumExecutionTime = value;
    … …  
    6973    [Storable]
    7074    private ObservableList<TimeSpan> snapshotTimes;
    71     public ObservableList<TimeSpan> SnapshotTimes {
     75    public ObservableList<TimeSpan> SnapshotTimes
     76    {
    7277      get { return snapshotTimes; }
    73       set {
     78      set
     79      {
    7480        if (snapshotTimes == value) return;
    7581        snapshotTimes = value;
    … …  
    8389    private bool storeAlgorithmInEachSnapshot;
    8490    [Storable]
    85     public bool StoreAlgorithmInEachSnapshot {
     91    public bool StoreAlgorithmInEachSnapshot
     92    {
    8693      get { return storeAlgorithmInEachSnapshot; }
    87       set {
     94      set
     95      {
    8896        if (storeAlgorithmInEachSnapshot == value) return;
    8997        storeAlgorithmInEachSnapshot = value;
    … …  
    94102    [Storable]
    95103    private RunCollection snapshots;
    96     public RunCollection Snapshots {
     104    public RunCollection Snapshots
     105    {
    97106      get { return snapshots; }
    98       set {
     107      set
     108      {
    99109        if (snapshots == value) return;
    100110        snapshots = value;
    … …  
    104114
    105115    #region Inherited Properties
    106     public ExecutionState ExecutionState {
     116    public ExecutionState ExecutionState
     117    {
    107118      get { return (Algorithm != null) ? Algorithm.ExecutionState : ExecutionState.Stopped; }
    108119    }
    109120
    110     public TimeSpan ExecutionTime {
     121    public TimeSpan ExecutionTime
     122    {
    111123      get { return (Algorithm != null) ? Algorithm.ExecutionTime : TimeSpan.FromSeconds(0); }
    112124    }
    … …  
    114126    [Storable]
    115127    private IAlgorithm algorithm;
    116     public IAlgorithm Algorithm {
     128    public IAlgorithm Algorithm
     129    {
    117130      get { return algorithm; }
    118       set {
     131      set
     132      {
    119133        if (algorithm == value) return;
    120134        if (algorithm != null) DeregisterAlgorithmEvents();
    … …  
    130144    [Storable]
    131145    private RunCollection runs;
    132     public RunCollection Runs {
     146    public RunCollection Runs
     147    {
    133148      get { return runs; }
    134       private set {
     149      private set
     150      {
    135151        if (value == null) throw new ArgumentNullException();
    136152        if (runs == value) return;
    … …  
    140156    }
    141157
    142     public IEnumerable<IOptimizer> NestedOptimizers {
    143       get {
     158    public IEnumerable<IOptimizer> NestedOptimizers
     159    {
     160      get
     161      {
    144162        if (Algorithm == null) yield break;
    145163        yield return Algorithm;
Note: See TracChangeset for help on using the changeset viewer.