Changeset 12395 for branches/HiveStatistics/sources/HeuristicLab.Core

Timestamp:

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

Author:

dglaser

Message:

#2388 merged trunk into hive statistics branch

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Core (modified) (1 prop)
• HeuristicLab.Core/3.3/Attributes/CreatableAttribute.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Attributes/ItemAttribute.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/CheckedItemCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/CheckedItemList.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ConstraintCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/DirectedGraph (copied) (copied from trunk/sources/HeuristicLab.Core/3.3/Collections/DirectedGraph)
• HeuristicLab.Core/3.3/Collections/ItemArray.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ItemCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ItemDictionary.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ItemList.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ItemSet.cs (modified) (2 diffs)
• HeuristicLab.Core/3.3/Collections/KeyedItemCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/NamedItemCollection.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Collections/OperationCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/OperatorCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/OperatorList.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/OperatorSet.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ParameterCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemList.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ReadOnlyItemArray.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ReadOnlyItemCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ReadOnlyItemDictionary.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ReadOnlyItemList.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ReadOnlyItemSet.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ReadOnlyKeyedItemCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ScopeList.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ValueParameterCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/VariableCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Constraints/ComparisonConstraint.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Constraints/Constraint.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Constraints/ConstraintOperation.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Constraints/EqualityConstraint.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Constraints/IConstraint.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Constraints/TypeCompatibilityConstraint.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Engine.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Executable.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/ExecutionContext.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/ExecutionState.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj (modified) (9 diffs)
• HeuristicLab.Core/3.3/Interfaces/DirectedGraph (copied) (copied from trunk/sources/HeuristicLab.Core/3.3/Interfaces/DirectedGraph)
• HeuristicLab.Core/3.3/Interfaces/IAtomicOperation.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/ICheckedItemCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/ICheckedItemList.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/ICheckedMultiOperator.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IConstrainedValueParameter.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IEngine.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IExecutable.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IExecutionContext.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IFixedValueParameter.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IInstrumentedOperator.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IItem.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IItemArray.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IItemCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IItemDictionary.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IItemList.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IItemSet.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IKeyedItemCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/ILog.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/ILookupParameter.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IMultiOperator.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/INamedItem.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IOperation.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IOperator.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IOperatorGraphOperator.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IParameter.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IParameterizedItem.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IParameterizedNamedItem.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IRandom.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IScope.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IScopeTreeLookupParameter.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IStatefulItem.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IValueLookupParameter.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IValueParameter.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IVariable.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Item.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Log.cs (modified) (6 diffs)
• HeuristicLab.Core/3.3/NamedItem.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/OperatorExecutionException.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/OperatorGraph.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/ParameterizedNamedItem.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/PersistenceContentManager.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Plugin.cs.frame (modified) (2 diffs)
• HeuristicLab.Core/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
• HeuristicLab.Core/3.3/Scope.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/ThreadSafeLog.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Variable.cs (modified) (1 diff)

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Attributes/CreatableAttribute.cs

@@ -1 +1 @@
 #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.
@@ -36 +36 @@
     }
 
+    public int Priority { get; set; }
+
+
     public CreatableAttribute() {
       Category = "Other Items";
+      Priority = int.MaxValue;
     }
     public CreatableAttribute(string category)
@@ -53 +57 @@
       else return null;
     }
+
+    public static int GetPriority(Type type) {
+      var attribs = type.GetCustomAttributes(typeof(CreatableAttribute), false);
+      if (attribs.Length > 0) return ((CreatableAttribute)attribs[0]).Priority;
+      else return int.MaxValue;
+    }
   }
 }

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Attributes/ItemAttribute.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/CheckedItemCollection.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/CheckedItemList.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/ConstraintCollection.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/ItemArray.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/ItemCollection.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/ItemDictionary.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/ItemList.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/ItemSet.cs

@@ -1 +1 @@
 #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.
