Changeset 11737 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3

Timestamp:

01/07/15 14:06:08 (10 years ago)

Author:

mkommend

Message:

#2174: Minor code cleanup in encodings.

Location:

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3

Files:

• Encodings/Encoding.cs (modified) (2 diffs)
• Individuals/Individual.cs (modified) (1 diff)
• Individuals/MultiEncodingIndividual.cs (modified) (1 diff)
• Interfaces/IEncoding.cs (modified) (2 diffs)
• Operators/MultiEncodingOperator.cs (modified) (1 diff)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/Encoding.cs

@@ -80 +80 @@
     }
 
+    public void ConfigureOperator(IOperator @operator) { ConfigureOperators(new[] { @operator }); }
     public abstract void ConfigureOperators(IEnumerable<IOperator> operators);
-    public void ConfigureOperator(IOperator @operator) { ConfigureOperators(new[] { @operator }); }
+
 
     public event EventHandler SolutionCreatorChanged;
@@ -89 +90 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
-
-
-    public event EventHandler ParameterConfigurationChanged;
-    protected virtual void OnParameterConfigurationChanged() {
-      var handler = ParameterConfigurationChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
   }
 }

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Individuals/Individual.cs

@@ -29 +29 @@
 namespace HeuristicLab.Problems.Programmable {
   public abstract class Individual {
-    public IEncoding Encoding { get; private set; }
+    protected IEncoding Encoding { get; private set; }
     protected IScope Scope { get; private set; }
 

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Individuals/MultiEncodingIndividual.cs

@@ -27 +27 @@
 namespace HeuristicLab.Problems.Programmable {
   public sealed class MultiEncodingIndividual : Individual {
-    public new MultiEncoding Encoding {
+    private new MultiEncoding Encoding {
       get { return (MultiEncoding)base.Encoding; }
     }
 
     private readonly IEnumerable<Individual> individuals;
+
     public MultiEncodingIndividual(MultiEncoding encoding, IScope scope)
       : base(encoding, scope) {

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Interfaces/IEncoding.cs

@@ -30 +30 @@
 
     IEnumerable<IOperator> Operators { get; }
-    //event EventHandler ParameterConfigurationChanged;
 
     Individual GetIndividual(IScope scope);
@@ -37 +36 @@
 
     event EventHandler SolutionCreatorChanged;
-    //event EventHandler OperatorsChanged;
   }
 }

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/MultiEncodingOperator.cs

@@ -53 +53 @@
     }
 
-    public IConstrainedValueParameter<T> GetParameter(IEncoding encoding) {
+    protected IConstrainedValueParameter<T> GetParameter(IEncoding encoding) {
       if (!Parameters.ContainsKey(encoding.Name)) throw new ArgumentException(string.Format("Encoding {0} was not added to the MultiEncoding.", encoding.Name));