Changeset 11885 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators

Timestamp:

02/04/15 13:28:37 (10 years ago)

Author:

abeham

Message:

#2174:

• Some refactorings and bug fixes
• Renamed (Binary|Integer|Real)Encoding to (Binary|Integer|Real)VectorEncoding
• Improved error messages when compiling programmable problems

Location:

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

Files:

• MultiEncodingOperator.cs (modified) (1 diff)
• SingleObjectiveImprover.cs (modified) (1 diff)
• SingleObjectiveMoveGenerator.cs (modified) (1 diff)
• SingleObjectiveMoveMaker.cs (modified) (1 diff)

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

@@ -81 +81 @@
     }
 
-    public virtual void ReplaceEncoding(IEncoding oldEncoding, IEncoding newEncoding) {
-      var oldParameterValue = GetParameter(oldEncoding).Value;
-      RemoveEncoding(oldEncoding);
-      AddEncoding(newEncoding);
-
-      var parameter = GetParameter(newEncoding);
-      var newParameterValue = parameter.ValidValues.FirstOrDefault(op => op.GetType() == oldParameterValue.GetType());
-      if (newParameterValue != null) parameter.Value = newParameterValue;
-    }
-
     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));

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

@@ -110 +110 @@
       LocalEvaluatedSolutionsParameter.ActualValue = new IntValue(count);
       QualityParameter.ActualValue = new DoubleValue(quality);
-      individual.Copy(ExecutionContext.Scope);
+      individual.CopyToScope(ExecutionContext.Scope);
       return base.Apply();
     }

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

@@ -74 +74 @@
       for (int i = 0; i < moveScopes.Length; i++) {
         moveScopes[i] = new Scope(i.ToString(CultureInfo.InvariantCulture.NumberFormat));
-        nbhood[i].Copy(moveScopes[i]);
+        nbhood[i].CopyToScope(moveScopes[i]);
       }
       ExecutionContext.Scope.SubScopes.AddRange(moveScopes);

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

@@ -63 +63 @@
       var encoding = EncodingParameter.ActualValue;
       var individual = encoding.GetIndividual(ExecutionContext.Scope);
-      individual.Copy(ExecutionContext.Scope.Parent.Parent);
+      individual.CopyToScope(ExecutionContext.Scope.Parent.Parent);
 
       if (QualityParameter.ActualValue == null) QualityParameter.ActualValue = new DoubleValue(MoveQualityParameter.ActualValue.Value);