Changeset 13404 for branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3

Timestamp:

11/26/15 09:30:43 (9 years ago)

Author:

abeham

Message:

#2521:

• Adapted Knapsack problem to new problem infrastructure
• Introduced additional interfaces in binary vector encoding
• Improved KnapsackImprovementOperator which requires less evaluated solutions in case of an infeasible start solution

Loosely related change:

• All LookupParameters are now shown by default
• Wiring code should make sure that wired parameters are hidden

Location:

branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3

Files:

• . (modified) (1 prop)
• BinaryVectorEncoding.cs (modified) (6 diffs)
• HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj (modified) (1 diff)
• Interfaces/IBinaryVectorCreator.cs (modified) (1 diff)
• Interfaces/IBinaryVectorManipulator.cs (modified) (2 diffs)
• Interfaces/IBinaryVectorMoveOperator.cs (modified) (1 diff)
• Interfaces/IBinaryVectorMultiNeighborhoodShakingOperator.cs (modified) (1 diff)
• Interfaces/IBinaryVectorSolutionOperator.cs (added)
• Interfaces/IBinaryVectorSolutionsOperator.cs (added)
• Interfaces/IOneBitflipMoveQualityOperator.cs (copied) (copied from branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Interfaces/IOneBitflipMoveOperator.cs) (1 diff)
• Moves/OneBitflipMove/OneBitflipMoveMaker.cs (modified) (1 diff)
• Moves/OneBitflipMove/OneBitflipMoveTabuChecker.cs (modified) (1 diff)
• Moves/OneBitflipMove/OneBitflipMoveTabuMaker.cs (modified) (1 diff)

branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3

@@ -5 +5 @@
 *.vs10x
 Plugin.cs
+*.DotSettings

@@ -5 +5 @@
 *.vs10x
 Plugin.cs
+*.DotSettings

branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorEncoding.cs

@@ -52 +52 @@
     }
     #endregion
-
 
     public int Length {
@@ -108 +107 @@
         typeof (IBinaryVectorMoveOperator),
         typeof (IBinaryVectorMultiNeighborhoodShakingOperator),
+        typeof (IBinaryVectorSolutionOperator),
+        typeof (IBinaryVectorSolutionsOperator)
       };
     }
@@ -129 +130 @@
       ConfigureBitFlipMoveOperators(operators.OfType<IOneBitflipMoveOperator>());
       ConfigureShakingOperators(operators.OfType<IBinaryVectorMultiNeighborhoodShakingOperator>());
+      ConfigureSolutionOperators(operators.OfType<IBinaryVectorSolutionOperator>());
+      ConfigureSolutionsOperators(operators.OfType<IBinaryVectorSolutionsOperator>());
     }
 
@@ -134 +137 @@
     private void ConfigureCreators(IEnumerable<IBinaryVectorCreator> creators) {
       foreach (var creator in creators) {
-        creator.BinaryVectorParameter.ActualName = Name;
         creator.LengthParameter.ActualName = LengthParameter.Name;
       }
@@ -145 +147 @@
     }
     private void ConfigureManipulators(IEnumerable<IBinaryVectorManipulator> manipulators) {
-      foreach (var manipulator in manipulators) {
-        manipulator.BinaryVectorParameter.ActualName = Name;
-      }
+      // binary vector manipulators don't contain additional parameters besides the solution parameter
     }
     private void ConfigureMoveOperators(IEnumerable<IBinaryVectorMoveOperator> moveOperators) {
-      foreach (var moveOperator in moveOperators) {
-        moveOperator.BinaryVectorParameter.ActualName = Name;
-      }
+      // binary vector move operators don't contain additional parameters besides the solution parameter
     }
     private void ConfigureBitFlipMoveOperators(IEnumerable<IOneBitflipMoveOperator> oneBitflipMoveOperators) {
@@ -160 +158 @@
     }
     private void ConfigureShakingOperators(IEnumerable<IBinaryVectorMultiNeighborhoodShakingOperator> shakingOperators) {
-      foreach (var shakingOperator in shakingOperators) {
-        shakingOperator.BinaryVectorParameter.ActualName = Name;
-      }
+      // binary vector shaking operators don't contain additional parameters besides the solution parameter
+    }
+    private void ConfigureSolutionOperators(IEnumerable<IBinaryVectorSolutionOperator> solutionOperators) {
+      foreach (var solutionOperator in solutionOperators)
+        solutionOperator.BinaryVectorParameter.ActualName = Name;
+    }
+    private void ConfigureSolutionsOperators(IEnumerable<IBinaryVectorSolutionsOperator> solutionsOperators) {
+      foreach (var solutionsOperator in solutionsOperators)
+        solutionsOperator.BinaryVectorsParameter.ActualName = Name;
     }
     #endregion

branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj

