Changeset 4787

Timestamp:

11/13/10 02:14:39 (14 years ago)

Author:

abeham

Message:

#1258

• Updated binding according to discussion
• Added small test case for the TSP

Location:

branches/ParameterBinding

Files:

• HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IItemBinding.cs (added)
• HeuristicLab.Core/3.3/Interfaces/IParameterBinding.cs (deleted)
• HeuristicLab.Core/3.3/ItemBinding.cs (added)
• HeuristicLab.Core/3.3/ParameterizedNamedItem.cs (modified) (8 diffs)
• HeuristicLab.Parameters/3.3/HeuristicLab.Parameters-3.3.csproj (modified) (1 diff)
• HeuristicLab.Parameters/3.3/ParameterNameBinding.cs (deleted)
• HeuristicLab.Parameters/3.3/ParameterSecondLevelNameBinding.cs (deleted)
• HeuristicLab.Parameters/3.3/ParameterValueBinding.cs (deleted)
• HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs (modified) (3 diffs)

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

@@ -143 +143 @@
     <Compile Include="Constraints\IConstraint.cs" />
     <Compile Include="Constraints\TypeCompatibilityConstraint.cs" />
-    <Compile Include="Interfaces\IParameterBinding.cs" />
+    <Compile Include="Interfaces\IItemBinding.cs" />
+    <Compile Include="ItemBinding.cs" />
     <Compile Include="OperatorExecutionException.cs" />
     <Compile Include="Interfaces\IScopeTreeLookupParameter.cs" />

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

@@ -33 +33 @@
   public abstract class ParameterizedNamedItem : NamedItem, IParameterizedNamedItem {
     [Storable]
-    private List<IParameterBinding> parameterBindingList;
-    public List<IParameterBinding> ParameterBindingList {
+    private List<IItemBinding> parameterBindingList;
+    public List<IItemBinding> ParameterBindingList {
       get { return parameterBindingList; }
     }
@@ -62 +62 @@
       name = ItemName;
       description = ItemDescription;
-      parameterBindingList = new List<IParameterBinding>();
+      parameterBindingList = new List<IItemBinding>();
       parameters = new ParameterCollection();
       readOnlyParameters = null;
@@ -69 +69 @@
       : base(name) {
       description = ItemDescription;
-      parameterBindingList = new List<IParameterBinding>();
+      parameterBindingList = new List<IItemBinding>();
       parameters = new ParameterCollection();
       readOnlyParameters = null;
@@ -76 +76 @@
       : base(name) {
       description = ItemDescription;
-      parameterBindingList = new List<IParameterBinding>();
+      parameterBindingList = new List<IItemBinding>();
       this.parameters = parameters;
       readOnlyParameters = null;
@@ -82 +82 @@
     protected ParameterizedNamedItem(string name, string description)
       : base(name, description) {
-      parameterBindingList = new List<IParameterBinding>();
+      parameterBindingList = new List<IItemBinding>();
       parameters = new ParameterCollection();
       readOnlyParameters = null;
@@ -88 +88 @@
     protected ParameterizedNamedItem(string name, string description, ParameterCollection parameters)
       : base(name, description) {
-      parameterBindingList = new List<IParameterBinding>();
+      parameterBindingList = new List<IItemBinding>();
       this.parameters = parameters;
       readOnlyParameters = null;
@@ -105 +105 @@
     }
 
+    protected virtual void AddBinding(string targetPath, string sourcePath) {
+      ItemBinding binding = new ItemBinding(this, targetPath, this, sourcePath);
+      parameterBindingList.Add(binding);
+      binding.Bind();
+    }
+
+    protected virtual void AddSourceBinding(IDeepCloneable target, string targetPath, string sourcePath) {
+      ItemBinding binding = new ItemBinding(target, targetPath, this, sourcePath);
+      parameterBindingList.Add(binding);
+      binding.Bind();
+    }
+
+    protected virtual void AddTargetBinding(string targetPath, IDeepCloneable source, string sourcePath) {
+      ItemBinding binding = new ItemBinding(this, targetPath, source, sourcePath);
+      parameterBindingList.Add(binding);
+      binding.Bind();
+    }
+
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
@@ -110 +128 @@
       #region Remove this code when going to 3.4
       if (parameterBindingList == null)
-        parameterBindingList = new List<IParameterBinding>();
+        parameterBindingList = new List<IItemBinding>();
       #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="ParameterSecondLevelNameBinding.cs" />
-    <Compile Include="ParameterValueBinding.cs" />
     <Compile Include="OptionalConstrainedValueParameter.cs" />
-    <Compile Include="ParameterNameBinding.cs" />
     <Compile Include="ScopeTreeLookupParameter.cs" />
     <Compile Include="ValueParameter.cs" />

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

@@ -178 +178 @@
       InitializeOperators();
       AttachEventHandlers();
+
+      AddBinding("BestTSPSolutionAnalyzer.QualityParameter.ActualName", "Evaluator.QualityParameter.ActualName");
+      AddBinding("BestTSPSolutionAnalyzer.CoordinatesParameter.ActualName", "CoordinatesParameter.Name");
+      AddBinding("BestTSPSolutionAnalyzer.PermutationParameter.ActualName", "SolutionCreator.PermutationParameter.ActualName");
+      AddBinding("BestTSPSolutionAnalyzer.BestKnownQualityParameter.ActualName", "BestKnownQualityParameter.Name");
+      AddBinding("BestTSPSolutionAnalyzer.BestKnownSolutionParameter.ActualName", "BestKnownSolutionParameter.Name");
+      AddBinding("BestTSPSolutionAnalyzer.MaximizationParameter.ActualName", "MaximizationParameter.Name");
+      BestTSPSolutionAnalyzer.ResultsParameter.ActualName = "Results";
     }
 
@@ -320 +328 @@
     }
     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
+      /*if (BestTSPSolutionAnalyzer != null) {
         BestTSPSolutionAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
         BestTSPSolutionAnalyzer.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
@@ -365 +336 @@
         BestTSPSolutionAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
         BestTSPSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
-        #endregion
-      }
+      }*/
 
       if (TSPAlleleFrequencyAnalyzer != null) {