Changeset 2843 for trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols

Timestamp:

02/19/10 18:49:17 (14 years ago)

Author:

gkronber

Message:

Removed max. and min. time offset constraints as algorithm parameters and from all engines. The time constraints were added to the relevant terminal symbols (variable & differential) instead. The time offset constraint can be changed by editing the symbols in the function library. #880 (Max and min time offsets for variable symbols are not set correctly by FunctionLibraryInjectors)

Location:

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols

Files:

• Differential.cs (modified) (1 diff)
• Variable.cs (modified) (3 diffs)
• VariableView.Designer.cs (added)
• VariableView.cs (added)
• VariableView.resx (added)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Differential.cs

@@ -36 +36 @@
       return new VariableFunctionTree(this);
     }
+
+    public override HeuristicLab.Core.IView CreateView() {
+      return new VariableView(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Variable.cs

@@ -24 +24 @@
 using HeuristicLab.Random;
 using HeuristicLab.Data;
+using System.Xml;
 
 namespace HeuristicLab.GP.StructureIdentification {
@@ -32 +33 @@
 
     private int minOffset;
+    public int MinTimeOffset {
+      get {
+        return minOffset;
+      }
+      set {
+        if (value != minOffset) {
+          minOffset = value;
+          SetupInitialization();
+          SetupManipulation();
+        }
+      }
+    }
+
     private int maxOffset;
+    public int MaxTimeOffset {
+      get {
+        return maxOffset;
+      }
+      set {
+        if (value != maxOffset) {
+          maxOffset = value;
+          SetupManipulation();
+          SetupInitialization();
+        }
+      }
+    }
 
     public override string Description {
@@ -116 +142 @@
     }
 
-    public void SetConstraints(int minSampleOffset, int maxSampleOffset) {
-      this.minOffset = minSampleOffset;
-      this.maxOffset = maxSampleOffset;
-      SetupInitialization();
-      SetupManipulation();
+    public override HeuristicLab.Core.IView CreateView() {
+      return new VariableView(this);
     }
+
+    #region persistence
+    public override object Clone(System.Collections.Generic.IDictionary<System.Guid, object> clonedObjects) {
+      Variable clone = (Variable)base.Clone(clonedObjects);
+      clone.MaxTimeOffset = MaxTimeOffset;
+      clone.MinTimeOffset = MinTimeOffset;
+      return clone;
+    }
+    public override System.Xml.XmlNode GetXmlNode(string name, System.Xml.XmlDocument document, System.Collections.Generic.IDictionary<System.Guid, HeuristicLab.Core.IStorable> persistedObjects) {
+      XmlNode node = base.GetXmlNode(name, document, persistedObjects);
+      var minTimeOffsetAttr = document.CreateAttribute("MinTimeOffset");
+      minTimeOffsetAttr.Value = MinTimeOffset.ToString();
+      var maxTimeOffsetAttr = document.CreateAttribute("MaxTimeOffset");
+      maxTimeOffsetAttr.Value = MaxTimeOffset.ToString();
+      node.Attributes.Append(minTimeOffsetAttr);
+      node.Attributes.Append(maxTimeOffsetAttr);
+      return node;
+    }
+    public override void Populate(System.Xml.XmlNode node, System.Collections.Generic.IDictionary<System.Guid, HeuristicLab.Core.IStorable> restoredObjects) {
+      base.Populate(node, restoredObjects);
+      MinTimeOffset = XmlConvert.ToInt32(node.Attributes["MinTimeOffset"].Value);
+      MaxTimeOffset = XmlConvert.ToInt32(node.Attributes["MaxTimeOffset"].Value);
+    }
+    #endregion
   }
 }