Changeset 14114


Ignore:
Timestamp:
07/19/16 16:46:55 (13 months ago)
Author:
mkommend
Message:

#2566: Merged r13566, r14103 into stable.

Location:
stable
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Operators/3.3/InstrumentedOperator.cs

    r12009 r14114  
    6161      Parameters.Add(new FixedValueParameter<OperatorList>(AfterExecutionOperatorsParameterName, "Actions that are executed after the execution of the operator", new OperatorList()));
    6262      BeforeExecutionOperatorsParameter.Hidden = true;
     63      BeforeExecutionOperatorsParameter.GetsCollected = false;
    6364      AfterExecutionOperatorsParameter.Hidden = true;
     65      AfterExecutionOperatorsParameter.GetsCollected = false;
    6466    }
    6567
     
    7779      }
    7880      #endregion
     81    }
     82
     83    protected override IEnumerable<KeyValuePair<string, IItem>> GetCollectedValues(IValueParameter param) {
     84      foreach (var b in base.GetCollectedValues(param)) yield return b;
     85      if (param != BeforeExecutionOperatorsParameter && param != AfterExecutionOperatorsParameter) yield break;
     86      var operatorList = (OperatorList)param.Value;
     87      var counter = 0;
     88      foreach (var op in operatorList) {
     89        yield return new KeyValuePair<string, IItem>(counter.ToString(), op);
     90        var children = new Dictionary<string, IItem>();
     91        op.CollectParameterValues(children);
     92        foreach (var c in children) yield return new KeyValuePair<string, IItem>(counter + "." + c.Key, c.Value);
     93        counter++;
     94      }
    7995    }
    8096
Note: See TracChangeset for help on using the changeset viewer.