@@ -127 +127 @@
     <Compile Include="BinaryVector.cs" />
     <Compile Include="Interfaces\IBinaryVectorMultiNeighborhoodShakingOperator.cs" />
+    <Compile Include="Interfaces\IBinaryVectorSolutionsOperator.cs" />
+    <Compile Include="Interfaces\IBinaryVectorSolutionOperator.cs" />
+    <Compile Include="Interfaces\IOneBitflipMoveQualityOperator.cs" />
     <Compile Include="Interfaces\IOneBitflipMoveOperator.cs" />
     <Compile Include="Interfaces\IBinaryVectorCreator.cs" />

branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Interfaces/IBinaryVectorCreator.cs

@@ -28 +28 @@
   /// An interface which represents an operator for creating vectors of bool-valued data.
   /// </summary>
-  public interface IBinaryVectorCreator : IBinaryVectorOperator, ISolutionCreator<BinaryVector> {
+  public interface IBinaryVectorCreator : IBinaryVectorSolutionOperator, ISolutionCreator<BinaryVector> {
     IValueLookupParameter<IntValue> LengthParameter { get; }
-    ILookupParameter<BinaryVector> BinaryVectorParameter { get; }
   }
 }

branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Interfaces/IBinaryVectorManipulator.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Core;
 using HeuristicLab.Optimization;
 
@@ -27 +26 @@
   /// An interface which represents an operator for manipulating vectors of bool-valued data.
   /// </summary>
-  public interface IBinaryVectorManipulator : IBinaryVectorOperator, IManipulator {
-    ILookupParameter<BinaryVector> BinaryVectorParameter { get; }
+  public interface IBinaryVectorManipulator : IBinaryVectorSolutionOperator, IManipulator {
   }
 }

branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Interfaces/IBinaryVectorMoveOperator.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Core;
 using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding {
-  public interface IBinaryVectorMoveOperator : IBinaryVectorOperator, IMoveOperator {
-    ILookupParameter<BinaryVector> BinaryVectorParameter { get; }
+  public interface IBinaryVectorMoveOperator : IBinaryVectorSolutionOperator, IMoveOperator {
   }
 }

branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Interfaces/IBinaryVectorMultiNeighborhoodShakingOperator.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Core;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding {
-  public interface IBinaryVectorMultiNeighborhoodShakingOperator : IBinaryVectorOperator {
-    ILookupParameter<BinaryVector> BinaryVectorParameter { get; }
+  public interface IBinaryVectorMultiNeighborhoodShakingOperator : IBinaryVectorSolutionOperator {
   }
 }

branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Interfaces/IOneBitflipMoveQualityOperator.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding {
-  public interface IOneBitflipMoveOperator : IBinaryVectorMoveOperator {
-    ILookupParameter<OneBitflipMove> OneBitflipMoveParameter { get; }
+  public interface IOneBitflipMoveQualityOperator : IOneBitflipMoveOperator {
+    ILookupParameter<DoubleValue> MoveQualityParameter { get; }
   }
 }

branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveMaker.cs

@@ -31 +31 @@
   [Item("OneBitflipMoveMaker", "Peforms a one bitflip move on a given BitVector and updates the quality.")]
   [StorableClass]
-  public class OneBitflipMoveMaker : SingleSuccessorOperator, IOneBitflipMoveOperator, IMoveMaker, ISingleObjectiveOperator {
+  public class OneBitflipMoveMaker : SingleSuccessorOperator, IOneBitflipMoveQualityOperator, IMoveMaker, ISingleObjectiveOperator {
     public override bool CanChangeName {
       get { return false; }

branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveTabuChecker.cs

@@ -31 +31 @@
   [Item("OneBitflipMoveTabuChecker", "Prevents peforming a one bitflip move again.")]
   [StorableClass]
-  public class OneBitflipMoveTabuChecker : SingleSuccessorOperator, IOneBitflipMoveOperator, ITabuChecker {
+  public class OneBitflipMoveTabuChecker : SingleSuccessorOperator, IOneBitflipMoveQualityOperator, ITabuChecker {
     public override bool CanChangeName {
       get { return false; }

branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveTabuMaker.cs

@@ -29 +29 @@
   [Item("OneBitflipMoveTabuMaker", "Declares a given one bitflip move as tabu, by adding its attributes to the tabu list. It also removes the oldest entry in the tabu list when its size is greater than tenure.")]
   [StorableClass]
-  public class OneBitflipMoveTabuMaker : TabuMaker, IOneBitflipMoveOperator {
+  public class OneBitflipMoveTabuMaker : TabuMaker, IOneBitflipMoveQualityOperator {
     public ILookupParameter<BinaryVector> BinaryVectorParameter {
       get { return (ILookupParameter<BinaryVector>)Parameters["BinaryVector"]; }

@@ -5 +5 @@
 *.vs10x
 Plugin.cs
+*.DotSettings