Changeset 2430 for trunk/sources/HeuristicLab.LinearRegression

Timestamp:

10/15/09 13:22:07 (15 years ago)

Author:

gkronber

Message:

Moved ALGLIB code into a separate plugin. #783

Location:

trunk/sources/HeuristicLab.LinearRegression/3.2

Files:

• HeuristicLab.LinearRegression-3.2.csproj (modified) (3 diffs)
• HeuristicLabLinearRegressionPlugin.cs (modified) (1 diff)
• LinearRegressionOperator.cs (modified) (1 diff)
• alglib (deleted)

trunk/sources/HeuristicLab.LinearRegression/3.2/HeuristicLab.LinearRegression-3.2.csproj

@@ -80 +80 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="alglib\ap.cs" />
-    <Compile Include="alglib\bdsvd.cs" />
-    <Compile Include="alglib\bidiagonal.cs" />
-    <Compile Include="alglib\blas.cs" />
-    <Compile Include="alglib\leastsquares.cs" />
-    <Compile Include="alglib\lq.cs" />
-    <Compile Include="alglib\qr.cs" />
-    <Compile Include="alglib\reflections.cs" />
-    <Compile Include="alglib\rotations.cs" />
-    <Compile Include="alglib\spline3.cs" />
-    <Compile Include="alglib\svd.cs" />
     <Compile Include="LinearClassification.cs" />
     <Compile Include="HeuristicLabLinearRegressionPlugin.cs" />
@@ -103 +92 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\ALGLIB\ALGLIB.csproj">
+      <Project>{44456535-5DB5-454A-BE2B-7426DA6700B6}</Project>
+      <Name>ALGLIB</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Common\3.2\HeuristicLab.Common-3.2.csproj">
       <Project>{1FC004FC-59AF-4249-B1B6-FF25873A20E4}</Project>
@@ -160 +153 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="ALGLIB License.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

trunk/sources/HeuristicLab.LinearRegression/3.2/HeuristicLabLinearRegressionPlugin.cs

@@ -27 +27 @@
   [ClassInfo(Name = "HeuristicLab.LinearRegression-3.2")]
   [PluginFile(Filename = "HeuristicLab.LinearRegression-3.2.dll", Filetype = PluginFileType.Assembly)]
-  [PluginFile(Filename = "ALGLIB License.txt", Filetype = PluginFileType.License)]
+  [Dependency(Dependency = "ALGLIB")]
   [Dependency(Dependency = "HeuristicLab.Common-3.2")]
   [Dependency(Dependency = "HeuristicLab.Core-3.2")]

trunk/sources/HeuristicLab.LinearRegression/3.2/LinearRegressionOperator.cs

@@ -104 +104 @@
       for (int i = 0; i < weights.Length; i++) weights[i] = 1.0;
       // call external ALGLIB solver
-      leastsquares.buildgeneralleastsquares(ref targetVector, ref weights, ref inputMatrix, inputMatrix.GetLength(0), inputMatrix.GetLength(1), ref coefficients);
+      alglib.leastsquares.buildgeneralleastsquares(ref targetVector, ref weights, ref inputMatrix, inputMatrix.GetLength(0), inputMatrix.GetLength(1), ref coefficients);
 
       return coefficients;