Context Navigation

← Previous Change
Next Change →

ServiceClients

Timestamp:

07/18/14 13:34:37 (10 years ago)

Author:

ascheibe

Message:

merged only Hive changes from trunk into branch

Location:

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive

Files:

: 24 edited

. (modified) (1 prop)
3.3/ServiceClients/Downtime.cs (modified) (1 diff)
3.3/ServiceClients/Heartbeat.cs (modified) (1 diff)
3.3/ServiceClients/HiveItem.cs (modified) (1 diff)
3.3/ServiceClients/HiveItemCollection.cs (modified) (1 diff)
3.3/ServiceClients/IHiveItem.cs (modified) (1 diff)
3.3/ServiceClients/Job.cs (modified) (1 diff)
3.3/ServiceClients/JobPermission.cs (modified) (1 diff)
3.3/ServiceClients/LightweightTask.cs (modified) (1 diff)
3.3/ServiceClients/MessageContainer.cs (modified) (1 diff)
3.3/ServiceClients/NamedHiveItem.cs (modified) (1 diff)
3.3/ServiceClients/Plugin.cs (modified) (1 diff)
3.3/ServiceClients/PluginData.cs (modified) (1 diff)
3.3/ServiceClients/Resource.cs (modified) (1 diff)
3.3/ServiceClients/ResourcePermission.cs (modified) (1 diff)
3.3/ServiceClients/Slave.cs (modified) (1 diff)
3.3/ServiceClients/SlaveGroup.cs (modified) (1 diff)
3.3/ServiceClients/SlaveStatistics.cs (modified) (1 diff)
3.3/ServiceClients/StateLog.cs (modified) (1 diff)
3.3/ServiceClients/Statistics.cs (modified) (1 diff)
3.3/ServiceClients/Task.cs (modified) (2 diffs)
3.3/ServiceClients/TaskData.cs (modified) (1 diff)
3.3/ServiceClients/UserPriority.cs (modified) (1 diff)
3.3/ServiceClients/UserStatistics.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive

Property svn:mergeinfo set to (toggle deleted branches)

/trunk/sources/HeuristicLab.Clients.Hive	merged	eligible
/branches/Algorithms.GradientDescent/HeuristicLab.Clients.Hive	5516-5520
/branches/Benchmarking/sources/HeuristicLab.Clients.Hive	6917-7005
/branches/CloningRefactoring/HeuristicLab.Clients.Hive	4656-4721
/branches/DataAnalysis Refactoring/HeuristicLab.Clients.Hive	5471-5808
/branches/DataAnalysis SolutionEnsembles/HeuristicLab.Clients.Hive	5815-6180
/branches/DataAnalysis/HeuristicLab.Clients.Hive	4458-4459,4462,4464
/branches/GP.Grammar.Editor/HeuristicLab.Clients.Hive	6284-6795
/branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Clients.Hive	5060
/branches/NET40/sources/HeuristicLab.Clients.Hive	5138-5162
/branches/ParallelEngine/HeuristicLab.Clients.Hive	5175-5192
/branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Clients.Hive	7568-7810
/branches/QAPAlgorithms/HeuristicLab.Clients.Hive	6350-6627
/branches/Restructure trunk solution/HeuristicLab.Clients.Hive	6828
/branches/RuntimeOptimizer/HeuristicLab.Clients.Hive	8943-9078
/branches/ScatterSearch (trunk integration)/HeuristicLab.Clients.Hive	7787-8333
/branches/SlaveShutdown/HeuristicLab.Clients.Hive	8944-8956
/branches/SuccessProgressAnalysis/HeuristicLab.Clients.Hive	5370-5682
/branches/Trunk/HeuristicLab.Clients.Hive	6829-6865
/branches/UnloadJobs/HeuristicLab.Clients.Hive	9168-9215
/branches/VNS/HeuristicLab.Clients.Hive	5594-5752
/branches/histogram/HeuristicLab.Clients.Hive	5959-6341

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/Downtime.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/Heartbeat.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveItem.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveItemCollection.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/IHiveItem.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/Job.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/JobPermission.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/LightweightTask.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/MessageContainer.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/NamedHiveItem.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/Plugin.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/PluginData.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/Resource.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/ResourcePermission.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/Slave.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/SlaveGroup.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/SlaveStatistics.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/StateLog.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/Statistics.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/Task.cs

-                      r11203
+                      r11204
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
   public partial class Task : LightweightTask {
+    public Task() { }
+    public Task() {
+      Priority = 1;
+    }
     protected Task(Task original, Cloner cloner)

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/TaskData.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/UserPriority.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/UserStatistics.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 11204 for branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients

Legend:

Download in other formats: