Changeset 7460 for branches/HeuristicLab.TimeSeries/HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour

Timestamp:

02/06/12 17:50:17 (13 years ago)

Author:

gkronber

Message:

#1081: merged r7266:7459 from the trunk into the time series prognosis branch.

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (2 props)
• HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourModel.cs (modified) (2 diffs)

branches/HeuristicLab.TimeSeries

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user

branches/HeuristicLab.TimeSeries/HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourModel.cs

@@ -73 +73 @@
       kdTree.curdist = original.kdTree.curdist;
       kdTree.debugcounter = original.kdTree.debugcounter;
-      kdTree.distmatrixtype = original.kdTree.distmatrixtype;
       kdTree.idx = (int[])original.kdTree.idx.Clone();
       kdTree.kcur = original.kdTree.kcur;
@@ -241 +240 @@
     }
     [Storable]
-    public int KDTreeDistMatrixType {
-      get { return kdTree.distmatrixtype; }
-      set { kdTree.distmatrixtype = value; }
-    }
-    [Storable]
     public int[] KDTreeIdx {
       get { return kdTree.idx; }

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user