Changeset 4770 for branches/ParameterBinding/HeuristicLab.Parameters

Timestamp:

11/11/10 14:03:24 (14 years ago)

Author:

abeham

Message:

#1258

• worked on parameter binding

Location:

branches/ParameterBinding/HeuristicLab.Parameters/3.3

Files:

• HeuristicLab.Parameters-3.3.csproj (modified) (1 diff)
• ParameterActualNameBinding.cs (deleted)
• ParameterNameBinding.cs (added)
• ParameterSecondLevelNameBinding.cs (added)
• ParameterSecondLevelValueBinding.cs (deleted)
• ParameterValueBinding.cs (modified) (4 diffs)

branches/ParameterBinding/HeuristicLab.Parameters/3.3/HeuristicLab.Parameters-3.3.csproj

@@ -111 +111 @@
     <None Include="HeuristicLabParametersPlugin.cs.frame" />
     <Compile Include="ConstrainedValueParameter.cs" />
-    <Compile Include="ParameterSecondLevelValueBinding.cs" />
+    <Compile Include="ParameterSecondLevelNameBinding.cs" />
     <Compile Include="ParameterValueBinding.cs" />
     <Compile Include="OptionalConstrainedValueParameter.cs" />
-    <Compile Include="ParameterActualNameBinding.cs" />
+    <Compile Include="ParameterNameBinding.cs" />
     <Compile Include="ScopeTreeLookupParameter.cs" />
     <Compile Include="ValueParameter.cs" />

branches/ParameterBinding/HeuristicLab.Parameters/3.3/ParameterValueBinding.cs

@@ -11 +11 @@
   public class ParameterValueBinding : IParameterBinding {
     [Storable]
-    private IValueParameter recipient;
-    public IValueParameter Recipient {
-      get { return recipient; }
+    private IValueParameter target;
+    public IValueParameter Target {
+      get { return target; }
     }
     [Storable]
-    private IValueParameter donor;
-    public IValueParameter Donor {
-      get { return donor; }
+    private IValueParameter source;
+    public IValueParameter Source {
+      get { return source; }
     }
 
@@ -24 +24 @@
     protected ParameterValueBinding(bool deserializing) { }
     protected ParameterValueBinding(ParameterValueBinding original, Cloner cloner) {
-      this.donor = cloner.Clone(donor);
-      this.recipient = cloner.Clone(recipient);
+      this.source = cloner.Clone(source);
+      this.target = cloner.Clone(target);
       RegisterEventHandlers();
     }
-    public ParameterValueBinding(IValueParameter recipient, IValueParameter donor) {
-      if (recipient == null) throw new ArgumentNullException("destination");
-      if (donor == null) throw new ArgumentNullException("source");
-      this.recipient = recipient;
-      this.donor = donor;
-      RegisterEventHandlers();
+    public ParameterValueBinding(IValueParameter target, IValueParameter source) {
+      if (target == null) throw new ArgumentNullException("destination");
+      if (source == null) throw new ArgumentNullException("source");
+      this.target = target;
+      this.source = source;
     }
 
-    public override IDeepCloneable Clone(Cloner cloner) {
+    public object Clone() {
+      return Clone(new Cloner());
+    }
+
+    public virtual IDeepCloneable Clone(Cloner cloner) {
       return new ParameterValueBinding(this, cloner);
     }
@@ -42 +45 @@
     public void Bind() {
       RegisterEventHandlers();
+      ExecuteBinding();
     }
 
@@ -54 +58 @@
 
     private void RegisterEventHandlers() {
-      donor.ValueChanged += new EventHandler(source_ValueChanged);
+      source.ValueChanged += new EventHandler(source_ValueChanged);
     }
 
     private void DeregisterEventHandlers() {
-      donor.ValueChanged -= new EventHandler(source_ValueChanged);
+      source.ValueChanged -= new EventHandler(source_ValueChanged);
     }
-    
 
     private void source_ValueChanged(object sender, EventArgs e) {
-      recipient.Value = (IItem)donor.Value.Clone();
+      ExecuteBinding();
+    }
+
+    private void ExecuteBinding() {
+      target.Value = (IItem)source.Value.Clone();
     }
   }