Changeset 4770 for branches

Timestamp:

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

Author:

abeham

Message:

#1258

• worked on parameter binding

Location:

branches/ParameterBinding

Files:

• HeuristicLab.Core/3.3/ParameterizedNamedItem.cs (modified) (2 diffs)
• HeuristicLab.Parameters/3.3/HeuristicLab.Parameters-3.3.csproj (modified) (1 diff)
• HeuristicLab.Parameters/3.3/ParameterActualNameBinding.cs (deleted)
• HeuristicLab.Parameters/3.3/ParameterNameBinding.cs (added)
• HeuristicLab.Parameters/3.3/ParameterSecondLevelNameBinding.cs (added)
• HeuristicLab.Parameters/3.3/ParameterSecondLevelValueBinding.cs (deleted)
• HeuristicLab.Parameters/3.3/ParameterValueBinding.cs (modified) (4 diffs)
• HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs (modified) (5 diffs)

branches/ParameterBinding/HeuristicLab.Core/3.3/ParameterizedNamedItem.cs

@@ -34 +34 @@
     [Storable]
     private List<IParameterBinding> parameterBindingList;
-    // eventuelly this should be made public and exposed in a view so that the algorithm designer can add bindings in the GUI
-    protected List<IParameterBinding> ParameterBindingList {
+    public List<IParameterBinding> ParameterBindingList {
       get { return parameterBindingList; }
     }
@@ -105 +104 @@
       }
     }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      //BackwardsCompatibility3.3
+      #region Remove this code when going to 3.4
+      if (parameterBindingList == null)
+        parameterBindingList = new List<IParameterBinding>();
+      #endregion
+    }
   }
 }

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();
     }
   }

branches/ParameterBinding/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

@@ -239 +239 @@
       ParameterizeAnalyzers();
     }
+    private void MoveGenerator_InversionMoveParameter_ActualNameChanged(object sender, EventArgs e) {
+      string name = ((ILookupParameter<InversionMove>)sender).ActualName;
+      foreach (IPermutationInversionMoveOperator op in Operators.OfType<IPermutationInversionMoveOperator>()) {
+        op.InversionMoveParameter.ActualName = name;
+      }
+    }
     private void MoveGenerator_TranslocationMoveParameter_ActualNameChanged(object sender, EventArgs e) {
       string name = ((ILookupParameter<TranslocationMove>)sender).ActualName;
@@ -279 +285 @@
     }
     private void InitializeMoveGenerators() {
-      foreach (IPermutationInversionMoveOperator moveGen in Operators.OfType<IMoveGenerator>().OfType<IPermutationInversionMoveOperator>()) {
-        foreach (IPermutationInversionMoveOperator moveOp in Operators.Where(x => ! (x is IMoveGenerator)).OfType<IPermutationInversionMoveOperator>()) {
-          ParameterActualNameBinding binding = new ParameterActualNameBinding(
-            moveGen.InversionMoveParameter,
-            moveOp.InversionMoveParameter);
-          ParameterBindingList.Add(binding);
-          binding.Bind();
+      foreach (IPermutationInversionMoveOperator op in Operators.OfType<IPermutationInversionMoveOperator>()) {
+        if (op is IMoveGenerator) {
+          op.InversionMoveParameter.ActualNameChanged += new EventHandler(MoveGenerator_InversionMoveParameter_ActualNameChanged);
         }
       }
-      foreach (IPermutationTranslocationMoveOperator moveGen in Operators.OfType<IMoveGenerator>().OfType<IPermutationTranslocationMoveOperator>()) {
-        foreach (IPermutationTranslocationMoveOperator moveOp in Operators.Where(x => !(x is IMoveGenerator)).OfType<IPermutationTranslocationMoveOperator>()) {
-          ParameterActualNameBinding binding = new ParameterActualNameBinding(
-            moveGen.TranslocationMoveParameter,
-            moveOp.TranslocationMoveParameter);
-          ParameterBindingList.Add(binding);
-          binding.Bind();
+      foreach (IPermutationTranslocationMoveOperator op in Operators.OfType<IPermutationTranslocationMoveOperator>()) {
+        if (op is IMoveGenerator) {
+          op.TranslocationMoveParameter.ActualNameChanged += new EventHandler(MoveGenerator_TranslocationMoveParameter_ActualNameChanged);
         }
       }
@@ -312 +310 @@
     }
     private void ParameterizeEvaluator() {
-      ParameterSecondLevelActualNameBinding binding = new ParameterSecondLevelActualNameBinding(
-        SolutionCreatorParameter, EvaluatorParameter,
-        "PermutationParameter", "PermutationParameter"
-        );
-      ParameterBindingList.Add(binding);
-      binding.Bind();
-
       if (Evaluator is ITSPPathEvaluator)
         ((ITSPPathEvaluator)Evaluator).PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
@@ -330 +321 @@
     private void ParameterizeAnalyzers() {
       if (BestTSPSolutionAnalyzer != null) {
+        #region Using First Level Bindings
+        BestTSPSolutionAnalyzer.ParameterBindingList.Add(new ParameterNameBinding(
+          BestTSPSolutionAnalyzer.QualityParameter,
+          Evaluator.QualityParameter
+          ));
+        BestTSPSolutionAnalyzer.ParameterBindingList.Add(new ParameterNameBinding(
+          BestTSPSolutionAnalyzer.CoordinatesParameter,
+          CoordinatesParameter
+          ));
+        BestTSPSolutionAnalyzer.ParameterBindingList.Add(new ParameterNameBinding(
+          BestTSPSolutionAnalyzer.PermutationParameter,
+          SolutionCreator.PermutationParameter
+          ));
+        BestTSPSolutionAnalyzer.ParameterBindingList.Add(new ParameterNameBinding(
+          BestTSPSolutionAnalyzer.BestKnownQualityParameter,
+          BestKnownQualityParameter
+          ));
+        BestTSPSolutionAnalyzer.ParameterBindingList.Add(new ParameterNameBinding(
+          BestTSPSolutionAnalyzer.BestKnownSolutionParameter,
+          BestKnownSolutionParameter
+          ));
+        BestTSPSolutionAnalyzer.ParameterBindingList.Add(new ParameterNameBinding(
+          BestTSPSolutionAnalyzer.MaximizationParameter,
+          MaximizationParameter
+          ));
+        #endregion
+        #region Using Second Level Bindings
+        BestTSPSolutionAnalyzer.ParameterBindingList.Add(new ParameterSecondLevelNameBinding(
+          BestTSPSolutionAnalyzer.QualityParameter,
+          EvaluatorParameter, "QualityParameter"
+          ));
+        BestTSPSolutionAnalyzer.ParameterBindingList.Add(new ParameterSecondLevelNameBinding(
+           BestTSPSolutionAnalyzer.PermutationParameter,
+           SolutionCreatorParameter, "PermutationParameter"
+           ));
+        #endregion
+        #region Old
         BestTSPSolutionAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
         BestTSPSolutionAnalyzer.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
@@ -337 +365 @@
         BestTSPSolutionAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
         BestTSPSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
+        #endregion
       }