Changeset 13046 for branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/Analyzers

Timestamp:

10/21/15 17:42:18 (9 years ago)

Author:

pfleck

Message:

#2269

• Changed the age type from int to double.
• Changed EldersSelector to make use of a ScopeTreeLookupParameter.
• Removed unused operators in LayerUpdator.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/Analyzers

Files:

• AgeDistributionAnalyzer.cs (modified) (3 diffs)
• OldestAverageYoungestAgeAnalyzer.cs (modified) (3 diffs)
• OldestAverageYoungestAgeCalculator.cs (modified) (4 diffs)

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/Analyzers/AgeDistributionAnalyzer.cs

@@ -37 +37 @@
 
     #region Parameter Properties
-    public IScopeTreeLookupParameter<IntValue> AgeParameter {
-      get { return (IScopeTreeLookupParameter<IntValue>)Parameters["Age"]; }
+    public IScopeTreeLookupParameter<DoubleValue> AgeParameter {
+      get { return (IScopeTreeLookupParameter<DoubleValue>)Parameters["Age"]; }
     }
     public ValueLookupParameter<ResultCollection> ResultsParameter {
@@ -78 +78 @@
     public AgeDistributionAnalyzer()
       : base() {
-      Parameters.Add(new ScopeTreeLookupParameter<IntValue>("Age", "The value which represents the age of a solution."));
+      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Age", "The value which represents the age of a solution."));
       Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The results collection where the analysis values should be stored."));
       Parameters.Add(new FixedValueParameter<StringValue>("HistogramName", "The name of the histogram that gets injected in to the results collection.", new StringValue("Age Distribution")));
@@ -110 +110 @@
       }
       var ages = AgeParameter.ActualValue;
-      row.Values.Replace(ages.Select(x => (double)x.Value));
+      row.Values.Replace(ages.Select(x => x.Value));
 
       if (StoreHistory) {

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/Analyzers/OldestAverageYoungestAgeAnalyzer.cs

@@ -36 +36 @@
   public sealed class OldestAverageYoungestAgeAnalyzer : AlgorithmOperator, IAnalyzer {
     #region Parameter properties
-    public IScopeTreeLookupParameter<IntValue> AgeParameter {
-      get { return (IScopeTreeLookupParameter<IntValue>)Parameters["Age"]; }
+    public IScopeTreeLookupParameter<DoubleValue> AgeParameter {
+      get { return (IScopeTreeLookupParameter<DoubleValue>)Parameters["Age"]; }
     }
-    public IValueLookupParameter<IntValue> CurrentOldestAgeParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["CurrentOldestAge"]; }
+    public IValueLookupParameter<DoubleValue> CurrentOldestAgeParameter {
+      get { return (IValueLookupParameter<DoubleValue>)Parameters["CurrentOldestAge"]; }
     }
-    public IValueLookupParameter<IntValue> CurrentAverageAgeParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["CurrentAverageAge"]; }
+    public IValueLookupParameter<DoubleValue> CurrentAverageAgeParameter {
+      get { return (IValueLookupParameter<DoubleValue>)Parameters["CurrentAverageAge"]; }
     }
-    public IValueLookupParameter<IntValue> CurrentYoungestAgeParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["CurrentYoungestAge"]; }
+    public IValueLookupParameter<DoubleValue> CurrentYoungestAgeParameter {
+      get { return (IValueLookupParameter<DoubleValue>)Parameters["CurrentYoungestAge"]; }
     }
     public IValueLookupParameter<DataTable> AgesParameter {
@@ -79 +79 @@
       : base() {
       #region Create parameters
-      Parameters.Add(new ScopeTreeLookupParameter<IntValue>("Age", "The value which represents the age of a solution."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("CurrentOldestAge", "The oldest age value found in the current population."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("CurrentAverageAge", "The average age value of all solutions in the current population."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("CurrentYoungestAge", "The youngest age value found in the current population."));
+      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Age", "The value which represents the age of a solution."));
+      Parameters.Add(new ValueLookupParameter<DoubleValue>("CurrentOldestAge", "The oldest age value found in the current population."));
+      Parameters.Add(new ValueLookupParameter<DoubleValue>("CurrentAverageAge", "The average age value of all solutions in the current population."));
+      Parameters.Add(new ValueLookupParameter<DoubleValue>("CurrentYoungestAge", "The youngest age value found in the current population."));
       Parameters.Add(new ValueLookupParameter<DataTable>("Ages", "The data table to store the current oldest, current average, current youngest age value."));
       Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The results collection where the analysis values should be stored."));
@@ -103 +103 @@
       oldestAverageYoungestAgeCalculator.YoungestAgeParameter.ActualName = CurrentYoungestAgeParameter.Name;
 
-      dataTableValuesCollector.CollectedValues.Add(new LookupParameter<IntValue>("CurrentOldestAge", null, CurrentOldestAgeParameter.Name));
-      dataTableValuesCollector.CollectedValues.Add(new LookupParameter<IntValue>("CurrentAverageAge", null, CurrentAverageAgeParameter.Name));
-      dataTableValuesCollector.CollectedValues.Add(new LookupParameter<IntValue>("CurrentYoungestAge", null, CurrentYoungestAgeParameter.Name));
+      dataTableValuesCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("CurrentOldestAge", null, CurrentOldestAgeParameter.Name));
+      dataTableValuesCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("CurrentAverageAge", null, CurrentAverageAgeParameter.Name));
+      dataTableValuesCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("CurrentYoungestAge", null, CurrentYoungestAgeParameter.Name));
       dataTableValuesCollector.DataTableParameter.ActualName = AgesParameter.Name;
 
-      //resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("CurrentOldestAge", null, CurrentOldestAgeParameter.Name));
-      //resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("CurrentAverageAge", null, CurrentAverageAgeParameter.Name));
-      //resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("CurrentYoungestAge", null, CurrentYoungestAgeParameter.Name));
       resultsCollector.CollectedValues.Add(new LookupParameter<DataTable>(AgesParameter.Name));
       resultsCollector.ResultsParameter.ActualName = ResultsParameter.Name;

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/Analyzers/OldestAverageYoungestAgeCalculator.cs

@@ -31 +31 @@
   [StorableClass]
   public sealed class OldestAverageYoungestAgeCalculator : SingleSuccessorOperator {
-    public IScopeTreeLookupParameter<IntValue> AgeParameter {
-      get { return (IScopeTreeLookupParameter<IntValue>)Parameters["Age"]; }
+    public IScopeTreeLookupParameter<DoubleValue> AgeParameter {
+      get { return (IScopeTreeLookupParameter<DoubleValue>)Parameters["Age"]; }
     }
-    public IValueLookupParameter<IntValue> OldestAgeParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["OldestAge"]; }
+    public IValueLookupParameter<DoubleValue> OldestAgeParameter {
+      get { return (IValueLookupParameter<DoubleValue>)Parameters["OldestAge"]; }
     }
-    public IValueLookupParameter<IntValue> AverageAgeParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["AverageAge"]; }
+    public IValueLookupParameter<DoubleValue> AverageAgeParameter {
+      get { return (IValueLookupParameter<DoubleValue>)Parameters["AverageAge"]; }
     }
-    public IValueLookupParameter<IntValue> YoungestAgeParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["YoungestAge"]; }
+    public IValueLookupParameter<DoubleValue> YoungestAgeParameter {
+      get { return (IValueLookupParameter<DoubleValue>)Parameters["YoungestAge"]; }
     }
 
@@ -55 +55 @@
     public OldestAverageYoungestAgeCalculator()
       : base() {
-      Parameters.Add(new ScopeTreeLookupParameter<IntValue>("Age", "The value contained in the scope tree which represents the solution age."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("OldestAge", "The age value of the oldest solution."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("AverageAge", "The average age of all solutions."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("YoungestAge", "The age value of the youngest solution."));
+      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Age", "The value contained in the scope tree which represents the solution age."));
+      Parameters.Add(new ValueLookupParameter<DoubleValue>("OldestAge", "The age value of the oldest solution."));
+      Parameters.Add(new ValueLookupParameter<DoubleValue>("AverageAge", "The average age of all solutions."));
+      Parameters.Add(new ValueLookupParameter<DoubleValue>("YoungestAge", "The age value of the youngest solution."));
 
       OldestAgeParameter.Hidden = true;
@@ -69 +69 @@
 
       if (ages.Length > 0) {
-        int min = int.MaxValue, max = int.MinValue, sum = 0;
+        double min = double.MaxValue, max = double.MinValue, sum = 0;
         for (int i = 0; i < ages.Length; i++) {
           if (ages[i].Value < min) min = ages[i].Value;
@@ -77 +77 @@
 
         var oldest = OldestAgeParameter.ActualValue;
-        if (oldest == null) OldestAgeParameter.ActualValue = new IntValue(max);
+        if (oldest == null) OldestAgeParameter.ActualValue = new DoubleValue(max);
         else oldest.Value = max;
         var average = AverageAgeParameter.ActualValue;
-        if (average == null) AverageAgeParameter.ActualValue = new IntValue(sum / ages.Length);
+        if (average == null) AverageAgeParameter.ActualValue = new DoubleValue(sum / ages.Length);
         else average.Value = sum / ages.Length;
         var youngest = YoungestAgeParameter.ActualValue;
-        if (youngest == null) YoungestAgeParameter.ActualValue = new IntValue(min);
+        if (youngest == null) YoungestAgeParameter.ActualValue = new DoubleValue(min);
         else youngest.Value = min;
       }