Changeset 14137


Ignore:
Timestamp:
07/21/16 04:57:29 (8 months ago)
Author:
jkarder
Message:

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

Location:
trunk/sources
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Algorithms.RAPGA/3.3/RAPGA.cs

    r14106 r14137  
    205205        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 });
    206206      }
     207      if (Parameters.ContainsKey("SimilarityCalculator") && Parameters["SimilarityCalculator"] is IConstrainedValueParameter<ISingleObjectiveSolutionSimilarityCalculator>) {
    207208#pragma warning disable 0618
    208       if (Parameters.ContainsKey("SimilarityCalculator") && Parameters["SimilarityCalculator"] is IConstrainedValueParameter<ISingleObjectiveSolutionSimilarityCalculator>) {
    209209        var oldParameter = (IConstrainedValueParameter<ISingleObjectiveSolutionSimilarityCalculator>)Parameters["SimilarityCalculator"];
    210210#pragma warning restore 0618
  • trunk/sources/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs

    r14106 r14137  
    162162      // BackwardsCompatibility3.3
    163163      #region Backwards compatible code, remove with 3.4
     164      if (Parameters.ContainsKey("SimilarityCalculator") && Parameters["SimilarityCalculator"] is IConstrainedValueParameter<ISingleObjectiveSolutionSimilarityCalculator>) {
    164165#pragma warning disable 0618
    165       if (Parameters.ContainsKey("SimilarityCalculator") && Parameters["SimilarityCalculator"] is IConstrainedValueParameter<ISingleObjectiveSolutionSimilarityCalculator>) {
    166166        var oldParameter = (IConstrainedValueParameter<ISingleObjectiveSolutionSimilarityCalculator>)Parameters["SimilarityCalculator"];
    167167#pragma warning restore 0618
  • trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs

    r14106 r14137  
    537537    }
    538538
    539     protected override void dataGridView_KeyDown(object sender, KeyEventArgs e) {
     539    private void dataGridView_KeyDown(object sender, KeyEventArgs e) {
    540540      var selectedRows = dataGridView.SelectedRows;
    541541      var selectedCells = dataGridView.SelectedCells;
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/ConstantModel.cs

    r14106 r14137  
    9797    }
    9898
    99 #pragma warning disable 0067
    10099    public event EventHandler ValueChanged;
    101 #pragma warning restore 0067
    102100    #endregion
    103101
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConstantRegressionModel.cs

    r14106 r14137  
    8585    }
    8686
    87 #pragma warning disable 0067
    8887    public event EventHandler ValueChanged;
    89 #pragma warning restore 0067
    9088    #endregion
    9189  }
  • trunk/sources/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/TwoPointFiveMove.cs

    r14106 r14137  
    3030  public sealed class TwoPointFiveMove : Item {
    3131    [Storable]
    32     public int Index1 { get; private set; }
     32    public int Index1 { get; protected set; }
    3333    [Storable]
    34     public int Index2 { get; private set; }
     34    public int Index2 { get; protected set; }
    3535    [Storable]
    36     public Permutation Permutation { get; private set; }
     36    public Permutation Permutation { get; protected set; }
    3737    [Storable]
    38     public bool IsInvert { get; private set; }
     38    public bool IsInvert { get; protected set; }
    3939
    4040    [StorableConstructor]
  • trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/Analyzers/QAPPopulationDiversityAnalyzer.cs

    r14106 r14137  
    3434  [Item("QAPPopulationDiversityAnalyzer", "An operator for analyzing the diversity of solutions of Quadratic Assignment Problems regarding their structural identity (number of equal facilty->location assignments).")]
    3535  [StorableClass]
    36 #pragma warning disable 0612
    3736  public sealed class QAPPopulationDiversityAnalyzer : PopulationDiversityAnalyzer<Permutation> {
    38 #pragma warning restore 0612
    3937    public IValueParameter<BoolValue> UsePhenotypeSimilarityParameter {
    4038      get { return (IValueParameter<BoolValue>)Parameters["UsePhenotypeSimilarity"]; }
Note: See TracChangeset for help on using the changeset viewer.