Changeset 12495 for branches/GBT/HeuristicLab.Problems.DataAnalysis

Timestamp:

06/23/15 12:50:05 (9 years ago)

Author:

gkronber

Message:

#2261: merged trunk changes to branch
r12494
#2403: added a null check in the MatlabParameterVectorEvaluator to prevent exceptions when clearstate is called

---

r12493
#2369: added support for squared errors and relative errors to error-characteristic-curve view

---

r12492
#2392: implemented PearsonsRCalculator to fix incorrect correlation values in the correlation matrix.

---

r12491
#2402 don't set task state to waiting when it fails

---

r12490
#2401 added missing Mono.Cecil plugin dependency

---

r12488
#2400 - Interfaces for Capaciated-, PickupAndDelivery- and TimeWindowed-ProblemInstances now specify an additional penalty parameter to set the current penalty factor for the constraint relaxation. - The setter of the penalty-property in ...

---

r12485
#2374 made RegressionSolution and ClassificationSolution non-abstract

---

r12482
#2320: Fixed warnings in unit test solutions introduced in r12420 by marking methods as obsolete.

---

r12481
#2320: Fixed AfterDeserialization of GEArtifialAntEvaluator.

---

r12480
#2320: Fixed error in symbolicexpressiontree crossover regarding the wiring of lookup parameters if persisted file is loaded.

---

r12479
#2397 moved GeoIP project into ExtLibs

---

r12478
#2329 fixed bug in simple code editor

---

r12476
#2331 removed outdated plugins

---

r12475
#2368 fixed compile warnings

---

r12474
#2399 worked on Mono project prepare script

---

r12473
#2329 added a simple code editor for Linux

---

r12472
#2399 - fixed MathJax.js file name - worked on Mono project prepare script

---

r12471
#2399 worked on Mono project prepare script

---

r12470
#2399 fixed pre-build events in project files

---

r12465
#2399 worked on mono project prepare script

---

r12464
#2399 added patch to project

---

r12463
#2399 fixed EPPlus so that it compiles on Linux

---

r12461
#2398: Skip root and start symbols when calculating impacts and replacement values in the pruning operators.

---

r12458
#2354 show label when no data is displayed and don't show the legend

---

r12457
#2353 removed duplicated call to Any() in Hive Status page

---

r12456
#2368 fixed modifier

---

r12455
#2368 added support in persistence for typecaches in streams

---

r12445
#2394: Changed Web.config compilation from debug to release to force script bundling. Changed history loading type from lazy to eager loading to increase performance. Fixed "getCoreStatus" typo in statusCtrl.js

---

r12443
#2394: Fixed UserTaskQuery and GetStatusHistory in the WebApp.Status plugin

---

r12442
#2394 added nuget folders to svn ignore list

---

r12435
#2394: Improved PluginManager and updated hive status monitor.

---

r12434
#2396 added symbolic expression tree formatter for C#

---

r12433
#2395: Minor change in DoubleValue.GetValue.

---

r12432
#2395 Use simple round-trip format for doubles because G17 prints some strange numbers (20.22 to 20.219999999999999999). Some accuracy can still be lost on 64bit machines, but should be very rare and minimal. double.MaxValue can still be pa...

---

r12431
#2395 Fixed parsing issues by using the G17 format.

---

r12430
#2394 added missing package config

---

r12429
#2394 added missing package config

---

r12428
#2394 added web app and status page to trunk

---

r12424
#2320: Adapted plugin file and updated project file of SymbolicExpressionTreeEncoding.

---

r12422
#2320: Merged the encoding class and all accompanying changes in the trunk.

---

r12401
#2387 Fixed a bug where the automatic selection of the first element behaved differently for the NewItemDialog.

---

r12400
#2387 Forgot to commit a file.

---

r12399
#2387 - Added context-menu for expanding and collapsing tree-nodes. - Improve response time when expanding/collapsing all nodes for TypeSelector and NewItemDialog.

---

r12398
#2387 - Added clearSearch-button in TypeSelector. - Adapted behavior of TypeSelector and NewItemDialog that a selected node stays selected as long as it matches the search criteria.

---

r12397
#2387 - Adapted behavior of the matching in the TypeSelector that it behave the same as the NewItemDialog. The search string is tokenized by space and matches if all tokens are contained, (eg. "Sym Reg" matches "SymbolicRegression...")...

---

r12393
#2025 - Removed Expand/CollapseAll buttons. - Removed cycling of items.

---

r12392
#2386: Updated GetHashCode method in the EnumerableBoolEqualityComparer.

---

Location:

branches/GBT

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolution.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/DependencyCalculator/PearsonsRDependenceCalculator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlinePearsonsRCalculator.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlinePearsonsRCalculator.cs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlinePearsonsRSquaredCalculator.cs (modified) (4 diffs)

branches/GBT/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

