Changeset 8642


Ignore:
Timestamp:
09/13/12 13:13:00 (10 years ago)
Author:
jkarder
Message:

#1247: integrated branch into trunk

Location:
trunk/sources
Files:
1 deleted
4 edited
2 copied

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab 3.3.sln

    r8598 r8642  
    347347EndProject
    348348Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.DataAnalysis.Views-3.3", "HeuristicLab.Problems.Instances.DataAnalysis.Views\3.3\HeuristicLab.Problems.Instances.DataAnalysis.Views-3.3.csproj", "{72232235-B6CF-4E6C-B086-9E9E11AA0717}"
     349EndProject
     350Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.RAPGA-3.3", "HeuristicLab.Algorithms.RAPGA\3.3\HeuristicLab.Algorithms.RAPGA-3.3.csproj", "{B03C4E41-1D01-4C60-B0F4-DBB257D98CA8}"
    349351EndProject
    350352Global
     
    16981700    {72232235-B6CF-4E6C-B086-9E9E11AA0717}.Release|x64.ActiveCfg = Release|Any CPU
    16991701    {72232235-B6CF-4E6C-B086-9E9E11AA0717}.Release|x86.ActiveCfg = Release|Any CPU
     1702    {B03C4E41-1D01-4C60-B0F4-DBB257D98CA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1703    {B03C4E41-1D01-4C60-B0F4-DBB257D98CA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1704    {B03C4E41-1D01-4C60-B0F4-DBB257D98CA8}.Debug|x64.ActiveCfg = Debug|Any CPU
     1705    {B03C4E41-1D01-4C60-B0F4-DBB257D98CA8}.Debug|x86.ActiveCfg = Debug|Any CPU
     1706    {B03C4E41-1D01-4C60-B0F4-DBB257D98CA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1707    {B03C4E41-1D01-4C60-B0F4-DBB257D98CA8}.Release|Any CPU.Build.0 = Release|Any CPU
     1708    {B03C4E41-1D01-4C60-B0F4-DBB257D98CA8}.Release|x64.ActiveCfg = Release|Any CPU
     1709    {B03C4E41-1D01-4C60-B0F4-DBB257D98CA8}.Release|x86.ActiveCfg = Release|Any CPU
    17001710  EndGlobalSection
    17011711  GlobalSection(SolutionProperties) = preSolution
  • trunk/sources/HeuristicLab.Algorithms.RAPGA/3.3/HeuristicLab.Algorithms.RAPGA-3.3.csproj

    r8631 r8642  
    1313    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
     15    <SignAssembly>true</SignAssembly>
     16    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    1517  </PropertyGroup>
    1618  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    1820    <DebugType>full</DebugType>
    1921    <Optimize>false</Optimize>
    20     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     22    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2123    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2224    <ErrorReport>prompt</ErrorReport>
     
    2729    <DebugType>pdbonly</DebugType>
    2830    <Optimize>true</Optimize>
    29     <OutputPath>bin\Release\</OutputPath>
     31    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    3032    <DefineConstants>TRACE</DefineConstants>
    3133    <ErrorReport>prompt</ErrorReport>
    3234    <WarningLevel>4</WarningLevel>
     35    <DocumentationFile>
     36    </DocumentationFile>
     37    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    3338  </PropertyGroup>
    34   <PropertyGroup>
    35     <SignAssembly>true</SignAssembly>
     39  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     40    <DebugSymbols>true</DebugSymbols>
     41    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     42    <DefineConstants>DEBUG;TRACE</DefineConstants>
     43    <DebugType>full</DebugType>
     44    <PlatformTarget>x86</PlatformTarget>
     45    <ErrorReport>prompt</ErrorReport>
     46    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    3647  </PropertyGroup>
    37   <PropertyGroup>
    38     <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
     48  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     49    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     50    <DefineConstants>TRACE</DefineConstants>
     51    <DocumentationFile>
     52    </DocumentationFile>
     53    <Optimize>true</Optimize>
     54    <DebugType>pdbonly</DebugType>
     55    <PlatformTarget>x86</PlatformTarget>
     56    <ErrorReport>prompt</ErrorReport>
     57    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     58  </PropertyGroup>
     59  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     60    <DebugSymbols>true</DebugSymbols>
     61    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     62    <DefineConstants>DEBUG;TRACE</DefineConstants>
     63    <DebugType>full</DebugType>
     64    <PlatformTarget>x64</PlatformTarget>
     65    <ErrorReport>prompt</ErrorReport>
     66    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     67  </PropertyGroup>
     68  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     69    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     70    <DefineConstants>TRACE</DefineConstants>
     71    <DocumentationFile>
     72    </DocumentationFile>
     73    <Optimize>true</Optimize>
     74    <DebugType>pdbonly</DebugType>
     75    <PlatformTarget>x64</PlatformTarget>
     76    <ErrorReport>prompt</ErrorReport>
     77    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    3978  </PropertyGroup>
    4079  <ItemGroup>
    41     <Reference Include="HeuristicLab.Analysis-3.3">
    42       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
    43       <Private>False</Private>
    44     </Reference>
    45     <Reference Include="HeuristicLab.Collections-3.3">
    46       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    47       <Private>False</Private>
    48     </Reference>
    49     <Reference Include="HeuristicLab.Common-3.3">
    50       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    51       <Private>False</Private>
    52     </Reference>
    53     <Reference Include="HeuristicLab.Core-3.3">
    54       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    55       <Private>False</Private>
    56     </Reference>
    57     <Reference Include="HeuristicLab.Data-3.3">
    58       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    59       <Private>False</Private>
    60     </Reference>
    61     <Reference Include="HeuristicLab.Operators-3.3">
    62       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
    63       <Private>False</Private>
    64     </Reference>
    65     <Reference Include="HeuristicLab.Optimization-3.3">
    66       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    67       <Private>False</Private>
    68     </Reference>
    69     <Reference Include="HeuristicLab.Optimization.Operators-3.3">
    70       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
    71       <Private>False</Private>
    72     </Reference>
    73     <Reference Include="HeuristicLab.Parameters-3.3">
    74       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    75       <Private>False</Private>
    76     </Reference>
    77     <Reference Include="HeuristicLab.Persistence-3.3">
    78       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
    79       <Private>False</Private>
    80     </Reference>
    81     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    82       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    83       <Private>False</Private>
    84     </Reference>
    85     <Reference Include="HeuristicLab.Random-3.3">
    86       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
    87       <Private>False</Private>
    88     </Reference>
    89     <Reference Include="HeuristicLab.Selection-3.3">
    90       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Selection-3.3.dll</HintPath>
    91       <Private>False</Private>
    92     </Reference>
    9380    <Reference Include="System" />
    9481    <Reference Include="System.Core" />
     
    10087    <Compile Include="Analyzers\OffspringSuccessAnalyzer.cs" />
    10188    <Compile Include="Analyzers\PopulationSizeAnalyzer.cs" />
    102     <Compile Include="Calculator.cs" />
    10389    <Compile Include="DuplicatesSelector.cs" />
    10490    <Compile Include="ProgressiveOffspringPreserver.cs" />
     
    10692    <Compile Include="RAPGA.cs" />
    10793    <Compile Include="RAPGAMainLoop.cs" />
    108     <None Include="Properties\AssemblyInfo.cs.frame" />
    109     <None Include="Plugin.cs.frame" />
    11094    <Compile Include="Plugin.cs" />
    11195    <Compile Include="Properties\AssemblyInfo.cs" />
     
    11397  <ItemGroup>
    11498    <None Include="HeuristicLab.snk" />
     99    <None Include="Plugin.cs.frame" />
     100    <None Include="Properties\AssemblyInfo.cs.frame" />
    115101  </ItemGroup>
    116   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     102  <ItemGroup>
     103    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     104      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
     105      <Name>HeuristicLab.Analysis-3.3</Name>
     106      <Private>False</Private>
     107    </ProjectReference>
     108    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     109      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     110      <Name>HeuristicLab.Collections-3.3</Name>
     111      <Private>False</Private>
     112    </ProjectReference>
     113    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     114      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     115      <Name>HeuristicLab.Common-3.3</Name>
     116      <Private>False</Private>
     117    </ProjectReference>
     118    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     119      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     120      <Name>HeuristicLab.Core-3.3</Name>
     121      <Private>False</Private>
     122    </ProjectReference>
     123    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     124      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     125      <Name>HeuristicLab.Data-3.3</Name>
     126      <Private>False</Private>
     127    </ProjectReference>
     128    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     129      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
     130      <Name>HeuristicLab.Operators-3.3</Name>
     131      <Private>False</Private>
     132    </ProjectReference>
     133    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
     134      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
     135      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     136      <Private>False</Private>
     137    </ProjectReference>
     138    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     139      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     140      <Name>HeuristicLab.Optimization-3.3</Name>
     141      <Private>False</Private>
     142    </ProjectReference>
     143    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     144      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     145      <Name>HeuristicLab.Parameters-3.3</Name>
     146      <Private>False</Private>
     147    </ProjectReference>
     148    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     149      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     150      <Name>HeuristicLab.Persistence-3.3</Name>
     151      <Private>False</Private>
     152    </ProjectReference>
     153    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     154      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     155      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     156      <Private>False</Private>
     157    </ProjectReference>
     158    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
     159      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
     160      <Name>HeuristicLab.Random-3.3</Name>
     161      <Private>False</Private>
     162    </ProjectReference>
     163    <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj">
     164      <Project>{2C36CD4F-E5F5-43A4-801A-201EA895FE17}</Project>
     165      <Name>HeuristicLab.Selection-3.3</Name>
     166      <Private>False</Private>
     167    </ProjectReference>
     168  </ItemGroup>
     169  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
     170  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
     171       Other similar extension points exist, see Microsoft.Common.targets.
     172  <Target Name="BeforeBuild">
     173  </Target>
     174  <Target Name="AfterBuild">
     175  </Target>
     176  -->
    117177  <PropertyGroup>
    118     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     178   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    119179set ProjectDir=$(ProjectDir)
    120180set SolutionDir=$(SolutionDir)
     
    123183call PreBuildEvent.cmd
    124184</PreBuildEvent>
     185<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     186export ProjectDir=$(ProjectDir)
     187export SolutionDir=$(SolutionDir)
     188
     189$SolutionDir/PreBuildEvent.sh
     190</PreBuildEvent>
    125191  </PropertyGroup>
    126   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    127        Other similar extension points exist, see Microsoft.Common.targets.
    128   <Target Name="BeforeBuild">
    129   </Target>
    130   <Target Name="AfterBuild">
    131   </Target>
    132   -->
    133192</Project>
  • trunk/sources/HeuristicLab.Algorithms.RAPGA/3.3/RAPGAMainLoop.cs

    r8622 r8642  
    166166      ProgressiveOffspringPreserver progressiveOffspringSelector = new ProgressiveOffspringPreserver();
    167167      SubScopesCounter subScopesCounter2 = new SubScopesCounter();
    168       Calculator calculator1 = new Calculator();
     168      ExpressionCalculator calculator1 = new ExpressionCalculator();
    169169      ConditionalBranch conditionalBranch1 = new ConditionalBranch();
    170170      Comparator comparator1 = new Comparator();
     
    179179      IntCounter intCounter3 = new IntCounter();
    180180      SubScopesCounter subScopesCounter3 = new SubScopesCounter();
    181       Calculator calculator2 = new Calculator();
     181      ExpressionCalculator calculator2 = new ExpressionCalculator();
    182182      Comparator comparator2 = new Comparator();
    183183      ConditionalBranch conditionalBranch3 = new ConditionalBranch();
  • trunk/sources/HeuristicLab.Optimization.Operators/3.3/ExpressionCalculator.cs

    r8640 r8642  
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2929
    30 namespace HeuristicLab.Algorithms.RAPGA {
     30namespace HeuristicLab.Optimization.Operators {
    3131  /// <summary>
    3232  /// An operator that evaluates an expression.
    3333  /// </summary>
    34   [Item("Calculator", "An operator that evaluates an expression.")]
     34  [Item("ExpressionCalculator", "An operator that evaluates an expression.")]
    3535  [StorableClass]
    36   public class Calculator : ValuesCollector {
     36  public class ExpressionCalculator : ValuesCollector {
    3737    [Storable]
    38     public Optimization.Calculator Calc { get; set; }
     38    public Calculator Calculator { get; set; }
    3939
    4040    #region Parameter Properties
     
    5757
    5858    [StorableConstructor]
    59     protected Calculator(bool deserializing) : base(deserializing) { }
    60     protected Calculator(Calculator original, Cloner cloner)
     59    protected ExpressionCalculator(bool deserializing) : base(deserializing) { }
     60    protected ExpressionCalculator(ExpressionCalculator original, Cloner cloner)
    6161      : base(original, cloner) {
    62       this.Calc = cloner.Clone(original.Calc);
     62      this.Calculator = cloner.Clone(original.Calculator);
    6363    }
    64     public Calculator()
     64    public ExpressionCalculator()
    6565      : base() {
    6666      Parameters.Add(new ValueLookupParameter<IItem>("ExpressionResult", "The result of the evaluated expression."));
     
    7575  unquoted or in double quotes if they contain special characters or whitespace
    7676mathematical functions:
    77   +, -, /, ^ (power), log
     77  +, -, *, /, ^ (power), log
    7878predicates:
    7979  ==, <, >, isnull, not
     
    8989If the final value is null, the result variable is removed if it exists."));
    9090
    91       Calc = new Optimization.Calculator();
     91      Calculator = new Calculator();
    9292    }
    9393
    9494    public override IDeepCloneable Clone(Cloner cloner) {
    95       return new Calculator(this, cloner);
     95      return new ExpressionCalculator(this, cloner);
    9696    }
    9797
    9898    public override IOperation Apply() {
    99       Calc.Formula = Formula;
     99      Calculator.Formula = Formula;
    100100      var variables = new Dictionary<string, IItem>();
    101101      foreach (var collectedValue in CollectedValues)
    102102        variables[collectedValue.Name] = collectedValue.ActualValue;
    103       ExpressionResult = Calc.GetValue(variables);
     103      ExpressionResult = Calculator.GetValue(variables);
    104104      return base.Apply();
    105105    }
  • trunk/sources/HeuristicLab.Optimization.Operators/3.3/HeuristicLab.Optimization.Operators-3.3.csproj

    r8630 r8642  
    109109  </ItemGroup>
    110110  <ItemGroup>
     111    <Compile Include="ExpressionCalculator.cs" />
    111112    <Compile Include="NoSimilarityCalculator.cs" />
    112113    <Compile Include="QualitySimilarityCalculator.cs" />
Note: See TracChangeset for help on using the changeset viewer.