Changeset 8535 for branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/SymbolicExpressionGrammar

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

Location:

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/SymbolicExpressionGrammar

Files:

• SymbolValueConfiguration.cs (modified) (2 diffs)
• SymbolicExpressionGrammarValueConfiguration.cs (modified) (1 diff)

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/SymbolicExpressionGrammar/SymbolValueConfiguration.cs

@@ -43 +43 @@
     [StorableConstructor]
     protected SymbolValueConfiguration(bool deserializing) : base(deserializing) { }
+    protected SymbolValueConfiguration(SymbolValueConfiguration original, Cloner cloner)
+      : base(original, cloner) {
+      RegisterInitialFrequencyEvents();
+      this.parentOptimizable = cloner.Clone(original.parentOptimizable);
+    }
     public SymbolValueConfiguration(Symbol symbol)
       : base() {
@@ -50 +55 @@
       this.ActualValue = new ConstrainedValue(symbol, symbol.GetType(), new ItemSet<IItem> { symbol }, false);
     }
-    protected SymbolValueConfiguration(SymbolValueConfiguration original, Cloner cloner)
-      : base(original, cloner) {
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
       RegisterInitialFrequencyEvents();
-      this.parentOptimizable = cloner.Clone(original.parentOptimizable);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new SymbolValueConfiguration(this, cloner);
-    }
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      RegisterInitialFrequencyEvents();
     }
     #endregion

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/SymbolicExpressionGrammar/SymbolicExpressionGrammarValueConfiguration.cs

@@ -29 +29 @@
   [StorableClass]
   public class SymbolicExpressionGrammarValueConfiguration : ParameterizedValueConfiguration {
-
     #region Constructors and Cloning
     [StorableConstructor]
     protected SymbolicExpressionGrammarValueConfiguration(bool deserializing) : base(deserializing) { }
+    protected SymbolicExpressionGrammarValueConfiguration(SymbolicExpressionGrammarValueConfiguration original, Cloner cloner) : base(original, cloner) { }
     public SymbolicExpressionGrammarValueConfiguration() : base() { }
-    public SymbolicExpressionGrammarValueConfiguration(ISymbolicExpressionGrammar grammar) {
+    public SymbolicExpressionGrammarValueConfiguration(ISymbolicExpressionGrammar grammar)
+      : base() {
       this.IsOptimizable = true;
       this.ActualValue = new ConstrainedValue(grammar, grammar.GetType(), new ItemSet<IItem> { grammar }, false);
-    }
-    protected SymbolicExpressionGrammarValueConfiguration(SymbolicExpressionGrammarValueConfiguration original, Cloner cloner)
-      : base(original, cloner) {
     }
     public override IDeepCloneable Clone(Cloner cloner) {