Changeset 3048 for trunk/sources/HeuristicLab.Encodings.Permutation

Timestamp:

03/15/10 23:49:54 (14 years ago)

Author:

swagner

Message:

Renamed classes of HeuristicLab.Data (#909)

Location:

trunk/sources/HeuristicLab.Encodings.Permutation/3.3

Files:

• Creators/RandomPermutationCreator.cs (modified) (2 diffs)
• Interfaces/IPermutationCreator.cs (modified) (1 diff)
• Moves/TwoOpt/StochasticTwoOptMoveGenerator.cs (modified) (2 diffs)
• Moves/TwoOpt/TwoOptMoveMaker.cs (modified) (3 diffs)
• Moves/TwoOpt/TwoOptMoveTabuEvaluator.cs (modified) (3 diffs)
• Moves/TwoOpt/TwoOptMoveTabuMaker.cs (modified) (3 diffs)
• Permutation.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Creators/RandomPermutationCreator.cs

@@ -42 +42 @@
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
     }
-    public IValueLookupParameter<IntData> LengthParameter {
-      get { return (IValueLookupParameter<IntData>)Parameters["Length"]; }
+    public IValueLookupParameter<IntValue> LengthParameter {
+      get { return (IValueLookupParameter<IntValue>)Parameters["Length"]; }
     }
     public ILookupParameter<Permutation> PermutationParameter {
@@ -52 +52 @@
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be used to initialize the new random permutation."));
-      Parameters.Add(new ValueLookupParameter<IntData>("Length", "The length of the new random permutation."));
+      Parameters.Add(new ValueLookupParameter<IntValue>("Length", "The length of the new random permutation."));
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The new random permutation."));
     }

trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Interfaces/IPermutationCreator.cs

@@ -29 +29 @@
   /// </summary>
   public interface IPermutationCreator : IPermutationOperator, ISolutionCreator {
-    IValueLookupParameter<IntData> LengthParameter { get; }
+    IValueLookupParameter<IntValue> LengthParameter { get; }
     ILookupParameter<Permutation> PermutationParameter { get; }
   }

trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Moves/TwoOpt/StochasticTwoOptMoveGenerator.cs

@@ -34 +34 @@
       get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
     }
-    private ValueLookupParameter<IntData> SampleSizeParameter {
-      get { return (ValueLookupParameter<IntData>)Parameters["SampleSize"]; }
+    private ValueLookupParameter<IntValue> SampleSizeParameter {
+      get { return (ValueLookupParameter<IntValue>)Parameters["SampleSize"]; }
     }
 
@@ -41 +41 @@
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator."));
-      Parameters.Add(new ValueLookupParameter<IntData>("SampleSize", "The number of moves to generate."));
+      Parameters.Add(new ValueLookupParameter<IntValue>("SampleSize", "The number of moves to generate."));
     }
 

trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Moves/TwoOpt/TwoOptMoveMaker.cs

