Context Navigation

Changeset 10507 for stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Timestamp:

02/25/14 14:00:47 (11 years ago)

Author:

mkommend

Message:

Location:

stable

Files:

stable
- Property svn:mergeinfo changed
  /trunk/sources merged: 10149,10231,10261,10291-10292,10295,10298
stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding merged: 10291

r9456	r10507
94	94	}
95	95
96		public override IOperation Apply() {
	96	public override IOperation InstrumentedApply() {
97	97	if (ClonedSymbolicExpressionTreeGrammarParameter.ActualValue == null) {
98	98	SymbolicExpressionTreeGrammarParameter.ActualValue.ReadOnly = true;
…	…
104	104	(ISymbolicExpressionGrammar)SymbolicExpressionTreeGrammarParameter.ActualValue.Clone()));
105	105	}
106		return base.Apply();
	106	return base.InstrumentedApply();
107	107	}
108	108

r9456	r10507
94	94	}
95	95
96		public override IOperation Apply() {
	96	public override IOperation InstrumentedApply() {
97	97	if (ClonedSymbolicExpressionTreeGrammarParameter.ActualValue == null) {
98	98	SymbolicExpressionTreeGrammarParameter.ActualValue.ReadOnly = true;
…	…
104	104	(ISymbolicExpressionGrammar)SymbolicExpressionTreeGrammarParameter.ActualValue.Clone()));
105	105	}
106		return base.Apply();
	106	return base.InstrumentedApply();
107	107	}
108	108

r9456	r10507
87	87	}
88	88
89		public override IOperation Apply() {
	89	public override IOperation InstrumentedApply() {
90	90	if (ClonedSymbolicExpressionTreeGrammarParameter.ActualValue == null) {
91	91	SymbolicExpressionTreeGrammarParameter.ActualValue.ReadOnly = true;
…	…
96	96	globalScope.Variables.Add(new Variable(ClonedSymbolicExpressionTreeGrammarParameterName, (ISymbolicExpressionGrammar)SymbolicExpressionTreeGrammarParameter.ActualValue.Clone()));
97	97	}
98		return base.Apply();
	98	return base.InstrumentedApply();
99	99	}
100	100

r9456	r10507
95	95	}
96	96
97		public override IOperation Apply() {
	97	public override IOperation InstrumentedApply() {
98	98	if (ClonedSymbolicExpressionTreeGrammarParameter.ActualValue == null) {
99	99	SymbolicExpressionTreeGrammarParameter.ActualValue.ReadOnly = true;
…	…
105	105	(ISymbolicExpressionGrammar)SymbolicExpressionTreeGrammarParameter.ActualValue.Clone()));
106	106	}
107		return base.Apply();
	107	return base.InstrumentedApply();
108	108	}
109	109

r9456	r10507
54	54	}
55	55
56		public override IOperation Apply() {
	56	public override IOperation InstrumentedApply() {
57	57	SymbolicExpressionTree = Create(Random);
58		return base.Apply();
	58	return base.InstrumentedApply();
59	59	}
60	60

-                      r9456
+                      r10507
+    }
     public sealed override IOperation Apply() {
+    public sealed override IOperation InstrumentedApply() {
       if (Parents.Length != 2)
         throw new ArgumentException("Number of parents must be exactly two for symbolic expression tree crossover operators.");
 …
       Child = result;
       return base.Apply();
+      return base.InstrumentedApply();
+    }

-                      r9456
+                      r10507
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 …
+    }
     public sealed override IOperation Apply() {
+    public sealed override IOperation InstrumentedApply() {
       ISymbolicExpressionTree tree = SymbolicExpressionTreeParameter.ActualValue;
       Manipulate(RandomParameter.ActualValue, tree);
       return base.Apply();
+      return base.InstrumentedApply();
+    }

r9456	r10507
34	34	[Item("SymbolicExpressionTreeOperator", "A base class for operators for symbolic expression trees.")]
35	35	[StorableClass]
36		public abstract class SymbolicExpressionTreeOperator : ~~SingleSuccessor~~Operator, IStochasticOperator, ISymbolicExpressionTreeOperator {
	36	public abstract class SymbolicExpressionTreeOperator : InstrumentedOperator, IStochasticOperator, ISymbolicExpressionTreeOperator {
37	37	private const string RandomParameterName = "Random";
38	38

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