Context Navigation

Symbols

Timestamp:

04/13/10 20:44:31 (14 years ago)

Author:

gkronber

Message:

Fixed bugs related to dynamic symbol constraints with ADFs. #290 (Implement ADFs)

Location:

Files:

-                      r3294
+                      r3338
+      }
+    }
+    private int argumentIndex;
+    public int ArgumentIndex {
+      get { return argumentIndex; }
+    }
+    public Argument(int argumentIndex)
+      : base() {
+      this.argumentIndex = argumentIndex;
+      this.name = "ARG" + argumentIndex;
+    }
     public override SymbolicExpressionTreeNode CreateTreeNode() {
       return new ArgumentTreeNode(this);

-                      r3294
+                      r3338
   [StorableClass]
   public sealed class ArgumentTreeNode : SymbolicExpressionTreeNode {
+    private int argumentIndex;
+    [Storable]
+    public int ArgumentIndex {
+      get { return argumentIndex; }
+      set { argumentIndex = value; }
+    public new Argument Symbol {
+      get { return (Argument)base.Symbol; }
+      set {
+        if (value == null) throw new ArgumentNullException();
+        if(!(value is Argument)) throw new ArgumentException();
+        base.Symbol = value;
+      }
+    }
     // copy constructor
     private ArgumentTreeNode(ArgumentTreeNode original)
       : base(original) {
-      argumentIndex = original.argumentIndex;
+    }

r3294	r3338
34	34	}
35	35	}
	36
36	37	public override SymbolicExpressionTreeNode CreateTreeNode() {
37	38	return new DefunTreeNode(this);

-                      r3294
+                      r3338
 using System;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Core;
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.GeneralSymbols {
   [StorableClass]
 …
       set { numberOfArguments = value; }
+    }
     private string name;
+    private string functionName;
     [Storable]
+    public string Name {
+      get { return name; }
+      set { this.name = value; }
+    public string FunctionName {
+      get { return functionName; }
+      set { this.functionName = value; }
+    }
+    private new Defun Symbol {
+      get { return (Defun)base.Symbol; }
+    }
 …
     private DefunTreeNode(DefunTreeNode original)
       : base(original) {
       name = original.Name;
+      functionName = original.functionName;
       numberOfArguments = original.numberOfArguments;
+    }
     public DefunTreeNode(Defun defunSymbol) : base(defunSymbol) { }
     public override object Clone() {

-                      r3294
+                      r3338
+      }
+    }
+    public string FunctionName { get; set; }
+    public InvokeFunction(string functionName)
+      : base() {
+      this.FunctionName = functionName;
+      this.name = "Invoke: " + functionName;
+    }
     public override SymbolicExpressionTreeNode CreateTreeNode() {
       return new InvokeFunctionTreeNode(this);

-                      r3294
+                      r3338
   [StorableClass]
   public sealed class InvokeFunctionTreeNode : SymbolicExpressionTreeNode {
+    private string invokedFunctionName;
+    [Storable]
+    public string InvokedFunctionName {
+      get { return invokedFunctionName; }
+      set { this.invokedFunctionName = value; }
+    public new InvokeFunction Symbol {
+      get { return (InvokeFunction)base.Symbol; }
+    }
 …
     private InvokeFunctionTreeNode(InvokeFunctionTreeNode original)
       : base(original) {
-      invokedFunctionName = original.invokedFunctionName;
+    }

r3294	r3338
31	31	}
32	32	}
	33
	34	public override SymbolicExpressionTreeNode CreateTreeNode() {
	35	return new StartSymbolTreeNode(this);
	36	}
33	37	}
34	38	}

Note: See TracChangeset for help on using the changeset viewer.