Changeset 8725 for branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Analysis/InformationAnalysisCalculator.cs

Timestamp:

10/03/12 17:13:31 (12 years ago)

Author:

epitzer

Message:

improve information analysis #1696

• fixed a bug in quality delta filtering
• report finer-grained results
• add total entropy
• add peak values to results

File:

• branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Analysis/InformationAnalysisCalculator.cs (modified) (4 diffs)

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Analysis/InformationAnalysisCalculator.cs

@@ -25 +25 @@
       get { return (LookupParameter<IntValue>)Parameters["Regularity"]; }
     }
+    public LookupParameter<IntValue> DiversityParameter {
+      get { return (LookupParameter<IntValue>)Parameters["Diversity"]; }
+    }
     public LookupParameter<DoubleArray> InformationContentParameter {
       get { return (LookupParameter<DoubleArray>)Parameters["InformationContent"]; }
@@ -34 +37 @@
       get { return (LookupParameter<DoubleArray>)Parameters["DensityBasinInformation"]; }
     }
+    public LookupParameter<DoubleArray> TotalEntropyParameter {
+      get { return (LookupParameter<DoubleArray>)Parameters["TotalEntropy"]; }
+    }
     public LookupParameter<DoubleArray> EpsilonQuantilesParameter {
       get { return (LookupParameter<DoubleArray>)Parameters["EpsilonQuantiles"]; }
@@ -42 +48 @@
     [StorableConstructor]
     protected InformationAnalysisCalculator(bool deserializing) : base(deserializing) { }
-    public InformationAnalysisCalculator()
-      : base() {
+    public InformationAnalysisCalculator() {
       Parameters.Add(new LookupParameter<DataTable>("QualityTrail", "Historical quality trail of a walk over a fitness landscape."));
       Parameters.Add(new ValueLookupParameter<IntValue>("NQuantiles", "Number of epsilon quantiles to calculate information analysis."));
       Parameters.Add(new LookupParameter<DoubleValue>("InformationStability"));
       Parameters.Add(new LookupParameter<IntValue>("Regularity"));
+      Parameters.Add(new LookupParameter<IntValue>("Diversity"));
       Parameters.Add(new LookupParameter<DoubleArray>("InformationContent"));
       Parameters.Add(new LookupParameter<DoubleArray>("PartialInformationContent"));
       Parameters.Add(new LookupParameter<DoubleArray>("DensityBasinInformation"));
+      Parameters.Add(new LookupParameter<DoubleArray>("TotalEntropy"));
       Parameters.Add(new LookupParameter<DoubleArray>("EpsilonQuantiles", "Considered values of epsilon, selected as quantiles of actual quality differences"));
     }
@@ -66 +73 @@
         NQuantilesParameter.ActualValue.Value);
       RegularityParameter.ActualValue = new IntValue(analysis.Regularity);
+      DiversityParameter.ActualValue = new IntValue(analysis.Diversity);
       InformationStabilityParameter.ActualValue = new DoubleValue(analysis.InformationStability);
       InformationContentParameter.ActualValue = new DoubleArray(analysis.InformationContent.ToArray());
       PartialInformationContentParameter.ActualValue = new DoubleArray(analysis.PartialInformationContent.ToArray());
       DensityBasinInformationParameter.ActualValue = new DoubleArray(analysis.DensityBasinInformation.ToArray());
+      TotalEntropyParameter.ActualValue = new DoubleArray(analysis.TotalEntropy.ToArray());
       EpsilonQuantilesParameter.ActualValue = new DoubleArray(analysis.QualityDelta.ToArray());
       return base.Apply();