Free cookie consent management tool by TermsFeed Policy Generator

Changeset 8471


Ignore:
Timestamp:
08/10/12 17:35:12 (12 years ago)
Author:
abeham
Message:

#1913: integrated branch into trunk

Location:
trunk/sources
Files:
2 added
3 edited
12 copied

Legend:

Unmodified
Added
Removed

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

    r8463 r8471  
    154154      <DependentUpon>KMeansClusteringModelView.cs</DependentUpon>
    155155    </Compile>
     156    <Compile Include="NcaDimensionReductionView.cs">
     157      <SubType>UserControl</SubType>
     158    </Compile>
     159    <Compile Include="NcaDimensionReductionView.Designer.cs">
     160      <DependentUpon>NcaDimensionReductionView.cs</DependentUpon>
     161    </Compile>
    156162    <Compile Include="Plugin.cs" />
    157163    <Compile Include="SupportVectorMachineModelSupportVectorsView.cs">
    … …  
    184190      <Project>{2E782078-FA81-4B70-B56F-74CE38DAC6C8}</Project>
    185191      <Name>HeuristicLab.Algorithms.DataAnalysis-3.4</Name>
     192      <Private>False</Private>
     193    </ProjectReference>
     194    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     195      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
     196      <Name>HeuristicLab.Analysis-3.3</Name>
    186197      <Private>False</Private>
    187198    </ProjectReference>

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/NcaDimensionReductionView.Designer.cs

    r8464 r8471  
    2020#endregion
    2121
    22 namespace HeuristicLab.Algorithms.NCA.Views {
     22namespace HeuristicLab.Algorithms.DataAnalysis.Views {
    2323  partial class NCADimensionReductionView {
    2424    /// <summary>

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/NcaDimensionReductionView.cs

    r8470 r8471  
    2929using HeuristicLab.Problems.DataAnalysis.Views;
    3030
    31 namespace HeuristicLab.Algorithms.NCA.Views {
     31namespace HeuristicLab.Algorithms.DataAnalysis.Views {
    3232  [View("Dimension Reduction")]
    3333  [Content(typeof(INcaClassificationSolution), IsDefaultView = false)]

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/Plugin.cs.frame

    r8246 r8471  
    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")]
    … …  
    4143  [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
    4244  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
     45  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Views", "3.4")]
    4346  public class HeuristicLabAlgorithmsDataAnalysisViewsPlugin : PluginBase {
    4447  }

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

    r8464 r8471  
    147147    <Compile Include="Interfaces\IGaussianProcessModel.cs" />
    148148    <Compile Include="Interfaces\IGaussianProcessSolution.cs" />
     149    <Compile Include="Interfaces\INcaClassificationSolution.cs" />
     150    <Compile Include="Interfaces\INcaModel.cs" />
    149151    <Compile Include="Interfaces\INearestNeighbourClassificationSolution.cs" />
    150152    <Compile Include="Interfaces\INearestNeighbourRegressionSolution.cs" />
    … …  
    177179    <Compile Include="Linear\MultinomialLogitClassificationSolution.cs" />
    178180    <Compile Include="Linear\MultinomialLogitModel.cs" />
     181    <Compile Include="Nca\Initialization\INcaInitializer.cs" />
     182    <Compile Include="Nca\Initialization\LdaInitializer.cs" />
     183    <Compile Include="Nca\Initialization\PcaInitializer.cs" />
     184    <Compile Include="Nca\Initialization\RandomInitializer.cs" />
     185    <Compile Include="Nca\Matrix.cs" />
     186    <Compile Include="Nca\NcaAlgorithm.cs" />
     187    <Compile Include="Nca\NcaClassificationSolution.cs" />
     188    <Compile Include="Nca\NcaModel.cs" />
    179189    <Compile Include="NearestNeighbour\NearestNeighbourClassification.cs" />
    180190    <Compile Include="NearestNeighbour\NearestNeighbourClassificationSolution.cs" />

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/INcaClassificationSolution.cs

    r8466 r8471  
    2222using HeuristicLab.Problems.DataAnalysis;
    2323
    24 namespace HeuristicLab.Algorithms.NCA {
     24namespace HeuristicLab.Algorithms.DataAnalysis {
    2525  public interface INcaClassificationSolution : IClassificationSolution {
    2626    new INcaModel Model { get; }

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/INcaModel.cs

    r8466 r8471  
    2323using HeuristicLab.Problems.DataAnalysis;
    2424
    25 namespace HeuristicLab.Algorithms.NCA {
     25namespace HeuristicLab.Algorithms.DataAnalysis {
    2626  public interface INcaModel : IClassificationModel {
    2727    new INcaClassificationSolution CreateClassificationSolution(IClassificationProblemData problemData);

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/INcaInitializer.cs

    r8464 r8471  
    2323using HeuristicLab.Problems.DataAnalysis;
    2424
    25 namespace HeuristicLab.Algorithms.NCA {
     25namespace HeuristicLab.Algorithms.DataAnalysis {
    2626  public interface INCAInitializer : IItem {
    2727    /// <summary>

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/LdaInitializer.cs

    r8464 r8471  
    2727using HeuristicLab.Problems.DataAnalysis;
    2828
    29 namespace HeuristicLab.Algorithms.NCA {
     29namespace HeuristicLab.Algorithms.DataAnalysis {
    3030  [Item("LDA", "Initializes the matrix by performing a linear discriminant analysis.")]
    3131  [StorableClass]

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/PcaInitializer.cs

    r8464 r8471  
    2626using HeuristicLab.Problems.DataAnalysis;
    2727
    28 namespace HeuristicLab.Algorithms.NCA {
     28namespace HeuristicLab.Algorithms.DataAnalysis {
    2929  [Item("PCA", "Initializes the matrix by performing a principal components analysis.")]
    3030  [StorableClass]

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/RandomInitializer.cs

    r8464 r8471  
    2929using HeuristicLab.Random;
    3030
    31 namespace HeuristicLab.Algorithms.NCA {
     31namespace HeuristicLab.Algorithms.DataAnalysis {
    3232  [Item("Random", "Initializes the matrix randomly.")]
    3333  [StorableClass]

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Matrix.cs

    r8466 r8471  
    2727using HeuristicLab.PluginInfrastructure;
    2828
    29 namespace HeuristicLab.Algorithms.NCA {
     29namespace HeuristicLab.Algorithms.DataAnalysis {
    3030  [NonDiscoverableType]
    3131  internal class Matrix : IEnumerable<double>, IDeepCloneable {

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/NcaAlgorithm.cs

    r8470 r8471  
    2424using System.Linq;
    2525using System.Threading;
    26 using HeuristicLab.Algorithms.DataAnalysis;
    2726using HeuristicLab.Analysis;
    2827using HeuristicLab.Common;
    … …  
    3534using HeuristicLab.Problems.DataAnalysis;
    3635
    37 namespace HeuristicLab.Algorithms.NCA {
     36namespace HeuristicLab.Algorithms.DataAnalysis {
    3837  internal delegate void Reporter(double quality, double[] coefficients);
    3938  /// <summary>

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/NcaClassificationSolution.cs

    r8466 r8471  
    2525using HeuristicLab.Problems.DataAnalysis;
    2626
    27 namespace HeuristicLab.Algorithms.NCA {
     27namespace HeuristicLab.Algorithms.DataAnalysis {
    2828  [Item("NCA Classification Solution", "")]
    2929  [StorableClass]
    … …  
    3636
    3737    [StorableConstructor]
    38     private NcaClassificationSolution(bool deserializing) : base(deserializing) { }
    39     private NcaClassificationSolution(NcaClassificationSolution original, Cloner cloner)
     38    protected NcaClassificationSolution(bool deserializing) : base(deserializing) { }
     39    protected NcaClassificationSolution(NcaClassificationSolution original, Cloner cloner)
    4040      : base(original, cloner) {
    4141    }

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/NcaModel.cs

    r8466 r8471  
    2222using System.Collections.Generic;
    2323using System.Linq;
    24 using HeuristicLab.Algorithms.DataAnalysis;
    2524using HeuristicLab.Common;
    2625using HeuristicLab.Core;
    … …  
    2827using HeuristicLab.Problems.DataAnalysis;
    2928
    30 namespace HeuristicLab.Algorithms.NCA {
     29namespace HeuristicLab.Algorithms.DataAnalysis {
    3130  [Item("NCA Model", "")]
    3231  [StorableClass]
Note: See TracChangeset for help on using the changeset viewer.