Changeset 14787 for branches

Timestamp:

03/27/17 15:28:48 (8 years ago)

Author:

gkronber

Message:

#2700: more changes while reviewing

Location:

branches/TSNE/HeuristicLab.Algorithms.DataAnalysis/3.4

Files:

• HeuristicLab.Algorithms.DataAnalysis-3.4.csproj (modified) (2 diffs)
• Interfaces/TSNEInterfaces/ICell.cs (deleted)
• Interfaces/TSNEInterfaces/IDataPoint.cs (deleted)
• TSNE/Cell.cs (deleted)
• TSNE/SpacePartitioningTree.cs (modified) (4 diffs)
• TSNE/VantagePointTree.cs (modified) (2 diffs)

branches/TSNE/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

@@ -331 +331 @@
     <Compile Include="Interfaces\ISupportVectorMachineSolution.cs" />
     <Compile Include="Interfaces\IDataAnalysisAlgorithm.cs" />
-    <Compile Include="Interfaces\TSNEInterfaces\ICell.cs" />
-    <Compile Include="Interfaces\TSNEInterfaces\IDataPoint.cs" />
     <Compile Include="Interfaces\TSNEInterfaces\IDistance.cs" />
     <Compile Include="Interfaces\TSNEInterfaces\ISpacePartitioningTree.cs" />
@@ -418 +416 @@
     </Compile>
     <Compile Include="TimeSeries\AutoregressiveModeling.cs" />
-    <Compile Include="TSNE\Cell.cs" />
     <Compile Include="TSNE\Distances\DistanceBase.cs" />
     <Compile Include="TSNE\Distances\EuclideanDistance.cs" />

branches/TSNE/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/SpacePartitioningTree.cs

@@ -58 +58 @@
 using System.Linq;
 using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
@@ -64 +63 @@
   /// Space partitioning tree (SPTree)
   /// </summary>
-  [StorableClass]
-  public class SpacePartitioningTree : DeepCloneable, ISpacePartitioningTree {
+  public class SpacePartitioningTree : ISpacePartitioningTree {
     private const uint QT_NODE_CAPACITY = 1;
 
-    #region properties
-    [Storable]
     private double[] buff;
-    [Storable]
     private SpacePartitioningTree parent;
-    [Storable]
     private int dimension;
-    [Storable]
     private bool isLeaf;
-    [Storable]
     private uint size;
-    [Storable]
     private uint cumulativeSize;
 
     // Axis-aligned bounding box stored as a center with half-dimensions to represent the boundaries of this quad tree
-    [Storable]
-    private ICell boundary;
+    private Cell boundary;
 
     // Indices in this space-partitioning tree node, corresponding center-of-mass, and list of all children
-    [Storable]
-    public double[,] Data { private get; set; }
-    [Storable]
+    public double[,] Data { private get; set; } // TODO public setter, private getter?
+
     private double[] centerOfMass;
-    [Storable]
-    private int[] index = new int[QT_NODE_CAPACITY];
+    private readonly int[] index = new int[QT_NODE_CAPACITY];
 
     // Children
     private SpacePartitioningTree[] children;
-    [Storable]
     private uint noChildren;
-    #endregion
-
-    #region HLConstructors & Cloning
-    [StorableConstructor]
-    protected SpacePartitioningTree(bool deserializing) { }
-    protected SpacePartitioningTree(SpacePartitioningTree original, Cloner cloner)
-      : base(original, cloner) {
-      buff = original.buff.Select(x => x).ToArray();
-      parent = cloner.Clone(original.parent);
-      dimension = original.dimension;
-      isLeaf = original.isLeaf;
-      size = original.size;
-      cumulativeSize = original.cumulativeSize;
-      boundary = cloner.Clone(original.boundary);
-      if (original.Data != null) {
-        Data = new double[size, dimension];
-        Buffer.BlockCopy(original.Data, 0, Data, 0, original.Data.Length * sizeof(double));
-      }
-      centerOfMass = original.centerOfMass.Select(x => x).ToArray();
-      index = original.index.Select(x => x).ToArray();
-      children = original.children.Select(cloner.Clone).ToArray();
-      noChildren = original.noChildren;
-    }
-    public override IDeepCloneable Clone(Cloner cloner) { return new SpacePartitioningTree(this, cloner); }
 
     public SpacePartitioningTree(double[,] inpData) {
@@ -151 +114 @@
       Init(parent, inpData, impCorner, impWith);
     }
-    #endregion
 
     public ISpacePartitioningTree GetParent() {
@@ -327 +289 @@
     #endregion
 
+
+    private class Cell  {
+      private readonly uint dimension;
+      private readonly double[] corner;
+      private readonly double[] width;
+
+      public Cell(uint inpDimension) {
+        dimension = inpDimension;
+        corner = new double[dimension];
+        width = new double[dimension];
+      }
+
+      public double GetCorner(int d) {
+        return corner[d];
+      }
+      public double GetWidth(int d) {
+        return width[d];
+      }
+      public void SetCorner(int d, double val) {
+        corner[d] = val;
+      }
+      public void SetWidth(int d, double val) {
+        width[d] = val;
+      }
+      public bool ContainsPoint(double[] point) {
+        for (var d = 0; d < dimension; d++)
+          if (corner[d] - width[d] > point[d] || corner[d] + width[d] < point[d]) return false;
+        return true;
+      }
+    }
   }
 }

branches/TSNE/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/VantagePointTree.cs

@@ -54 +54 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Collections;
-using HeuristicLab.Common;
-using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Random;
 
@@ -72 +68 @@
   /// </summary>
   /// <typeparam name="T"></typeparam>
-  [StorableClass]
   public class VantagePointTree<T> : IVantagePointTree<T> {
     #region properties