@@ -222 +222 @@
     <Compile Include="OnlineCalculators\OnlineMeanSquaredErrorCalculator.cs" />
     <Compile Include="OnlineCalculators\OnlineNormalizedMeanSquaredErrorCalculator.cs" />
+    <Compile Include="OnlineCalculators\OnlinePearsonsRCalculator.cs" />
     <Compile Include="OnlineCalculators\OnlinePearsonsRSquaredCalculator.cs" />
     <Compile Include="Implementation\Regression\RegressionSolution.cs" />

branches/GBT/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolution.cs

@@ -30 +30 @@
   /// </summary>
   [StorableClass]
-  public abstract class ClassificationSolution : ClassificationSolutionBase {
+  public class ClassificationSolution : ClassificationSolutionBase {
     protected readonly Dictionary<int, double> evaluationCache;
 
@@ -46 +46 @@
       evaluationCache = new Dictionary<int, double>(problemData.Dataset.Rows);
       CalculateClassificationResults();
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ClassificationSolution(this, cloner);
     }
 

branches/GBT/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/DependencyCalculator/PearsonsRDependenceCalculator.cs

@@ -33 +33 @@
 
     public double Calculate(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, out OnlineCalculatorError errorState) {
-      return Math.Sqrt(OnlinePearsonsRSquaredCalculator.Calculate(originalValues, estimatedValues, out errorState));
+      return OnlinePearsonsRCalculator.Calculate(originalValues, estimatedValues, out errorState);
     }
   }

branches/GBT/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlinePearsonsRSquaredCalculator.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Problems.DataAnalysis {
+  [Obsolete("Use OnlinePearsonsRCalculator directly")]
   public class OnlinePearsonsRSquaredCalculator : IOnlineCalculator {
-    private OnlineCovarianceCalculator covCalculator = new OnlineCovarianceCalculator();
-    private OnlineMeanAndVarianceCalculator sxCalculator = new OnlineMeanAndVarianceCalculator();
-    private OnlineMeanAndVarianceCalculator syCalculator = new OnlineMeanAndVarianceCalculator();
+    private readonly OnlinePearsonsRCalculator rCalculator = new OnlinePearsonsRCalculator();
 
     public double RSquared {
       get {
-        double xVar = sxCalculator.PopulationVariance;
-        double yVar = syCalculator.PopulationVariance;
-        if (xVar.IsAlmost(0.0) || yVar.IsAlmost(0.0)) {
-          return 0.0;
-        } else {
-          double r = covCalculator.Covariance / (Math.Sqrt(xVar) * Math.Sqrt(yVar));
-          return r * r;
-        }
+        if (rCalculator.ErrorState != OnlineCalculatorError.None) return 0.0;
+        else return rCalculator.R * rCalculator.R;
       }
     }
@@ -47 +40 @@
     #region IOnlineCalculator Members
     public OnlineCalculatorError ErrorState {
-      get { return covCalculator.ErrorState | sxCalculator.PopulationVarianceErrorState | syCalculator.PopulationVarianceErrorState; }
+      get { return rCalculator.ErrorState; }
     }
     public double Value {
@@ -53 +46 @@
     }
     public void Reset() {
-      covCalculator.Reset();
-      sxCalculator.Reset();
-      syCalculator.Reset();
+      rCalculator.Reset();
     }
 
     public void Add(double x, double y) {
-      // no need to check validity of values explicitly here as it is checked in all three evaluators 
-      covCalculator.Add(x, y);
-      sxCalculator.Add(x);
-      syCalculator.Add(y);
+      rCalculator.Add(x, y);
     }
 
@@ -68 +56 @@
 
     public static double Calculate(IEnumerable<double> first, IEnumerable<double> second, out OnlineCalculatorError errorState) {
-      IEnumerator<double> firstEnumerator = first.GetEnumerator();
-      IEnumerator<double> secondEnumerator = second.GetEnumerator();
-      OnlinePearsonsRSquaredCalculator rSquaredCalculator = new OnlinePearsonsRSquaredCalculator();
-
-      // always move forward both enumerators (do not use short-circuit evaluation!)
-      while (firstEnumerator.MoveNext() & secondEnumerator.MoveNext()) {
-        double original = firstEnumerator.Current;
-        double estimated = secondEnumerator.Current;
-        rSquaredCalculator.Add(original, estimated);
-        if (rSquaredCalculator.ErrorState != OnlineCalculatorError.None) break;
-      }
-
-      // check if both enumerators are at the end to make sure both enumerations have the same length
-      if (rSquaredCalculator.ErrorState == OnlineCalculatorError.None &&
-           (secondEnumerator.MoveNext() || firstEnumerator.MoveNext())) {
-        throw new ArgumentException("Number of elements in first and second enumeration doesn't match.");
-      } else {
-        errorState = rSquaredCalculator.ErrorState;
-        return rSquaredCalculator.RSquared;
-      }
+      var r = OnlinePearsonsRCalculator.Calculate(first, second, out errorState);
+      return r * r;
     }
   }