Context Navigation

← Previous Change
Next Change →

Interfaces

Timestamp:

05/20/15 16:41:14 (10 years ago)

Author:

dglaser

Message:

#2388 merged trunk into hive statistics branch

Location:

branches/HiveStatistics/sources

Files:

: 8 edited

. (modified) (1 prop)
HeuristicLab.Services.Hive (modified) (1 prop)
HeuristicLab.Services.Hive/3.3/Interfaces/IAuthorizationManager.cs (modified) (1 diff)
HeuristicLab.Services.Hive/3.3/Interfaces/IEventManager.cs (modified) (1 diff)
HeuristicLab.Services.Hive/3.3/Interfaces/IHiveDao.cs (modified) (2 diffs)
HeuristicLab.Services.Hive/3.3/Interfaces/IOptimizedHiveDao.cs (modified) (2 diffs)
HeuristicLab.Services.Hive/3.3/Interfaces/IServiceLocator.cs (modified) (1 diff)
HeuristicLab.Services.Hive/3.3/Interfaces/ITaskScheduler.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/HiveStatistics/sources

Property svn:mergeinfo changed

/branches/CodeEditor (added)	merged: 11700-11701,11707,11722,11738,11741,11743,11765,11785,11800,11802,11804-11805
/branches/NSGA-II Changes (added)	merged: 12033-12034,12044
/stable	merged: 12008-12010
/trunk/sources	merged: 11214,11241,11248-11251,11256,11263,11274,11280,11282-11283,11285-11287,11290,11292,11294-11296,11298,11300,11302,11306,11308-11309,11313,11315,11317,11324,11326,11330-11332,11337-11348,11352-11353,11361-11362,11364-11367,11380-11382,11384,11389,11391-11392,11394,11403-11404,11410-11411,11417-11420,11422,11426-11430,11432,11434-11437,11439-11448,11450,11453,11455-11457,11464,11466-11467,11469-11472,11474,11477-11480,11483,11494-11498,11504,11514-11515,11523-11525,11532-11533,11536,11540-11542,11544-11545,11547-11549,11555,11557,11581,11592,11596-11597,11599-11600,11605,11608,11610,11615-11616,11618,11623,11631,11634,11650-11652,11657,11675,11679-11680,11703-11705,11715,11717,11721,11723-11725,11734-11736,11756-11758,11762-11763,11766,11771-11772,11781-11782,11784,11787-11790,11794,11807,11809-11811,11815-11816,11818-11819,11822,11825-11831,11833-11837,11839-11840,11854,11856,11877-11879,11882,11890,11909,11912-11916,11918,11921,11930,11933-11934,11936,11938-11939,11942,11945,11948,11950-11951,11955-11956,11958-11961,11963,11967,11970-11971,11978,11982-11984,11987-11994,11996,11998-12004,12012,12015-12016,12019,12022,12037,12041,12057,12059-12060,12067,12069-12070,12072,12074,12076-12078,12085,12087-12091,12093,12095-12096,12100-12104,12106-12108,12110-12114,12116-12117,12122-12123,12125-12126,12129,12131,12134-12135,12137,12139-12140,12143-12146,12148,12151-12152,12172-12173,12178-12182,12188-12189,12227,12236-12237,12262,12264,12273,12292-12293,12305,12315,12333,12358-12361,12365,12392-12393

branches/HiveStatistics/sources/HeuristicLab.Services.Hive
- Property svn:mergeinfo changed
  /stable/HeuristicLab.Services.Hive merged: 12008-12009
  /trunk/sources/HeuristicLab.Services.Hive merged: 11623,12012,12146,12172

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

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

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

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

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

-                      r11204
+                      r12395
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
     #region Statistics Methods
-    Dictionary<Guid, int> GetWaitingTasksByUser();
     Dictionary<Guid, int> GetWaitingTasksByUserForResources(List<Guid> resourceIds);
-    Dictionary<Guid, int> GetCalculatingTasksByUser();
     Dictionary<Guid, int> GetCalculatingTasksByUserForResources(List<Guid> resourceIds);
     DT.Statistics GetStatistic(Guid id);

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

-                      r11204
+                      r12395
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
     IEnumerable<Guid> GetAssignedResourceIds(Guid jobId);
     #endregion
+    #region Website Methods
+    IEnumerable<Guid> GetAllResourceIds();
+    int GetNumberOfWaitingTasks();
+    Dictionary<Guid, int> GetCalculatingTasksByUser();
+    Dictionary<Guid, int> GetWaitingTasksByUser();
+    #endregion
+  }
+}

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

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

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

r11204	r12395
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 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.

/stable/HeuristicLab.Services.Hive	merged: 12008-12009
/trunk/sources/HeuristicLab.Services.Hive	merged: 11623,12012,12146,12172

Context Navigation

Changeset 12395 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Interfaces

Legend:

Download in other formats: