Changeset 12280 for stable/HeuristicLab.Optimization

Timestamp:

04/01/15 17:06:17 (10 years ago)

Author:

mkommend

Message:

#2332: Merged all changes from this ticket into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization (modified) (1 prop)
• HeuristicLab.Optimization/3.3/Interfaces/ISimilarityBasedOperator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveSolutionSimilarityCalculator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ISolutionSimilarityCalculator.cs (modified) (1 diff)

stable/HeuristicLab.Optimization/3.3/Interfaces/ISimilarityBasedOperator.cs

@@ -24 +24 @@
 namespace HeuristicLab.Optimization {
   public interface ISimilarityBasedOperator : IOperator {
-    ISolutionSimilarityCalculator SimilarityCalculator { get; set; }
+    IConstrainedValueParameter<ISolutionSimilarityCalculator> SimilarityCalculatorParameter { get; }
   }
 }

stable/HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveSolutionSimilarityCalculator.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+
 namespace HeuristicLab.Optimization {
+  // use HeuristicLab.Optimization.ISolutionSimilarityCalculator instead
+  // BackwardsCompatibility3.3
+  #region Backwards compatible code, remove with 3.4
   /// <summary>
   /// An interface which represents an operator for similarity calculation between single objective solutions.
   /// </summary>
+  [Obsolete("use HeuristicLab.Optimization.ISolutionSimilarityCalculator instead")]
   public interface ISingleObjectiveSolutionSimilarityCalculator : ISolutionSimilarityCalculator, ISingleObjectiveOperator {
-    string SolutionVariableName { get; set; }
-    string QualityVariableName { get; set; }
+
   }
+  #endregion
 }

stable/HeuristicLab.Optimization/3.3/Interfaces/ISolutionSimilarityCalculator.cs

@@ -28 +28 @@
   /// </summary>
   public interface ISolutionSimilarityCalculator : IItem, IEqualityComparer<IScope> {
+    string SolutionVariableName { get; set; }
+    string QualityVariableName { get; set; }
+
     /// <summary>
     /// Calculates the similarity of two solutions.