Changeset 14885

Timestamp:

04/24/17 14:45:37 (8 years ago)

Author:

gkronber

Message:

#2699 renamed and moved files

Location:

branches/RBFRegression/HeuristicLab.Algorithms.DataAnalysis/3.4

Files:

• HeuristicLab.Algorithms.DataAnalysis-3.4.csproj (modified) (4 diffs)
• KernelRidgeRegression/Interfaces (deleted)
• KernelRidgeRegression/KernelRidgeRegression.cs (moved) (moved from branches/RBFRegression/HeuristicLab.Algorithms.DataAnalysis/3.4/KernelRidgeRegression/RadialBasisRegression.cs)
• KernelRidgeRegression/KernelRidgeRegressionModel.cs (moved) (moved from branches/RBFRegression/HeuristicLab.Algorithms.DataAnalysis/3.4/KernelRidgeRegression/RadialBasisFunctionModel.cs)
• TSNE/Distances/ManhattanDistance.cs (moved) (moved from branches/RBFRegression/HeuristicLab.Algorithms.DataAnalysis/3.4/KernelRidgeRegression/Distances/ManhattanDistance.cs) (1 diff)

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

@@ -307 +307 @@
     <Compile Include="Interfaces\ISupportVectorMachineSolution.cs" />
     <Compile Include="Interfaces\IDataAnalysisAlgorithm.cs" />
+    <Compile Include="KernelRidgeRegression\KernelFunctions\CicularKernel.cs" />
+    <Compile Include="KernelRidgeRegression\KernelFunctions\GaussianKernel.cs" />
+    <Compile Include="KernelRidgeRegression\KernelFunctions\InverseMultiquadraticKernel.cs" />
+    <Compile Include="KernelRidgeRegression\KernelFunctions\KernelBase.cs" />
+    <Compile Include="KernelRidgeRegression\KernelFunctions\LaplacianKernel.cs" />
+    <Compile Include="KernelRidgeRegression\KernelFunctions\MultiquadraticKernel.cs" />
+    <Compile Include="KernelRidgeRegression\KernelFunctions\PolysplineKernel.cs" />
+    <Compile Include="KernelRidgeRegression\KernelFunctions\ThinPlatePolysplineKernel.cs" />
+    <Compile Include="KernelRidgeRegression\KernelRidgeRegression.cs" />
+    <Compile Include="KernelRidgeRegression\KernelRidgeRegressionModel.cs" />
     <Compile Include="kMeans\KMeansClustering.cs" />
     <Compile Include="kMeans\KMeansClusteringModel.cs" />
@@ -369 +379 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RadialBasisFunctions\KernelFunctions\CicularKernel.cs" />
-    <Compile Include="RadialBasisFunctions\KernelFunctions\GaussianKernel.cs" />
-    <Compile Include="RadialBasisFunctions\KernelFunctions\InverseMultiquadraticKernel.cs" />
-    <Compile Include="RadialBasisFunctions\KernelFunctions\KernelBase.cs" />
-    <Compile Include="RadialBasisFunctions\KernelFunctions\LaplacianKernel.cs" />
-    <Compile Include="RadialBasisFunctions\KernelFunctions\MultiquadraticKernel.cs" />
-    <Compile Include="RadialBasisFunctions\KernelFunctions\PolysplineKernel.cs" />
-    <Compile Include="RadialBasisFunctions\KernelFunctions\ThinPlatePolysplineKernel.cs" />
-    <Compile Include="RadialBasisFunctions\RadialBasisFunctionModel.cs" />
-    <Compile Include="RadialBasisFunctions\RadialBasisRegression.cs" />
     <Compile Include="RandomForest\RandomForestClassificationSolution.cs" />
     <Compile Include="RandomForest\RandomForestClassification.cs" />
@@ -402 +402 @@
     <Compile Include="TSNE\Distances\IndexedItemDistance.cs" />
     <Compile Include="TSNE\Distances\InnerProductDistance.cs" />
+    <Compile Include="TSNE\Distances\ManhattanDistance.cs" />
     <Compile Include="TSNE\Interfaces\IDistance.cs" />
     <Compile Include="TSNE\Interfaces\ISpacePartitioningTree.cs" />
@@ -434 +435 @@
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="RadialBasisFunctions\Distances\" />
-    <Folder Include="RadialBasisFunctions\Interfaces\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/RBFRegression/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Distances/ManhattanDistance.cs

@@ -50 +50 @@
     }
 
-    public static double GetDistance(IEnumerable<double> a, IEnumerable<double> b, double threshold) {
-      double sum = 0;
-      var it1 = a.GetEnumerator();
-      var it2 = b.GetEnumerator();
-      while (sum > threshold && it1.MoveNext() && it2.MoveNext()) {
-        sum += Math.Abs(it1.Current - it2.Current);
-      }
-      it1.Dispose();
-      it2.Dispose();
-      return sum;
-    }
-
     public override double Get(IEnumerable<double> a, IEnumerable<double> b) {
       return GetDistance(a.ToArray(), b.ToArray());
     }
-
-    public override double Get(IEnumerable<double> a, IEnumerable<double> b, double threshold) {
-      return GetDistance(a, b, threshold);
-    }
-
-
   }
 }