Changeset 6760 for branches/PersistenceSpeedUp/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols

Timestamp:

09/14/11 13:59:25 (13 years ago)

Author:

epitzer

Message:

#1530 integrate changes from trunk

Location:

branches/PersistenceSpeedUp

Files:

• . (modified) (2 props)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/Argument.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/InvokeFunction.cs (modified) (3 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/Symbol.cs (modified) (3 diffs)

branches/PersistenceSpeedUp

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

branches/PersistenceSpeedUp/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/Argument.cs

@@ -38 +38 @@
     }
 
-    public override bool CanChangeDescription {
-      get { return false; }
-    }
-
     [StorableConstructor]
     private Argument(bool deserializing) : base(deserializing) { }

branches/PersistenceSpeedUp/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/InvokeFunction.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -38 +37 @@
     public string FunctionName {
       get { return functionName; }
-      set {
-        if (value == null) throw new ArgumentNullException();
-        functionName = value;
-      }
     }
 
@@ -53 +48 @@
     public InvokeFunction(string functionName)
       : base("Invoke: " + functionName, InvokeFunction.InvokeFunctionDescription) {
-      this.FunctionName = functionName;
+      this.functionName = functionName;
     }
 

branches/PersistenceSpeedUp/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/Symbol.cs

@@ -43 +43 @@
     }
     public override bool CanChangeName {
-      get { return false; }
+      get { return !(this is IReadOnlySymbol); }
     }
     public override bool CanChangeDescription {
@@ -56 +56 @@
       initialFrequency = original.initialFrequency;
     }
-    protected Symbol()
-      : base() {
-      initialFrequency = 1.0;
-    }
 
     protected Symbol(string name, string description)
@@ -65 +61 @@
       initialFrequency = 1.0;
     }
-
 
     public virtual ISymbolicExpressionTreeNode CreateTreeNode() {

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates