Changeset 8535 for branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ConstrainedTypeValue.cs

Timestamp:

08/29/12 09:22:21 (12 years ago)

Author:

jkarder

Message:

#1853:

• enhanced combinations count calculation
• restructured code
• minor code improvements
• added license information

File:

• branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ConstrainedTypeValue.cs (modified) (6 diffs)

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ConstrainedTypeValue.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11 +32 @@
   [StorableClass]
   public class ConstrainedTypeValue : TypeValue {
-
     private IEnumerable<Type> validTypes;
     public IEnumerable<Type> ValidTypes {
@@ -25 +45 @@
     }
 
+    #region Constructors and Cloning
+    [StorableConstructor]
+    protected ConstrainedTypeValue(bool deserializing) : base(deserializing) { }
+    protected ConstrainedTypeValue(ConstrainedTypeValue original, Cloner cloner)
+      : base(original, cloner) {
+      if (original.validTypes != null)
+        this.validTypes = new List<Type>(original.validTypes);
+    }
     public ConstrainedTypeValue()
       : base() {
@@ -33 +61 @@
       this.Value = value;
     }
-
-    [StorableConstructor]
-    protected ConstrainedTypeValue(bool deserializing) : base(deserializing) { }
-    protected ConstrainedTypeValue(ConstrainedTypeValue original, Cloner cloner)
-      : base(original, cloner) {
-      if (original.validTypes != null)
-        this.validTypes = new List<Type>(original.validTypes);
-    }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new ConstrainedTypeValue(this, cloner);
     }
+    #endregion
   }
 
@@ -49 +70 @@
   [StorableClass]
   public class ConstrainedTypeValue<T> : ConstrainedTypeValue where T : class, IItem {
-
+    [StorableConstructor]
+    protected ConstrainedTypeValue(bool deserializing)
+      : base(deserializing) {
+      if (deserializing) {
+        this.ValidTypes = ApplicationManager.Manager.GetTypes(typeof(T), true).ToList();
+      }
+    }
+    protected ConstrainedTypeValue(ConstrainedTypeValue original, Cloner cloner) : base(original, cloner) { }
     public ConstrainedTypeValue()
       : base() {
@@ -60 +88 @@
       this.Value = value;
     }
-
-    [StorableConstructor]
-    protected ConstrainedTypeValue(bool deserializing)
-      : base(deserializing) {
-      if (deserializing) {
-        this.ValidTypes = ApplicationManager.Manager.GetTypes(typeof(T), true).ToList();
-      }
-    }
-
-    protected ConstrainedTypeValue(ConstrainedTypeValue original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new ConstrainedTypeValue<T>(this, cloner);