Changeset 13527 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SchemaDiversification/SchemaEvaluator.cs
- Timestamp:
- 01/16/16 15:39:03 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SchemaDiversification/SchemaEvaluator.cs
r13496 r13527 143 143 }; 144 144 145 [Storable] 145 146 public ISymbolicExpressionTree Schema { get; set; } 146 147 147 148 [Storable] 148 private readonly Update EstimatedValuesOperator updateEstimatedValuesOperator;149 private readonly UpdateQualityOperator updateQualityOperator; 149 150 150 151 [StorableHook(HookType.AfterDeserialization)] … … 156 157 public SchemaEvaluator() { 157 158 qm = new QueryMatch(comp) { MatchParents = true }; 158 this.update EstimatedValuesOperator = new UpdateEstimatedValuesOperator();159 this.updateQualityOperator = new UpdateQualityOperator(); 159 160 #region add parameters 160 161 Parameters.Add(new LookupParameter<ISymbolicExpressionTree>(SchemaParameterName, "The current schema to be evaluated")); … … 185 186 186 187 protected SchemaEvaluator(SchemaEvaluator original, Cloner cloner) : base(original, cloner) { 187 this.comp = original.comp == null ? new SymbolicExpressionTreeNodeEqualityComparer { 188 MatchConstantValues = false, 189 MatchVariableWeights = false, 190 MatchVariableNames = true 191 } : (ISymbolicExpressionTreeNodeEqualityComparer)original.comp.Clone(); 188 this.comp = new SymbolicExpressionTreeNodeEqualityComparer(); 192 189 this.qm = new QueryMatch(comp) { MatchParents = original.qm?.MatchParents ?? true }; 193 this.updateEstimatedValuesOperator = new UpdateEstimatedValuesOperator(); 190 this.updateQualityOperator = new UpdateQualityOperator(); 191 Schema = original.Schema; 194 192 } 195 193 … … 295 293 foreach (var ind in individualsToReplace) { 296 294 var mutatorOp = ExecutionContext.CreateChildOperation(mutator, ind); 297 var updateOp = ExecutionContext.CreateChildOperation(update EstimatedValuesOperator, ind);295 var updateOp = ExecutionContext.CreateChildOperation(updateQualityOperator, ind); 298 296 mutationOc.Add(mutatorOp); 299 297 updateEstimatedValues.Add(updateOp);
Note: See TracChangeset
for help on using the changeset viewer.