Changeset 14193


Ignore:
Timestamp:
07/23/16 01:37:30 (10 months ago)
Author:
jkarder
Message:

#2526: merged r13499, r13509 and r13644 into stable

Location:
stable
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Clients.Hive.Slave.App/3.3/HeuristicLab.Clients.Hive.Slave.App-3.3.csproj

    r11920 r14193  
    173173  </PropertyGroup>
    174174  <PropertyGroup>
    175     <PostBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    176 set ProjectDir=$(ProjectDir)
    177 set SolutionDir=$(SolutionDir)
    178 set Outdir=$(Outdir)
    179 set Platform=$(PlatformName)
    180 set Configuration=$(ConfigurationName)
    181 
    182 call "$(SolutionDir)MergeConfigs.cmd"</PostBuildEvent>
     175    <PostBuildEvent>
     176    </PostBuildEvent>
    183177  </PropertyGroup>
    184178  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • stable/HeuristicLab.Clients.Hive.Slave/3.3/HeuristicLab.Clients.Hive.Slave-3.3.csproj

    r11932 r14193  
    185185  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    186186  <PropertyGroup>
    187     <PostBuildEvent>
    188     </PostBuildEvent>
     187    <PostBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     188set ProjectDir=$(ProjectDir)
     189set SolutionDir=$(SolutionDir)
     190set Outdir=$(Outdir)
     191set Platform=$(PlatformName)
     192set Configuration=$(ConfigurationName)
     193set TargetDir=$(ProjectDir)
     194
     195call "$(SolutionDir)MergeConfigs.cmd"</PostBuildEvent>
    189196  </PropertyGroup>
    190197  <PropertyGroup>
  • stable/HeuristicLab.Problems.Instances.DataAnalysis

  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Vladislavleva/KotanchekFunction.cs

    r14186 r14193  
    2828  public class KotanchekFunction : ArtificialRegressionDataDescriptor {
    2929
    30     public override string Name { get { return "Vladislavleva-1 F1(X1,X2) = exp(-(X1 - 1))² / (1.2 + (X2 -2.5)²"; } }
     30    public override string Name { get { return "Vladislavleva-1 F1(X1,X2) = exp(- (X1 - 1)²) / (1.2 + (X2 - 2.5)²)"; } }
    3131    public override string Description {
    3232      get {
    3333        return "Paper: Order of Nonlinearity as a Complexity Measure for Models Generated by Symbolic Regression via Pareto Genetic Programming " + Environment.NewLine
    3434        + "Authors: Ekaterina J. Vladislavleva, Member, IEEE, Guido F. Smits, Member, IEEE, and Dick den Hertog" + Environment.NewLine
    35         + "Function: F1(X1, X2) = exp(-(X1 - 1))² / (1.2 + (X2 -2.5)²" + Environment.NewLine
     35        + "Function: F1(X1, X2) = exp(- (X1 - 1)²) / (1.2 + (X2 - 2.5)²)" + Environment.NewLine
    3636        + "Training Data: 100 points X1, X2 = Rand(0.3, 4)" + Environment.NewLine
    3737        + "Test Data: 45*45 points (X1, X2) = (-0.2:0.1:4.2)" + Environment.NewLine
  • stable/prepareProjectsForMono.sh

    r13172 r14193  
    1313unamestr=`uname`
    1414if [[ "$unamestr" == 'Darwin' ]]; then
    15    awk '/ICSharpCode.AvalonEdit-5.0.1|HeuristicLab.AvalonEdit-5.0.1/ {while (/ICSharpCode.AvalonEdit-5.0.1|HeuristicLab.AvalonEdit-5.0.1/ && getline>0) ; next} 1' HeuristicLab.ExtLibs.sln > tmp
     15   awk '/ICSharpCode.AvalonEdit-5.0.1|HeuristicLab.AvalonEdit-5.0.1|HeuristicLab.SharpDX-2.6.3/ {while (/ICSharpCode.AvalonEdit-5.0.1|HeuristicLab.AvalonEdit-5.0.1|HeuristicLab.SharpDX-2.6.3/ && getline>0) ; next} 1' HeuristicLab.ExtLibs.sln > tmp
    1616   mv tmp HeuristicLab.ExtLibs.sln
    1717
     
    2424
    2525elif [[ "$unamestr" == 'Linux' ]]; then
    26    sed -e '/ICSharpCode.AvalonEdit-5.0.1/,+1d' -e '/HeuristicLab.AvalonEdit-5.0.1/,+1d' HeuristicLab.ExtLibs.sln > tmp
     26   sed -e '/ICSharpCode.AvalonEdit-5.0.1/,+1d' -e '/HeuristicLab.SharpDX-2.6.3/,+1d' HeuristicLab.ExtLibs.sln > tmp
    2727   mv tmp HeuristicLab.ExtLibs.sln
    2828   sed -e '/HeuristicLab.Problems.ExternalEvaluation-3.4/,+1d' -e '/HeuristicLab.Problems.ExternalEvaluation.GP-3.5/,+1d' -e '/HeuristicLab.Problems.ExternalEvaluation.Views-3.4/,+1d' -e '/HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3/,+1d' "HeuristicLab 3.3.sln" > tmp
Note: See TracChangeset for help on using the changeset viewer.