Merge pull request #91 from alyst/fix_bench

Update benchmarking scripts

Author: robertfeldt

README.md

@@ -5,6 +5,7 @@ BlackBoxOptim.jl
 [![Coverage Status](https://coveralls.io/repos/robertfeldt/BlackBoxOptim.jl/badge.png?branch=master)](https://coveralls.io/r/robertfeldt/BlackBoxOptim.jl?branch=master)
 [![BlackBoxOptim](http://pkg.julialang.org/badges/BlackBoxOptim_0.6.svg)](http://pkg.julialang.org/?pkg=BlackBoxOptim)
 [![BlackBoxOptim](http://pkg.julialang.org/badges/BlackBoxOptim_0.7.svg)](http://pkg.julialang.org/?pkg=BlackBoxOptim)
+[![BlackBoxOptim](http://pkg.julialang.org/badges/BlackBoxOptim_1.0.svg)](http://pkg.julialang.org/?pkg=BlackBoxOptim)
 
 `BlackBoxOptim` is a global optimization package for Julia (http://julialang.org/). It supports both multi- and single-objective optimization problems and is focused on (meta-)heuristic/stochastic algorithms (DE, NES etc) that do NOT require the function being optimized to be differentiable. This is in contrast to more traditional, deterministic algorithms that are often based on gradients/differentiability. It also supports parallel evaluation to speed up optimization for functions that are slow to evaluate.
 

Rakefile

@@ -4,7 +4,7 @@ TestDir = "test"
 # General parameters that the user can set from the command line.
 Julia = "julia"
 Julia06 = "julia06"
-Julia07 = "julia07"
+Julia07 = "julia"
 MinReps = (ENV["minreps"] || 30).to_i
 MaxReps = (ENV["maxreps"] || 1000).to_i
 MaxRepTime = (ENV["maxreptime"] || 1.0).to_f
@@ -23,7 +23,7 @@ task :atest do
 end
 
 Command06 = "#{Julia06} --color=yes -L src/BlackBoxOptim.jl"
-Command07 = "#{Julia07} --depwarn=no --color=yes -L src/BlackBoxOptim.jl"
+Command07 = "#{Julia07} --depwarn=no --color=yes"
 Command = Command06
 
 desc "Run normal (fast) tests"
@@ -117,6 +117,16 @@ end
 desc "Benchmark (against latest, saved set of benchmark runs)"
 task :bench do
   cd("./examples/benchmarking")
-  sh("julia runcompare.jl 10")
+  sh("#{Command} runcompare.jl examples/benchmarking 10")
   cd("../..")
 end
+
+desc "Benchmark on 0.7 (against the latest benchmark reference)"
+task :bench07 do
+  sh("#{Command07} ./examples/benchmarking/runcompare.jl examples/benchmarking 10")
+end
+
+desc "Generate benchmark reference"
+task :benchref07 do
+  sh("#{Command07} ./examples/benchmarking/runupdate.jl examples/benchmarking 10")
+end

examples/benchmarking/activate_pwd_env.jl

@@ -0,0 +1,3 @@
+# activates the Julia environment associated with the working folder
+using Pkg
+Pkg.activate(".")