Free cookie consent management tool by TermsFeed Policy Generator

Changeset 651 for branches


Ignore:
Timestamp:
10/12/08 21:54:18 (16 years ago)
Author:
gkronber
Message:
  • moved !GPEvaluatorBase to directory Evaluators
  • fixed installation
  • fixed generations of AssemblyInfos from templates with subwcrev
  • fixed plugin dependencies

(ticket #177)

Location:
branches/GpPluginsRefactoringBranch
Files:
5 added
5 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • branches/GpPluginsRefactoringBranch/HeuristicLab.GP.SantaFe/HeuristicLabGPSantaFePlugin.cs

    r641 r651  
    2828  [ClassInfo(Name = "HeuristicLab.GP.SantaFe-3.2")]
    2929  [PluginFile(Filename = "HeuristicLab.GP.SantaFe-3.2.dll", Filetype = PluginFileType.Assembly)]
     30  [Dependency(Dependency = "HeuristicLab.GP-3.2")]
    3031  [Dependency(Dependency = "HeuristicLab.Core-3.2")]
    3132  [Dependency(Dependency = "HeuristicLab.Data-3.2")]

  • branches/GpPluginsRefactoringBranch/HeuristicLab.GP.StructureIdentification.Classification/HeuristicLab.GP.StructureIdentification.Classification.csproj

    r646 r651  
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
    1111    <RootNamespace>HeuristicLab.GP.Classification</RootNamespace>
    12     <AssemblyName>HeuristicLab.GP.Classification</AssemblyName>
     12    <AssemblyName>HeuristicLab.GP.StructureIdentification.Classification-3.2</AssemblyName>
    1313    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    … …  
    109109  <ItemGroup>
    110110    <None Include="HeuristicLab.snk" />
     111    <None Include="Properties\AssemblyInfo.frame" />
    111112  </ItemGroup>
    112113  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    … …  
    118119  </Target>
    119120  -->
     121  <PropertyGroup>
     122    <PreBuildEvent>cmd /c ""$(SolutionDir)PreBuildEvent.cmd" "$(ProjectDir).""</PreBuildEvent>
     123  </PropertyGroup>
    120124</Project>

  • branches/GpPluginsRefactoringBranch/HeuristicLab.GP.StructureIdentification.Classification/HeuristicLabGPClassificationPlugin.cs

    r646 r651  
    2626
    2727namespace HeuristicLab.GP.Classification {
    28   [ClassInfo(Name = "HeuristicLab.GP.Classification-3.2")]
    29   [PluginFile(Filename = "HeuristicLab.GP.Classification-3.2.dll", Filetype = PluginFileType.Assembly)]
     28  [ClassInfo(Name = "HeuristicLab.GP.StructureIdentification.Classification-3.2")]
     29  [PluginFile(Filename = "HeuristicLab.GP.StructureIdentification.Classification-3.2.dll", Filetype = PluginFileType.Assembly)]
    3030  [Dependency(Dependency = "HeuristicLab.Constraints-3.2")]
    3131  [Dependency(Dependency = "HeuristicLab.Core-3.2")]
    3232  [Dependency(Dependency = "HeuristicLab.Data-3.2")]
    3333  [Dependency(Dependency = "HeuristicLab.DataAnalysis-3.2")]
     34  [Dependency(Dependency = "HeuristicLab.GP-3.2")]
     35  [Dependency(Dependency = "HeuristicLab.GP.StructureIdentification-3.2")]
    3436  [Dependency(Dependency = "HeuristicLab.Operators-3.2")]
    3537  [Dependency(Dependency = "HeuristicLab.Random-3.2")]

  • branches/GpPluginsRefactoringBranch/HeuristicLab.GP.StructureIdentification.TimeSeries/FunctionLibraryInjector.cs

    r645 r651  
    4040
    4141    public override string Description {
    42       get { return @"Injects a default function library."; }
     42      get { return @"Injects a default function library for time series modeling."; }
    4343    }
    4444

  • branches/GpPluginsRefactoringBranch/HeuristicLab.GP.StructureIdentification.TimeSeries/HeuristicLab.GP.StructureIdentification.TimeSeries.csproj

    r646 r651  
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
    1111    <RootNamespace>HeuristicLab.GP.TimeSeries</RootNamespace>
    12     <AssemblyName>HeuristicLab.GP.TimeSeries</AssemblyName>
     12    <AssemblyName>HeuristicLab.GP.StructureIdentification.TimeSeries-3.2</AssemblyName>
    1313    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    … …  
    105105  <ItemGroup>
    106106    <None Include="HeuristicLab.snk" />
     107    <None Include="Properties\AssemblyInfo.frame" />
    107108  </ItemGroup>
    108109  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    … …  
    114115  </Target>
    115116  -->
     117  <PropertyGroup>
     118    <PreBuildEvent>cmd /c ""$(SolutionDir)PreBuildEvent.cmd" "$(ProjectDir).""</PreBuildEvent>
     119  </PropertyGroup>
    116120</Project>

  • branches/GpPluginsRefactoringBranch/HeuristicLab.GP.StructureIdentification.TimeSeries/HeuristicLabGPTimeSeriesPlugin.cs

    r645 r651  
    2626
    2727namespace HeuristicLab.GP.TimeSeries {
    28   [ClassInfo(Name = "HeuristicLab.GP.TimeSeries-3.2")]
    29   [PluginFile(Filename = "HeuristicLab.GP.TimeSeries-3.2.dll", Filetype = PluginFileType.Assembly)]
     28  [ClassInfo(Name = "HeuristicLab.GP.StructureIdentification.TimeSeries-3.2")]
     29  [PluginFile(Filename = "HeuristicLab.GP.StructureIdentification.TimeSeries-3.2.dll", Filetype = PluginFileType.Assembly)]
    3030  [Dependency(Dependency = "HeuristicLab.Constraints-3.2")]
    3131  [Dependency(Dependency = "HeuristicLab.Core-3.2")]
    3232  [Dependency(Dependency = "HeuristicLab.Data-3.2")]
    3333  [Dependency(Dependency = "HeuristicLab.DataAnalysis-3.2")]
     34  [Dependency(Dependency = "HeuristicLab.GP-3.2")]
    3435  [Dependency(Dependency = "HeuristicLab.GP.StructureIdentification-3.2")]
    3536  public class HeuristicLabGPTimeSeriesPlugin : PluginBase {

  • branches/GpPluginsRefactoringBranch/HeuristicLab.GP.StructureIdentification/HeuristicLab.GP.StructureIdentification.csproj

    r645 r651  
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
    1111    <RootNamespace>HeuristicLab.GP.StructureIdentification</RootNamespace>
    12     <AssemblyName>HeuristicLab.GP.StructureIdentification</AssemblyName>
     12    <AssemblyName>HeuristicLab.GP.StructureIdentification-3.2</AssemblyName>
    1313    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    … …  
    3232    <ErrorReport>prompt</ErrorReport>
    3333    <WarningLevel>4</WarningLevel>
     34  </PropertyGroup>
     35  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     36    <DebugSymbols>true</DebugSymbols>
     37    <OutputPath>bin\x86\Debug\</OutputPath>
     38    <DefineConstants>DEBUG;TRACE</DefineConstants>
     39    <DebugType>full</DebugType>
     40    <PlatformTarget>x86</PlatformTarget>
     41    <ErrorReport>prompt</ErrorReport>
     42  </PropertyGroup>
     43  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     44    <OutputPath>bin\x86\Release\</OutputPath>
     45    <DefineConstants>TRACE</DefineConstants>
     46    <Optimize>true</Optimize>
     47    <DebugType>pdbonly</DebugType>
     48    <PlatformTarget>x86</PlatformTarget>
     49    <ErrorReport>prompt</ErrorReport>
    3450  </PropertyGroup>
    3551  <ItemGroup>
    … …  
    6177    <Compile Include="Evaluators\CoefficientOfDeterminationEvaluator.cs" />
    6278    <Compile Include="Evaluators\EarlyStoppingMeanSquaredErrorEvaluator.cs" />
     79    <Compile Include="Evaluators\GPEvaluatorBase.cs" />
    6380    <Compile Include="Evaluators\MeanAbsolutePercentageErrorEvaluator.cs" />
    6481    <Compile Include="Evaluators\MeanSquaredErrorEvaluator.cs" />
    … …  
    6683    <Compile Include="Evaluators\VarianceAccountedForEvaluator.cs" />
    6784    <Compile Include="Exponential.cs" />
    68     <Compile Include="GPEvaluatorBase.cs" />
    6985    <Compile Include="GreaterThan.cs" />
    7086    <Compile Include="HeuristicLabGPStructureIdentificationPlugin.cs" />
    … …  
    137153  <ItemGroup>
    138154    <None Include="HeuristicLab.snk" />
     155    <None Include="Properties\AssemblyInfo.frame" />
    139156  </ItemGroup>
    140157  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    … …  
    146163  </Target>
    147164  -->
     165  <PropertyGroup>
     166    <PreBuildEvent>cmd /c ""$(SolutionDir)PreBuildEvent.cmd" "$(ProjectDir).""</PreBuildEvent>
     167  </PropertyGroup>
    148168</Project>

  • branches/GpPluginsRefactoringBranch/HeuristicLab.GP.StructureIdentification/HeuristicLabGPStructureIdentificationPlugin.cs

    r645 r651  
    3232  [Dependency(Dependency = "HeuristicLab.Data-3.2")]
    3333  [Dependency(Dependency = "HeuristicLab.DataAnalysis-3.2")]
     34  [Dependency(Dependency = "HeuristicLab.GP-3.2")]
    3435  [Dependency(Dependency = "HeuristicLab.Operators-3.2")]
    3536  [Dependency(Dependency = "HeuristicLab.Random-3.2")]

  • branches/GpPluginsRefactoringBranch/HeuristicLab.GP/HeuristicLab.GP.csproj

    r645 r651  
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
    1111    <RootNamespace>HeuristicLab.GP</RootNamespace>
    12     <AssemblyName>HeuristicLab.GP</AssemblyName>
     12    <AssemblyName>HeuristicLab.GP-3.2</AssemblyName>
    1313    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    … …  
    3232    <ErrorReport>prompt</ErrorReport>
    3333    <WarningLevel>4</WarningLevel>
     34  </PropertyGroup>
     35  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     36    <DebugSymbols>true</DebugSymbols>
     37    <OutputPath>bin\x86\Debug\</OutputPath>
     38    <DefineConstants>DEBUG;TRACE</DefineConstants>
     39    <DebugType>full</DebugType>
     40    <PlatformTarget>x86</PlatformTarget>
     41    <ErrorReport>prompt</ErrorReport>
     42  </PropertyGroup>
     43  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     44    <OutputPath>bin\x86\Release\</OutputPath>
     45    <DefineConstants>TRACE</DefineConstants>
     46    <Optimize>true</Optimize>
     47    <DebugType>pdbonly</DebugType>
     48    <PlatformTarget>x86</PlatformTarget>
     49    <ErrorReport>prompt</ErrorReport>
    3450  </PropertyGroup>
    3551  <ItemGroup>
    … …  
    129145  <ItemGroup>
    130146    <None Include="HeuristicLab.snk" />
     147    <None Include="Properties\AssemblyInfo.frame" />
    131148  </ItemGroup>
    132149  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    … …  
    138155  </Target>
    139156  -->
     157  <PropertyGroup>
     158    <PreBuildEvent>cmd /c ""$(SolutionDir)PreBuildEvent.cmd" "$(ProjectDir).""</PreBuildEvent>
     159  </PropertyGroup>
    140160</Project>

  • branches/GpPluginsRefactoringBranch/HeuristicLab.GP/HeuristicLabGPPlugin.cs

    r645 r651  
    3333  [Dependency(Dependency = "HeuristicLab.Operators-3.2")]
    3434  [Dependency(Dependency = "HeuristicLab.Random-3.2")]
    35   [Dependency(Dependency = "HeuristicLab.Selection-3.2)")]
     35  [Dependency(Dependency = "HeuristicLab.Selection-3.2")]
    3636  public class HeuristicLabGPPlugin : PluginBase {
    3737  }

  • branches/GpPluginsRefactoringBranch/HeuristicLab.sln

    r645 r651  
    102102Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.GP.StructureIdentification", "HeuristicLab.GP.StructureIdentification\HeuristicLab.GP.StructureIdentification.csproj", "{74223A32-C726-4978-BE78-37113A18373C}"
    103103EndProject
    104 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.GP.StructureIdentification.Classification", "HeuristicLab.GP.Classification\HeuristicLab.GP.StructureIdentification.Classification.csproj", "{7C20D100-8BEB-433A-9499-F075E2CB9297}"
    105 EndProject
    106 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.GP.StructureIdentification.TimeSeries", "HeuristicLab.GP.TimeSeries\HeuristicLab.GP.StructureIdentification.TimeSeries.csproj", "{6084CFB5-733F-449D-9F92-2E40D13F0514}"
     104Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.GP.StructureIdentification.Classification", "HeuristicLab.GP.StructureIdentification.Classification\HeuristicLab.GP.StructureIdentification.Classification.csproj", "{7C20D100-8BEB-433A-9499-F075E2CB9297}"
     105EndProject
     106Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.GP.StructureIdentification.TimeSeries", "HeuristicLab.GP.StructureIdentification.TimeSeries\HeuristicLab.GP.StructureIdentification.TimeSeries.csproj", "{6084CFB5-733F-449D-9F92-2E40D13F0514}"
    107107EndProject
    108108Global
    … …  
    461461    {1F1CF3ED-374C-4288-995B-93F6B872F571}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    462462    {1F1CF3ED-374C-4288-995B-93F6B872F571}.Debug|Any CPU.Build.0 = Debug|Any CPU
    463     {1F1CF3ED-374C-4288-995B-93F6B872F571}.Debug|x86.ActiveCfg = Debug|Any CPU
     463    {1F1CF3ED-374C-4288-995B-93F6B872F571}.Debug|x86.ActiveCfg = Debug|x86
     464    {1F1CF3ED-374C-4288-995B-93F6B872F571}.Debug|x86.Build.0 = Debug|x86
    464465    {1F1CF3ED-374C-4288-995B-93F6B872F571}.Release|Any CPU.ActiveCfg = Release|Any CPU
    465466    {1F1CF3ED-374C-4288-995B-93F6B872F571}.Release|Any CPU.Build.0 = Release|Any CPU
    … …  
    467468    {74223A32-C726-4978-BE78-37113A18373C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    468469    {74223A32-C726-4978-BE78-37113A18373C}.Debug|Any CPU.Build.0 = Debug|Any CPU
    469     {74223A32-C726-4978-BE78-37113A18373C}.Debug|x86.ActiveCfg = Debug|Any CPU
     470    {74223A32-C726-4978-BE78-37113A18373C}.Debug|x86.ActiveCfg = Debug|x86
     471    {74223A32-C726-4978-BE78-37113A18373C}.Debug|x86.Build.0 = Debug|x86
    470472    {74223A32-C726-4978-BE78-37113A18373C}.Release|Any CPU.ActiveCfg = Release|Any CPU
    471473    {74223A32-C726-4978-BE78-37113A18373C}.Release|Any CPU.Build.0 = Release|Any CPU
    … …  
    473475    {7C20D100-8BEB-433A-9499-F075E2CB9297}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    474476    {7C20D100-8BEB-433A-9499-F075E2CB9297}.Debug|Any CPU.Build.0 = Debug|Any CPU
    475     {7C20D100-8BEB-433A-9499-F075E2CB9297}.Debug|x86.ActiveCfg = Debug|Any CPU
     477    {7C20D100-8BEB-433A-9499-F075E2CB9297}.Debug|x86.ActiveCfg = Debug|x86
     478    {7C20D100-8BEB-433A-9499-F075E2CB9297}.Debug|x86.Build.0 = Debug|x86
    476479    {7C20D100-8BEB-433A-9499-F075E2CB9297}.Release|Any CPU.ActiveCfg = Release|Any CPU
    477480    {7C20D100-8BEB-433A-9499-F075E2CB9297}.Release|Any CPU.Build.0 = Release|Any CPU
    478     {7C20D100-8BEB-433A-9499-F075E2CB9297}.Release|x86.ActiveCfg = Release|Any CPU
     481    {7C20D100-8BEB-433A-9499-F075E2CB9297}.Release|x86.ActiveCfg = Release|x86
     482    {7C20D100-8BEB-433A-9499-F075E2CB9297}.Release|x86.Build.0 = Release|x86
    479483    {6084CFB5-733F-449D-9F92-2E40D13F0514}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    480484    {6084CFB5-733F-449D-9F92-2E40D13F0514}.Debug|Any CPU.Build.0 = Debug|Any CPU
    481     {6084CFB5-733F-449D-9F92-2E40D13F0514}.Debug|x86.ActiveCfg = Debug|Any CPU
     485    {6084CFB5-733F-449D-9F92-2E40D13F0514}.Debug|x86.ActiveCfg = Debug|x86
     486    {6084CFB5-733F-449D-9F92-2E40D13F0514}.Debug|x86.Build.0 = Debug|x86
    482487    {6084CFB5-733F-449D-9F92-2E40D13F0514}.Release|Any CPU.ActiveCfg = Release|Any CPU
    483488    {6084CFB5-733F-449D-9F92-2E40D13F0514}.Release|Any CPU.Build.0 = Release|Any CPU
    484     {6084CFB5-733F-449D-9F92-2E40D13F0514}.Release|x86.ActiveCfg = Release|Any CPU
     489    {6084CFB5-733F-449D-9F92-2E40D13F0514}.Release|x86.ActiveCfg = Release|x86
     490    {6084CFB5-733F-449D-9F92-2E40D13F0514}.Release|x86.Build.0 = Release|x86
    485491  EndGlobalSection
    486492  GlobalSection(SolutionProperties) = preSolution

  • branches/GpPluginsRefactoringBranch/HeuristicLab/CopyAssemblies.cmd

    r641 r651  
    2828copy %1\HeuristicLab.DistributedEngine\%2\HeuristicLab.DistributedEngine-3.2.dll .\plugins
    2929copy %1\HeuristicLab.Evolutionary\%2\HeuristicLab.Evolutionary-3.2.dll .\plugins
    30 copy %1\HeuristicLab.Functions\%2\HeuristicLab.Functions-3.2.dll .\plugins
     30copy %1\HeuristicLab.GP\%2\HeuristicLab.GP-3.2.dll .\plugins
    3131copy %1\HeuristicLab.GP.SantaFe\%2\HeuristicLab.GP.SantaFe-3.2.dll .\plugins
     32copy %1\HeuristicLab.GP.StructureIdentification\%2\HeuristicLab.GP.StructureIdentification-3.2.dll .\plugins
     33copy %1\HeuristicLab.GP.StructureIdentification.Classification\%2\HeuristicLab.GP.StructureIdentification.Classification-3.2.dll .\plugins
     34copy %1\HeuristicLab.GP.StructureIdentification.TimeSeries\%2\HeuristicLab.GP.StructureIdentification.TimeSeries-3.2.dll .\plugins
    3235copy %1\HeuristicLab.Grid\%2\HeuristicLab.Grid-3.2.dll .\plugins
    3336copy %1\HeuristicLab.Logging\%2\HeuristicLab.Logging-3.2.dll .\plugins
    … …  
    5154copy %1\HeuristicLab.SQLite\"SQLite License.txt" .\plugins
    5255copy %1\HeuristicLab.SQLite\SQLite.NET.chm .\plugins
    53 copy %1\HeuristicLab.StructureIdentification\%2\HeuristicLab.StructureIdentification-3.2.dll .\plugins
    5456copy %1\HeuristicLab.TestFunctions\%2\HeuristicLab.TestFunctions-3.2.dll .\plugins
    5557copy %1\HeuristicLab.ThreadParallelEngine\%2\HeuristicLab.ThreadParallelEngine-3.2.dll .\plugins
Note: See TracChangeset for help on using the changeset viewer.