Changeset 3048 for trunk/sources/HeuristicLab.Algorithms.TS/3.3

Timestamp:

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

Author:

swagner

Message:

Renamed classes of HeuristicLab.Data (#909)

Location:

trunk/sources/HeuristicLab.Algorithms.TS/3.3

Files:

• TS.cs (modified) (5 diffs)
• TSMainLoop.cs (modified) (6 diffs)
• TabuSelector.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Algorithms.TS/3.3/TS.cs

@@ -35 +35 @@
   public sealed class TS : EngineAlgorithm {
     /*#region Parameter Properties
-    private ValueParameter<IntData> SeedParameter {
-      get { return (ValueParameter<IntData>)Parameters["Seed"]; }
-    }
-    private ValueParameter<BoolData> SetSeedRandomlyParameter {
-      get { return (ValueParameter<BoolData>)Parameters["SetSeedRandomly"]; }
+    private ValueParameter<IntValue> SeedParameter {
+      get { return (ValueParameter<IntValue>)Parameters["Seed"]; }
+    }
+    private ValueParameter<BoolValue> SetSeedRandomlyParameter {
+      get { return (ValueParameter<BoolValue>)Parameters["SetSeedRandomly"]; }
     }
     private ConstrainedValueParameter<IMoveGenerator> MoveGeneratorParameter {
       get { return (ConstrainedValueParameter<IMoveGenerator>)Parameters["MoveGenerator"]; }
     }
-    private ValueParameter<IntData> MaximumIterationsParameter {
-      get { return (ValueParameter<IntData>)Parameters["MaximumIterations"]; }
+    private ValueParameter<IntValue> MaximumIterationsParameter {
+      get { return (ValueParameter<IntValue>)Parameters["MaximumIterations"]; }
     }
     #endregion
 
     #region Properties
-    public IntData Seed {
+    public IntValue Seed {
       get { return SeedParameter.Value; }
       set { SeedParameter.Value = value; }
     }
-    public BoolData SetSeedRandomly {
+    public BoolValue SetSeedRandomly {
       get { return SetSeedRandomlyParameter.Value; }
       set { SetSeedRandomlyParameter.Value = value; }
@@ -62 +62 @@
       set { MoveGeneratorParameter.Value = value; }
     }
-    public IntData MaximumIterations {
+    public IntValue MaximumIterations {
       get { return MaximumIterationsParameter.Value; }
       set { MaximumIterationsParameter.Value = value; }
@@ -79 +79 @@
     public TS()
       : base() {
-      Parameters.Add(new ValueParameter<IntData>("Seed", "The random seed used to initialize the new pseudo random number generator.", new IntData(0)));
-      Parameters.Add(new ValueParameter<BoolData>("SetSeedRandomly", "True if the random seed should be set to a random value, otherwise false.", new BoolData(true)));
+      Parameters.Add(new ValueParameter<IntValue>("Seed", "The random seed used to initialize the new pseudo random number generator.", new IntValue(0)));
+      Parameters.Add(new ValueParameter<BoolValue>("SetSeedRandomly", "True if the random seed should be set to a random value, otherwise false.", new BoolValue(true)));
       Parameters.Add(new ConstrainedValueParameter<IMoveGenerator>("MoveGenerator", "The operator used to generate moves to the neighborhood of the current solution."));
-      Parameters.Add(new ValueParameter<IntData>("MaximumIterations", "The maximum number of generations which should be processed.", new IntData(1000)));
+      Parameters.Add(new ValueParameter<IntValue>("MaximumIterations", "The maximum number of generations which should be processed.", new IntValue(1000)));
 
       RandomCreator randomCreator = new RandomCreator();
@@ -96 +96 @@
       randomCreator.Successor = solutionsCreator;
 
-      solutionsCreator.NumberOfSolutions = new IntData(1);
+      solutionsCreator.NumberOfSolutions = new IntValue(1);
       solutionsCreator.Successor = tsMainLoop;
 
@@ -206 +206 @@
     private void ParameterizeSelectors() {
       foreach (ISelector selector in Selectors) {
-        selector.CopySelected = new BoolData(true);
-        selector.NumberOfSelectedSubScopesParameter.Value = new IntData(2 * (PopulationSizeParameter.Value.Value - ElitesParameter.Value.Value));
+        selector.CopySelected = new BoolValue(true);
+        selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(2 * (PopulationSizeParameter.Value.Value - ElitesParameter.Value.Value));
         ParameterizeStochasticOperator(selector);
       }

trunk/sources/HeuristicLab.Algorithms.TS/3.3/TSMainLoop.cs

@@ -39 +39 @@
       get { return (ValueLookupParameter<IRandom>)Parameters["Random"]; }
     }
-    public ValueLookupParameter<BoolData> MaximizationParameter {
-      get { return (ValueLookupParameter<BoolData>)Parameters["Maximization"]; }
-    }
-    public SubScopesLookupParameter<DoubleData> QualityParameter {
-      get { return (SubScopesLookupParameter<DoubleData>)Parameters["Quality"]; }
-    }
-    public ValueLookupParameter<IntData> MaximumIterationsParameter {
-      get { return (ValueLookupParameter<IntData>)Parameters["MaximumIterations"]; }
-    }
-    public ValueLookupParameter<IntData> TabuTenureParameter {
-      get { return (ValueLookupParameter<IntData>)Parameters["TabuTenure"]; }
+    public ValueLookupParameter<BoolValue> MaximizationParameter {
+      get { return (ValueLookupParameter<BoolValue>)Parameters["Maximization"]; }
+    }
+    public SubScopesLookupParameter<DoubleValue> QualityParameter {
+      get { return (SubScopesLookupParameter<DoubleValue>)Parameters["Quality"]; }
+    }
+    public ValueLookupParameter<IntValue> MaximumIterationsParameter {
+      get { return (ValueLookupParameter<IntValue>)Parameters["MaximumIterations"]; }
+    }
+    public ValueLookupParameter<IntValue> TabuTenureParameter {
+      get { return (ValueLookupParameter<IntValue>)Parameters["TabuTenure"]; }
     }
     public ValueLookupParameter<VariableCollection> ResultsParameter {
@@ -85 +85 @@
       #region Create parameters
       Parameters.Add(new ValueLookupParameter<IRandom>("Random", "A pseudo random number generator."));
-      Parameters.Add(new ValueLookupParameter<BoolData>("Maximization", "True if the problem is a maximization problem, otherwise false."));
-      Parameters.Add(new SubScopesLookupParameter<DoubleData>("Quality", "The value which represents the quality of a solution."));
-      Parameters.Add(new ValueLookupParameter<IntData>("MaximumIterations", "The maximum number of generations which should be processed."));
-      Parameters.Add(new ValueLookupParameter<IntData>("TabuTenure", "The length of the tabu list, and also means the number of iterations a move is kept tabu"));
+      Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, otherwise false."));
+      Parameters.Add(new SubScopesLookupParameter<DoubleValue>("Quality", "The value which represents the quality of a solution."));
+      Parameters.Add(new ValueLookupParameter<IntValue>("MaximumIterations", "The maximum number of generations which should be processed."));
+      Parameters.Add(new ValueLookupParameter<IntValue>("TabuTenure", "The length of the tabu list, and also means the number of iterations a move is kept tabu"));
       Parameters.Add(new ValueLookupParameter<VariableCollection>("Results", "The variable collection where results should be stored."));
 
@@ -124 +124 @@
       EmptyOperator finished = new EmptyOperator();
 
-      variableCreator.CollectedValues.Add(new ValueParameter<IntData>("Iterations", new IntData(0)));
-      variableCreator.CollectedValues.Add(new ValueParameter<DoubleData>("Best Move Quality", new DoubleData(0)));
-      variableCreator.CollectedValues.Add(new ValueParameter<DoubleData>("Average Move Quality", new DoubleData(0)));
-      variableCreator.CollectedValues.Add(new ValueParameter<DoubleData>("Worst Move Quality", new DoubleData(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iterations", new IntValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("Best Move Quality", new DoubleValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("Average Move Quality", new DoubleValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("Worst Move Quality", new DoubleValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<DataTable>("MoveQualities", new DataTable("MoveQualities")));
 
-      resultsCollector.CollectedValues.Add(new LookupParameter<IntData>("Iterations"));
-      resultsCollector.CollectedValues.Add(new LookupParameter<DoubleData>("Best Quality") { ActualName = "BestQuality" });
-      resultsCollector.CollectedValues.Add(new LookupParameter<DoubleData>("Best Move Quality"));
-      resultsCollector.CollectedValues.Add(new LookupParameter<DoubleData>("Average Move Quality"));
-      resultsCollector.CollectedValues.Add(new LookupParameter<DoubleData>("Worst Move Quality"));
+      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Iterations"));
+      resultsCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("Best Quality") { ActualName = "BestQuality" });
+      resultsCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("Best Move Quality"));
+      resultsCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("Average Move Quality"));
+      resultsCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("Worst Move Quality"));
       resultsCollector.CollectedValues.Add(new LookupParameter<DataTable>("MoveQualities"));
       resultsCollector.ResultsParameter.ActualName = "Results";
@@ -158 +158 @@
       bestAverageWorstMoveQualityCalculator.WorstQualityParameter.ActualName = "Worst Move Quality";
 
-      tabuSelector.NumberOfSelectedSubScopes = new IntData(1);
+      tabuSelector.NumberOfSelectedSubScopes = new IntValue(1);
 
       moveMakingProcessor.Name = "MoveMaking processor (UniformSequentialSubScopesProcessor)";
@@ -168 +168 @@
       moveMaker.OperatorParameter.ActualName = "MoveMaker";
 
-      valuesCollector.CollectedValues.Add(new LookupParameter<DoubleData>("Best Move Quality"));
-      valuesCollector.CollectedValues.Add(new LookupParameter<DoubleData>("Average Move Quality"));
-      valuesCollector.CollectedValues.Add(new LookupParameter<DoubleData>("Worst Move Quality"));
+      valuesCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("Best Move Quality"));
+      valuesCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("Average Move Quality"));
+      valuesCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("Worst Move Quality"));
       valuesCollector.DataTableParameter.ActualName = "MoveQualities";
 
@@ -176 +176 @@
 
       iterationsCounter.Name = "Iterations Counter";
-      iterationsCounter.Increment = new IntData(1);
+      iterationsCounter.Increment = new IntValue(1);
       iterationsCounter.ValueParameter.ActualName = "Iterations";
 
       iterationsComparator.Name = "Iterations Comparator";
-      iterationsComparator.Comparison = new ComparisonData(Comparison.Less);
+      iterationsComparator.Comparison = new Comparison(ComparisonType.Less);
       iterationsComparator.LeftSideParameter.ActualName = "Iterations";
       iterationsComparator.RightSideParameter.ActualName = "MaximumIterations";

trunk/sources/HeuristicLab.Algorithms.TS/3.3/TabuSelector.cs

@@ -42 +42 @@
     /// The best found quality so far.
     /// </summary>
-    public LookupParameter<DoubleData> BestQualityParameter {
-      get { return (LookupParameter<DoubleData>)Parameters["BestQuality"]; }
+    public LookupParameter<DoubleValue> BestQualityParameter {
+      get { return (LookupParameter<DoubleValue>)Parameters["BestQuality"]; }
     }
     /// <summary>
     /// Whether to use the default aspiration criteria or not.
     /// </summary>
-    public ValueLookupParameter<BoolData> AspirationParameter {
-      get { return (ValueLookupParameter<BoolData>)Parameters["Aspiration"]; }
+    public ValueLookupParameter<BoolValue> AspirationParameter {
+      get { return (ValueLookupParameter<BoolValue>)Parameters["Aspiration"]; }
     }
     /// <summary>
     /// Whether the problem is a maximization problem or not.
     /// </summary>
-    public IValueLookupParameter<BoolData> MaximizationParameter {
-      get { return (IValueLookupParameter<BoolData>)Parameters["Maximization"]; }
+    public IValueLookupParameter<BoolValue> MaximizationParameter {
+      get { return (IValueLookupParameter<BoolValue>)Parameters["Maximization"]; }
     }
     /// <summary>
     /// The parameter for the move qualities.
     /// </summary>
-    public ILookupParameter<ItemArray<DoubleData>> MoveQualityParameter {
-      get { return (ILookupParameter<ItemArray<DoubleData>>)Parameters["MoveQuality"]; }
+    public ILookupParameter<ItemArray<DoubleValue>> MoveQualityParameter {
+      get { return (ILookupParameter<ItemArray<DoubleValue>>)Parameters["MoveQuality"]; }
     }
     /// <summary>
     /// The parameter for the tabu status of the moves.
     /// </summary>
-    public ILookupParameter<ItemArray<BoolData>> MoveTabuParameter {
-      get { return (ILookupParameter<ItemArray<BoolData>>)Parameters["MoveTabu"]; }
+    public ILookupParameter<ItemArray<BoolValue>> MoveTabuParameter {
+      get { return (ILookupParameter<ItemArray<BoolValue>>)Parameters["MoveTabu"]; }
     }
 
-    public IntData NumberOfSelectedSubScopes {
+    public IntValue NumberOfSelectedSubScopes {
       set { NumberOfSelectedSubScopesParameter.Value = value; }
     }
@@ -80 +80 @@
     public TabuSelector()
       : base() {
-      Parameters.Add(new LookupParameter<DoubleData>("BestQuality", "The best found quality so far."));
-      Parameters.Add(new ValueLookupParameter<BoolData>("Aspiration", "Whether the default aspiration criterion should be used or not. The default aspiration criterion accepts a tabu move if it results in a better solution than the best solution found so far.", new BoolData(true)));
-      Parameters.Add(new ValueLookupParameter<BoolData>("Maximization", "Whether the problem is a maximization or minimization problem (used to decide whether a solution is better"));
-      Parameters.Add(new SubScopesLookupParameter<DoubleData>("MoveQuality", "The quality of the move."));
-      Parameters.Add(new SubScopesLookupParameter<BoolData>("MoveTabu", "The tabu status of the move."));
+      Parameters.Add(new LookupParameter<DoubleValue>("BestQuality", "The best found quality so far."));
+      Parameters.Add(new ValueLookupParameter<BoolValue>("Aspiration", "Whether the default aspiration criterion should be used or not. The default aspiration criterion accepts a tabu move if it results in a better solution than the best solution found so far.", new BoolValue(true)));
+      Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "Whether the problem is a maximization or minimization problem (used to decide whether a solution is better"));
+      Parameters.Add(new SubScopesLookupParameter<DoubleValue>("MoveQuality", "The quality of the move."));
+      Parameters.Add(new SubScopesLookupParameter<BoolValue>("MoveTabu", "The tabu status of the move."));
     }
 
@@ -99 +99 @@
       bool maximization = MaximizationParameter.ActualValue.Value;
       double bestQuality = BestQualityParameter.ActualValue.Value;
-      ItemArray<DoubleData> moveQualities = MoveQualityParameter.ActualValue;
-      ItemArray<BoolData> moveTabus = MoveTabuParameter.ActualValue;
+      ItemArray<DoubleValue> moveQualities = MoveQualityParameter.ActualValue;
+      ItemArray<BoolValue> moveTabus = MoveTabuParameter.ActualValue;
 
       IScope[] selected = new IScope[count];