Changeset 10483 for branches/LogResidualEvaluator/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4
- Timestamp:
- 02/20/14 14:56:39 (11 years ago)
- Location:
- branches/LogResidualEvaluator
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/LogResidualEvaluator
- Property svn:mergeinfo changed
-
branches/LogResidualEvaluator/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding
- Property svn:mergeinfo changed
-
branches/LogResidualEvaluator/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/MultiSymbolicExpressionTreeArchitectureManipulator.cs
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 -
branches/LogResidualEvaluator/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/FullTreeCreator.cs
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 -
branches/LogResidualEvaluator/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/GrowTreeCreator.cs
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 -
branches/LogResidualEvaluator/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/ProbabilisticTreeCreator.cs
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 -
branches/LogResidualEvaluator/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/RampedHalfAndHalfTreeCreator.cs
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 -
branches/LogResidualEvaluator/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/SymbolicExpressionTreeCreator.cs
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 -
branches/LogResidualEvaluator/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SymbolicExpressionTreeCrossover.cs
r9456 r10483 63 63 } 64 64 65 public sealed override IOperation Apply() {65 public sealed override IOperation InstrumentedApply() { 66 66 if (Parents.Length != 2) 67 67 throw new ArgumentException("Number of parents must be exactly two for symbolic expression tree crossover operators."); … … 70 70 71 71 Child = result; 72 return base. Apply();72 return base.InstrumentedApply(); 73 73 } 74 74 -
branches/LogResidualEvaluator/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/MultiSymbolicExpressionTreeManipulator.cs
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 -
branches/LogResidualEvaluator/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/SymbolicExpressionTreeManipulator.cs
r9456 r10483 22 22 using HeuristicLab.Common; 23 23 using HeuristicLab.Core; 24 using HeuristicLab.Data;25 24 using HeuristicLab.Parameters; 26 25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; … … 55 54 } 56 55 57 public sealed override IOperation Apply() {56 public sealed override IOperation InstrumentedApply() { 58 57 ISymbolicExpressionTree tree = SymbolicExpressionTreeParameter.ActualValue; 59 58 Manipulate(RandomParameter.ActualValue, tree); 60 59 61 return base. Apply();60 return base.InstrumentedApply(); 62 61 } 63 62 -
branches/LogResidualEvaluator/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeOperator.cs
r9456 r10483 34 34 [Item("SymbolicExpressionTreeOperator", "A base class for operators for symbolic expression trees.")] 35 35 [StorableClass] 36 public abstract class SymbolicExpressionTreeOperator : SingleSuccessorOperator, 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.