Context Navigation

HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Timestamp:

10/29/10 19:47:39 (14 years ago)

Author:

mkommend

Message:

Refactored ExternalEvaluation.* and fixed some errors and warnings (ticket #922).

Location:

Files:

r4674	r4682
67	67	[StorableConstructor]
68	68	private MinAverageMaxSymbolicExpressionTreeSizeAnalyzer(bool deserializing) : base() { }
69		pr~~otected~~ MinAverageMaxSymbolicExpressionTreeSizeAnalyzer(MinAverageMaxSymbolicExpressionTreeSizeAnalyzer original, Cloner cloner)
	69	private MinAverageMaxSymbolicExpressionTreeSizeAnalyzer(MinAverageMaxSymbolicExpressionTreeSizeAnalyzer original, Cloner cloner)
70	70	: base(original, cloner) {
71	71	AfterDeserialization();

r4674	r4682
47	47	get { return false; }
48	48	}
49		pr~~ivate~~ override bool CreateChildOperation {
	49	protected override bool CreateChildOperation {
50	50	get { return true; }
51	51	}
…	…
100	100	}
101	101
102		pr~~ivate~~ override void Operators_ItemsReplaced(object sender, CollectionItemsChangedEventArgs<IndexedItem<ISymbolicExpressionTreeArchitectureManipulator>> e) {
	102	protected override void Operators_ItemsReplaced(object sender, CollectionItemsChangedEventArgs<IndexedItem<ISymbolicExpressionTreeArchitectureManipulator>> e) {
103	103	base.Operators_ItemsReplaced(sender, e);
104	104	ParameterizeManipulators();
105	105	}
106	106
107		pr~~ivate~~ override void Operators_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<ISymbolicExpressionTreeArchitectureManipulator>> e) {
	107	protected override void Operators_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<ISymbolicExpressionTreeArchitectureManipulator>> e) {
108	108	base.Operators_ItemsAdded(sender, e);
109	109	ParameterizeManipulators();

r4674	r4682
45	45	}
46	46
47		pr~~ivate~~ override SymbolicExpressionTree Create(
	47	protected override SymbolicExpressionTree Create(
48	48	IRandom random,
49	49	ISymbolicExpressionGrammar grammar,

-                      r4674
+                      r4682
+    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new DefaultSymbolicExpressionGrammar(this, cloner);
+    }
     public void Clear() {
       minSubTreeCount.Clear();

r4674	r4682
39	39	}
40	40
41		pr~~ivate~~ override void Manipulate(IRandom random, SymbolicExpressionTree symbolicExpressionTree, ISymbolicExpressionGrammar grammar, IntValue maxTreeSize, IntValue maxTreeHeight, out bool success) {
	41	protected override void Manipulate(IRandom random, SymbolicExpressionTree symbolicExpressionTree, ISymbolicExpressionGrammar grammar, IntValue maxTreeSize, IntValue maxTreeHeight, out bool success) {
42	42	foreach (var node in symbolicExpressionTree.IterateNodesPrefix()) {
43	43	if (node.HasLocalParameters) {

r4674	r4682
43	43	}
44	44
45		pr~~ivate~~ override void Manipulate(IRandom random, SymbolicExpressionTree symbolicExpressionTree, ISymbolicExpressionGrammar grammar, IntValue maxTreeSize, IntValue maxTreeHeight, out bool success) {
	45	protected override void Manipulate(IRandom random, SymbolicExpressionTree symbolicExpressionTree, ISymbolicExpressionGrammar grammar, IntValue maxTreeSize, IntValue maxTreeHeight, out bool success) {
46	46	ReplaceRandomBranch(random, symbolicExpressionTree, grammar, maxTreeSize.Value, maxTreeHeight.Value, out success);
47	47	}

-                      r4674
+                      r4682
         clonedSubTree.Parent = this;
+      }
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new SymbolicExpressionTreeNode(this, cloner);
+    }
 …
       return Grammar.GetMaxSubtreeCount(Symbol);
+    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new SymbolicExpressionTreeNode(this, cloner);
+    }
     public override string ToString() {
       return Symbol.Name;

r4674	r4682
37	37	[StorableConstructor]
38	38	private ArgumentTreeNode(bool deserializing) : base(deserializing) { }
39		pr~~otected~~ ArgumentTreeNode(ArgumentTreeNode original, Cloner cloner) : base(original, cloner) { }
	39	private ArgumentTreeNode(ArgumentTreeNode original, Cloner cloner) : base(original, cloner) { }
40	40	public ArgumentTreeNode(Argument argSymbol) : base(argSymbol) { }
41	41

r4674	r4682
40	40	[StorableConstructor]
41	41	private DefunTreeNode(bool deserializing) : base(deserializing) { }
42		pr~~otected~~ DefunTreeNode(DefunTreeNode original, Cloner cloner)
	42	private DefunTreeNode(DefunTreeNode original, Cloner cloner)
43	43	: base(original, cloner) {
44	44	functionName = original.functionName;

r4674	r4682
37	37	[StorableConstructor]
38	38	private InvokeFunctionTreeNode(bool deserializing) : base(deserializing) { }
39		pr~~otected~~ InvokeFunctionTreeNode(InvokeFunctionTreeNode original, Cloner cloner) : base(original, cloner) { }
	39	private InvokeFunctionTreeNode(InvokeFunctionTreeNode original, Cloner cloner) : base(original, cloner) { }
40	40	public InvokeFunctionTreeNode(InvokeFunction invokeSymbol) : base(invokeSymbol) { }
41	41

-                      r4674
+                      r4682
+    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new Symbol(this, cloner);
+    }
     #region events
     public event EventHandler Changed;

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