@@ -32 +32 @@
   [StorableClass]
   public class TwoOptMoveMaker : SingleSuccessorOperator, ITwoOptPermutationMoveOperator, IMoveMaker {
-    public ILookupParameter<DoubleData> QualityParameter {
-      get { return (LookupParameter<DoubleData>)Parameters["Quality"]; }
+    public ILookupParameter<DoubleValue> QualityParameter {
+      get { return (LookupParameter<DoubleValue>)Parameters["Quality"]; }
     }
-    public ILookupParameter<DoubleData> MoveQualityParameter {
-      get { return (LookupParameter<DoubleData>)Parameters["MoveQuality"]; }
+    public ILookupParameter<DoubleValue> MoveQualityParameter {
+      get { return (LookupParameter<DoubleValue>)Parameters["MoveQuality"]; }
     }
     public ILookupParameter<TwoOptMove> TwoOptMoveParameter {
@@ -47 +47 @@
     public TwoOptMoveMaker()
       : base() {
-      Parameters.Add(new LookupParameter<DoubleData>("Quality", "The quality of the solution."));
+      Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality of the solution."));
       Parameters.Add(new LookupParameter<TwoOptMove>("Move", "The move to evaluate."));
-      Parameters.Add(new LookupParameter<DoubleData>("MoveQuality", "The relative quality of the move."));
+      Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The relative quality of the move."));
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The solution as permutation."));
     }
@@ -56 +56 @@
       TwoOptMove move = TwoOptMoveParameter.ActualValue;
       Permutation permutation = PermutationParameter.ActualValue;
-      DoubleData moveQuality = MoveQualityParameter.ActualValue;
-      DoubleData quality = QualityParameter.ActualValue;
+      DoubleValue moveQuality = MoveQualityParameter.ActualValue;
+      DoubleValue quality = QualityParameter.ActualValue;
 
       InversionManipulator.Apply(permutation, move.Index1, move.Index2);

trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Moves/TwoOpt/TwoOptMoveTabuEvaluator.cs

@@ -41 +41 @@
       get { return (LookupParameter<ItemList<IItem>>)Parameters["TabuList"]; }
     }
-    public LookupParameter<BoolData> MoveTabuParameter {
-      get { return (LookupParameter<BoolData>)Parameters["MoveTabu"]; }
+    public LookupParameter<BoolValue> MoveTabuParameter {
+      get { return (LookupParameter<BoolValue>)Parameters["MoveTabu"]; }
     }
     private ScopeParameter CurrentScopeParameter {
@@ -51 +51 @@
       : base() {
       Parameters.Add(new LookupParameter<TwoOptMove>("Move", "The move to evaluate."));
-      Parameters.Add(new LookupParameter<BoolData>("MoveTabu", "The variable to store if a move was tabu."));
+      Parameters.Add(new LookupParameter<BoolValue>("MoveTabu", "The variable to store if a move was tabu."));
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The solution as permutation."));
       Parameters.Add(new LookupParameter<ItemList<IItem>>("TabuList", "The tabu list."));
@@ -83 +83 @@
         }
       }
-      MoveTabuParameter.ActualValue = new BoolData(isTabu);
+      MoveTabuParameter.ActualValue = new BoolValue(isTabu);
       return base.Apply();
     }

trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Moves/TwoOpt/TwoOptMoveTabuMaker.cs

@@ -41 +41 @@
       get { return (LookupParameter<ItemList<IItem>>)Parameters["TabuList"]; }
     }
-    public ValueLookupParameter<IntData> TabuTenureParameter {
-      get { return (ValueLookupParameter<IntData>)Parameters["TabuTenure"]; }
+    public ValueLookupParameter<IntValue> TabuTenureParameter {
+      get { return (ValueLookupParameter<IntValue>)Parameters["TabuTenure"]; }
     }
 
@@ -49 +49 @@
       Parameters.Add(new LookupParameter<TwoOptMove>("Move", "The move that was made."));
       Parameters.Add(new LookupParameter<ItemList<IItem>>("TabuList", "The tabu list where move attributes are stored."));
-      Parameters.Add(new ValueLookupParameter<IntData>("TabuTenure", "The tenure of the tabu list."));
+      Parameters.Add(new ValueLookupParameter<IntValue>("TabuTenure", "The tenure of the tabu list."));
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The solution as permutation."));
     }
@@ -56 +56 @@
       ItemList<IItem> tabuList = TabuListParameter.ActualValue;
       TwoOptMove move = TwoOptMoveParameter.ActualValue;
-      IntData tabuTenure = TabuTenureParameter.ActualValue;
+      IntValue tabuTenure = TabuTenureParameter.ActualValue;
       Permutation permutation = PermutationParameter.ActualValue;
       

trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Permutation.cs

@@ -31 +31 @@
   [Item("Permutation", "Represents a permutation of integer values.")]
   [Creatable("Test")]
-  public sealed class Permutation : ValueTypeArrayData<int>, IStringConvertibleArrayData {
+  public sealed class Permutation : ValueTypeArray<int>, IStringConvertibleArray {
     public Permutation() : base() { }
     public Permutation(int length)
@@ -92 +92 @@
 
     #region IStringConvertibleArrayData Members
-    int IStringConvertibleArrayData.Length {
+    int IStringConvertibleArray.Length {
       get { return Length; }
       set { Length = value; }
     }
 
-    bool IStringConvertibleArrayData.Validate(string value, out string errorMessage) {
+    bool IStringConvertibleArray.Validate(string value, out string errorMessage) {
       int val;
       bool valid = int.TryParse(value, out val);
@@ -110 +110 @@
       return valid;
     }
-    string IStringConvertibleArrayData.GetValue(int index) {
+    string IStringConvertibleArray.GetValue(int index) {
       return this[index].ToString();
     }
-    bool IStringConvertibleArrayData.SetValue(string value, int index) {
+    bool IStringConvertibleArray.SetValue(string value, int index) {
       int val;
       if (int.TryParse(value, out val)) {