Context Navigation

HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Timestamp:

02/20/14 14:56:39 (11 years ago)

Author:

gkronber

Message:

#2093: merged trunk changes to prepare for reintegration

Location:

branches/LogResidualEvaluator

Files:

Property svn:mergeinfo changed

/branches/HLScript (added)	merged: 10331-10332,10358
/branches/SpectralKernelForGaussianProcesses (added)	merged: 10204-10205,10473,10479
/trunk/sources (added)	merged: 10212-10213,10231,10261,10273,10291-10292,10295,10298,10323-10324,10346,10348,10355,10359-10360,10362-10363,10365-10366,10368,10375,10378,10391,10401,10406-10407,10414,10417-10418,10428,10432-10433,10435,10440,10448,10453,10460,10465-10466,10469-10470,10472,10474-10477,10480

Property svn:mergeinfo changed

/branches/HLScript/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (added)	merged: 10358
/branches/SpectralKernelForGaussianProcesses/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (added)	merged: 10479
/trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (added)	merged: 10291,10346,10359,10480

r9456	r10483
106	106	Operators = checkedItemList.AsReadOnly();
107	107	Operators_ItemsAdded(this, new CollectionItemsChangedEventArgs<IndexedItem<ISymbolicExpressionTreeManipulator>>(Operators.CheckedItems));
	108
	109	SelectedOperatorParameter.ActualName = "SelectedManipulationOperator";
108	110	}
109	111

r9456	r10483
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	r10483
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	r10483
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	r10483
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	r10483
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
+                      r10483
+    }
     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	r10483
83	83	Operators = checkedItemList.AsReadOnly();
84	84	Operators_ItemsAdded(this, new CollectionItemsChangedEventArgs<IndexedItem<ISymbolicExpressionTreeManipulator>>(Operators.CheckedItems));
	85
	86	SelectedOperatorParameter.ActualName = "SelectedManipulationOperator";
85	87	}
86	88

-                      r9456
+                      r10483
 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	r10483
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.