Changeset 14137 for trunk

Timestamp:

07/21/16 04:57:29 (8 years ago)

Author:

jkarder

Message:

#2639: reverted r14106, r14129 and r14135 ...

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.RAPGA/3.3/RAPGA.cs (modified) (1 diff)
• HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/ConstantModel.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConstantRegressionModel.cs (modified) (1 diff)
• HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/TwoPointFiveMove.cs (modified) (1 diff)
• HeuristicLab.Problems.QuadraticAssignment/3.3/Analyzers/QAPPopulationDiversityAnalyzer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Algorithms.RAPGA/3.3/RAPGA.cs

@@ -205 +205 @@
         Parameters.Add(new FixedValueParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)", (BoolValue)new BoolValue(false).AsReadOnly()) { Hidden = true });
       }
+      if (Parameters.ContainsKey("SimilarityCalculator") && Parameters["SimilarityCalculator"] is IConstrainedValueParameter<ISingleObjectiveSolutionSimilarityCalculator>) {
 #pragma warning disable 0618
-      if (Parameters.ContainsKey("SimilarityCalculator") && Parameters["SimilarityCalculator"] is IConstrainedValueParameter<ISingleObjectiveSolutionSimilarityCalculator>) {
         var oldParameter = (IConstrainedValueParameter<ISingleObjectiveSolutionSimilarityCalculator>)Parameters["SimilarityCalculator"];
 #pragma warning restore 0618

trunk/sources/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs

@@ -162 +162 @@
       // BackwardsCompatibility3.3
       #region Backwards compatible code, remove with 3.4
+      if (Parameters.ContainsKey("SimilarityCalculator") && Parameters["SimilarityCalculator"] is IConstrainedValueParameter<ISingleObjectiveSolutionSimilarityCalculator>) {
 #pragma warning disable 0618
-      if (Parameters.ContainsKey("SimilarityCalculator") && Parameters["SimilarityCalculator"] is IConstrainedValueParameter<ISingleObjectiveSolutionSimilarityCalculator>) {
         var oldParameter = (IConstrainedValueParameter<ISingleObjectiveSolutionSimilarityCalculator>)Parameters["SimilarityCalculator"];
 #pragma warning restore 0618

trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs

@@ -537 +537 @@
     }
 
-    protected override void dataGridView_KeyDown(object sender, KeyEventArgs e) {
+    private void dataGridView_KeyDown(object sender, KeyEventArgs e) {
       var selectedRows = dataGridView.SelectedRows;
       var selectedCells = dataGridView.SelectedCells;

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/ConstantModel.cs

@@ -97 +97 @@
     }
 
-#pragma warning disable 0067
     public event EventHandler ValueChanged;
-#pragma warning restore 0067
     #endregion
 

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConstantRegressionModel.cs

@@ -85 +85 @@
     }
 
-#pragma warning disable 0067
     public event EventHandler ValueChanged;
-#pragma warning restore 0067
     #endregion
   }

trunk/sources/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/TwoPointFiveMove.cs

@@ -30 +30 @@
   public sealed class TwoPointFiveMove : Item {
     [Storable]
-    public int Index1 { get; private set; }
+    public int Index1 { get; protected set; }
     [Storable]
-    public int Index2 { get; private set; }
+    public int Index2 { get; protected set; }
     [Storable]
-    public Permutation Permutation { get; private set; }
+    public Permutation Permutation { get; protected set; }
     [Storable]
-    public bool IsInvert { get; private set; }
+    public bool IsInvert { get; protected set; }
 
     [StorableConstructor]

trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/Analyzers/QAPPopulationDiversityAnalyzer.cs

@@ -34 +34 @@
   [Item("QAPPopulationDiversityAnalyzer", "An operator for analyzing the diversity of solutions of Quadratic Assignment Problems regarding their structural identity (number of equal facilty->location assignments).")]
   [StorableClass]
-#pragma warning disable 0612
   public sealed class QAPPopulationDiversityAnalyzer : PopulationDiversityAnalyzer<Permutation> {
-#pragma warning restore 0612
     public IValueParameter<BoolValue> UsePhenotypeSimilarityParameter {
       get { return (IValueParameter<BoolValue>)Parameters["UsePhenotypeSimilarity"]; }