Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/05/11 21:55:55 (13 years ago)
Author:
abeham
Message:

#1614

  • updated branch from trunk
Location:
branches/GeneralizedQAP
Files:
5 deleted
17 edited
5 copied

Legend:

Unmodified
Added
Removed

  • branches/GeneralizedQAP

  • branches/GeneralizedQAP/HeuristicLab.Algorithms.DataAnalysis/3.3

    • Property svn:ignore

      •  

        old new  
        44obj
        55*.vs10x
         6Plugin.cs

  • branches/GeneralizedQAP/HeuristicLab.Algorithms.DataAnalysis/3.3/HeuristicLab.Algorithms.DataAnalysis-3.3.csproj

    r5163 r6878  
    2121    </StartupObject>
    2222    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    23     <TargetFrameworkProfile></TargetFrameworkProfile>
     23    <TargetFrameworkProfile>
     24    </TargetFrameworkProfile>
    2425    <PublishUrl>publish\</PublishUrl>
    2526    <Install>true</Install>
    … …  
    4243    <DebugType>full</DebugType>
    4344    <Optimize>false</Optimize>
    44     <OutputPath>bin\Debug\</OutputPath>
     45    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4546    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4647    <ErrorReport>prompt</ErrorReport>
    … …  
    5152    <DebugType>pdbonly</DebugType>
    5253    <Optimize>true</Optimize>
    53     <OutputPath>bin\Release\</OutputPath>
     54    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5455    <DefineConstants>TRACE</DefineConstants>
    5556    <ErrorReport>prompt</ErrorReport>
    5657    <WarningLevel>4</WarningLevel>
    57     <DocumentationFile>bin\Release\HeuristicLab.Algorithms.DataAnalysis-3.3.xml</DocumentationFile>
     58    <DocumentationFile>
     59    </DocumentationFile>
    5860    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5961  </PropertyGroup>
    6062  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6163    <DebugSymbols>true</DebugSymbols>
    62     <OutputPath>bin\x86\Debug\</OutputPath>
     64    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6365    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6466    <DebugType>full</DebugType>
    … …  
    6870  </PropertyGroup>
    6971  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    70     <OutputPath>bin\x86\Release\</OutputPath>
     72    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7173    <DefineConstants>TRACE</DefineConstants>
    72     <DocumentationFile>bin\x86\Release\HeuristicLab.Algorithms.DataAnalysis-3.3.xml</DocumentationFile>
     74    <DocumentationFile>
     75    </DocumentationFile>
    7376    <Optimize>true</Optimize>
    7477    <DebugType>pdbonly</DebugType>
    … …  
    7982  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8083    <DebugSymbols>true</DebugSymbols>
    81     <OutputPath>bin\x64\Debug\</OutputPath>
     84    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8285    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8386    <DebugType>full</DebugType>
    … …  
    8790  </PropertyGroup>
    8891  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    89     <OutputPath>bin\x64\Release\</OutputPath>
     92    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    9093    <DefineConstants>TRACE</DefineConstants>
    91     <DocumentationFile>bin\x64\Release\HeuristicLab.Algorithms.DataAnalysis-3.3.xml</DocumentationFile>
     94    <DocumentationFile>
     95    </DocumentationFile>
    9296    <Optimize>true</Optimize>
    9397    <DebugType>pdbonly</DebugType>
    … …  
    107111  <ItemGroup>
    108112    <Compile Include="CrossValidation.cs" />
     113    <Compile Include="Plugin.cs" />
    109114    <Compile Include="SupportVectorMachine.cs" />
    110     <Compile Include="HeuristicLabAlgorithmsDataAnalysisPlugin.cs" />
    111115    <Compile Include="LinearRegression.cs" />
    112116    <Compile Include="Properties\AssemblyInfo.cs" />
    … …  
    116120      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    117121      <Name>HeuristicLab.Collections-3.3</Name>
     122      <Private>False</Private>
    118123    </ProjectReference>
    119124    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    120125      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    121126      <Name>HeuristicLab.Common.Resources-3.3</Name>
     127      <Private>False</Private>
    122128    </ProjectReference>
    123129    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    124130      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    125131      <Name>HeuristicLab.Common-3.3</Name>
     132      <Private>False</Private>
    126133    </ProjectReference>
    127134    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    128135      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    129136      <Name>HeuristicLab.Core-3.3</Name>
     137      <Private>False</Private>
    130138    </ProjectReference>
    131139    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    132140      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    133141      <Name>HeuristicLab.Data-3.3</Name>
     142      <Private>False</Private>
    134143    </ProjectReference>
    135144    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    136145      <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    137146      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
     147      <Private>False</Private>
    138148    </ProjectReference>
    139149    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    140150      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    141151      <Name>HeuristicLab.Operators-3.3</Name>
     152      <Private>False</Private>
    142153    </ProjectReference>
    143154    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    144155      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    145156      <Name>HeuristicLab.Optimization-3.3</Name>
     157      <Private>False</Private>
    146158    </ProjectReference>
    147159    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    148160      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    149161      <Name>HeuristicLab.Parameters-3.3</Name>
     162      <Private>False</Private>
    150163    </ProjectReference>
    151164    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    152165      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    153166      <Name>HeuristicLab.Persistence-3.3</Name>
     167      <Private>False</Private>
    154168    </ProjectReference>
    155169    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    156170      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    157171      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     172      <Private>False</Private>
    158173    </ProjectReference>
    159174    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Regression\3.3\HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj">
    160175      <Project>{BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}</Project>
    161176      <Name>HeuristicLab.Problems.DataAnalysis.Regression-3.3</Name>
     177      <Private>False</Private>
    162178    </ProjectReference>
    163179    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.3\HeuristicLab.Problems.DataAnalysis-3.3.csproj">
    164180      <Project>{70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}</Project>
    165181      <Name>HeuristicLab.Problems.DataAnalysis-3.3</Name>
     182      <Private>False</Private>
    166183    </ProjectReference>
    167184  </ItemGroup>
    168185  <ItemGroup>
    169186    <None Include="HeuristicLab.snk" />
    170     <None Include="HeuristicLabAlgorithmsDataAnalysisPlugin.cs.frame" />
    171     <None Include="Properties\AssemblyInfo.frame" />
     187    <None Include="Plugin.cs.frame" />
     188    <None Include="Properties\AssemblyInfo.cs.frame" />
    172189  </ItemGroup>
    173190  <ItemGroup>
    … …  
    203220
    204221call PreBuildEvent.cmd
    205 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabAlgorithmsDataAnalysisPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabAlgorithmsDataAnalysisPlugin.cs"</PreBuildEvent>
     222</PreBuildEvent>
    206223  </PropertyGroup>
    207224</Project>

  • branches/GeneralizedQAP/HeuristicLab.Algorithms.DataAnalysis/3.4

    • Property svn:ignore

      •  

        old new  
        44HeuristicLab.Algorithms.DataAnalysis-3.4.csproj.user
        55*.vs10x
         6Plugin.cs

  • branches/GeneralizedQAP/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

    r6587 r6878  
    4343    <DebugType>full</DebugType>
    4444    <Optimize>false</Optimize>
    45     <OutputPath>bin\Debug\</OutputPath>
     45    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4646    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4747    <ErrorReport>prompt</ErrorReport>
    … …  
    5252    <DebugType>pdbonly</DebugType>
    5353    <Optimize>true</Optimize>
    54     <OutputPath>bin\Release\</OutputPath>
     54    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5555    <DefineConstants>TRACE</DefineConstants>
    5656    <ErrorReport>prompt</ErrorReport>
    5757    <WarningLevel>4</WarningLevel>
    58     <DocumentationFile>bin\Release\HeuristicLab.Algorithms.DataAnalysis-3.4.xml</DocumentationFile>
     58    <DocumentationFile>
     59    </DocumentationFile>
    5960    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    6061  </PropertyGroup>
    6162  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6263    <DebugSymbols>true</DebugSymbols>
    63     <OutputPath>bin\x86\Debug\</OutputPath>
     64    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6465    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6566    <DebugType>full</DebugType>
    … …  
    6970  </PropertyGroup>
    7071  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    71     <OutputPath>bin\x86\Release\</OutputPath>
     72    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7273    <DefineConstants>TRACE</DefineConstants>
    73     <DocumentationFile>bin\x86\Release\HeuristicLab.Algorithms.DataAnalysis-3.4.xml</DocumentationFile>
     74    <DocumentationFile>
     75    </DocumentationFile>
    7476    <Optimize>true</Optimize>
    7577    <DebugType>pdbonly</DebugType>
    … …  
    8082  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8183    <DebugSymbols>true</DebugSymbols>
    82     <OutputPath>bin\x64\Debug\</OutputPath>
     84    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8385    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8486    <DebugType>full</DebugType>
    … …  
    8890  </PropertyGroup>
    8991  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    90     <OutputPath>bin\x64\Release\</OutputPath>
     92    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    9193    <DefineConstants>TRACE</DefineConstants>
    92     <DocumentationFile>bin\x64\Release\HeuristicLab.Algorithms.DataAnalysis-3.3.xml</DocumentationFile>
     94    <DocumentationFile>
     95    </DocumentationFile>
    9396    <Optimize>true</Optimize>
    9497    <DebugType>pdbonly</DebugType>
    … …  
    98101  </PropertyGroup>
    99102  <ItemGroup>
     103    <Reference Include="ALGLIB-3.1.0, Version=3.1.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     104      <HintPath>..\..\bin\ALGLIB-3.1.0.dll</HintPath>
     105    </Reference>
     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>
     108    </Reference>
    100109    <Reference Include="System" />
    101110    <Reference Include="System.Core">
    … …  
    107116  </ItemGroup>
    108117  <ItemGroup>
    109     <Compile Include="RegressionWorkbench.cs" />
    110118    <Compile Include="CrossValidation.cs">
    111119      <SubType>Code</SubType>
    112120    </Compile>
    113     <Compile Include="HeuristicLabAlgorithmsDataAnalysisPlugin.cs" />
    114121    <Compile Include="FixedDataAnalysisAlgorithm.cs" />
    115122    <Compile Include="Interfaces\INearestNeighbourClassificationSolution.cs" />
    … …  
    135142    </Compile>
    136143    <Compile Include="Linear\AlglibUtil.cs" />
     144    <Compile Include="Linear\LinearTimeSeriesPrognosis.cs" />
    137145    <Compile Include="Linear\LinearDiscriminantAnalysis.cs" />
    138146    <Compile Include="Linear\LinearRegression.cs">
    … …  
    157165    <Compile Include="NeuralNetwork\NeuralNetworkRegression.cs" />
    158166    <Compile Include="NeuralNetwork\NeuralNetworkRegressionSolution.cs" />
     167    <Compile Include="Plugin.cs" />
    159168    <Compile Include="Properties\AssemblyInfo.cs" />
    160169    <Compile Include="RandomForest\RandomForestClassificationSolution.cs" />
    … …  
    180189      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    181190      <Name>HeuristicLab.Collections-3.3</Name>
     191      <Private>False</Private>
    182192    </ProjectReference>
    183193    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    184194      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    185195      <Name>HeuristicLab.Common.Resources-3.3</Name>
     196      <Private>False</Private>
    186197    </ProjectReference>
    187198    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    188199      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    189200      <Name>HeuristicLab.Common-3.3</Name>
     201      <Private>False</Private>
    190202    </ProjectReference>
    191203    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    192204      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    193205      <Name>HeuristicLab.Core-3.3</Name>
     206      <Private>False</Private>
    194207    </ProjectReference>
    195208    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    196209      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    197210      <Name>HeuristicLab.Data-3.3</Name>
     211      <Private>False</Private>
    198212    </ProjectReference>
    199213    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
    200214      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
    201215      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
    202     </ProjectReference>
    203     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj">
    204       <Project>{FC841674-62A7-4055-BE91-E41944B6C606}</Project>
    205       <Name>ALGLIB-3.1.0</Name>
    206     </ProjectReference>
    207     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0.csproj">
    208       <Project>{DE69A359-A5B8-4D3D-BA8D-D5780D7F96D6}</Project>
    209       <Name>HeuristicLab.ALGLIB-3.1.0 %28HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0%29</Name>
    210     </ProjectReference>
    211     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\HeuristicLab.LibSVM-1.6.3\HeuristicLab.LibSVM-1.6.3.csproj">
    212       <Project>{89B50302-9CEE-4D13-9779-633EADCAE624}</Project>
    213       <Name>HeuristicLab.LibSVM-1.6.3 %28HeuristicLab.ExtLibs\HeuristicLab.LibSVM\HeuristicLab.LibSVM-1.6.3\HeuristicLab.LibSVM-1.6.3%29</Name>
    214     </ProjectReference>
    215     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\LibSVM-1.6.3\LibSVM-1.6.3.csproj">
    216       <Project>{A16F23B5-FB62-499E-A831-26953AA56FE2}</Project>
    217       <Name>LibSVM-1.6.3</Name>
     216      <Private>False</Private>
    218217    </ProjectReference>
    219218    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    220219      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    221220      <Name>HeuristicLab.Optimization-3.3</Name>
     221      <Private>False</Private>
    222222    </ProjectReference>
    223223    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    224224      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    225225      <Name>HeuristicLab.Parameters-3.3</Name>
     226      <Private>False</Private>
    226227    </ProjectReference>
    227228    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    228229      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    229230      <Name>HeuristicLab.Persistence-3.3</Name>
     231      <Private>False</Private>
    230232    </ProjectReference>
    231233    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    232234      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    233235      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     236      <Private>False</Private>
    234237    </ProjectReference>
    235238    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.csproj">
    236239      <Project>{05BAE4E1-A9FA-4644-AA77-42558720159E}</Project>
    237240      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4</Name>
     241      <Private>False</Private>
    238242    </ProjectReference>
    239243    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj">
    240244      <Project>{5AC82412-911B-4FA2-A013-EDC5E3F3FCC2}</Project>
    241245      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4</Name>
     246      <Private>False</Private>
     247    </ProjectReference>
     248    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4.csproj">
     249      <Project>{07486E68-1517-4B9D-A58D-A38E99AE71AB}</Project>
     250      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4</Name>
     251      <Private>False</Private>
    242252    </ProjectReference>
    243253    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
    244254      <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
    245255      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
     256      <Private>False</Private>
    246257    </ProjectReference>
    247258    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    248259      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
    249260      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     261      <Private>False</Private>
    250262    </ProjectReference>
    251263  </ItemGroup>
    252264  <ItemGroup>
    253265    <None Include="HeuristicLab.snk" />
    254     <None Include="HeuristicLabAlgorithmsDataAnalysisPlugin.cs.frame" />
    255     <None Include="Properties\AssemblyInfo.frame" />
     266    <None Include="Plugin.cs.frame" />
     267    <None Include="Properties\AssemblyInfo.cs.frame" />
    256268  </ItemGroup>
    257269  <ItemGroup>
    … …  
    288300
    289301call PreBuildEvent.cmd
    290 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabAlgorithmsDataAnalysisPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabAlgorithmsDataAnalysisPlugin.cs"</PreBuildEvent>
     302</PreBuildEvent>
    291303  </PropertyGroup>
    292304</Project>

  • branches/GeneralizedQAP/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/AlglibUtil.cs

    r6002 r6878  
    2727  public static class AlglibUtil {
    2828    public static double[,] PrepareInputMatrix(Dataset dataset, IEnumerable<string> variables, IEnumerable<int> rows) {
    29       List<string> variablesList = variables.ToList();
     29      return PrepareInputMatrix(dataset, variables, rows, new int[] { 0 });
     30    }
     31
     32    public static double[,] PrepareInputMatrix(Dataset dataset, IEnumerable<string> variables, IEnumerable<int> rows, IEnumerable<int> lags) {
     33      int maxLag = lags.Max();
     34
     35      // drop last variable (target variable)
     36      List<string> inputVariablesList = variables
     37        .Reverse()
     38        .Skip(1)
     39        .Reverse()
     40        .ToList();
     41      string targetVariable = variables.Last();
    3042      List<int> rowsList = rows.ToList();
     43      int nRows = rowsList.Count - maxLag;
     44      double[,] matrix = new double[nRows, inputVariablesList.Count * lags.Count() + 1];
    3145
    32       double[,] matrix = new double[rowsList.Count, variablesList.Count];
    33       for (int row = 0; row < rowsList.Count; row++) {
    34         int col = 0;
    35         foreach (string column in variables) {
    36           matrix[row, col] = dataset[column, rowsList[row]];
     46      int col = 0;
     47      int row = 0;
     48      // input variables
     49      foreach (int lag in lags) {
     50        foreach (string column in inputVariablesList) {
     51          var values = dataset.GetDoubleValues(column, rows.Select(x => x - lag).Take(nRows));
     52          row = 0;
     53          foreach (var value in values) {
     54            if (row >= 0) {
     55              matrix[row, col] = value;
     56            }
     57            row++;
     58          }
    3759          col++;
    3860        }
     61      }
     62      // target variable
     63      row = 0;
     64      foreach (var value in dataset.GetDoubleValues(targetVariable, rows).Take(nRows)) {
     65        matrix[row, col] = value;
     66        row++;
    3967      }
    4068      return matrix;

  • branches/GeneralizedQAP/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitClassification.cs

    r6685 r6878  
    7878      int nRows = inputMatrix.GetLength(0);
    7979      int nFeatures = inputMatrix.GetLength(1) - 1;
    80       double[] classValues = dataset.GetVariableValues(targetVariable).Distinct().OrderBy(x => x).ToArray();
     80      double[] classValues = dataset.GetDoubleValues(targetVariable).Distinct().OrderBy(x => x).ToArray();
    8181      int nClasses = classValues.Count();
    8282      // map original class values to values [0..nClasses-1]

  • branches/GeneralizedQAP/HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourClassification.cs

    r6685 r6878  
    9696      int nRows = inputMatrix.GetLength(0);
    9797      int nFeatures = inputMatrix.GetLength(1) - 1;
    98       double[] classValues = dataset.GetVariableValues(targetVariable).Distinct().OrderBy(x => x).ToArray();
     98      double[] classValues = dataset.GetDoubleValues(targetVariable).Distinct().OrderBy(x => x).ToArray();
    9999      int nClasses = classValues.Count();
    100100      // map original class values to values [0..nClasses-1]

  • branches/GeneralizedQAP/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkClassification.cs

    r6685 r6878  
    113113    private NeuralNetworkClassification(NeuralNetworkClassification original, Cloner cloner)
    114114      : base(original, cloner) {
     115      RegisterEventHandlers();
    115116    }
    116117    public NeuralNetworkClassification()
    117118      : base() {
    118       var validHiddenLayerValues = new ItemSet<IntValue>(new IntValue[] { new IntValue(0), new IntValue(1), new IntValue(2) });
     119      var validHiddenLayerValues = new ItemSet<IntValue>(new IntValue[] {
     120        (IntValue)new IntValue(0).AsReadOnly(),
     121        (IntValue)new IntValue(1).AsReadOnly(),
     122        (IntValue)new IntValue(2).AsReadOnly() });
    119123      var selectedHiddenLayerValue = (from v in validHiddenLayerValues
    120124                                      where v.Value == 1
    … …  
    127131      Parameters.Add(new FixedValueParameter<IntValue>(RestartsParameterName, "The number of restarts for learning.", new IntValue(2)));
    128132
     133      RestartsParameter.Hidden = true;
     134      NodesInSecondHiddenLayerParameter.Hidden = true;
     135
     136      RegisterEventHandlers();
     137
    129138      Problem = new ClassificationProblem();
    130139    }
     140
     141    private void RegisterEventHandlers() {
     142      HiddenLayersParameter.Value.ValueChanged += HiddenLayersParameterValueValueChanged;
     143      HiddenLayersParameter.ValueChanged += HiddenLayersParameterValueChanged;
     144    }
     145
    131146    [StorableHook(HookType.AfterDeserialization)]
    132     private void AfterDeserialization() { }
     147    private void AfterDeserialization() {
     148      RegisterEventHandlers();
     149    }
    133150
    134151    public override IDeepCloneable Clone(Cloner cloner) {
    135152      return new NeuralNetworkClassification(this, cloner);
     153    }
     154    private void HiddenLayersParameterValueChanged(object source, EventArgs e) {
     155      HiddenLayersParameter.Value.ValueChanged += HiddenLayersParameterValueValueChanged;
     156      HiddenLayersParameterValueValueChanged(this, EventArgs.Empty);
     157    }
     158
     159    private void HiddenLayersParameterValueValueChanged(object source, EventArgs e) {
     160      if (HiddenLayers == 0) {
     161        NodesInFirstHiddenLayerParameter.Hidden = true;
     162        NodesInSecondHiddenLayerParameter.Hidden = true;
     163      } else if (HiddenLayers == 1) {
     164        NodesInFirstHiddenLayerParameter.Hidden = false;
     165        NodesInSecondHiddenLayerParameter.Hidden = true;
     166      } else {
     167        NodesInFirstHiddenLayerParameter.Hidden = false;
     168        NodesInSecondHiddenLayerParameter.Hidden = false;
     169      }
    136170    }
    137171
    … …  
    158192      int nRows = inputMatrix.GetLength(0);
    159193      int nFeatures = inputMatrix.GetLength(1) - 1;
    160       double[] classValues = dataset.GetVariableValues(targetVariable).Distinct().OrderBy(x => x).ToArray();
     194      double[] classValues = dataset.GetDoubleValues(targetVariable).Distinct().OrderBy(x => x).ToArray();
    161195      int nClasses = classValues.Count();
    162196      // map original class values to values [0..nClasses-1]

  • branches/GeneralizedQAP/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleClassification.cs

    r6685 r6878  
    127127    public NeuralNetworkEnsembleClassification()
    128128      : base() {
    129       var validHiddenLayerValues = new ItemSet<IntValue>(new IntValue[] { new IntValue(0), new IntValue(1), new IntValue(2) });
     129        var validHiddenLayerValues = new ItemSet<IntValue>(new IntValue[] {
     130        (IntValue)new IntValue(0).AsReadOnly(),
     131        (IntValue)new IntValue(1).AsReadOnly(),
     132        (IntValue)new IntValue(2).AsReadOnly() });
    130133      var selectedHiddenLayerValue = (from v in validHiddenLayerValues
    131134                                      where v.Value == 1
    … …  
    139142      Parameters.Add(new FixedValueParameter<IntValue>(RestartsParameterName, "The number of restarts for learning.", new IntValue(2)));
    140143
     144      HiddenLayersParameter.Hidden = true;
     145      NodesInFirstHiddenLayerParameter.Hidden = true;
     146      NodesInSecondHiddenLayerParameter.Hidden = true;
     147      RestartsParameter.Hidden = true;
     148
    141149      Problem = new ClassificationProblem();
    142150    }
    … …  
    170178      int nRows = inputMatrix.GetLength(0);
    171179      int nFeatures = inputMatrix.GetLength(1) - 1;
    172       double[] classValues = dataset.GetVariableValues(targetVariable).Distinct().OrderBy(x => x).ToArray();
     180      double[] classValues = dataset.GetDoubleValues(targetVariable).Distinct().OrderBy(x => x).ToArray();
    173181      int nClasses = classValues.Count();
    174182      // map original class values to values [0..nClasses-1]

  • branches/GeneralizedQAP/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleRegression.cs

    r6685 r6878  
    127127    public NeuralNetworkEnsembleRegression()
    128128      : base() {
    129       var validHiddenLayerValues = new ItemSet<IntValue>(new IntValue[] { new IntValue(0), new IntValue(1), new IntValue(2) });
     129        var validHiddenLayerValues = new ItemSet<IntValue>(new IntValue[] {
     130        (IntValue)new IntValue(0).AsReadOnly(),
     131        (IntValue)new IntValue(1).AsReadOnly(),
     132        (IntValue)new IntValue(2).AsReadOnly() });
    130133      var selectedHiddenLayerValue = (from v in validHiddenLayerValues
    131134                                      where v.Value == 1
    … …  
    138141      Parameters.Add(new FixedValueParameter<IntValue>(NodesInSecondHiddenLayerParameterName, "The number of nodes in the second hidden layer. This value is not used if the number of hidden layers is zero or one.", new IntValue(100)));
    139142      Parameters.Add(new FixedValueParameter<IntValue>(RestartsParameterName, "The number of restarts for learning.", new IntValue(2)));
     143
     144      HiddenLayersParameter.Hidden = true;
     145      NodesInFirstHiddenLayerParameter.Hidden = true;
     146      NodesInSecondHiddenLayerParameter.Hidden = true;
     147      RestartsParameter.Hidden = true;
    140148
    141149      Problem = new RegressionProblem();

  • branches/GeneralizedQAP/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkRegression.cs

    r6685 r6878  
    113113    private NeuralNetworkRegression(NeuralNetworkRegression original, Cloner cloner)
    114114      : base(original, cloner) {
     115      RegisterEventHandlers();
    115116    }
    116117    public NeuralNetworkRegression()
    117118      : base() {
    118       var validHiddenLayerValues = new ItemSet<IntValue>(new IntValue[] { new IntValue(0), new IntValue(1), new IntValue(2) });
     119      var validHiddenLayerValues = new ItemSet<IntValue>(new IntValue[] {
     120        (IntValue)new IntValue(0).AsReadOnly(),
     121        (IntValue)new IntValue(1).AsReadOnly(),
     122        (IntValue)new IntValue(2).AsReadOnly() });
    119123      var selectedHiddenLayerValue = (from v in validHiddenLayerValues
    120124                                      where v.Value == 1
    … …  
    127131      Parameters.Add(new FixedValueParameter<IntValue>(RestartsParameterName, "The number of restarts for learning.", new IntValue(2)));
    128132
     133      RestartsParameter.Hidden = true;
     134      NodesInSecondHiddenLayerParameter.Hidden = true;
     135
     136      RegisterEventHandlers();
     137
    129138      Problem = new RegressionProblem();
    130139    }
     140
     141    private void RegisterEventHandlers() {
     142      HiddenLayersParameter.Value.ValueChanged += HiddenLayersParameterValueValueChanged;
     143      HiddenLayersParameter.ValueChanged += HiddenLayersParameterValueChanged;
     144    }
     145
    131146    [StorableHook(HookType.AfterDeserialization)]
    132     private void AfterDeserialization() { }
     147    private void AfterDeserialization() {
     148      RegisterEventHandlers();
     149    }
    133150
    134151    public override IDeepCloneable Clone(Cloner cloner) {
    135152      return new NeuralNetworkRegression(this, cloner);
    136153    }
     154
     155    private void HiddenLayersParameterValueChanged(object source, EventArgs e) {
     156      HiddenLayersParameter.Value.ValueChanged += HiddenLayersParameterValueValueChanged;
     157      HiddenLayersParameterValueValueChanged(this, EventArgs.Empty);
     158    }
     159
     160    private void HiddenLayersParameterValueValueChanged(object source, EventArgs e) {
     161      if (HiddenLayers == 0) {
     162        NodesInFirstHiddenLayerParameter.Hidden = true;
     163        NodesInSecondHiddenLayerParameter.Hidden = true;
     164      } else if (HiddenLayers == 1) {
     165        NodesInFirstHiddenLayerParameter.Hidden = false;
     166        NodesInSecondHiddenLayerParameter.Hidden = true;
     167      } else {
     168        NodesInFirstHiddenLayerParameter.Hidden = false;
     169        NodesInSecondHiddenLayerParameter.Hidden = false;
     170      }
     171    }
     172
    137173
    138174    #region neural network
    … …  
    155191        throw new NotSupportedException("Neural network regression does not support NaN or infinity values in the input dataset.");
    156192
    157       double targetMin = problemData.Dataset.GetEnumeratedVariableValues(targetVariable).Min();
    158       targetMin = targetMin - targetMin * 0.1; // -10%
    159       double targetMax = problemData.Dataset.GetEnumeratedVariableValues(targetVariable).Max();
    160       targetMax = targetMax + targetMax * 0.1; // + 10%
    161 
    162193      alglib.multilayerperceptron multiLayerPerceptron = null;
    163194      if (nLayers == 0) {
    164         alglib.mlpcreater0(allowedInputVariables.Count(), 1, targetMin, targetMax, out multiLayerPerceptron);
     195        alglib.mlpcreate0(allowedInputVariables.Count(), 1, out multiLayerPerceptron);
    165196      } else if (nLayers == 1) {
    166         alglib.mlpcreater1(allowedInputVariables.Count(), nHiddenNodes1, 1, targetMin, targetMax, out multiLayerPerceptron);
     197        alglib.mlpcreate1(allowedInputVariables.Count(), nHiddenNodes1, 1, out multiLayerPerceptron);
    167198      } else if (nLayers == 2) {
    168         alglib.mlpcreater2(allowedInputVariables.Count(), nHiddenNodes1, nHiddenNodes2, 1, targetMin, targetMax, out multiLayerPerceptron);
     199        alglib.mlpcreate2(allowedInputVariables.Count(), nHiddenNodes1, nHiddenNodes2, 1, out multiLayerPerceptron);
    169200      } else throw new ArgumentException("Number of layers must be zero, one, or two.", "nLayers");
    170201      alglib.mlpreport rep;
    … …  
    177208
    178209      rmsError = alglib.mlprmserror(multiLayerPerceptron, inputMatrix, nRows);
    179       avgRelError = alglib.mlpavgrelerror(multiLayerPerceptron, inputMatrix, nRows);     
     210      avgRelError = alglib.mlpavgrelerror(multiLayerPerceptron, inputMatrix, nRows);
    180211
    181212      return new NeuralNetworkRegressionSolution((IRegressionProblemData)problemData.Clone(), new NeuralNetworkModel(multiLayerPerceptron, targetVariable, allowedInputVariables));

  • branches/GeneralizedQAP/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestClassification.cs

    r6685 r6878  
    108108      int nCols = inputMatrix.GetLength(1);
    109109      int info;
    110       double[] classValues = dataset.GetVariableValues(targetVariable).Distinct().OrderBy(x => x).ToArray();
     110      double[] classValues = dataset.GetDoubleValues(targetVariable).Distinct().OrderBy(x => x).ToArray();
    111111      int nClasses = classValues.Count();
    112112      // map original class values to values [0..nClasses-1]

  • branches/GeneralizedQAP/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorClassification.cs

    r6240 r6878  
    8888      Problem = new ClassificationProblem();
    8989
    90       List<StringValue> svrTypes = (from type in new List<string> { "NU_SVC", "EPSILON_SVC" }
     90      List<StringValue> svrTypes = (from type in new List<string> { "NU_SVC", "C_SVC" }
    9191                                    select new StringValue(type).AsReadOnly())
    9292                                   .ToList();
    … …  
    134134      parameter.Probability = false;
    135135
     136      foreach (double c in problemData.ClassValues) {
     137        double wSum = 0.0;
     138        foreach (double otherClass in problemData.ClassValues) {
     139          if (!c.IsAlmost(otherClass)) {
     140            wSum += problemData.GetClassificationPenalty(c, otherClass);
     141          }
     142        }
     143        parameter.Weights.Add((int)c, wSum);
     144      }
     145
    136146
    137147      SVM.Problem problem = SupportVectorMachineUtil.CreateSvmProblem(dataset, targetVariable, allowedInputVariables, rows);

  • branches/GeneralizedQAP/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorMachineUtil.cs

    r6002 r6878  
    3434    public static SVM.Problem CreateSvmProblem(Dataset dataset, string targetVariable, IEnumerable<string> inputVariables, IEnumerable<int> rowIndices) {
    3535      double[] targetVector =
    36         dataset.GetEnumeratedVariableValues(targetVariable, rowIndices)
    37         .ToArray();
     36        dataset.GetDoubleValues(targetVariable, rowIndices).ToArray();
    3837
    3938      SVM.Node[][] nodes = new SVM.Node[targetVector.Length][];
    … …  
    4645        int colIndex = 1; // make sure the smallest node index for SVM = 1
    4746        foreach (var inputVariable in inputVariablesList) {
    48           double value = dataset[row, dataset.GetVariableIndex(inputVariable)];
     47          double value = dataset.GetDoubleValue(inputVariable, row);
    4948          // SVM also works with missing values
    5049          // => don't add NaN values in the dataset to the sparse SVM matrix representation

  • branches/GeneralizedQAP/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorRegression.cs

    r6240 r6878  
    143143      parameter.Probability = false;
    144144
    145 
    146145      SVM.Problem problem = SupportVectorMachineUtil.CreateSvmProblem(dataset, targetVariable, allowedInputVariables, rows);
    147146      SVM.RangeTransform rangeTransform = SVM.RangeTransform.Compute(problem);

  • branches/GeneralizedQAP/HeuristicLab.Algorithms.DataAnalysis/3.4/kMeans/KMeansClusteringUtil.cs

    r5809 r6878  
    2020#endregion
    2121
     22using System;
    2223using System.Collections.Generic;
    2324using System.Linq;
    2425using HeuristicLab.Problems.DataAnalysis;
    25 using System;
    2626
    2727namespace HeuristicLab.Algorithms.DataAnalysis {
    … …  
    4242          int col = 0;
    4343          foreach (var inputVariable in allowedInputVariables) {
    44             double d = center[col++] - dataset[inputVariable, row];
     44            double d = center[col++] - dataset.GetDoubleValue(inputVariable, row);
    4545            d = d * d; // square;
    4646            centerDistance += d;
    … …  
    7373        double[] p = new double[allowedInputVariables.Count];
    7474        for (int i = 0; i < nCols; i++) {
    75           p[i] = dataset[allowedInputVariables[i], row];
     75          p[i] = dataset.GetDoubleValue(allowedInputVariables[i], row);
    7676        }
    7777        clusterPoints[clusterValues[clusterValueIndex++]].Add(p);
Note: See TracChangeset for help on using the changeset viewer.