Changeset 4757

Timestamp:

11/09/10 15:46:55 (14 years ago)

Author:

abeham

Message:

#1258

• worked on parameter binding (wip)

Location:

branches/ParameterBinding

Files:

• HeuristicLab.Core/3.3/Interfaces/IParameterBinding.cs (added)
• HeuristicLab.Core/3.3/ParameterizedNamedItem.cs (modified) (7 diffs)
• HeuristicLab.Parameters/3.3/ParameterActualNameBinding.cs (added)
• HeuristicLab.Parameters/3.3/ParameterSecondLevelValueBinding.cs (added)
• HeuristicLab.Parameters/3.3/ParameterValueBinding.cs (added)
• HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs (modified) (3 diffs)

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

@@ -33 +33 @@
   public abstract class ParameterizedNamedItem : NamedItem, IParameterizedNamedItem {
     [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 {
+      get { return parameterBindingList; }
+    }
+    [Storable]
     private ParameterCollection parameters;
     protected ParameterCollection Parameters {
@@ -50 +56 @@
       : base(original, cloner) {
       parameters = cloner.Clone(original.parameters);
+      parameterBindingList = original.parameterBindingList.Select(x => cloner.Clone(x)).ToList();
       readOnlyParameters = null;
     }
@@ -56 +63 @@
       name = ItemName;
       description = ItemDescription;
+      parameterBindingList = new List<IParameterBinding>();
       parameters = new ParameterCollection();
       readOnlyParameters = null;
@@ -62 +70 @@
       : base(name) {
       description = ItemDescription;
+      parameterBindingList = new List<IParameterBinding>();
       parameters = new ParameterCollection();
       readOnlyParameters = null;
@@ -68 +77 @@
       : base(name) {
       description = ItemDescription;
+      parameterBindingList = new List<IParameterBinding>();
       this.parameters = parameters;
       readOnlyParameters = null;
@@ -73 +83 @@
     protected ParameterizedNamedItem(string name, string description)
       : base(name, description) {
+      parameterBindingList = new List<IParameterBinding>();
       parameters = new ParameterCollection();
       readOnlyParameters = null;
@@ -78 +89 @@
     protected ParameterizedNamedItem(string name, string description, ParameterCollection parameters)
       : base(name, description) {
+      parameterBindingList = new List<IParameterBinding>();
       this.parameters = parameters;
       readOnlyParameters = null;

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;
@@ -285 +279 @@
     }
     private void InitializeMoveGenerators() {
-      foreach (IPermutationInversionMoveOperator op in Operators.OfType<IPermutationInversionMoveOperator>()) {
-        if (op is IMoveGenerator) {
-          op.InversionMoveParameter.ActualNameChanged += new EventHandler(MoveGenerator_InversionMoveParameter_ActualNameChanged);
+      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 (IPermutationTranslocationMoveOperator op in Operators.OfType<IPermutationTranslocationMoveOperator>()) {
-        if (op is IMoveGenerator) {
-          op.TranslocationMoveParameter.ActualNameChanged += new EventHandler(MoveGenerator_TranslocationMoveParameter_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();
         }
       }
@@ -310 +312 @@
     }
     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;