Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/10/12 11:02:37 (12 years ago)
Author:
gkronber
Message:

#1944 changed SVR and SVC algorithms in HeuristicLab to use most recent LibSVM version.

Location:
trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj

    r8600 r8609  
    104104  </PropertyGroup>
    105105  <ItemGroup>
    106     <Reference Include="LibSVM-1.6.3, Version=1.6.3.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    107       <HintPath>..\..\bin\LibSVM-1.6.3.dll</HintPath>
     106    <Reference Include="LibSVM-3.12, Version=3.12.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     107      <HintPath>..\..\bin\LibSVM-3.12.dll</HintPath>
    108108      <Private>False</Private>
    109109    </Reference>
     
    282282  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    283283  <PropertyGroup>
    284    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
     284    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
    285285      set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    286286      set ProjectDir=$(ProjectDir)
     
    290290      call PreBuildEvent.cmd
    291291</PreBuildEvent>
    292 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     292    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    293293export ProjectDir=$(ProjectDir)
    294294export SolutionDir=$(SolutionDir)
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/Plugin.cs.frame

    r8473 r8609  
    3737  [PluginDependency("HeuristicLab.Data", "3.3")]
    3838  [PluginDependency("HeuristicLab.Data.Views", "3.3")]
    39   [PluginDependency("HeuristicLab.LibSVM", "1.6.3")]
     39  [PluginDependency("HeuristicLab.LibSVM", "3.12")]
    4040  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    4141  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelView.cs

    r7259 r8609  
    2424using HeuristicLab.MainForm;
    2525using HeuristicLab.MainForm.WindowsForms;
     26using LibSVM;
    2627
    2728namespace HeuristicLab.Algorithms.DataAnalysis.Views {
     
    6667        writer.Flush();
    6768        using (MemoryStream memStream = new MemoryStream()) {
    68           SVM.RangeTransform.Write(memStream, Content.RangeTransform);
     69          RangeTransform.Write(memStream, Content.RangeTransform);
    6970          memStream.Seek(0, SeekOrigin.Begin);
    7071          memStream.WriteTo(s);
     
    7374        writer.Flush();
    7475        using (MemoryStream memStream = new MemoryStream()) {
    75           SVM.Model.Write(memStream, Content.Model);
     76          svm.svm_save_model(new StreamWriter(memStream), Content.Model);
    7677          memStream.Seek(0, SeekOrigin.Begin);
    7778          memStream.WriteTo(s);
Note: See TracChangeset for help on using the changeset viewer.