Changeset 11952 for branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems

Timestamp:

02/06/15 15:22:27 (9 years ago)

Author:

abeham

Message:

#2174:

• Made encodingOperators hash set an ItemSet and private
• Added a parameter that displays the operators of an encoding (fixedvalue showing a readonly version of the itemset)
• Added protected methods to Encoding to add and remove operators
• Adapted MultiEncodingView to derive from ParameterizedNamedItemView
• Added name of MultiEncoding itself to list of forbidden names

Location:

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems

Files:

• Encoding.cs (modified) (4 diffs)
• MultiEncoding.cs (modified) (1 diff)

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs

@@ -26 +26 @@
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -37 +38 @@
     }
 
-    protected HashSet<IOperator> encodingOperators = new HashSet<IOperator>(new TypeEqualityComparer<IOperator>());
+    private ItemSet<IOperator> encodingOperators = new ItemSet<IOperator>(new TypeEqualityComparer<IOperator>());
 
     [Storable(Name = "Operators")]
     private IEnumerable<IOperator> StorableOperators {
       get { return encodingOperators; }
-      set { encodingOperators = new HashSet<IOperator>(value, new TypeEqualityComparer<IOperator>()); ; }
+      set { encodingOperators = new ItemSet<IOperator>(value, new TypeEqualityComparer<IOperator>()); ; }
     }
 
@@ -50 +51 @@
         if (!value.OfType<T>().Any())
           throw new ArgumentException("The provided operators contain no suitable solution creator");
-        encodingOperators = new HashSet<IOperator>(value, new TypeEqualityComparer<IOperator>());
+        encodingOperators.Clear();
+        foreach (var op in value) encodingOperators.Add(op);
 
         T newSolutionCreator = (T)encodingOperators.FirstOrDefault(o => o.GetType() == solutionCreator.GetType()) ??
@@ -85 +87 @@
     protected Encoding(Encoding<T> original, Cloner cloner)
       : base(original, cloner) {
-      encodingOperators = new HashSet<IOperator>(original.Operators.Select(cloner.Clone), new TypeEqualityComparer<IOperator>());
+      encodingOperators = cloner.Clone(original.encodingOperators);
       solutionCreator = cloner.Clone(original.solutionCreator);
     }
-    protected Encoding(string name) : base(name) { }
+    protected Encoding(string name)
+      : base(name) {
+      Parameters.Add(new FixedValueParameter<ReadOnlyItemSet<IOperator>>(name + ".Operators", "The operators that the encoding specifies.", encodingOperators.AsReadOnly()));
+    }
 
     public virtual Individual GetIndividual(IScope scope) {
       return new SingleEncodingIndividual(this, scope);
+    }
+
+    protected bool AddOperator(IOperator @operator) {
+      return encodingOperators.Add(@operator);
+    }
+
+    protected bool RemoveOperator(IOperator @operator) {
+      return encodingOperators.Remove(@operator);
     }
 

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/MultiEncoding.cs

@@ -56 +56 @@
 
       foreach (var @operator in ApplicationManager.Manager.GetInstances<IMultiEncodingOperator>())
-        encodingOperators.Add(@operator);
+        AddOperator(@operator);
     }