@@ -52 +52 @@
     protected ItemSet(ItemSet<T> original, Cloner cloner) {
       cloner.RegisterClonedObject(original, this);
-      set = new HashSet<T>(original.Select(x => cloner.Clone(x)));
+      set = new HashSet<T>(original.Select(cloner.Clone), original.set.Comparer);
     }
     public ItemSet() : base() { }

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/KeyedItemCollection.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/NamedItemCollection.cs

@@ -1 +1 @@
 #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.
@@ -75 +75 @@
     }
 
-    protected void RegisterItemEvents(IEnumerable<T> items) {
+    protected virtual void RegisterItemEvents(IEnumerable<T> items) {
       foreach (T item in items) {
         if (item != null) {
@@ -83 +83 @@
       }
     }
-    private void DeregisterItemEvents(IEnumerable<T> items) {
+    protected virtual void DeregisterItemEvents(IEnumerable<T> items) {
       foreach (T item in items) {
         if (item != null) {

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/OperationCollection.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/OperatorCollection.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/OperatorList.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/OperatorSet.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/ParameterCollection.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemCollection.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemList.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyItemArray.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyItemCollection.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyItemDictionary.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyItemList.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyItemSet.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyKeyedItemCollection.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/ScopeList.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/ValueParameterCollection.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Collections/VariableCollection.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Constraints/ComparisonConstraint.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Constraints/Constraint.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Constraints/ConstraintOperation.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Constraints/EqualityConstraint.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Constraints/IConstraint.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Constraints/TypeCompatibilityConstraint.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Engine.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Executable.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/ExecutionContext.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/ExecutionState.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj

@@ -19 +19 @@
     </UpgradeBackupLocation>
     <IsWebBootstrapper>true</IsWebBootstrapper>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -48 +48 @@
     </DocumentationFile>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -60 +61 @@
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -69 +71 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
@@ -80 +83 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
@@ -89 +93 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
@@ -100 +105 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
@@ -116 +122 @@
     <Compile Include="Collections\CheckedItemCollection.cs" />
     <Compile Include="Collections\CheckedItemList.cs" />
+    <Compile Include="Collections\DirectedGraph\Arc.cs" />
+    <Compile Include="Collections\DirectedGraph\DirectedGraph.cs" />
+    <Compile Include="Collections\DirectedGraph\Vertex.cs" />
     <Compile Include="Collections\ReadOnlyCheckedItemCollection.cs" />
     <Compile Include="Collections\ReadOnlyCheckedItemList.cs">
@@ -148 +157 @@
     <Compile Include="Constraints\IConstraint.cs" />
     <Compile Include="Constraints\TypeCompatibilityConstraint.cs" />
+    <Compile Include="Interfaces\DirectedGraph\IArc.cs" />
+    <Compile Include="Interfaces\DirectedGraph\IDirectedGraph.cs" />
+    <Compile Include="Interfaces\DirectedGraph\IVertex.cs" />
     <Compile Include="Interfaces\ICheckedMultiOperator.cs" />
     <Compile Include="Interfaces\IConstrainedValueParameter.cs" />

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IAtomicOperation.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/ICheckedItemCollection.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/ICheckedItemList.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/ICheckedMultiOperator.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IConstrainedValueParameter.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IEngine.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IExecutable.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IExecutionContext.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IFixedValueParameter.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IInstrumentedOperator.cs

@@ -2 +2 @@
 
 /* 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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IItem.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IItemArray.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IItemCollection.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IItemDictionary.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IItemList.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IItemSet.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IKeyedItemCollection.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/ILog.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/ILookupParameter.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IMultiOperator.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/INamedItem.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IOperation.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IOperator.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IOperatorGraphOperator.cs

@@ -2 +2 @@
 
 /* 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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IParameter.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IParameterizedItem.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IParameterizedNamedItem.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IRandom.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IScope.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IScopeTreeLookupParameter.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IStatefulItem.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IValueLookupParameter.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IValueParameter.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Interfaces/IVariable.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Item.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Log.cs

@@ -1 +1 @@
 #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.
@@ -30 +30 @@
   [Item("Log", "A log for logging string messages.")]
   [StorableClass]
-  public class Log : Item, ILog, IStorableContent {
+  public sealed class Log : Item, ILog, IStorableContent {
     public string Filename { get; set; }
 
@@ -38 +38 @@
 
     [Storable]
-    protected IList<string> messages;
-    public virtual IEnumerable<string> Messages {
+    private IList<string> messages;
+    public IEnumerable<string> Messages {
       get { return messages; }
     }
 
     [Storable]
-    protected long maxMessageCount;
-    public virtual long MaxMessageCount {
+    private long maxMessageCount;
+    public long MaxMessageCount {
       get { return maxMessageCount; }
     }
 
     [StorableConstructor]
-    protected Log(bool deserializing) : base(deserializing) { }
-    protected Log(Log original, Cloner cloner)
+    private Log(bool deserializing) : base(deserializing) { }
+    private Log(Log original, Cloner cloner)
       : base(original, cloner) {
       this.messages = new List<string>(original.messages);
@@ -66 +66 @@
     }
 
-    public virtual void Clear() {
+    public void Clear() {
       messages.Clear();
       OnCleared();
     }
-    public virtual void LogMessage(string message) {
+    public void LogMessage(string message) {
       string s = FormatLogMessage(message);
       messages.Add(s);
@@ -76 +76 @@
       OnMessageAdded(s);
     }
-    public virtual void LogException(Exception ex) {
+    public void LogException(Exception ex) {
       string s = FormatException(ex);
       messages.Add(s);
@@ -82 +82 @@
       OnMessageAdded(s);
     }
-    protected virtual void CapMessages() {
+    private void CapMessages() {
       while (maxMessageCount >= 0 && messages.Count > maxMessageCount) {
         messages.RemoveAt(0);
       }
     }
-    protected virtual string FormatLogMessage(string message) {
+    public static string FormatLogMessage(string message) {
       return DateTime.Now.ToString() + "\t" + message;
     }
-    protected virtual string FormatException(Exception ex) {
+    public static string FormatException(Exception ex) {
       return DateTime.Now.ToString() + "\t" + "Exception occurred:" + Environment.NewLine + ErrorHandling.BuildErrorMessage(ex);
     }
 
     public event EventHandler<EventArgs<string>> MessageAdded;
-    protected virtual void OnMessageAdded(string message) {
+    private void OnMessageAdded(string message) {
       EventHandler<EventArgs<string>> handler = MessageAdded;
       if (handler != null) handler(this, new EventArgs<string>(message));
     }
     public event EventHandler Cleared;
-    protected virtual void OnCleared() {
+    private void OnCleared() {
       EventHandler handler = Cleared;
       if (handler != null) handler(this, EventArgs.Empty);

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/NamedItem.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/OperatorExecutionException.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/OperatorGraph.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/ParameterizedNamedItem.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/PersistenceContentManager.cs

@@ -1 +1 @@
 #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.
@@ -20 +20 @@
 #endregion
 
+using System.IO.Compression;
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.Xml;
@@ -32 +33 @@
 
     protected override void SaveContent(IStorableContent content, string filename, bool compressed) {
-      XmlGenerator.Serialize(content, filename, compressed ? 9 : 0);
+      XmlGenerator.Serialize(content, filename, compressed ? CompressionLevel.Optimal : CompressionLevel.NoCompression);
     }
   }

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Plugin.cs.frame

@@ -1 +1 @@
 #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.
@@ -29 +29 @@
   /// Plugin class for HeuristicLab.Core plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Core", "3.3.10.$WCREV$")]
+  [Plugin("HeuristicLab.Core", "3.3.11.$WCREV$")]
   [PluginFile("HeuristicLab.Core-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Properties/AssemblyInfo.cs.frame

@@ -1 +1 @@
 #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.
@@ -32 +32 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.10.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.11.$WCREV$")]

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Scope.cs

@@ -1 +1 @@
 #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.

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/ThreadSafeLog.cs

@@ -1 +1 @@
 #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.
@@ -21 +21 @@
 
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -30 +29 @@
   [Item("ThreadSafeLog", "A thread-safe log for logging string messages.")]
   [StorableClass]
-  public sealed class ThreadSafeLog : Log {
-    private ReaderWriterLockSlim locker = new ReaderWriterLockSlim();
+  public sealed class ThreadSafeLog : Item, ILog, IStorableContent {
+    public string Filename { get; set; }
+    private ConcurrentQueue<string> messages;
 
-    public override IEnumerable<string> Messages {
-      get {
-        locker.EnterReadLock();
-        try {
-          return messages.ToArray(); // return copy of messages
-        } finally { locker.ExitReadLock(); }
-      }
+    public IEnumerable<string> Messages {
+      get { return messages.ToArray(); }
+    }
+
+    [Storable(Name = "messages")]
+    private IEnumerable<string> StorableMessages {
+      get { return Messages; }
+      set { messages = new ConcurrentQueue<string>(value); }
+    }
+
+    [Storable]
+    private long maxMessageCount;
+    public long MaxMessageCount {
+      get { return maxMessageCount; }
     }
 
     [StorableConstructor]
     private ThreadSafeLog(bool deserializing) : base(deserializing) { }
-    public ThreadSafeLog(long maxMessageCount = -1)
-      : base(maxMessageCount) {
+    private ThreadSafeLog(ThreadSafeLog original, Cloner cloner)
+      : base(original, cloner) {
+      this.messages = new ConcurrentQueue<string>(original.messages);
+      this.maxMessageCount = original.maxMessageCount;
+    }
+    public ThreadSafeLog(long maxMessageCount = int.MaxValue) {
+      this.messages = new ConcurrentQueue<string>();
+      this.maxMessageCount = maxMessageCount;
     }
 
-    private ThreadSafeLog(ThreadSafeLog original, Cloner cloner)
-      : base(original, cloner) { }
-
     public override IDeepCloneable Clone(Cloner cloner) {
-      locker.EnterReadLock();
-      try {
-        return new ThreadSafeLog(this, cloner);
-      } finally { locker.ExitReadLock(); }
+      return new ThreadSafeLog(this, cloner);
     }
 
-    public override void Clear() {
-      locker.EnterWriteLock();
-      try {
-        messages.Clear();
-      } finally { locker.ExitWriteLock(); }
+    public void Clear() {
+      messages = new ConcurrentQueue<string>();
       OnCleared();
     }
 
-    public override void LogMessage(string message) {
-      string s = FormatLogMessage(message);
-      locker.EnterWriteLock();
-      try {
-        messages.Add(s);
-        CapMessages();
-      } finally { locker.ExitWriteLock(); }
+    public void LogMessage(string message) {
+      var s = Log.FormatLogMessage(message);
+      messages.Enqueue(s);
+      CapMessages();
       OnMessageAdded(s);
     }
 
-    public override void LogException(Exception ex) {
-      string s = FormatException(ex);
-      locker.EnterWriteLock();
-      try {
-        messages.Add(s);
-        CapMessages();
-      } finally { locker.ExitWriteLock(); }
+    public void LogException(Exception ex) {
+      var s = Log.FormatException(ex);
+      messages.Enqueue(s);
+      CapMessages();
       OnMessageAdded(s);
+    }
+
+    private readonly object capLock = new object();
+    private void CapMessages() {
+      lock (capLock) {
+        string s;
+        while (messages.Count > maxMessageCount)
+          if (!messages.TryDequeue(out s)) break;
+      }
+    }
+
+    public event EventHandler<EventArgs<string>> MessageAdded;
+    private void OnMessageAdded(string message) {
+      var handler = MessageAdded;
+      if (handler != null) handler(this, new EventArgs<string>(message));
+    }
+
+    public event EventHandler Cleared;
+    private void OnCleared() {
+      var handler = Cleared;
+      if (handler != null) handler(this, EventArgs.Empty);
     }
   }

branches/HiveStatistics/sources/HeuristicLab.Core/3.3/Variable.cs

@@ -1 +1 @@
 #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.