Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/14/12 18:58:15 (12 years ago)
Author:
gkronber
Message:

#1847 merged r8205:8635 from trunk into branch

Location:
branches/GP-MoveOperators
Files:
5 edited
14 copied

Legend:

Unmodified
Added
Removed

  • branches/GP-MoveOperators

  • branches/GP-MoveOperators/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj

    r7021 r8660  
    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>
    … …  
    112112    <Reference Include="System.Drawing" />
    113113    <Reference Include="System.Windows.Forms" />
     114    <Reference Include="System.Windows.Forms.DataVisualization" />
    114115    <Reference Include="System.Xml.Linq" />
    115116    <Reference Include="System.Data.DataSetExtensions" />
    … …  
    118119  </ItemGroup>
    119120  <ItemGroup>
     121    <Compile Include="MeanProdView.cs">
     122      <SubType>UserControl</SubType>
     123    </Compile>
     124    <Compile Include="MeanProdView.Designer.cs">
     125      <DependentUpon>MeanProdView.cs</DependentUpon>
     126    </Compile>
     127    <Compile Include="MeanSumView.cs">
     128      <SubType>UserControl</SubType>
     129    </Compile>
     130    <Compile Include="MeanSumView.Designer.cs">
     131      <DependentUpon>MeanSumView.cs</DependentUpon>
     132    </Compile>
     133    <Compile Include="CovarianceProdView.cs">
     134      <SubType>UserControl</SubType>
     135    </Compile>
     136    <Compile Include="CovarianceProdView.Designer.cs">
     137      <DependentUpon>CovarianceProdView.cs</DependentUpon>
     138    </Compile>
     139    <Compile Include="CovarianceSumView.cs">
     140      <SubType>UserControl</SubType>
     141    </Compile>
     142    <Compile Include="CovarianceSumView.Designer.cs">
     143      <DependentUpon>CovarianceSumView.cs</DependentUpon>
     144    </Compile>
     145    <Compile Include="GaussianProcessModelView.cs">
     146      <SubType>UserControl</SubType>
     147    </Compile>
     148    <Compile Include="GaussianProcessModelView.Designer.cs">
     149      <DependentUpon>GaussianProcessModelView.cs</DependentUpon>
     150    </Compile>
    120151    <Compile Include="KMeansClusteringModelView.cs">
    121152      <SubType>UserControl</SubType>
    … …  
    124155      <DependentUpon>KMeansClusteringModelView.cs</DependentUpon>
    125156    </Compile>
     157    <Compile Include="NcaDimensionReductionView.cs">
     158      <SubType>UserControl</SubType>
     159    </Compile>
     160    <Compile Include="NcaDimensionReductionView.Designer.cs">
     161      <DependentUpon>NcaDimensionReductionView.cs</DependentUpon>
     162    </Compile>
    126163    <Compile Include="Plugin.cs" />
     164    <Compile Include="GaussianProcessRegressionSolutionLineChartView.cs">
     165      <SubType>UserControl</SubType>
     166    </Compile>
     167    <Compile Include="GaussianProcessRegressionSolutionLineChartView.Designer.cs">
     168      <DependentUpon>GaussianProcessRegressionSolutionLineChartView.cs</DependentUpon>
     169    </Compile>
    127170    <Compile Include="SupportVectorMachineModelSupportVectorsView.cs">
    128171      <SubType>UserControl</SubType>
    … …  
    156199      <Private>False</Private>
    157200    </ProjectReference>
     201    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     202      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
     203      <Name>HeuristicLab.Analysis-3.3</Name>
     204      <Private>False</Private>
     205    </ProjectReference>
    158206    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    159207      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    … …  
    226274      <Private>False</Private>
    227275    </ProjectReference>
     276    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
     277      <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
     278      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
     279      <Private>False</Private>
     280    </ProjectReference>
    228281  </ItemGroup>
    229282  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    230283  <PropertyGroup>
    231     <PreBuildEvent>
     284    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
    232285      set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    233286      set ProjectDir=$(ProjectDir)
    … …  
    236289
    237290      call PreBuildEvent.cmd
     291</PreBuildEvent>
     292    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     293export ProjectDir=$(ProjectDir)
     294export SolutionDir=$(SolutionDir)
     295
     296$SolutionDir/PreBuildEvent.sh
    238297</PreBuildEvent>
    239298  </PropertyGroup>

  • branches/GP-MoveOperators/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/Plugin.cs.frame

    r8085 r8660  
    2626  /// Plugin class for HeuristicLab.Algorithms.DataAnalysis.Views plugin.
    2727  /// </summary>
    28   [Plugin("HeuristicLab.Algorithms.DataAnalysis.Views", "Provides views for data analysis algorithms implemented in external libraries (linear regression, linear discriminant analysis, k-means clustering, support vector classification and regression)", "3.4.2.$WCREV$")]
     28  [Plugin("HeuristicLab.Algorithms.DataAnalysis.Views", "Provides views for data analysis algorithms implemented in external libraries (linear regression, linear discriminant analysis, k-means clustering, support vector classification and regression)", "3.4.3.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Algorithms.DataAnalysis.Views-3.4.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Algorithms.DataAnalysis", "3.4")]
     31  [PluginDependency("HeuristicLab.Analysis", "3.3")]
     32  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3133  [PluginDependency("HeuristicLab.Common", "3.3")]
    3234  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    … …  
    3537  [PluginDependency("HeuristicLab.Data", "3.3")]
    3638  [PluginDependency("HeuristicLab.Data.Views", "3.3")]
    37   [PluginDependency("HeuristicLab.LibSVM", "1.6.3")]
     39  [PluginDependency("HeuristicLab.LibSVM", "3.12")]
    3840  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    3941  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    … …  
    4143  [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
    4244  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
     45  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Views", "3.4")]
     46  [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")]
    4347  public class HeuristicLabAlgorithmsDataAnalysisViewsPlugin : PluginBase {
    4448  }

  • branches/GP-MoveOperators/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/Properties/AssemblyInfo.cs.frame

    r7259 r8660  
    5353// by using the '*' as shown below:
    5454[assembly: AssemblyVersion("3.4.0.0")]
    55 [assembly: AssemblyFileVersion("3.4.2.$WCREV$")]
     55[assembly: AssemblyFileVersion("3.4.3.$WCREV$")]

  • branches/GP-MoveOperators/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelView.cs

    r7259 r8660  
    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.